smart_properties 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e43f13ab772a153c4729a1f20be52f140934555
-  data.tar.gz: 5dab533362b6132ee4b67c4eaef9269d957b4211
+  metadata.gz: 863983d7a1707f254f044997c1e35b193bfb2c36
+  data.tar.gz: 4853b0a0f314cc9c8f1062d293a5f550fce92f1c
 SHA512:
-  metadata.gz: 3b3c1e442d65b38c7571a2380b9bbdc643dd6f3b3d9931be1edeafcd3f9eedf9432e0637ce585e6a2d383274a3090eae0bde5473c461dcb7a1346ff3671769cb
-  data.tar.gz: 80ebfc6a118202f954e7b347b8685132e23478bbc9f9ef4e8dbd0d34bb5d98f009f71fab9b4f213f9618938c1d62b6de762989b4e89ef9c70224e22468b5e15d
+  metadata.gz: 6cb253427617818e2969273311ffaa622289c8420920b7cb98cf981857693a7c0a2a06c8b789b33c1a258e978b4b3372e60d86c58a0e783a2369069637eb8432
+  data.tar.gz: d55fbab7960a235c68fcb28765366926de5fccad1daee313b437e135100ef5bb09fd755bbd9b6cffebaebd6bfd7ae5e9178b300ae400ad585ec88d3d67cefcd1

data/lib/smart_properties.rb

@@ -21,7 +21,7 @@
 #                           :required => true
 #
 module SmartProperties
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 
   class Error < ::ArgumentError; end
   class ConfigurationError < Error; end
@@ -312,8 +312,10 @@ module SmartProperties
   #
   # @param [Hash] attrs the set of attributes that is used for initialization
   #
-  def initialize(attrs = {}, &block)
-    attrs ||= {}
+  def initialize(*args, &block)
+    attrs = args.last.is_a?(Hash) ? args.pop : {}
+    super(*args)
+
     properties = self.class.properties.each.to_a
     missing_properties = []
 

data/spec/smart_properties_spec.rb

@@ -1,6 +1,68 @@
 require 'spec_helper'
 
 describe SmartProperties do
+  described_module = self.described_class
+
+  context 'when extending a subclass' do
+    let(:klass) do
+      Class.new do
+        attr_reader :a, :b
+
+        def initialize(a = 13, b = nil)
+          @a = a
+          @b = b
+        end
+      end
+    end
+
+    let(:subklass) do
+      Class.new(klass) do
+        include described_module
+        property :title
+      end
+    end
+
+    context 'when creating new instances' do
+      it 'should call the super-class constructor' do
+        instance = subklass.new
+        expect(instance.a).to eq(13)
+      end
+
+      it 'should handle keyword arguments' do
+        instance = subklass.new(:title => 'Lorem ipsum')
+        expect(instance.title).to eq('Lorem ipsum')
+      end
+    end
+
+    context 'when creating new instances with additional positional arguments' do
+      it 'it should forward those arguments to super-class constructor' do
+        instance = subklass.new(1, 2)
+        expect(instance.a).to eq(1)
+        expect(instance.b).to eq(2)
+      end
+
+      it 'should forward arrays as they are to the super-class constructor' do
+        instance = subklass.new([1, 2])
+        expect(instance.a).to eq([1, 2])
+        expect(instance.b).to eq(nil)
+      end
+
+      it 'should handle keyword arguments' do
+        instance = subklass.new(1, :title => 'Lorem ipsum')
+        expect(instance.a).to eq(1)
+        expect(instance.b).to eq(nil)
+        expect(instance.title).to eq('Lorem ipsum')
+      end
+
+      it 'should handle blocks' do
+        instance = subklass.new(1) { |i| i.title = 'Lorem ipsum' }
+        expect(instance.a).to eq(1)
+        expect(instance.b).to eq(nil)
+        expect(instance.title).to eq('Lorem ipsum')
+      end
+    end
+  end
+
   context "when extending an other class" do
     subject(:klass) do
       Class.new.tap do |c|

data/spec/support/smart_property_matcher.rb

@@ -1,45 +1,56 @@
 module Matchers
   class SmartPropertyMatcher
-
     attr_reader :property_name
-    attr_reader :instance
+    attr_reader :subject
 
     def initialize(property_name)
       @property_name = property_name
     end
 
-    def matches?(instance)
-      @instance = instance
-      smart_property_enabled? && is_smart_property?
+    def matches?(subject)
+      @subject = subject.is_a?(Class) ? subject : subject.class
+      smart_property_enabled? && is_smart_property? && getters_and_setters_are_defined?
+    end
+
+    def does_not_match?(subject)
+      @subject = subject.is_a?(Class) ? subject : subject.class
+      !smart_property_enabled? || !is_smart_property?
+    end
+
+    def description
+      "have smart property #{property_name}"
     end
 
     def failure_message
-      return "expected #{instance.class.name} to have a property named #{property_name}" if smart_property_enabled?
-      return "expected #{instance.class.name} to be smart property enabled"
+      return "expected #{subject.class.name} to have a property named #{property_name}" if smart_property_enabled?
+      return "expected #{subject.class.name} to be smart property enabled"
     end
 
     def failure_message_when_negated
-      "expected #{instance.class.name} to not have a property named #{property_name}"
+      "expected #{subject.class.name} to not have a property named #{property_name}"
     end
     alias negative_failure_message failure_message_when_negated
 
     private
 
-      def smart_property_enabled?
-        instance.ancestors.include?(::SmartProperties)
-      end
+    def smart_property_enabled?
+      subject.ancestors.include?(::SmartProperties)
+    end
 
-      def is_smart_property?
-        instance.properties[property_name].kind_of?(::SmartProperties::Property)
-      end
+    def is_smart_property?
+      subject.properties[property_name].kind_of?(::SmartProperties::Property)
+    end
 
+    def getters_and_setters_are_defined?
+      methods = subject.instance_methods
+      methods.include?(property_name) && methods.include?(:"#{property_name}=")
+    end
   end
 
-  def has_smart_property(*args)
+  def have_smart_property(*args)
     SmartPropertyMatcher.new(*args)
   end
-
-  alias :have_smart_property :has_smart_property
+  alias has_smart_property have_smart_property
 end
 
 RSpec.configure do |spec|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_properties
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Konstantin Tennhard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec