webink 1.2.7 → 1.2.9

data/lib/webink/model.rb

@@ -94,9 +94,11 @@ module Ink
       if self.class.respond_to? :fields
         self.class.fields.each do |k,v|
           raise NameError.new("Model cannot use #{k} as field, it already exists") if self.class.respond_to? k or k.to_s.downcase == "pk"
-          raise LoadError.new("Model cannot be loaded, argument missing: #{k}") if not data[k.to_s] and self.class.primary_key[0] != k
+          raise LoadError.new("Model cannot be loaded, argument missing: #{k}") if not data.key?(k.to_s) and self.class.primary_key[0] != k
           entry = nil
-          if data[k.to_s].is_a? String
+          if data[k.to_s].nil?
+            entry = nil
+          elsif data[k.to_s].is_a? String
             entry = data[k.to_s].gsub(/'/, ''')
           elsif data[k.to_s].is_a? Numeric
             entry = data[k.to_s]
@@ -110,7 +112,9 @@ module Ink
           end
           if self.class.primary_key[0] != k
             self.class.send(:define_method, "#{k}=") do |val|
-              if val.is_a? String
+              if data[k.to_s].nil?
+                val = nil
+              elsif val.is_a? String
                 val = val.gsub(/'/, ''')
               elsif val.is_a? Numeric
                 val = val
@@ -139,7 +143,17 @@ module Ink
         end
       else
         data.each do |k,v|
-          instance_variable_set "@#{k}", (v.is_a?(Numeric)) ? v : "\'#{v}\'"
+          entry = nil
+          if v.nil?
+            entry = nil
+          elsif v.is_a? String
+            entry = v.gsub(/'/, ''')
+          elsif v.is_a? Numeric
+            entry = v
+          else
+            entry = "\'#{v}\'"
+          end
+          instance_variable_set "@#{k}", entry
         end
       end
     end

metadata

@@ -2,7 +2,7 @@
 name: webink
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors: 
 - Matthias Geier
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-23 00:00:00 Z
+date: 2012-08-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fcgi