frenchy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9bcb2bcc3f11278f88a3bb50be78b459819fb7f
-  data.tar.gz: e1910af141550b7eb50534ac609c1657e1244b0a
+  metadata.gz: 1bb700958327ccb49035e1f8d2f41f67ba4695fa
+  data.tar.gz: 8e3c24ef49b796468820eda75a17c16f5f704418
 SHA512:
-  metadata.gz: 7a76e4478486f1680b5b534c614a3d0b2ce5055be3c17c671fd29c432795c44b691a565e43f6b9f8e5e0572a34874274ac0f0b737c743c9e11cf8d94cec3538f
-  data.tar.gz: e88fa62c9009e507ce356163093a2c1ac1bf8be4f896c58ba51c04e9ed2a81db7ce6d8ca02eb2bdc527f32a43efec3ed6e28e6a727d84855c97952a265d1dcb1
+  metadata.gz: 37c1cd4486c8dfc647e4e1a0326a0a4864a09ae2605cf9b1bb8f894678edb900b04e9451c12a5ef6ff92f3403adc1749b0fc0f3cde7156b0106917e9cd032047
+  data.tar.gz: 7f27293f2b2073fe20ceefe12a207b8d182e63c3e2daee00129ad422df60e92bc5a17fa719f9a96d27c49232c459abc1705308b038d900a456fbb3b1b7748333

data/lib/frenchy/model.rb

@@ -13,7 +13,7 @@ module Frenchy
 
     # Create a new instance of this model with the given attributes
     def initialize(attrs={})
-      self.class.defaults.merge(attrs).each do |k,v|
+      self.class.defaults.merge((attrs || {}).reject {|k,v| v.nil? }).each do |k,v|
         if self.class.fields[k.to_sym]
           send("#{k}=", v)
         end
@@ -125,7 +125,11 @@ module Frenchy
             if options[:many]
               set(name, Frenchy::Collection.new(Array(v).map {|vv| klass.new(vv)}))
             else
-              set(name, klass.new(v))
+              if v.is_a?(Hash)
+                set(name, klass.new(v))
+              else
+                set(name, v)
+              end
             end
           end
         end

data/lib/frenchy/version.rb

@@ -1,3 +1,3 @@
 module Frenchy
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frenchy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jason Coene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel