smart_properties 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ad423c03336ecabd1643f2cfea0faacc7e74f68
-  data.tar.gz: 5b1f77117faaa6314f0a4fe62952367cf3f13fcd
+  metadata.gz: 2348523c881e2d305ed3c9491cdc5ff5ab4c211c
+  data.tar.gz: 5fb7e1a4a6498b7d98d70786c53df1ed81337646
 SHA512:
-  metadata.gz: cb13998cb8ca5404110a2596dbc58442a13554d75026d44668759a35b7c3a942de99b3c80f32465917e5e4ff3c7a414f194768dc78ceb49a8eea89901e14c905
-  data.tar.gz: 61d44649397e83afb2c1abb20af45c01e7aac716e73089720d210b5faeb798c6d6695cc627287c564cb9b41f642c1383e72a52df7bb656cea3c38ce7040dbbda
+  metadata.gz: 9314f5a0c3de2c5deb2555c16d3a98073bceffd1cddf04ed0dee81bc22cf2e463f62f39c591fee1af5f6d84c2b26281f3bd191e449614ea7703698fb115a79b7
+  data.tar.gz: 1a7e4cbc840468d4dcea882eefd1ad46bcd1ce37c703a0bb6742c5417cee477c69235edb1d32acb8c401cb02e2e5a2553ec93f6a418ed7eace24da723f928d71

data/lib/smart_properties.rb

@@ -22,7 +22,7 @@
 #
 module SmartProperties
 
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 
   class Property
 
@@ -50,16 +50,7 @@ module SmartProperties
 
     def convert(value, scope)
       return value unless converter
-
-      if converter.respond_to?(:call)
-        scope.instance_exec(value, &converter)
-      else
-        begin
-          value.send(:"#{converter}")
-        rescue NoMethodError
-          raise ArgumentError, "#{value.class.name} does not respond to ##{converter}"
-        end
-      end
+      scope.instance_exec(value, &converter)
     end
 
     def default(scope)
@@ -70,12 +61,10 @@ module SmartProperties
       return true unless value
       return true unless accepter
 
-      if accepter.kind_of?(Enumerable)
-        accepter.include?(value)
-      elsif !accepter.kind_of?(Proc)
-        accepter === value
-      else
+      if accepter.respond_to?(:to_proc)
         !!scope.instance_exec(value, &accepter)
+      else
+        Array(accepter).any? { |accepter| accepter === value }
       end
     end
 

data/smart_properties.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SmartProperties::VERSION
 
-  gem.add_development_dependency "rspec", "~> 2.12"
+  gem.add_development_dependency "rspec", "~> 2.14"
   gem.add_development_dependency "rake", "~> 0.8"
   gem.add_development_dependency "guard-rspec", "~> 0.7"
 end

data/spec/smart_properties_spec.rb

@@ -3,22 +3,20 @@ require 'spec_helper'
 describe SmartProperties do
 
   context "when extending an other class" do
-
-    subject do
+    subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
       end
     end
 
     it "should add a .property method" do
-      subject.respond_to?(:property, true).should be_true
+      klass.respond_to?(:property, true).should be_true
     end
 
     context "and defining a property with invalid configuration options" do
-
       it "should raise an error reporting one invalid option when one invalid option was given" do
         expect {
-          subject.tap do |c|
+          klass.tap do |c|
             c.instance_eval do
               property :title, :invalid_option => 'boom'
             end
@@ -28,21 +26,18 @@ describe SmartProperties do
 
       it "should raise an error reporting three invalid options when three invalid options were given" do
         expect {
-          subject.tap do |c|
+          klass.tap do |c|
             c.instance_eval do
               property :title, :invalid_option_1 => 'boom', :invalid_option_2 => 'boom', :invalid_option_3 => 'boom'
             end
           end
         }.to raise_error(ArgumentError, "SmartProperties do not support the following configuration options: invalid_option_1, invalid_option_2, invalid_option_3.")
       end
-
     end
-
   end
 
   context "when used to build a class that has a property called :title" do
-
-    subject do
+    subject(:klass) do
       title = Object.new.tap do |o|
         def o.to_title; 'chunky'; end
       end
@@ -62,103 +57,76 @@ describe SmartProperties do
       klass
     end
 
+    let(:superklass) { klass }
+
     it { should have_smart_property(:title) }
 
     context "instances of this class" do
-
-      klass = subject.call
-
-      subject do
-        klass.new
-      end
+      subject(:instance) { klass.new }
 
       it { should respond_to(:title) }
       it { should respond_to(:title=) }
 
       it "should have 'chucky' as default value for title" do
-        subject.title.should be == 'chunky'
+        instance.title.should be == 'chunky'
       end
 
       it "should convert all values that are assigned to title into strings" do
-        subject.title = double(:to_title => 'bacon')
-        subject.title.should be == 'bacon'
+        instance.title = double(:to_title => 'bacon')
+        instance.title.should be == 'bacon'
       end
 
       it "should not allow to set nil as title" do
-        expect { subject.title = nil }.to raise_error(ArgumentError, "TestDummy requires the property title to be set")
+        expect { instance.title = nil }.to raise_error(ArgumentError, "TestDummy requires the property title to be set")
       end
 
       it "should not allow to set objects as title that do not respond to #to_title" do
-        expect { subject.title = Object.new }.to raise_error(ArgumentError, "Object does not respond to #to_title")
+        expect { instance.title = Object.new }.to raise_error(NoMethodError, /undefined method `to_title'/)
       end
 
       it "should not influence other instances that have been initialized with different attributes" do
-        other = klass.new :title => double(:to_title => 'Lorem ipsum')
+        other_instance = klass.new :title => double(:to_title => 'Lorem ipsum')
 
-        subject.title.should be == 'chunky'
-        other.title.should   be == 'Lorem ipsum'
+        instance.title.should be == 'chunky'
+        other_instance.title.should be == 'Lorem ipsum'
       end
 
       context "when initialized with a block" do
-
-        subject do
+        subject(:instance) do
           klass.new do |c|
             c.title = double(:to_title => 'bacon')
           end
         end
 
         it "should have the title specified in the block" do
-          subject.title.should be == 'bacon'
+          instance.title.should be == 'bacon'
         end
-
       end
-
     end
 
     context "when subclassed" do
-
-      superklass = subject.call
-
-      subject do
-        Class.new(superklass)
-      end
+      subject(:subklass) { Class.new(superklass) }
 
       it { should have_smart_property(:title) }
 
       context "instances of this subclass" do
-
-        klass = subject.call
-
-        subject do
-          klass.new
-        end
+        subject(:instance) { subklass.new }
 
         it { should respond_to(:title) }
         it { should respond_to(:title=) }
-
       end
 
       context "instances of this subclass that have been intialized from a set of attributes" do
-
-        klass = subject.call
-
-        subject do
-          klass.new :title => stub(:to_title => 'Message')
-        end
+        subject(:instance) { subklass.new :title => double(:to_title => 'Message') }
 
         it "should have the correct title" do
-          subject.title.should be == 'Message'
+          instance.title.should be == 'Message'
         end
-
       end
-
     end
 
     context "when subclassed and extended with a property called text" do
-
-      superklass = subject.call
-
-      subject do
+      subject(:subklass) do
         Class.new(superklass).tap do |c|
           c.instance_eval do
             property :text
@@ -170,80 +138,46 @@ describe SmartProperties do
       it { should have_smart_property(:text) }
 
       context "instances of this subclass" do
-
-        klass = subject.call
-
-        subject do
-          klass.new
-        end
+        subject(:instance) { subklass.new }
 
         it { should respond_to(:title) }
         it { should respond_to(:title=) }
         it { should respond_to(:text) }
         it { should respond_to(:text=) }
-
       end
 
       context "instances of the super class" do
-
-        subject do
-          superklass.new
-        end
+        subject(:instance) { superklass.new }
 
         it { should_not respond_to(:text) }
         it { should_not respond_to(:text=) }
-
       end
 
       context "instances of this subclass" do
-
-        klass = subject.call
-
         context "when initialized with a set of attributes" do
+          subject(:instance) { subklass.new :title => double(:to_title => 'Message'), :text => "Hello" }
 
-          subject do
-            klass.new :title => stub(:to_title => 'Message'), :text => "Hello"
-          end
-
-          it "should have the correct title" do
-            subject.title.should be == 'Message'
-          end
-
-          it "should have the correct text" do
-            subject.text.should be == 'Hello'
-          end
-
+          it("should have the correct title") { instance.title.should be == 'Message' }
+          it("should have the correct text") { instance.text.should be == 'Hello' }
         end
 
         context "when initialized with a block" do
-
-          subject do
-            klass.new do |c|
-              c.title = stub(:to_title => 'Message')
+          subject(:instance) do
+            subklass.new do |c|
+              c.title = double(:to_title => 'Message')
               c.text = "Hello"
             end
           end
 
-          it "should have the title specified in the block" do
-            subject.title.should be == 'Message'
-          end
-
-          it "should have the text specified in the block" do
-            subject.text.should be == 'Hello'
-          end
-
+          it("should have the correct title") { instance.title.should be == 'Message' }
+          it("should have the correct text") { instance.text.should be == 'Hello' }
         end
-
       end
-
     end
 
     context "when extended with a :type property at runtime" do
-
-      klass = subject.call
-
-      subject do
-        klass.tap do |c|
+      before do
+        superklass.tap do |c|
           c.instance_eval do
             property :type, :converts => :to_sym
           end
@@ -254,51 +188,29 @@ describe SmartProperties do
       it { should have_smart_property(:type) }
 
       context "instances of this class" do
-
-        klass = subject.call
-
-        subject do
-          klass.new :title => double(:to_title => 'Lorem ipsum')
-        end
+        subject(:instance) { superklass.new :title => double(:to_title => 'Lorem ipsum') }
 
         it { should respond_to(:type)  }
         it { should respond_to(:type=) }
-
       end
 
       context "when subclassing this class" do
-
-        superklass = subject.call
-
-        subject do
-          Class.new(superklass)
-        end
+        subject(:subclass) { Class.new(superklass) }
 
         context "instances of this class" do
-
-          klass = subject.call
-
-          subject do
-            klass.new :title => double(:to_title => 'Lorem ipsum')
-          end
+          subject(:instance) { subclass.new :title => double(:to_title => 'Lorem ipsum') }
 
           it { should respond_to :title }
           it { should respond_to :title= }
-
           it { should respond_to :type }
           it { should respond_to :type= }
-
         end
-
       end
-
     end
-
   end
 
-  context "when used to build a class that has a property called :title which a lambda statement for conversion" do
-
-    subject do
+  context "when used to build a class that has a property called :title that uses a lambda statement for conversion" do
+    subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
         c.instance_eval do
@@ -308,25 +220,43 @@ describe SmartProperties do
     end
 
     context "instances of this class" do
+      subject(:instance) { klass.new }
 
-      klass = subject.call
-
-      subject do
-        klass.new
+      it "should convert the property title as specified the lambda statement" do
+        instance.title = "Lorem ipsum"
+        instance.title.should be == "<title>Lorem ipsum</title>"
       end
+    end
+  end
 
-      it "should convert the property title as specified the lambda statement" do
-        subject.title = "Lorem ipsum"
-        subject.title.should be == "<title>Lorem ipsum</title>"
+  context "when used to build a class that has a property called :title that uses an object that responds to #to_proc for conversion" do
+    subject(:klass) do
+      converter = Object.new.tap do |o|
+        def o.to_proc
+          lambda { |t| "<title>#{t.to_s}</title>"}
+        end
       end
 
+      Class.new.tap do |c|
+        c.send(:include, described_class)
+        c.instance_eval do
+          property :title, :converts => converter
+        end
+      end
     end
 
+    context "instances of this class" do
+      subject(:instance) { klass.new }
+
+      it "should convert the property title as specified the lambda statement" do
+        instance.title = "Lorem ipsum"
+        instance.title.should be == "<title>Lorem ipsum</title>"
+      end
+    end
   end
 
   context "when used to build a class that has a property called :visible which uses an array of valid values for acceptance checking" do
-
-    subject do
+    subject(:klass) do
       Class.new.tap do |c|
         def c.name; "TestDummy"; end
 
@@ -339,32 +269,47 @@ describe SmartProperties do
     end
 
     context "instances of this class" do
-
-      klass = subject.call
-
-      subject do
-        klass.new
-      end
+      subject(:instance) { klass.new }
 
       it "should allow to set true as value for visible" do
-        expect { subject.visible = true }.to_not raise_error
+        expect { instance.visible = true }.to_not raise_error
       end
 
       it "should allow to set false as value for visible" do
-        expect { subject.visible = false }.to_not raise_error
+        expect { instance.visible = false }.to_not raise_error
       end
 
       it "should not allow to set :maybe as value for visible" do
-        expect { subject.visible = :maybe }.to raise_error(ArgumentError, "TestDummy does not accept :maybe as value for the property visible")
+        expect { instance.visible = :maybe }.to raise_error(ArgumentError, "TestDummy does not accept :maybe as value for the property visible")
       end
+    end
+  end
 
+  context "when used to build a class that has a property called :title that can either be a String or a Symbol" do
+    subject(:klass) do
+      Class.new.tap do |c|
+        c.send(:include, described_class)
+        c.instance_eval do
+          property :title, accepts: [String, Symbol]
+        end
+      end
     end
 
+    context "intance of this class" do
+      subject(:instance) { klass.new }
+
+      it "should accept a String as title" do
+        expect { subject.title = "Test" }.to_not raise_error
+      end
+
+      it "should accept a Symbol as title" do
+        expect { subject.title = :test }.to_not raise_error
+      end
+    end
   end
 
   context 'when used to build a class that has a property called :license_plate which uses a lambda statement for accpetance checking' do
-
-    subject do
+    subject(:klass) do
       Class.new.tap do |c|
         def c.name; 'TestDummy'; end
 
@@ -377,28 +322,20 @@ describe SmartProperties do
     end
 
     context 'instances of this class' do
-
-      klass = subject.call
-
-      subject do
-        klass.new
-      end
+      subject(:instance) { klass.new }
 
       it 'should not a accept "invalid" as value for license_plate' do
-        expect { subject.license_plate = "invalid" }.to raise_error(ArgumentError, 'TestDummy does not accept "invalid" as value for the property license_plate')
+        expect { instance.license_plate = "invalid" }.to raise_error(ArgumentError, 'TestDummy does not accept "invalid" as value for the property license_plate')
       end
 
       it 'should accept "NE RD 1337" as license plate' do
-        expect { subject.license_plate = "NE RD 1337" }.to_not raise_error
+        expect { instance.license_plate = "NE RD 1337" }.to_not raise_error
       end
-
     end
-
   end
 
   context 'when used to build a class that has a property called :text whose getter is overriden' do
-
-    subject do
+    subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
 
@@ -415,24 +352,16 @@ describe SmartProperties do
     end
 
     context "instances of this class" do
-
-      klass = subject.call
-
-      subject do
-        klass.new
-      end
+      subject(:instance) { klass.new }
 
       it "should return the accepted value for the property called :text" do
-        subject.text.should be == '<em>Hello</em>'
+        instance.text.should be == '<em>Hello</em>'
       end
-
     end
-
   end
 
   context 'when used to build a class that has a property called :id whose default value is a lambda statement' do
-
-    subject do
+    subject(:klass) do
       counter = Class.new.tap do |c|
 
         c.class_eval do
@@ -454,22 +383,16 @@ describe SmartProperties do
     end
 
     context "instances of this class" do
-
-      klass = subject.call
-
       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
-
   end
 
   context 'when used to build a class that is then subclassed and later extended at runtime' do
-
     let!(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
@@ -490,16 +413,13 @@ describe SmartProperties do
     end
 
     context "the class" do
-
       subject { klass }
 
       it { should have_smart_property(:title) }
       it { should have_smart_property(:priority) }
-
     end
 
     context 'the subclass' do
-
       subject { subklass }
 
       it { should have_smart_property(:title) }
@@ -513,7 +433,7 @@ describe SmartProperties do
           s.body = "Lorem ipsum dolor sit amet."
         end
 
-        expect { subject.new(&configuration_instructions) }.to_not raise_error
+        expect { subklass.new(&configuration_instructions) }.to_not raise_error
       end
 
       it "should be initializable using a hash of attributes" do
@@ -523,15 +443,12 @@ describe SmartProperties do
           :body => "Lorem ipsum dolor sit amet."
         }
 
-        expect { subject.new(attributes) }.to_not raise_error
+        expect { subklass.new(attributes) }.to_not raise_error
       end
-
     end
-
   end
 
   context "when building a class that has a property which is not required and has a default" do
-
     subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
@@ -540,43 +457,33 @@ describe SmartProperties do
     end
 
     context 'instances of that class' do
-
       context 'when created with a set of attributes that explicitly contains nil for the title' do
-
         subject(:instance) { klass.new :title => nil }
 
         it "should have no title" do
           instance.title.should be_nil
         end
-
       end
 
       context 'when created without any arguments' do
-
         subject(:instance) { klass.new }
 
         it "should have the default title" do
           instance.title.should be == 'Lorem Ipsum'
         end
-
       end
 
       context 'when created with an empty block' do
-
         subject(:instance) { klass.new {} }
 
         it "should have the default title" do
           instance.title.should be == 'Lorem Ipsum'
         end
-
       end
-
     end
-
   end
 
   context "when building a class that has a property which is required and has no default" do
-
     subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
@@ -587,41 +494,31 @@ describe SmartProperties do
     end
 
     context 'instances of that class' do
-
       context 'when created with a set of attributes that explicitly contains nil for the title' do
-
         subject(:instance) { klass.new :title => 'Lorem Ipsum' }
 
         it "should have no title" do
           instance.title.should be == 'Lorem Ipsum'
         end
-
       end
 
       context 'when created with an block specifying that property' do
-
         subject(:instance) { klass.new { |i| i.title = 'Lorem Ipsum' } }
 
         it "should have the default title" do
           instance.title.should be == 'Lorem Ipsum'
         end
-
       end
 
       context "when created with no arguments" do
-
         it "should raise an error stating that required properties are missing" do
-          expect { subject.new }.to raise_error(ArgumentError, "Dummy requires the following properties to be set: title")
+          expect { klass.new }.to raise_error(ArgumentError, "Dummy requires the following properties to be set: title")
         end
-
       end
-
     end
-
   end
 
   context "when building a class that has a property which is required depending on the value of another property" do
-
     subject(:klass) do
       described_class = self.described_class
 
@@ -650,11 +547,9 @@ describe SmartProperties do
         expect { klass.new name: "John Doe", anonymous: false }.to_not raise_error
       end
     end
-
   end
 
   context "when building a class that has a property which is required and has false as default" do
-
     subject(:klass) do
       Class.new.tap do |c|
         c.send(:include, described_class)
@@ -665,39 +560,29 @@ describe SmartProperties do
     end
 
     context 'instances of that class' do
-
       context 'when created with a set of attributes that explicitly contains nil for the title' do
-
         subject(:instance) { klass.new :flag => true }
 
         it "should have no title" do
           instance.flag.should be_true
         end
-
       end
 
       context 'when created with an block specifying that property' do
-
         subject(:instance) { klass.new { |i| i.flag = true } }
 
         it "should have the default title" do
           instance.flag.should be_true
         end
-
       end
 
       context "when created with no arguments" do
-
         subject(:instance) { klass.new }
 
         it "should have false as default flag" do
           instance.flag.should be_false
         end
-
       end
-
     end
-
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement