rhodes-framework 1.0.0 → 1.0.1

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.0.0'
+    DBVERSION = '1.0.1'
   end
   
 end

data/lib/rhom/rhom_db_adapter.rb

@@ -91,11 +91,21 @@ module Rhom
       def string_from_key_vals(values, delim)
         vals = ""
         values.each do |key,value|
-          val = value.is_a?(String) ? "'#{value}'" : "#{value}"
-          vals << " #{key} = #{val}#{delim}"
+          vals << " #{key} = #{get_value_for_sql_stmt(value)}#{delim}"
         end
         vals
       end
+      
+      # generates a value for sql statement
+      def get_value_for_sql_stmt(value)
+        if value.is_a?(String)
+          "'#{value}'"
+        elsif value.nil?
+          "NULL"
+        else
+          "#{value}"
+        end
+      end
     
       # support for select statements
       # this function takes table name, columns (as a comma-separated list),
@@ -134,7 +144,7 @@ module Rhom
         vals = ""
         if table and values
           values.each do |key,val|
-            value = val.is_a?(Fixnum) ? "#{val}," : "'#{val}',"
+            value = get_value_for_sql_stmt(val)+","
             cols << "#{key},"
             vals << value
           end

data/lib/rhom/rhom_object_factory.rb

@@ -235,7 +235,7 @@ module Rhom
                   # Don't save objects with braces to database
                   val = self.inst_strip_braces(self.send(method.to_sym))
                   # add rows excluding object, source_id and update_type
-                  unless self.method_name_reserved?(method) or val.nil?
+                  unless self.method_name_reserved?(method)
                     fields = {"source_id"=>self.get_inst_source_id,
                               "object"=>obj,
                               "attrib"=>method,
@@ -263,8 +263,8 @@ module Rhom
                   
                   # if the object's value doesn't match the database record
                   # then we procede with update
-                  if new_val and old_val != new_val
-                    unless self.method_name_reserved?(attrib) or new_val.length == 0
+                  if old_val != new_val
+                    unless self.method_name_reserved?(attrib)
                       ::Rhom::RhomDbAdapter::delete_from_table(::Rhom::TABLE_NAME,
                                                                 {"source_id"=>self.get_inst_source_id,
                                                                  "object"=>obj,

data/lib/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.0.0'
+    DBVERSION = '1.0.1'
   end
 end

data/spec/rhom_object_factory_spec.rb

@@ -171,6 +171,28 @@ describe "RhomObjectFactory" do
     @new_acct.industry.should == "Technology"
   end
   
+  it "should update an attribute to nil" do
+    new_attributes = {"name"=>nil}
+    @account = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+    @account.update_attributes(new_attributes)
+    
+    @new_acct = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+
+    @new_acct.name.should be_nil
+    @new_acct.industry.should == "Technology"
+  end
+  
+  it "should update an attribute to empty string" do
+    new_attributes = {"name"=>""}
+    @account = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+    @account.update_attributes(new_attributes)
+    
+    @new_acct = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')
+
+    @new_acct.name.should == ""
+    @new_acct.industry.should == "Technology"
+  end
+  
   it "should store only last updated value for attrib" do
     new_attributes1 = {"new_name"=>"Mobio Europe"}
     @account = Account.find('44e804f2-4933-4e20-271c-48fcecd9450d')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes-framework
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -07:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -197,6 +197,6 @@ rubyforge_project: rhodes-framework
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: rhodes-framework 1.0.0
+summary: rhodes-framework 1.0.1
 test_files: []