Changeset 188

Timestamp:

02/15/07 21:15:52 (2 years ago)

Author:

e.@brainspl.at

Message:

checking in some changes to fragment cache adding trait method to Object , make the merb server spit out the options only after they have been munged so the correct options show

Files:

• trunk/lib/merb/caching/fragment_cache.rb (modified) (1 diff)
• trunk/lib/merb/core_ext/merb_object.rb (modified) (2 diffs)
• trunk/lib/merb/merb_server.rb (modified) (1 diff)

trunk/lib/merb/caching/fragment_cache.rb

@@ -4 +4 @@
-      class << self
-        def cache
-__
+
-        end
-        

trunk/lib/merb/core_ext/merb_object.rb

@@ +1 @@
+Traits = Hash.new{|h,k| h[k] = {}}
+
-class Object
+  # traits thanks to Michael Fellinger m.fellinger@gmail.com
+  # Adds a method to Object to annotate your objects with certain traits.
+  # It's basically a simple Hash that takes the current object as key
+  #
+  # Example:
+  #
+  #   class Foo
+  #     trait :instance => false
+  #
+  #     def initialize
+  #       trait :instance => true
+  #     end
+  #   end
+  #
+  #   Foo.trait[:instance]
+  #   # false
+  #
+  #   foo = Foo.new
+  #   foo.trait[:instance]
+  #   # true
+
+  def trait hash = nil
+    if hash
+      Traits[self].merge! hash
+    else
+      Traits[self]
+    end
+  end
+
+  # builds a trait from all the ancestors, closer ancestors
+  # overwrite distant ancestors
+  #
+  # class Foo
+  #   trait :one => :eins
+  #   trait :first => :erstes
+  # end
+  #
+  # class Bar < Foo
+  #   trait :two => :zwei
+  # end
+  #
+  # class Foobar < Bar
+  #   trait :three => :drei
+  #   trait :first => :overwritten
+  # end
+  #
+  # Foobar.ancestral_trait
+  # {:three=>:drei, :two=>:zwei, :one=>:eins, :first=>:overwritten}
+
+  def ancestral_trait
+    ancs = (ancestors rescue self.class.ancestors)
+    ancs.reverse.inject({}){|s,v| s.merge(v.trait)}.merge(trait)
+  end
+  
-  def returning(value)
-    yield(value)
@@ -5 +61 @@
-  end
-  
-__meta
-__meta
+meta_class
+meta_class
-  def meta_def(name, &blk) meta_eval { define_method name, &blk } end
-  def class_def name, &blk

trunk/lib/merb/merb_server.rb

@@ -116 +116 @@
-      
-        @@merb_opts = options
-
+
+
+
+
-          puts %{Merb started with these options:}
-          puts @@merb_opts.to_yaml; puts
-        end
-      end
-      
-      def initialize_merb
-        require 'merb'
-        require @@merb_opts[:merb_root] / 'dist/conf/router.rb'