property 2.1.2 → 2.2.0

data/History.txt

@@ -1,3 +1,8 @@
+== 2.2.0 2011-06-06
+
+* Major enhancements
+  * Better support for stored columns and custom type cast.
+
 == 2.1.2 2010-12-04
 
 * Major enhancements

data/lib/property/attribute.rb

@@ -101,7 +101,7 @@ module Property
               model_attrs[k] = attributes.delete(k)
             end
           end
-          
+
           # Properties validation will add errors on invalid keys.
           self.properties = attributes
           self.attributes_without_properties = model_attrs

data/lib/property/column.rb

@@ -59,7 +59,9 @@ module Property
     alias ptype type
 
     def type_cast(value)
-      if type == :string
+      if @caster && val = @caster.type_cast(value)
+        val
+      elsif type == :string
         value = value.to_s
         value.blank? ? nil : value
       elsif @klass
@@ -78,6 +80,7 @@ module Property
       def extract_property_options(options)
         @index = options.delete(:index) || options.delete(:indexed)
         @role  = options.delete(:role)
+        @caster= options.delete(:orig)
         if @index == true
           @index = (options.delete(:index_group) || ptype).to_s
         elsif @index.kind_of?(Proc)

data/lib/property/index.rb

@@ -186,7 +186,7 @@ module Property
                 cur_indices.merge!(proc.call(self))
               end
             end
-
+            
             if group_name.kind_of?(Class)
               # Use a custom indexer
               group_name.set_property_index(self, cur_indices)
@@ -200,7 +200,7 @@ module Property
               new_keys = cur_keys - old_keys
               del_keys = old_keys - cur_keys
               upd_keys = cur_keys & old_keys
-
+              
               upd_keys.each do |key|
                 value = cur_indices[key]
                 if value.blank?

data/lib/property/role_module.rb

@@ -101,7 +101,7 @@ module Property
 
     def inspect
       # "#<#{self.class}:#{sprintf("0x%x", object_id)} #{@name.inspect} @klass = #{@klass.inspect} @defined_columns = #{@defined_columns.inspect}>"
-      "#<#{self.class}:#{sprintf("0x%x", object_id)} #{defined_columns.keys.inspect}>"
+      "#<#{self.class}:'#{name}' #{defined_columns.keys.join(', ')}>"
     end
 
     # List all property columns defined for this role

data/lib/property/stored_column.rb

@@ -16,6 +16,11 @@ module Property
       {:index => (index.blank? ? nil : index)}
     end
 
+    # Dummy, can be reimplemented in the class storing the column.
+    def type_cast(value)
+      nil
+    end
+
     private
       def set_index
         if index == true

data/lib/property/stored_role.rb

@@ -22,7 +22,7 @@ module Property
       base.class_eval do
         after_save :update_columns
         validates_presence_of :name
-        
+
         extend ClassMethods
 
         def self.new(arg, &block)
@@ -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)))
+          add_column(Property::Column.new(column.name, column.default, column.ptype, column.options.merge(:role => self, :orig => column)))
         end
       end
 
@@ -85,7 +85,6 @@ module Property
         # deleted_columns = stored_column_names - defined_column_names
 
         new_columns.each do |name|
-          ActiveRecord::Base.logger.warn "Creating #{name} column"
           stored_columns.create(:name => name, :ptype => columns[name].type.to_s)
         end
 

data/lib/property/version.rb

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

data/property.gemspec

@@ -1,108 +1,105 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{property}
-  s.version = "2.1.2"
+  s.version = "2.2.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{2010-12-04}
+  s.date = %q{2011-06-06}
   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 = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "generators/property/property_generator.rb",
-     "lib/property.rb",
-     "lib/property/attribute.rb",
-     "lib/property/base.rb",
-     "lib/property/column.rb",
-     "lib/property/core_ext/time.rb",
-     "lib/property/db.rb",
-     "lib/property/declaration.rb",
-     "lib/property/dirty.rb",
-     "lib/property/error.rb",
-     "lib/property/index.rb",
-     "lib/property/properties.rb",
-     "lib/property/redefined_method_error.rb",
-     "lib/property/redefined_property_error.rb",
-     "lib/property/role.rb",
-     "lib/property/role_module.rb",
-     "lib/property/schema.rb",
-     "lib/property/schema_module.rb",
-     "lib/property/serialization/json.rb",
-     "lib/property/serialization/marshal.rb",
-     "lib/property/serialization/yaml.rb",
-     "lib/property/stored_column.rb",
-     "lib/property/stored_role.rb",
-     "lib/property/stored_schema.rb",
-     "lib/property/version.rb",
-     "property.gemspec",
-     "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"
+    "History.txt",
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "generators/property/property_generator.rb",
+    "lib/property.rb",
+    "lib/property/attribute.rb",
+    "lib/property/base.rb",
+    "lib/property/column.rb",
+    "lib/property/core_ext/time.rb",
+    "lib/property/db.rb",
+    "lib/property/declaration.rb",
+    "lib/property/dirty.rb",
+    "lib/property/error.rb",
+    "lib/property/index.rb",
+    "lib/property/properties.rb",
+    "lib/property/redefined_method_error.rb",
+    "lib/property/redefined_property_error.rb",
+    "lib/property/role.rb",
+    "lib/property/role_module.rb",
+    "lib/property/schema.rb",
+    "lib/property/schema_module.rb",
+    "lib/property/serialization/json.rb",
+    "lib/property/serialization/marshal.rb",
+    "lib/property/serialization/yaml.rb",
+    "lib/property/stored_column.rb",
+    "lib/property/stored_role.rb",
+    "lib/property/stored_schema.rb",
+    "lib/property/version.rb",
+    "property.gemspec",
+    "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"
   ]
   s.homepage = %q{http://zenadmin.org/635}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{property}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   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"
+    "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
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/test/test_helper.rb

@@ -2,6 +2,7 @@ require 'pathname'
 $LOAD_PATH.unshift((Pathname(__FILE__).dirname +  '..' + 'lib').expand_path)
 
 require 'rubygems'
+gem 'activerecord', '2.3.11'
 require 'test/unit'
 require 'shoulda'
 require 'active_record'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Renaud Kern
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +01:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - MIT-LICENSE
 - README.rdoc
@@ -114,8 +113,8 @@ homepage: http://zenadmin.org/635
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -139,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: property
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: model properties wrap into a single database column

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-coverage
-*.gem
-log/test.log
-.project