simple_record 1.1.65 → 1.1.67

data/lib/simple_record/translations.rb

@@ -26,14 +26,16 @@ module SimpleRecord
             end
 
 
-            if att_meta.options
-                if att_meta.options[:encrypted]
+            unless value.blank?
+                if att_meta.options
+                    if att_meta.options[:encrypted]
 #                    puts "ENCRYPTING #{name} value #{value}"
-                    ret = Translations.encrypt(ret, att_meta.options[:encrypted])
+                        ret = Translations.encrypt(ret, att_meta.options[:encrypted])
 #                    puts 'encrypted value=' + ret.to_s
-                end
-                if att_meta.options[:hashed]
-                    ret = Translations.pass_hash(ret)
+                    end
+                    if att_meta.options[:hashed]
+                        ret = Translations.pass_hash(ret)
+                    end
                 end
             end
 
@@ -48,7 +50,7 @@ module SimpleRecord
             return nil if value.nil?
             att_meta = defined_attributes_local[name.to_sym]
 
-             if att_meta.options
+            if att_meta.options
                 if att_meta.options[:encrypted]
                     value = Translations.decrypt(value, att_meta.options[:encrypted])
                 end

data/lib/simple_record.rb

@@ -321,6 +321,7 @@ module SimpleRecord
         #
         def save(options={})
 #            puts 'SAVING: ' + self.inspect
+            # todo: Clean out undefined values in @attributes (in case someone set the attributes hash with values that they hadn't defined)
             clear_errors
             # todo: decide whether this should go before pre_save or after pre_save? pre_save dirties "updated" and perhaps other items due to callbacks
             if options[:dirty]
@@ -745,6 +746,11 @@ module SimpleRecord
             @dirty = {}
         end
 
+        def hash
+            # same as ActiveRecord
+            id.hash
+        end
+
     end
 
 

data/test/my_model.rb

@@ -3,7 +3,7 @@ require 'my_base_model'
 
 class MyModel < MyBaseModel
 
-    has_strings :name, :nickname
+    has_strings :name, :nickname, :s1, :s2
     has_ints :age, :save_count
     has_booleans :cool
     has_dates :birthday, :date1, :date2, :date3

data/test/test_simple_record.rb

@@ -6,6 +6,7 @@ require "yaml"
 require 'aws'
 require 'my_model'
 require 'my_child_model'
+require 'model_with_enc'
 require 'active_support'
 
 # Tests for SimpleRecord
@@ -52,6 +53,17 @@ class TestSimpleRecord < TestBase
         assert mm2.age.nil?, "doh, age is " + mm2.age.inspect
     end
 
+    def test_funky_values
+        mm = MyModel.new(:name=>"Funky")
+        mm.s1 = "other/2009-11-10/04/84.eml" # reported here: http://groups.google.com/group/simple-record/browse_thread/thread/3659e82491d03a2c?hl=en
+        assert mm.save
+        assert mm.errors.size == 0
+
+        mm2 = MyModel.find(mm.id)
+        puts 'mm2=' + mm2.inspect
+
+    end
+
 
     def test_create
         mm = MyModel.create(:name=>"Travis", :age=>32, :cool=>true)
@@ -559,4 +571,12 @@ class TestSimpleRecord < TestBase
 
     end
 
+    def test_empty_initialize
+        mm = MyModel.new
+
+        mme = ModelWithEnc.new
+        mme = ModelWithEnc.new(:ssn=>"", :password=>"") # this caused encryptor errors
+        mme = ModelWithEnc.new(:ssn=>nil, :password=>nil)
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.1.65
+  version: 1.1.67
 platform: ruby
 authors: 
 - Travis Reeder
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-06 00:00:00 -08:00
+date: 2010-01-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency