constructable 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/constructable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{constructable}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]
@@ -33,7 +33,6 @@ See the documentation for Constructable::Constructable#constructable or the READ
     "constructable.gemspec",
     "lib/constructable.rb",
     "lib/constructable/attribute.rb",
-    "lib/constructable/constructable.rb",
     "lib/constructable/constructor.rb",
     "lib/constructable/core_ext.rb",
     "lib/constructable/exceptions.rb",

data/lib/constructable/attribute.rb

@@ -51,7 +51,7 @@ module Constructable
     private :check_for_requirement
 
     def process(constructor_hash)
-      if constructor_hash[self.name]
+      unless constructor_hash[self.name].nil?
         REQUIREMENTS.each do |requirement|
           check_for_requirement(requirement, constructor_hash)
         end
@@ -60,7 +60,7 @@ module Constructable
       else
         check_for_requirement(REQUIRED_REQUIREMENT, constructor_hash)
         self.default
-      end.tap { |value| @value = value }
+      end
     end
   end
 end

data/lib/constructable/constructor.rb

@@ -1,5 +1,7 @@
 module Constructable
   class Constructor
+    attr_accessor :attributes
+
     def initialize(klass)
       @attributes = []
       @klass = klass
@@ -11,6 +13,8 @@ module Constructable
         obj.send :initialize, *args, &block
         obj
       end
+
+      self.define_attributes_method
     end
 
 
@@ -42,5 +46,18 @@ module Constructable
         Attribute.new(*attribute)
       end
     end
+
+    def define_attributes_method
+      constructor = self
+      @klass.class_eval do
+        define_method :attributes do
+          Hash[
+            constructor.attributes
+            .map { |a| [a.name,instance_variable_get(a.ivar_symbol)] }
+            .select(&:last)
+          ]
+        end
+      end
+    end
   end
 end

data/lib/constructable/core_ext.rb

@@ -1,3 +1,42 @@
 module Constructable
-  ::Module.send :include, Constructable
+  class ::Class 
+    include Constructable
+
+    # @example
+    #
+    #  class Foo
+    #    constructable [:bar, :readable => true], [:baz, :required => true, :readable => true]
+    #  end
+    #
+    #  foo = Foo.new(bar: 5)
+    #  # raises AttributeError, ':baz is a required attribute'
+    #
+    #  foo = Foo.new(baz: 7, bar: 5)
+    #
+    #  foo.bar
+    #  # => 5
+    #  foo.baz
+    #  # => 7
+    #
+    #  class ProgrammingLanguage
+    #    constructable [:paradigms,
+    #      readable: true,
+    #      required: true,
+    #      validate: ->(value) { value.is_a?(Array) }]
+    #  end
+    #
+    #  c = ProgrammingLanguage.new(paradigms: :functional)
+    #  #  raises AttributeError, ':paradigms did not pass validation'
+    #
+    #  ruby = ProgrammingLanguage.new(paradigms: [:object_oriented, :functional])
+    #  ruby.paradigms
+    #  # => [:object_oriented, :functional]
+    #
+    # @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)
+      return nil
+    end
+  end
 end

data/lib/constructable.rb

@@ -1,7 +1,6 @@
 require 'constructable/exceptions'
 require 'constructable/constructor'
-require 'constructable/constructable'
-require 'constructable/core_ext'
 require 'constructable/attribute'
+require 'constructable/core_ext'
 module Constructable
 end

data/test/constructable/test_attribute.rb

@@ -2,16 +2,6 @@ require 'helper'
 include Constructable
 describe 'Attribute' do
 
-  describe 'value' do
-    it 'returns the last processed value' do
-      attribute = Attribute.new(:foo)
-      attribute.process({foo: :bar})
-      assert_equal :bar, attribute.value
-      attribute.process({foo: 1})
-      assert_equal 1, attribute.value
-    end
-  end
-
   describe 'name' do
     it 'returns the name' do
       attribute = Attribute.new(:attribute)
@@ -27,6 +17,11 @@ describe 'Attribute' do
   end
 
   describe 'process' do
+    it 'intepretes nil but not false as undefined' do
+      attribute = Attribute.new(:foo, default: true)
+      assert_equal false, attribute.process({foo: false})
+    end
+
     it 'should raise nothing if no attributes are specified' do
       attribute = Attribute.new(:foo)
       assert_equal 'bar', attribute.process({foo: 'bar'})

data/test/constructable/test_constructor.rb

@@ -14,6 +14,14 @@ describe 'Constructor' do
     end
   end
 
+  describe 'Class#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)
+    end
+  end
+
   describe 'permission' do
     it 'should allow writable attributes' do
       @klass.constructable [:writable_attribute, writable: true]

metadata

@@ -2,7 +2,7 @@
 name: constructable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -82,7 +82,6 @@ files:
 - constructable.gemspec
 - lib/constructable.rb
 - lib/constructable/attribute.rb
-- lib/constructable/constructable.rb
 - lib/constructable/constructor.rb
 - lib/constructable/core_ext.rb
 - lib/constructable/exceptions.rb
@@ -104,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1216029924814922555
+      hash: -3265931130624330065
       segments: 
       - 0
       version: "0"

data/lib/constructable/constructable.rb

@@ -1,40 +0,0 @@
-module Constructable
-  module Constructable
-    # @example
-    #
-    #  class Foo
-    #    constructable [:bar, :readable => true], [:baz, :required => true, :readable => true]
-    #  end
-    #
-    #  foo = Foo.new(bar: 5)
-    #  # raises AttributeError, ':baz is a required attribute'
-    #
-    #  foo = Foo.new(baz: 7, bar: 5)
-    #
-    #  foo.bar
-    #  # => 5
-    #  foo.baz
-    #  # => 7
-    #
-    #  class ProgrammingLanguage
-    #    constructable [:paradigms,
-    #      readable: true,
-    #      required: true,
-    #      validate: ->(value) { value.is_a?(Array) }]
-    #  end
-    #
-    #  c = ProgrammingLanguage.new(paradigms: :functional)
-    #  #  raises AttributeError, ':paradigms did not pass validation'
-    #
-    #  ruby = ProgrammingLanguage.new(paradigms: [:object_oriented, :functional])
-    #  ruby.paradigms
-    #  # => [:object_oriented, :functional]
-    #
-    # @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)
-      return nil
-    end
-  end
-end