opto-model 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c83427e75851b3d86750010b5b8f3ffffc81c8
-  data.tar.gz: 9a231b97d7c15fe3aa59592b0b511d5d79faefc0
+  metadata.gz: f80b35c3e68b4b6e9043dfdfeb74ca859467149f
+  data.tar.gz: 27c341eb48634ce7e5955ba609d09b5783158a91
 SHA512:
-  metadata.gz: 5a01e85569e88ef783986e3eab9ba32fff3705413ab903bf0fff8e54778bc91840da6af6d26fe4592a001dcf4dc0433995587d0416f3e37a630424f8a75d53e8
-  data.tar.gz: 34aa891072f587807d09852345eab957d03466d79c9ae22451b9b42f25c289db6f9eaa21c639f548cdace75170115e9978371207b130b373ead8a26c4ae70ef0
+  metadata.gz: 3af9c69f9aeec0d50bc9ef8d07a2d61932622655902e62c9d89ebf4705cf55478e565da23fab470d50fbbbb1284d00d9816d0fdd955f4a38230594ced2790e0e
+  data.tar.gz: b4b11b52c17ed4039779f9760e557f4ac620659bafff3e9881b234fd85789d1779032e959a0bd806e9e84af533f8054d463d90f914233e1cf2210fee511484ea

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 2.2.3
   - 2.3.1
   - 2.3.3
-  - 2.4.0-preview3
+  - 2.4.0
   - jruby-9.1.5.0
 env:
   - secure: "l6a3qDbzbCGmVuIcIq2n5rOCUztdumytt4mK/TkUIcCv36ZfYSlF1uWgFfPGg1vPsVFn6bexBL09/7RGMJl4iVyorluOJiwMxKixuOes6VHfuoi/fqW3yxFXL4tdWscAN6HfUtbCByxiH6BnbEKRuhr/C/crhNkZDnsT9GdBVOep9xYJ3L5T9cjWbceH1wk8+8i4OuchMwXPyh5Ybf3KsRqebN+IACSQW64OAgyYIncGVPOobo7Wm7/aNT/rN6MuA7gB9r4QWg17kbeP3V6Rc/G0R1P8vlJg7vq4tHMvEmuFtGF2UTAxQV8/C1AWrfdwonG3GWd0kFT8MDCW+vXvwavsiS5Ke5O7IvXqyhb0HzKTGVB3WqyQNJEVaCaHW+0JRO3mijVQFTfqfAScSF1nDpYsNkX0RhO8El58cNDPG8JcR8TMDyOIH/qbcF9RDNE3n/Es/QaTk8j+5ZTZffTFLQ+LogEnBRa3xUeb8FX23gmTk8a7sfkNpuQ9eRxl7nCCFBYWoe9viBpUsXiuGw1O+gSQAQjV/BcTopMLU6mpIf+1hLu5lUe+9mFvpzlyfXO+t8C7c9AF8g5h4lUPG/P5NsfS5OOWURxguIsBicaNro/D4S+HTQ+A47q9vy5vzIa05vYZ0rXYzczZs6J0ffSXN0Ns0h+L35s36TuXazHdGbY="

data/lib/opto/model/association/has_many/declaration.rb

@@ -37,6 +37,16 @@ module Opto
                     end
                   end
                   self.send(relation).members
+                elsif args.kind_of?(Hash)
+                  self.send(relation).clear
+                  args.each do |k,v|
+                    if v.kind_of?(Hash)
+                      self.send(relation).new(k => v)
+                    else
+                      raise TypeError, "Expected an instance of Hash"
+                    end
+                  end
+                  self.send(relation).members
                 elsif args.nil?
                   self.send(relation).clear
                 else

data/lib/opto/model/association/has_many/proxy.rb

@@ -8,7 +8,8 @@ module Opto
           extend Forwardable
 
           def initialize(parent, target_class, as, options = {})
-            @parent, @target_class, @as, @options = parent, target_class, as, options
+            @parent, @target_class, @as = parent, target_class, as
+            @options = { key_is: :name }.merge(options)
             @members = []
           end
 
@@ -33,6 +34,10 @@ module Opto
           end
 
           def new(*args)
+            if args.first.kind_of?(Hash) && args.size == 1 && args.first[args.first.keys.first].kind_of?(Hash)
+              key = args.first.keys.first
+              args = [args.first[key].merge(options[:key_is] => key.kind_of?(Symbol) ? key.to_s : key)]
+            end
             target = target_class.new(*args)
             members << target
             target
@@ -52,7 +57,7 @@ module Opto
             result.empty? ? {} : { as => result }
           end
 
-          def_delegators :members, *::Array.instance_methods - [:__send__, :object_id, :to_h]
+          def_delegators :members, *::Array.instance_methods - [:__send__, :object_id, :to_h, :__id__]
         end
       end
     end

data/lib/opto/model/association/has_one/proxy.rb

@@ -8,7 +8,8 @@ module Opto
           extend Forwardable
 
           def initialize(parent, target_class, as, target = nil, options = {})
-            @parent, @target_class, @as, @target, @options = parent, target_class, as, target, options
+            @parent, @target_class, @as, @target = parent, target_class, as, target
+            @options = { key_is: :name }.merge(options)
           end
 
           def association_errors
@@ -32,6 +33,10 @@ module Opto
           end
 
           def new(*args)
+            if args.first.kind_of?(Hash) && args.size == 1 && args.first[args.first.keys.first].kind_of?(Hash)
+              key = args.first.keys.first
+              args = [args.first[key].merge(options[:key_is] => key.kind_of?(Symbol) ? key.to_s : key)]
+            end
             @target = target_class.new(*args)
           end
 

data/lib/opto/model/version.rb

@@ -1,5 +1,5 @@
 module Opto
   module Model
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto-model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler