webink 2.0.2 → 2.1.0

data/lib/webink/database.rb

@@ -169,6 +169,44 @@ module Ink
       result
     end
 
+    # Class method
+    #
+    # Transform a value to sql representative values.
+    # This means quotes are escaped, nils are transformed
+    # and everything else is quoted.
+    # [param value:] Object
+    # [returns:] transformed String
+    def self.transform_to_sql(value)
+      if value.nil?
+        "NULL"
+      elsif value.is_a? String
+        "\'#{value.gsub(/'/, ''')}\'"
+      elsif value.is_a? Numeric
+        value
+      else
+        "\'#{value}\'"
+      end
+    end
+
+    # Class method
+    #
+    # Transform a value from sql to objects.
+    # This means nils, integer, floats and strings
+    # are imported correctly.
+    # [param value:] String
+    # [returns:] Object
+    def self.transform_from_sql(value)
+      if value =~ /^NULL$/
+        nil
+      elsif value =~ /^\d+$/
+        value.to_i
+      elsif value =~ /^\d+\.\d+$/
+        value.to_f
+      else
+        value
+      end
+    end
+
     # Instance method
     #
     # Send an SQL query string to the database
@@ -186,14 +224,7 @@ module Ink
             result.push type.new
             row.each_index do |i|
               k = keys[i]
-              v = row[i]
-              if v =~ /^[0-9]+$/
-                v = $&.to_i
-              elsif v =~ /^[0-9]+\.[0-9]+$/
-                v = $&.to_f
-              elsif v =~ /^NULL$/
-                v = nil
-              end
+              v = self.class.transform_from_sql(row[i])
               if block_given?
                 yield(result[result.length-1], k, v)
               else
@@ -207,13 +238,7 @@ module Ink
         re.each do |row|
           result.push type.new
           re.columns.each_index do |i|
-            if row[i] =~ /^[0-9]+$/
-              row[i] = $&.to_i
-            elsif row[i] =~ /^[0-9]+\.[0-9]+$/
-              row[i] = $&.to_f
-            elsif row[i] =~ /^NULL$/
-              row[i] = nil
-            end
+            row[i] = self.class.transform_from_sql(row[i])
             if block_given?
               yield(result[result.length-1], re.columns[i], row[i])
             else

data/lib/webink/model.rb

@@ -163,24 +163,33 @@ module Ink
       end
     end
 
+    # Class method
+    #
+    # Similar to making an Object sql safe.
+    # Escapes quotes.
+    # [param value:] Object
+    # [returns:] safe Object
+    def self.make_safe(value)
+      if value.nil?
+        nil
+      elsif value.is_a? String
+        value.gsub(/'/, ''')
+      elsif value.is_a? Numeric
+        value
+      else
+        "\'#{value}\'"
+      end
+    end
+
     # Private instance method
     #
     # Provides an instance accessor and setter for the key. It is
     # initialized with data[key].
     # [key:] String
-    # [data:] Hash of String => Object
+    # [value:] Object
     def init_field(key, value)
       raise NameError.new("Model cannot use #{key} as field, it is blocked by primary key") if key.to_s.downcase == "pk"
-      entry = nil
-      if value.nil?
-        entry = nil
-      elsif value.is_a? String
-        entry = value.gsub(/'/, ''')
-      elsif value.is_a? Numeric
-        entry = value
-      else
-        entry = "\'#{value}\'"
-      end
+      entry = self.class.make_safe(value)
       instance_variable_set("@#{key}", entry)
 
       if not self.respond_to? key
@@ -191,15 +200,7 @@ module Ink
       if self.class.primary_key != key
         if not self.respond_to? "#{key}="
           self.class.send(:define_method, "#{key}=") do |val|
-            if val.nil?
-              val = nil
-            elsif val.is_a? String
-              val = val.gsub(/'/, ''')
-            elsif val.is_a? Numeric
-              val = val
-            else
-              val = "\'#{val}\'"
-            end
+            val = self.class.make_safe(val)
             instance_variable_set "@#{key}", val
           end
         end
@@ -218,16 +219,7 @@ module Ink
     # [key:] String
     # [value:] Object
     def init_no_fields(key, value)
-      entry = nil
-      if value.nil?
-        entry = nil
-      elsif value.is_a? String
-        entry = value.gsub(/'/, ''')
-      elsif value.is_a? Numeric
-        entry = value
-      else
-        entry = "\'#{value}\'"
-      end
+      entry = self.class.make_safe(value)
       instance_variable_set "@#{key}", entry
     end
     private :init_no_fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webink
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fcgi