bound 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdc27f8c70cbf71b740d8c1d49cace05dbc6fa6
-  data.tar.gz: 596dbd67da344d3ab3503755e1c6fe4f7c1c46f6
+  metadata.gz: 55ee3700c0f6aff1e212a4b05a2d1c7eab87b9f7
+  data.tar.gz: 2a50137771a1b061051f14c46dd7b1ec8cd3ec95
 SHA512:
-  metadata.gz: 1a133d2ca72cab2dcf05425ec5442b26a617cb93230785d3008ce6261c4b9f628a42120dcd531e00fa3d1ef7a422eab3dc115daa84aed40a1a28951a56b27e61
-  data.tar.gz: a328984a7a01c4419f56e030b9c98e54c576a512ca59db953a2bf0f4780f4018dd320c035416dd0d331b4aae947a1e3f107e33b126bc3154f6dc306c1401370b
+  metadata.gz: aa4817e8a7046bb2d5e56da17a466968061497b036109057037e8f747c32332b25b4f247a3e0202ada60dc4555d78a92561adec5564b88c63294977da5f50f62
+  data.tar.gz: 804361979bd44ff9a1a42cb18e08300ae6169a518f9b3e5f2be387b7f1a9169f80356386afb800bb44c692f9a55e7cb36e9199be45add2dae642a9d1384cdff6

data/lib/bound.rb

@@ -2,11 +2,7 @@ require "bound/version"
 
 class Bound
   def self.new(*args)
-    new_bound_class.set_attributes(*args)
-  end
-
-  def self.nested(*args)
-    new_bound_class.nested(*args)
+    new_bound_class.required(*args)
   end
 
   def self.optional(*args)
@@ -14,13 +10,7 @@ class Bound
   end
 
   def self.required(*args)
-    bound = new_bound_class
-
-    if args.last.kind_of? Hash
-      bound.nested(args.pop)
-    end
-
-    bound.set_attributes(*args)
+    new_bound_class.required(*args)
   end
 
   private
@@ -132,51 +122,57 @@ class Bound
         self.nested_attr_classes = {}
       end
 
-      def set_attributes(*attributes)
-        if attributes.any? { |a| !a.kind_of? Symbol }
-          raise ArgumentError.new("Invalid list of attributes: #{attributes.inspect}")
-        end
-
-        attributes.each do |attribute|
-          self.attrs[attribute] = RequiredAttribute
+      def optional(*attributes)
+        if attributes.last.kind_of? Hash
+          nested_attributes = attributes.pop
+        else
+          nested_attributes = {}
         end
 
-        define_attribute_accessors attributes
+        set_attributes :optional, attributes, nested_attributes
 
         self
       end
 
-      def optional(*optionals)
-        if optionals.any? { |a| !a.kind_of? Symbol }
-          raise ArgumentError.new("Invalid list of optional attributes: #{optionals.inspect}")
-        end
-
-        optionals.each do |attribute|
-          self.attrs[attribute] = Attribute
+      def required(*attributes)
+        if attributes.last.kind_of? Hash
+          nested_attributes = attributes.pop
+        else
+          nested_attributes = {}
         end
 
-        define_attribute_accessors optionals
+        set_attributes :required, attributes, nested_attributes
 
         self
       end
 
-      def nested(nested_attributes)
-        attributes = nested_attributes.keys
+      private
+
+      def set_attributes(flag, attributes, nested_attributes = {})
+        is_optional = flag == :optional
+
+        if attributes.any? { |a| !a.kind_of? Symbol }
+          raise ArgumentError.new("Invalid list of attributes: #{attributes.inspect}")
+        end
 
         attributes.each do |attribute|
-          self.attrs[attribute]               = RequiredAttribute
-          self.nested_attr_classes[attribute] = nested_attributes[attribute]
+          if is_optional
+            self.attrs[attribute] = Attribute
+          else
+            self.attrs[attribute] = RequiredAttribute
+          end
         end
 
         define_attribute_accessors attributes
 
-        self
+        if nested_attributes.any?
+          set_attributes flag, nested_attributes.keys
+          nested_attributes.each do |attribute_name, attribute_class|
+            self.nested_attr_classes[attribute_name] = attribute_class
+          end
+        end
       end
 
-      alias :build :new
-
-      private
-
       def define_attribute_accessors(attributes)
         define_attribute_readers attributes
         define_attribute_writers attributes

data/lib/bound/version.rb

@@ -1,3 +1,3 @@
 class Bound
-  VERSION = "0.2.0"
+  VERSION = "1.0.0"
 end

data/spec/bound_spec.rb

@@ -24,15 +24,6 @@ describe Bound do
     end
   end
 
-  it 'also sets all attributes with new instead of build' do
-    [hash, object].each do |subject|
-      user = User.new(subject)
-
-      assert_equal hash[:name], user.name
-      assert_equal hash[:age], user.age
-    end
-  end
-
   it 'fails if attribute is missing' do
     hash.delete :age
 
@@ -130,7 +121,7 @@ describe Bound do
     end
 
     it 'are also included in attributes' do
-      user = UserWithoutAge.build(hash)
+      user = UserWithoutAge.new(hash)
 
       assert_equal 2, user.get_attributes.size
       assert_includes user.get_attributes.map(&:name), :name
@@ -138,6 +129,44 @@ describe Bound do
     end
   end
 
+  describe 'optional nested attributes' do
+    UserWithProfile = Bound.required(:id).optional(
+      :profile => Bound.required(:age)
+    )
+    let(:hash) do
+      {
+        :id => 12,
+        :profile => {
+          :age => 23
+        }
+      }
+    end
+
+    it 'sets optional attributes' do
+      [hash, object].each do |subject|
+        user = UserWithProfile.new(subject)
+
+        assert_equal hash[:profile][:age], user.profile.age
+      end
+    end
+
+    it 'works if optional attribute is missing' do
+      hash.delete :profile
+
+      [hash, object].each do |subject|
+        UserWithProfile.new(subject)
+      end
+    end
+
+    it 'are also included in attributes' do
+      user = UserWithProfile.new(hash)
+
+      assert_equal 2, user.get_attributes.size
+      assert_includes user.get_attributes.map(&:name), :id
+      assert_includes user.get_attributes.map(&:name), :profile
+    end
+  end
+
   describe 'no attributes' do
     UserWithoutAttributes = Bound.new
     let(:hash) { Hash.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bound
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jakob Holderbaum
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Implements a nice helper for fast boundary definitions