clavatar 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd9039cd2b20396bdc527d9f3ae3ac30ad379966
-  data.tar.gz: 341b95214049b68a3f819a6f7f8113ec824aded6
+  metadata.gz: 8fbb3f61f81e4c9cc49182ca5ac6f2b6680cf005
+  data.tar.gz: 7c1c21fc5bd31874c002a8a8303b567b304e2fba
 SHA512:
-  metadata.gz: 286a0ab327c6450d5fa4dd1a23b3e7d0a3bf2276553ae2bda807de241de0f7194e3e0f47a8af20d92de76e1deea0cc7e83907fa93c8f61578ac91db0764cdfce
-  data.tar.gz: bff9c0b8830f6b6c7d5a9285ee9e4be798420867abc685df5b9c1ea51348f643cd32ec639ff34af3a62f9b78a94abc1269c88fe8b0ca10f99ac81d6507ea9324
+  metadata.gz: 4354d16304659fff8bff453692ea09f08393191aa465bdbeb3e0bb0f0f2238ca9766f5861d74596b42a349a423d63860b6017aaebf942c1fbcd9c0ced0def301
+  data.tar.gz: 9cf359755e58ec5c95273501396b8076a912cd68d18966452b34efe1cbb980723b46f43b03be7f8f20ac3281bfa6487fa623f590457ad1947efb2e716a6d0a47

data/lib/clavatar.rb

@@ -11,26 +11,41 @@ module Clavatar
       end
     end
 
-    args = {}
+    key_args = {}
+    args = []
     construct_params = example.method(:initialize).parameters
     construct_params.each do |param|
-      arg_required = param.first
-      arg_name = param.last
+      arg_required, arg_name = param
 
-      if arg_required == :keyreq
-        raise "parameter #{arg_name} is mandatory but missing in #{hash}" unless hash.key? arg_name
-      elsif arg_required == :keyrest
-        args.merge! hash
-        break
+      case arg_required
+        when :req
+          args << arg_name
+        when :opt
+          args << arg_name if hash.key? arg_name
+        when :keyreq
+          raise "parameter #{arg_name} is mandatory but missing in #{hash}" unless hash.key? arg_name
+          key_args[arg_name] = hash[arg_name]
+        when :keyrest
+          key_args.merge! hash
+          break
       end
+    end
 
-      args[arg_name] = hash[arg_name]
+    args.map! { |val| hash[val] }
+    if args.empty? and key_args.empty?
+      instance = klass.send(:new)
+    elsif args.empty?
+      instance = klass.send(:new, key_args)
+    elsif key_args.empty?
+      instance = klass.send(:new, *args)
+    else
+      instance = klass.send(:new, *args, **key_args)
     end
 
-    instance = klass.new args
     accessible_attr.each do |attr|
       instance.send("#{attr}=", hash[attr])
     end
-    return instance
+
+    instance
   end
 end

data/lib/version.rb

@@ -1,4 +1,4 @@
 # Clavatar gem version
 module Clavatar
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clavatar
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Daniel Han
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2016-06-13 00:00:00.000000000 Z
 dependencies: []
 description: Apply a hash into a Ruby class and return an instance of it.
 email: hex0cter@gmail.com