corm 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTdiOTNmODcyZDNiYmUzYzE5Zjc1Mjk3ZmNhYmRjMWM1ODVmODMzZA==
+    ZmU2OWMwZDRlZWY0YmMzYzRlNWE2MWJiZDBmNzQ0ODFkZjdkYWQ4Yg==
   data.tar.gz: !binary |-
-    NDAzNTA3M2YzNDllMDFjYWNkNmI0Yzg4N2I2Y2ExMmE1MTEwMzUyNw==
+    NTI0YTYxZTA2YzVlMzNmOWMzN2QwYTlmYzA4NTBmNWM3NmMzM2IzMw==
 SHA512:
   metadata.gz: !binary |-
-    YTE4YjljNGI1ODFhOTU2YjI4YmI5NDk5ZGU5OTc3NDdlYjk2YWYyZDgxZTU1
-    ZTQ5MzdhNWFiNDM1Y2ZlZWI5ZWI1NWU4OTkzZWY4M2Q5NDM3MGMxODE1OGY3
-    YTRjNmM3YWI5NTk3YTIzN2IyYmZlYmQzNjc3MzY3MzAyMzA2OGQ=
+    NTU0ZjBiNmVkZTEyZGVhNzZhYTM1OTExMzExMTJhNzE4ZGQ0NmFkODViN2Rh
+    MDE2ODRmN2FlNDdjZmQ0MzY5OTEwMDM0NzM0MTNmZjE1MzEzOTM1MWJmYmY2
+    NmQ5OTFlMzdiODBmMTBkYjhkNTFlM2QwZDVhYmI5NzE1YmNmZTA=
   data.tar.gz: !binary |-
-    MDc0YmE2YWFmNThkYWVkOWYzNjA2NmFhZWU2MGVjZTdlNWEzNDkwOThlMWEz
-    NDZkMDdiYTQwNDZiZmRmNzcwNGYyZDBmZGZmMjM1NjJmN2VlNWI2MDRjYTEz
-    MGU4OTNkZjc3NTE2MGQzOTNhOTcyYjUyYWZlYTRmYjI1NGM4ODQ=
+    YzcwYTJkZTM0YTE1MGQyNjUyYzdiMWVhNjk5OTliNGU5MDYzMzQ3ODRkZTEz
+    MmFlYmRiOGIzYTNmZTkxYTYzYWI3OTZiZjc0MTNiNTQyZDg1ODQxMTM1MDRi
+    NWYzYTY5ZGJkYzIzMDcwOTAzMGE2MGJhNGU2YmUzMzliNTgyZWQ=

data/lib/corm/model.rb

@@ -29,53 +29,69 @@ module Corm
       
       primary_key name.to_s.downcase if pkey
       
-      send(:define_method, name.to_s.downcase) do
-        type = self.class.fields[name.to_s.downcase].to_s
+      send :define_method, name.to_s.downcase do
+        type = self.class.fields[name.to_s.downcase].to_s.downcase
         value = record[name.to_s.downcase]
         if type == 'json'
-          MultiJson.decode value
+          value.nil? ? '' : MultiJson.decode(value)
         elsif type.start_with?('list') && type['json']
-          value.map{|s| MultiJson.decode s}
+          value.nil? ? [] : value.map{|s| MultiJson.decode s}
+        elsif type.start_with?('list')
+          value.nil? ? [] : value
         elsif type.start_with?('set') && type['json']
-          Set.new value.map{|s| MultiJson.decode s}
+          Set.new(value.nil? ? [] : value.map{|s| MultiJson.decode s})
+        elsif type.start_with?('set')
+          Set.new []
         elsif type.start_with?('map') && type['json']
-          value.inject({}) do |hash, (k, v)|
+          hash = {}
+          (value || {}).each do |k, v|
             k = MultiJson.decode k if type['json,'] || type['json ,']
             v = MultiJson.decode v if type[', json'] || type[',json']
-            hash.merge(k => v)
+            hash[k] = v
           end
+          hash
+        elsif type.start_with?('map')
+          {}
         else
           value
         end
       end
 
-      send(:define_method, '[]') do |field|
+      send :define_method, '[]' do |field|
         send field.to_s.downcase
       end
 
-      send(:define_method, "#{name.to_s.downcase}=") do |value|
-        type = self.class.fields[name.to_s.downcase].to_s
+      send :define_method, "#{name.to_s.downcase}=" do |value|
+        type = self.class.fields[name.to_s.downcase].to_s.downcase
         record[name.to_s.downcase] = if type == 'json'
-          MultiJson.encode value
+          value.to_s.empty? ? nil : MultiJson.encode(value)
         elsif type.start_with?('list') && type['json']
-          value.map{|s| MultiJson.encode s}
+          value.to_a.empty? ? [] : value.map{|s| MultiJson.encode s}
+        elsif type.start_with?('list')
+          value.nil? ? [] : value
         elsif type.start_with?('set') && type['json']
-          Set.new value.map{|s| MultiJson.encode s}
+          Set.new(value.nil? ? [] : value.map{|s| MultiJson.encode s})
+        elsif type.start_with?('set')
+          Set.new []
         elsif type.start_with?('map') && type['json']
-          value.inject({}) do |hash, (k, v)|
+          hash = {}
+          (value || {}).each do |k, v|
             k = MultiJson.encode k if type['json,'] || type['json ,']
             v = MultiJson.encode v if type[', json'] || type[',json']
-            hash.merge(k => v)
+            hash[k] = v
           end
+          hash
+        elsif type.start_with?('map')
+          {}
         else
           value
         end
       end
-
-      send(:define_method, '[]=') do |field, value|
+      
+      send :define_method, '[]=' do |field, value|
         send "#{field.to_s.downcase}=", value
       end
-
+      
       nil
     end
 
@@ -169,7 +185,7 @@ module Corm
       nil
     end
 
-    private
+    protected
 
       def execute *args
         self.class.execute *args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Stefano Fontanelli