smart_properties 1.0.2 → 1.0.3

data/lib/smart_properties.rb

@@ -22,7 +22,7 @@
 #
 module SmartProperties
   
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   
   class Property
 
@@ -60,8 +60,8 @@ module SmartProperties
       end
     end
     
-    def default
-      @default.kind_of?(Proc) ? @default.call : @default
+    def default(scope)
+      @default.kind_of?(Proc) ? scope.instance_exec(&@default) : @default
     end
 
     def accepts?(value, scope)
@@ -210,7 +210,7 @@ module SmartProperties
     attrs ||= {}
 
     self.class.properties.each do |_, property|
-      value = attrs.key?(property.name) ? attrs.delete(property.name) : property.default
+      value = attrs.key?(property.name) ? attrs.delete(property.name) : property.default(self)
       send(:"#{property.name}=", value)
     end
   end

data/spec/smart_properties_spec.rb

@@ -373,14 +373,25 @@ describe SmartProperties do
     
   end
   
-  context 'when used to build a class that has a property called :text whose default value is a lambda statement' do
+  context 'when used to build a class that has a property called :id whose default value is a lambda statement' do
     
     subject do
+      counter = Class.new.tap do |c|
+        
+        c.class_eval do
+          def next
+            @counter ||= 0
+            @counter += 1
+          end
+        end
+        
+      end.new
+      
       Class.new.tap do |c|
         c.send(:include, described_class)
         
         c.instance_eval do
-          property :text, :default => lambda { "-" * 3 }
+          property :id, :default => lambda { counter.next }
         end
       end
     end
@@ -389,12 +400,11 @@ describe SmartProperties do
       
       klass = subject.call
       
-      subject do
-        klass.new
-      end
-      
-      it "should return the result of the lambda statement as default value for :text" do
-        subject.text.should be == '---'
+      it "should have auto-incrementing ids" do
+        first_instance = klass.new
+        second_instance = klass.new
+        
+        (second_instance.id - first_instance.id).should be == 1
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4417476715899075786
+      hash: 3382560522935455660
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4417476715899075786
+      hash: 3382560522935455660
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24