fattr 2.0.0 → 2.1.0

data/a.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'fattr'
+
+class A
+  class << A
+    fattr(:x, :inheritable => true){ 42 }
+  end
+end
+
+class B < A; end
+
+class C < B; end
+
+
+p C.x
+p B.x
+p A.x
+puts
+
+B.x = 42.0
+
+p C.x
+p B.x
+p A.x
+puts
+
+C.x! # force re-initialization from parent(s)
+
+p C.x
+p B.x
+p A.x
+puts
+
+
+class K
+end
+module M
+  fattr(:x, :inheritable => true){ 42 }
+end
+K.extend(M)
+
+p K.x

data/fattr.gemspec

@@ -4,11 +4,11 @@
 Gem::Specification::new do |spec|
   spec.name = "fattr"
   spec.description = 'fattr.rb is a "fatter attr" for ruby'  
-  spec.version = "2.0.0"
+  spec.version = "2.1.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "fattr"
 
-  spec.files = ["fattr.gemspec", "lib", "lib/fattr.rb", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "test", "test/fattr.rb"]
+  spec.files = ["a.rb", "fattr.gemspec", "lib", "lib/fattr.rb", "Rakefile", "README", "README.erb", "samples", "samples/a.rb", "samples/b.rb", "samples/c.rb", "samples/d.rb", "samples/e.rb", "samples/f.rb", "samples/g.rb", "samples/h.rb", "test", "test/fattr.rb"]
   spec.executables = []
   
   

data/lib/fattr.rb

@@ -1,5 +1,5 @@
 module Fattr
-  Fattr::Version = '2.0.0' unless Fattr.const_defined?(:Version)
+  Fattr::Version = '2.1.0' unless Fattr.const_defined?(:Version)
   def self.version() Fattr::Version end
 
   class List < ::Array
@@ -65,25 +65,25 @@ module Fattr
         default = config['default'] if config.has_key?('default')
 
         inheritable = false
-        if Class===self
+        if Module===self
           inheritable = config[:inheritable] if config.has_key?(:inheritable)
           inheritable = config['inheritable'] if config.has_key?('inheritable')
         end
 
         initialize = (
-          block || (
-            unless inheritable
-              lambda{ default }
-            else
-              lambda do
-                if ancestors[1..-1].any?{|ancestor| ancestor.Fattrs.include?(name)}
-                  ancestors[1].send(name)
-                else
-                  default
+          if inheritable
+            lambda do
+              parents = ancestors[1..-1]
+              catch(:value) do
+                parents.each do |parent|
+                  throw(:value, parent.send(name)) if parent.respond_to?(name)
                 end
+                block ? block.call : default
               end
             end
-          )
+          else
+            block || lambda{ default }
+          end
         )
 
         initializer = lambda do |this|

data/test/fattr.rb

@@ -65,21 +65,27 @@ Testing Fattr do
     a = Class.new{ Fattr :x, :default => 42, :inheritable => true }
     b = Class.new(a)
     c = Class.new(b)
+
     def a.name() 'a' end
     def b.name() 'b' end
     def c.name() 'c' end
+
     assert{ c.x==42 }
     assert{ b.x==42 }
     assert{ a.x==42 }
+
     assert{ b.x=42.0 }
     assert{ b.x==42.0 }
     assert{ a.x==42 }
+
     assert{ a.x='forty-two' }
     assert{ a.x=='forty-two' }
     assert{ b.x==42.0 }
+
     assert{ b.x! }
     assert{ b.x=='forty-two' }
     assert{ b.x='FORTY-TWO' }
+
     assert{ c.x! }
     assert{ c.x=='FORTY-TWO' }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fattr
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 -06:00
+date: 2009-10-12 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- a.rb
 - fattr.gemspec
 - lib/fattr.rb
 - Rakefile