ar_pg_array 0.9.12 → 0.9.13

data/README

@@ -33,7 +33,18 @@ This library adds ability to use PostgreSQL array types with ActiveRecord.
         end
       end
       
-Plugin worked with rails 2.3.x. integer_array works in ActiveRecord 3 at the moment.
+Installation
+============
 
+    gem install ar_pg_array
+
+Changelog
+=========
+
+  0.9.13
+
+    Since version 0.9.13 ar_pg_array will try to detect arrays changed inplace.
+    And parsed arrays are now cached in @attributes_cache.
+    Thanks to Romain Beauxis (https://github.com/toots ) for being insistent about this.
 
 Copyright (c) 2010 Sokolov Yura aka funny_falcon, released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.9.12
+0.9.13

data/lib/ar_pg_array/allways_save.rb

@@ -0,0 +1,38 @@
+module ActiveRecord
+    module CheckArrayBeforeUpdate
+      def mark_arrays_for_update
+        @attributes_cache.each do |name, value|
+          attribute_will_change!(name) if Array === value && _read_attribute(name) != value
+        end
+      end
+    end
+  if VERSION::MAJOR < 3
+    module CheckArrayBeforeUpdate
+      def self.included(base)
+        base.alias_method_chain :update, :check_array
+        base.send(:alias_method, :_read_attribute, :read_attribute)
+      end
+
+      def update_with_check_array
+        mark_arrays_for_update
+        update_without_check_array
+      end
+    end
+  else
+    module CheckArrayBeforeUpdate
+      include ActiveSupport::Concern
+
+      if VERSION::MAJOR == 3 && VERSION::MINOR >= 2
+        def _read_attribute(attr_name)
+          column_for_attribute(attr_name).type_cast(@attributes[attr_name])
+        end
+      end
+
+      def update(*)
+        mark_arrays_for_update
+        super
+      end
+    end
+  end
+  Base.__send__ :include, CheckArrayBeforeUpdate
+end

data/lib/ar_pg_array/schema.rb

@@ -150,7 +150,6 @@ module ActiveRecord
           when :string, :text, :other
             pa = prepare_array_for_arel_by_base_type(value, base_type)
             "'#{ quote_string( pa ) }'"
-            #"'#{ pa.gsub("'","''") }'"
           else
             raise "Unsupported array base type #{base_type} for arel"
         end
@@ -164,7 +163,6 @@ module ActiveRecord
             prepare_pg_float_array(value)
           when :string, :text, :other
             prepare_pg_text_array(value)
-            #prepare_pg_string_array(value, base_type).gsub("''","'")
           when :datetime, :timestamp, :time
             prepare_pg_string_array(value, base_type)
           when :decimal, :boolean, :date, :safe

data/lib/ar_pg_array/schema_cachable.rb

@@ -0,0 +1,11 @@
+adjust_cached_types = lambda do |atcbd|
+  atcbd << /_array$/
+  def atcbd.include?(val)
+    any?{|type| type === val}
+  end
+end
+if ActiveRecord::VERSION::MAJOR < 3
+  adjust_cached_types.call(ActiveRecord::AttributeMethods::ATTRIBUTE_TYPES_CACHED_BY_DEFAULT)
+else
+  adjust_cached_types.call(ActiveRecord::AttributeMethods::Read::ATTRIBUTE_TYPES_CACHED_BY_DEFAULT)
+end

data/lib/ar_pg_array/schema_cacheable.rb

@@ -0,0 +1,11 @@
+adjust_cached_types = lambda do |atcbd|
+  atcbd << /_array$/
+  def atcbd.include?(val)
+    any?{|type| type === val}
+  end
+end
+if ActiveRecord::VERSION::MAJOR < 3
+  adjust_cached_types.call(ActiveRecord::AttributeMethods::ATTRIBUTE_TYPES_CACHED_BY_DEFAULT)
+else
+  adjust_cached_types.call(ActiveRecord::AttributeMethods::Read::ATTRIBUTE_TYPES_CACHED_BY_DEFAULT)
+end

data/lib/ar_pg_array/schema_fix_will_change.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module Dirty
+    private
+      def attribute_will_change!(attr)
+        val = changed_attributes[attr] = clone_attribute_value(:read_attribute, attr)
+        if Array === val && !(Array === @attributes[attr])
+          send(attr) unless @attributes_cache.has_key?(attr)
+          @attributes[attr] = @attributes_cache[attr]
+        end
+        val
+      end
+  end
+end

data/lib/ar_pg_array.rb

@@ -3,9 +3,13 @@ require 'active_record/base'
 require 'active_record/connection_adapters/postgresql_adapter'
 
 require 'ar_pg_array/schema'
+require 'ar_pg_array/schema_cacheable'
 require 'ar_pg_array/querying'
+require 'ar_pg_array/allways_save'
 require 'ar_pg_array/references_by'
-if defined? ::Arel
+if ActiveRecord::VERSION::MAJOR >= 3
   require 'ar_pg_array/schema_arel'
-  require 'ar_pg_array/querying_arel'  
-end
+  require 'ar_pg_array/querying_arel'
+else
+  require 'ar_pg_array/schema_fix_will_change'
+end

data/spec/pg_array_spec.rb

@@ -131,6 +131,27 @@ describe "PgArray" do
       bulks_where(:ints => [1,2].search_subarray).should == bulks_where(:id=>[1,2,4])
     end
     
+    it "should be cached in @attributes_cache" do
+      bulk = Bulk.find(1)
+      ar = bulk.ints
+      bulk.ints.should.equal?(ar)
+      ard = ar.dup
+      arn = (bulk.ints << 1)
+      arn.should.equal?(ar)
+      bulk.ints.should.equal?(ar)
+      bulk.ints.should == (ard + [1])
+    end
+
+    it 'should allways save changed value' do
+      bulk = Bulk.find(1)
+      old = bulk.ints.dup
+      bulk.ints << 2
+      new = bulk.ints.dup
+      bulk.save
+      bulk.reload
+      bulk.ints.should == new
+    end
+
     def map_times(times)
       times.map{|t| t.strftime("%F %T")}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar_pg_array
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &84412580 !ruby/object:Gem::Requirement
+  requirement: &84224510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *84412580
+  version_requirements: *84224510
 description: ar_pg_array includes support of PostgreSQL's int[], float[], text[],
   timestamptz[] etc. into ActiveRecord. You could define migrations for array columns,
   query on array columns.
@@ -37,11 +37,15 @@ files:
 - VERSION
 - init.rb
 - lib/ar_pg_array.rb
+- lib/ar_pg_array/allways_save.rb
 - lib/ar_pg_array/querying.rb
 - lib/ar_pg_array/querying_arel.rb
 - lib/ar_pg_array/references_by.rb
 - lib/ar_pg_array/schema.rb
 - lib/ar_pg_array/schema_arel.rb
+- lib/ar_pg_array/schema_cachable.rb
+- lib/ar_pg_array/schema_cacheable.rb
+- lib/ar_pg_array/schema_fix_will_change.rb
 - spec/fixtures/bulk.rb
 - spec/fixtures/bulks.yml
 - spec/fixtures/item.rb
@@ -72,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ar-pg-array
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Use power of PostgreSQL Arrays in ActiveRecord