constructable 0.2.5 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.3.0

data/constructable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{constructable}
-  s.version = "0.2.5"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]
-  s.date = %q{2011-06-12}
+  s.date = %q{2011-06-15}
   s.description = %q{
 Adds the class macro Class#constructable to easily define what attributes a Class accepts provided as a hash to Class#new.
 Attributes can be configured in their behaviour in case they are not provided or are in the wrong format.

data/lib/constructable/attribute.rb

@@ -4,12 +4,6 @@ module Constructable
     attr_accessor *ATTRIBUTES, :name
     attr_reader :value
 
-    REQUIRED_REQUIREMENT = {
-      name: :required,
-      message: proc {":#{self.name} is a required attribute"},
-      check: ->(hash) { hash[self.name] }
-    }
-
     REQUIREMENTS = [
       {
         name: :validate,
@@ -55,10 +49,11 @@ module Constructable
         REQUIREMENTS.each do |requirement|
           check_for_requirement(requirement, constructor_hash)
         end
+
         value = constructor_hash[self.name]
         self.converter ? converter.(value) : value
       else
-        check_for_requirement(REQUIRED_REQUIREMENT, constructor_hash)
+        raise AttributeError, ":#{self.name} is a required attribute" if self.required
         self.default
       end
     end

data/lib/constructable/constructor.rb

@@ -2,11 +2,12 @@ module Constructable
   class Constructor
     attr_accessor :attributes
 
-    def initialize(klass)
+    def initialize(base)
       @attributes = []
-      @klass = klass
-      self.redefine_new(klass)
-      self.define_attributes_method
+      @module = Module.new
+      @base = base
+      @base.send :include, @module
+      self.define_concstructable_attributes_method
     end
 
     def redefine_new(klass)
@@ -20,14 +21,13 @@ module Constructable
       end
     end
 
-
     def define_attributes(attributes)
       attributes = generate_attributes(attributes)
       @attributes.concat attributes
 
       attributes = @attributes
       attributes.each do |attribute|
-        @klass.class_eval do
+        @module.module_eval do
           attr_reader attribute.name if attribute.readable
 
           define_method(:"#{attribute.name}=") do |value|
@@ -50,10 +50,10 @@ module Constructable
       end
     end
 
-    def define_attributes_method
+    def define_concstructable_attributes_method
       constructor = self
-      @klass.class_eval do
-        define_method :attributes do
+      @base.module_eval do
+        define_method :constructable_attributes do
           Hash[
             constructor.attributes
             .map { |a| [a.name,instance_variable_get(a.ivar_symbol)] }

data/lib/constructable/core_ext.rb

@@ -34,16 +34,17 @@ module Constructable
     #
     # @param [Array<[Array<Symbol, Hash>]>] args an array of symbols or arrays: the name of the attribute and it's configuration
     def constructable(*args)
+      @constructor ||= Constructor.new(self)
+      @constructor.define_attributes(args)
       case self
       when Class
-        @constructor ||= Constructor.new(self)
-        @constructor.define_attributes(args)
-        return nil
+        @constructor.redefine_new(self)
       when Module
-        define_singleton_method :included do |klass|
-          klass.constructable *args
+        define_singleton_method :included do |base|
+          @constructor.redefine_new(base) if Class === base
         end
       end
+      return nil
     end
   end
 end

data/test/constructable/test_constructable.rb

@@ -2,13 +2,6 @@ require 'helper'
 describe 'integration' do
   describe 'Class' do
     describe 'constructable' do
-      it 'should define attr_accessors' do
-        klass = Class.new
-        klass.constructable([:foo, accessible: true])
-        assert_respond_to klass.new, :foo
-        assert_respond_to klass.new, :foo=
-      end
-
       it 'should assign values found in the constructer hash' do
         klass = Class.new
         klass.constructable([:foo, readable: true])
@@ -45,17 +38,19 @@ describe 'integration' do
           assert_equal 20, instance.bar
         end
 
-        it 'works for methods with only arguments provided' do
+        it 'works for initialize methods with arguments' do
           klass = Class.new
           klass.constructable [:bar, accessible: true]
+          klass.send :attr_accessor, :baz
           klass.class_eval do
-            def initialize(bar)
-              self.bar = bar
+            def initialize(baz, options = {})
+              self.baz = baz
             end
           end
 
-          instance = klass.new(1)
-          assert_equal 1, instance.bar
+          instance = klass.new(1, bar: 5)
+          assert_equal 1, instance.baz
+          assert_equal 5, instance.bar
         end
       end
 

data/test/constructable/test_constructor.rb

@@ -2,9 +2,17 @@ require 'helper'
 describe 'Constructor' do
   before do
     @klass = Class.new
+    @module = Module.new
   end
 
   describe 'define_attributes' do
+    it 'should define attr_accessors' do
+      klass = Class.new
+      klass.constructable([:foo, accessible: true])
+      assert_respond_to klass.new, :foo
+      assert_respond_to klass.new, :foo=
+    end
+
     it 'defines public setters validating like in the constructor' do
       @klass.constructable [:integer, validate_type: Integer, writable: true]
       instance = @klass.new
@@ -12,13 +20,82 @@ describe 'Constructor' do
         instance.integer = 6.6
       end
     end
+
+    describe 'redefining' do
+
+      describe 'class' do
+        it 'getters ' do
+          @klass.constructable [:integer, validate_type: Integer, accessible: true]
+          @klass.class_eval { define_method(:integer){ 1 } }
+          instance = @klass.new(integer: 2)
+          assert_equal 1, instance.integer
+        end
+
+        it 'setters ' do
+          @klass.constructable [:integer, validate_type: Integer, accessible: true]
+          @klass.class_eval { def integer=(foo);@integer = 1;end }
+          instance = @klass.new(integer: 4)
+          instance.integer = 5
+          assert_equal 1, instance.integer
+        end
+      end
+
+      describe 'module' do
+        before do
+          @module.constructable [:integer, validate_type: Integer, accessible: true]
+        end
+
+        it 'getters ' do
+          @module.module_eval { def integer;1;end }
+          @klass.send :include,@module
+          instance = @klass.new(integer: 2)
+          assert_equal 1, instance.integer
+        end
+
+        it 'setters ' do
+          @module.module_eval { def integer=(foo);@integer = 1;end }
+          @klass.send :include,@module
+          instance = @klass.new(integer: 4)
+          instance.integer = 5
+          assert_equal 1, instance.integer
+        end
+
+        it 'also works for multiple inclusion' do
+          @module.module_eval { def integer=(foo);@integer = 1;end }
+          other_module = Module.new
+          other_module.send :include, @module
+          @klass.send :include, other_module
+          instance = @klass.new(integer: 4)
+          instance.integer = 5
+          assert_equal 1, instance.integer
+        end
+      end
+
+      describe 'allows to super to the generated method' do
+        it 'gets' do
+          @klass.constructable [:integer, validate_type: Integer, accessible: true]
+          @klass.class_eval { def integer; super ;end }
+          instance = @klass.new(integer: 2)
+          assert_equal 2, instance.integer
+        end
+
+        it 'sets' do
+          @klass.constructable [:integer, validate_type: Integer, accessible: true]
+          @klass.class_eval { def integer=(value); super ;end }
+          instance = @klass.new(integer: 2)
+          assert_raises Constructable::AttributeError do
+            instance.integer = :not_an_integer
+          end
+        end
+      end
+    end
   end
 
-  describe 'Class#attributes' do
+  describe 'Class#constructable_attributes' do
     it 'returns the attribute matching the symbol' do
       @klass.constructable :foo, :bar
       instance = @klass.new(foo: 6)
-      assert_equal({ foo: 6 }, instance.attributes)
+      assert_equal({ foo: 6 }, instance.constructable_attributes)
     end
   end
 

metadata

@@ -2,7 +2,7 @@
 name: constructable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +02:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 419636223836929306
+      hash: 830416941491402705
       segments: 
       - 0
       version: "0"