property 2.3.3 → 2.3.4

data/History.txt

@@ -1,4 +1,10 @@
-== 2.3.3 2012-08-16
+== 2.3.4 2013-10-17
+
+* Minor enhancements
+  * Raising 'Property::DecodingError' in case of decoding failure.
+  * Added support for 'invalid_property_failover' to use as failover in case of decoding failure.
+
+== 2.3.3 2013-08-16
 
 * Minor enhancements
   * Specifying rails dependency to avoid ruby version clash.

data/lib/property/attribute.rb

@@ -5,7 +5,7 @@ module Property
   #
   # The properties are encoded et decoded with a serialization tool than you can change by including
   # a Serialization module that should implement 'encode_properties' and 'decode_properties'.
-  # The default is to use Marshal through Property::Serialization::Marshal.
+  # The default is to use JSON through Property::Serialization::JSON.
   #
   # The attributes= method filters native attributes and properties in order to store
   # them apart.
@@ -42,6 +42,8 @@ module Property
         end
         load_and_dump_methods =<<-EOF
           private
+            @@invalid_property_failover = nil
+            
             def load_properties
               raw_data = #{accessor}read_attribute('properties')
               prop = raw_data ? decode_properties(raw_data) : Properties.new
@@ -49,6 +51,12 @@ module Property
               # type casting on write.
               prop.owner = self
               prop
+            rescue => err
+              if @@invalid_property_failover
+                Properties[@@invalid_property_failover]
+              else
+                raise Property::DecodingError.new err.message
+              end
             end
 
             def dump_properties
@@ -62,6 +70,11 @@ module Property
               end
               true
             end
+            
+            def self.invalid_property_failover(failover)
+              raise "Invalid failover property value type: should be a Hash." unless failover.kind_of?(Hash) || failover == nil
+              @@invalid_property_failover = failover
+            end
         EOF
         class_eval(load_and_dump_methods, __FILE__, __LINE__)
       end

data/lib/property/error.rb

@@ -1,4 +1,8 @@
 module Property
   class Error < Exception
   end
+  
+  # Raised in case property decoding fails and there is no invalid property default.
+  class DecodingError < ::Property::Error
+  end
 end

data/lib/property/serialization/json.rb

@@ -42,7 +42,7 @@ module Property
           properties.to_json
         end
 
-        # Decode Marshal encoded properties
+        # Decode JSON encoded properties
         def decode_properties(string)
           ::JSON.parse(string)
         end

data/lib/property/version.rb

@@ -1,3 +1,3 @@
 module Property
-  VERSION = '2.3.3'
+  VERSION = '2.3.4'
 end

data/property.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "2.3.3"
+  s.version = "2.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renaud Kern", "Gaspard Bucher"]
-  s.date = %q{2013-08-16}
+  s.date = %q{2013-10-17}
   s.description = %q{Wrap model properties into a single database column and declare properties from within the model.}
   s.email = %q{gaspard@teti.ch}
   s.extra_rdoc_files = [

data/test/shoulda_macros/serialization.rb

@@ -57,6 +57,13 @@ class Test::Unit::TestCase
             assert_equal Property::Properties, properties.class
             assert_equal subject['string'], properties['string']
           end
+          
+          should 'encode and decode with any chars' do
+            string = @obj.encode_properties(subject)
+            properties = @obj.decode_properties(string)
+            assert_equal Property::Properties, properties.class
+            assert_equal subject['string'], properties['string']
+          end
         end # with ascii 18
 
 

data/test/unit/property/attribute_test.rb

@@ -122,7 +122,6 @@ class AttributeTest < Test::Unit::TestCase
       assert_equal 'bar', subject.properties.delete('foo')
       assert_nil subject.properties['foo']
     end
-
   end
 
   context 'Retrieving' do
@@ -239,6 +238,65 @@ class AttributeTest < Test::Unit::TestCase
         assert_equal @cat, subject.prop['myserialized']
       end
     end
+    
+    context 'invalid encoded property' do
+      subject do
+        klass = Class.new(ActiveRecord::Base) do
+          include Property
+          invalid_property_failover 'error' => 'Property invalid!', 'myfloat' => 0.0
+          set_table_name :dummies
+          property.float 'myfloat'
+        end
+
+        obj = klass.create('myfloat' => 78.9)
+        obj = klass.find(obj)
+        obj.instance_eval do
+          @attributes['properties'] = '{aaa:'
+        end
+        obj
+      end
+
+      should 'find invalid default' do
+        assert_equal({'error' => 'Property invalid!', 'myfloat' => 0.0}, subject.prop)
+        assert_equal Property::Properties, subject.prop.class
+      end
+      
+      context 'without a default' do
+        subject do
+          klass = Class.new(ActiveRecord::Base) do
+            include Property
+            set_table_name :dummies
+            property.float 'myfloat'
+          end
+
+          obj = klass.create('myfloat' => 78.9)
+          obj = klass.find(obj)
+          obj.instance_eval do
+            @attributes['properties'] = '{aaa:'
+          end
+          obj
+        end
+        
+        should 'raise an error' do
+          assert_raise(Property::DecodingError) do
+            subject.prop
+          end
+        end
+      end
+    end
+    
+    context 'setting invalid failover' do
+      
+      should 'not allow non-hash values' do
+        klass = Class.new(ActiveRecord::Base) do
+          include Property
+          invalid_property_failover 'error' => 'Property invalid!', 'myfloat' => 0.0
+          set_table_name :dummies
+          property.float 'myfloat'
+        end
+      
+      end
+    end
   end
 
   context 'Setting attributes' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 3
-  - 3
-  version: 2.3.3
+  - 4
+  version: 2.3.4
 platform: ruby
 authors: 
 - Renaud Kern
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-16 00:00:00 +02:00
+date: 2013-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency