property 2.2.0 → 2.3.0

data/History.txt

@@ -1,3 +1,9 @@
+== 2.3.0
+
+* Major enhancements
+  * Fixed tests and sources for Ruby 1.9
+  * Enabled stored columns for serialized properties
+
 == 2.2.0 2011-06-06
 
 * Major enhancements

data/lib/property/serialization/json.rb

@@ -8,13 +8,25 @@ module Property
       module Validator
         NATIVE_TYPES = [Hash, Array, Integer, Float, String, TrueClass, FalseClass, NilClass]
 
-        # Should raise an exception if the type is not serializable.
-        def self.validate(klass)
-          if NATIVE_TYPES.include?(klass) ||
-             (klass.respond_to?('json_create') && klass.instance_methods.include?('to_json'))
-            true
-          else
-            raise TypeError.new("Cannot serialize #{klass}. Missing 'self.create_json' and 'to_json' methods.")
+        if RUBY_VERSION.to_f > 1.8
+          # Should raise an exception if the type is not serializable.
+          def self.validate(klass)
+            if NATIVE_TYPES.include?(klass) ||
+               (klass.respond_to?(:json_create) && klass.instance_methods.include?(:to_json))
+              true
+            else
+              raise TypeError.new("Cannot serialize #{klass}. Missing 'self.create_json' and 'to_json' methods.")
+            end
+          end
+        else
+          # Should raise an exception if the type is not serializable.
+          def self.validate(klass)
+            if NATIVE_TYPES.include?(klass) ||
+               (klass.respond_to?('json_create') && klass.instance_methods.include?('to_json'))
+              true
+            else
+              raise TypeError.new("Cannot serialize #{klass}. Missing 'self.create_json' and 'to_json' methods.")
+            end
           end
         end
       end

data/lib/property/stored_column.rb

@@ -10,6 +10,11 @@ module Property
     def default
       nil
     end
+    
+    # Used to store serialized properties. Should return the class to serialize.
+    def klass
+      nil
+    end
 
     # No supported options yet.
     def options

data/lib/property/stored_role.rb

@@ -67,7 +67,7 @@ module Property
         @original_columns = {}
         stored_columns.each do |column|
           @original_columns[column.name] = column
-          add_column(Property::Column.new(column.name, column.default, column.ptype, column.options.merge(:role => self, :orig => column)))
+          add_column(Property::Column.new(column.name, column.default, column.klass || column.ptype, column.options.merge(:role => self, :orig => column)))
         end
       end
 

data/lib/property/version.rb

@@ -1,3 +1,3 @@
 module Property
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/property.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "2.2.0"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Renaud Kern", "Gaspard Bucher"]
-  s.date = %q{2011-06-06}
+  s.date = %q{2012-05-23}
   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 = [
@@ -72,32 +72,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://zenadmin.org/635}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{property}
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{model properties wrap into a single database column}
-  s.test_files = [
-    "test/database.rb",
-    "test/fixtures.rb",
-    "test/shoulda_macros/index.rb",
-    "test/shoulda_macros/role.rb",
-    "test/shoulda_macros/serialization.rb",
-    "test/test_helper.rb",
-    "test/unit/property/attribute_test.rb",
-    "test/unit/property/base_test.rb",
-    "test/unit/property/column_test.rb",
-    "test/unit/property/declaration_test.rb",
-    "test/unit/property/dirty_test.rb",
-    "test/unit/property/index_complex_test.rb",
-    "test/unit/property/index_custom_test.rb",
-    "test/unit/property/index_field_test.rb",
-    "test/unit/property/index_foreign_test.rb",
-    "test/unit/property/index_simple_test.rb",
-    "test/unit/property/role_test.rb",
-    "test/unit/property/stored_role_test.rb",
-    "test/unit/property/validation_test.rb",
-    "test/unit/serialization/json_test.rb",
-    "test/unit/serialization/marshal_test.rb",
-    "test/unit/serialization/yaml_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/fixtures.rb

@@ -50,7 +50,6 @@ class Cat
   end
 end
 
-
 class IdxEmployeesString < ActiveRecord::Base
 end
 

data/test/shoulda_macros/index.rb

@@ -3,7 +3,7 @@ module IndexMacros
   class Client < ActiveRecord::Base
     set_table_name :employees
     include Property
-    
+
     def muse
       'I am your muse'
     end
@@ -53,15 +53,15 @@ class Test::Unit::TestCase
           end
         end
       end
-      
+
       should 'build a group of indices' do
         assert_equal Hash['ml_string'=>[['poem', nil]], 'integer'=>[['year', nil]]], subject.schema.index_groups
       end
-      
+
       should 'build indices array' do
-        assert_equal [['integer', 'year', nil], ['ml_string', 'poem', nil]], @poet.defined_indices
+        assert_equal [['integer', 'year', nil], ['ml_string', 'poem', nil]], @poet.defined_indices.sort{|a,b| a[0] <=> b[0]}
       end
-      
+
       should 'only use defined propertys to build indices array' do
         assert_equal [], subject.schema.defined_indices
       end

data/test/shoulda_macros/serialization.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 class Test::Unit::TestCase
 
   def self.should_encode_and_decode_properties
@@ -40,8 +41,13 @@ class Test::Unit::TestCase
 
         context 'with ascii 18' do
           subject do
+            if RUBY_VERSION.to_f > 1.8
+              str = (1..255).to_a.map{|n| n.chr('utf-8')}.join('') # "AB"
+            else
+              str = (1..255).to_a.map{|n| n.chr}.join('') # "AB"
+            end
             Property::Properties[
-              'string' => (1..255).to_a.map{|n| n.chr}.join('') # "AB"
+              'string' => str
             ]
           end
 
@@ -49,7 +55,7 @@ class Test::Unit::TestCase
             string = @obj.encode_properties(subject)
             properties = @obj.decode_properties(string)
             assert_equal Property::Properties, properties.class
-            assert_equal subject, properties
+            assert_equal subject['string'], properties['string']
           end
         end # with ascii 18
 

data/test/unit/property/declaration_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 require 'fixtures'
 
@@ -114,20 +115,39 @@ class DeclarationTest < Test::Unit::TestCase
       assert_kind_of Property::Column, subject.schema.columns['weapon']
     end
 
-    should 'create ruby accessors' do
-      subject.property.string('weapon')
-      assert subject.instance_methods.include?('weapon')
-      assert subject.instance_methods.include?('weapon=')
-      assert subject.instance_methods.include?('weapon?')
-    end
+    if RUBY_VERSION.to_f > 1.8
+      should 'create ruby accessors' do
+        subject.property.string('weapon')
+        assert subject.instance_methods.include?(:weapon)
+        assert subject.instance_methods.include?(:weapon=)
+        assert subject.instance_methods.include?(:weapon?)
+      end
+
+      should 'not create accessors for illegal ruby names' do
+        bad_names = ['some.thing', 'puts("yo")', '/var/', 'hello darness']
+        assert_nothing_raised { subject.property.string bad_names }
+        bad_names.each do |bad_name|
+          assert !subject.instance_methods.include?(bad_name.to_sym)
+          assert !subject.instance_methods.include?(:"#{bad_name}=")
+          assert !subject.instance_methods.include?(:"#{bad_name}?")
+        end
+      end
+    else
+      should 'create ruby accessors' do
+        subject.property.string('weapon')
+        assert subject.instance_methods.include?('weapon')
+        assert subject.instance_methods.include?('weapon=')
+        assert subject.instance_methods.include?('weapon?')
+      end
 
-    should 'not create accessors for illegal ruby names' do
-      bad_names = ['some.thing', 'puts("yo")', '/var/', 'hello darness']
-      assert_nothing_raised { subject.property.string bad_names }
-      bad_names.each do |bad_name|
-        assert !subject.instance_methods.include?(bad_name)
-        assert !subject.instance_methods.include?("#{bad_name}=")
-        assert !subject.instance_methods.include?("#{bad_name}?")
+      should 'not create accessors for illegal ruby names' do
+        bad_names = ['some.thing', 'puts("yo")', '/var/', 'hello darness']
+        assert_nothing_raised { subject.property.string bad_names }
+        bad_names.each do |bad_name|
+          assert !subject.instance_methods.include?(bad_name)
+          assert !subject.instance_methods.include?("#{bad_name}=")
+          assert !subject.instance_methods.include?("#{bad_name}?")
+        end
       end
     end
 
@@ -293,7 +313,7 @@ class DeclarationTest < Test::Unit::TestCase
       end
 
       subject.include_role @class
-      assert_equal %w{language last_name hop age first_name}, subject.schema.column_names
+      assert_equal %w{language last_name hop age first_name}.sort, subject.schema.column_names.sort
       assert subject.has_role?(@class.schema)
     end
   end

data/test/unit/property/dirty_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 require 'fixtures'
 

data/test/unit/property/index_complex_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 require 'fixtures'
 
@@ -20,7 +21,7 @@ class IndexComplexTest < ActiveSupport::TestCase
       p.string  'name'
       # only runs if 'age' is not blank
       p.integer 'age',    :index => Proc.new {|r| {'age' => r.age == 0 ? nil : r.age + 10}}
-      p.string  'gender', :index => Proc.new {|r| {'gender' => r.gender[0]}}, :index_group => :integer
+      p.string  'gender', :index => Proc.new {|r| {'gender' => r.gender.ord}}, :index_group => :integer
       p.string  'lang'
 
       p.index(:text) do |r| # r = record
@@ -78,11 +79,11 @@ class IndexComplexTest < ActiveSupport::TestCase
         int_index = IdxEmployeesInteger.first(:conditions => {:employee_id => person.id, :key => 'age'})
         assert_equal 44, int_index.value
       end
-      
+
       should 'use index_group setting to build values' do
         person = Person.create('name' => 'Juan', 'lang' => 'es', 'gender' => 'M', 'age' => 34)
         int_index = IdxEmployeesInteger.first(:conditions => {:employee_id => person.id, :key => 'gender'})
-        assert_equal "M"[0], int_index.value
+        assert_equal ?M.ord, int_index.value
       end
 
       should 'remove blank values built from proc execution' do

data/test/unit/property/index_simple_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'test_helper'
 require 'fixtures'
 
@@ -35,7 +36,7 @@ class IndexSimpleTest < ActiveSupport::TestCase
     should 'group indices by type' do
       assert_equal %w{integer special}, subject.index_groups.keys.map(&:to_s).sort
     end
-    
+
     should 'not contain duplicates' do
       assert_equal Hash["special"=>[["name", nil]], "integer"=>[["age", nil]]], subject.index_groups
     end

data/test/unit/serialization/json_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "test_helper"
 require 'property/serialization/json'
 

data/test/unit/serialization/yaml_test.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "test_helper"
 require 'property/serialization/yaml'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 2
-  - 2
+  - 3
   - 0
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Renaud Kern
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +02:00
+date: 2012-05-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,30 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: property
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: model properties wrap into a single database column
-test_files: 
-- test/database.rb
-- test/fixtures.rb
-- test/shoulda_macros/index.rb
-- test/shoulda_macros/role.rb
-- test/shoulda_macros/serialization.rb
-- test/test_helper.rb
-- test/unit/property/attribute_test.rb
-- test/unit/property/base_test.rb
-- test/unit/property/column_test.rb
-- test/unit/property/declaration_test.rb
-- test/unit/property/dirty_test.rb
-- test/unit/property/index_complex_test.rb
-- test/unit/property/index_custom_test.rb
-- test/unit/property/index_field_test.rb
-- test/unit/property/index_foreign_test.rb
-- test/unit/property/index_simple_test.rb
-- test/unit/property/role_test.rb
-- test/unit/property/stored_role_test.rb
-- test/unit/property/validation_test.rb
-- test/unit/serialization/json_test.rb
-- test/unit/serialization/marshal_test.rb
-- test/unit/serialization/yaml_test.rb
+test_files: []
+