ar-extensions 0.5.2 → 0.6.0

data/ChangeLog

@@ -1,3 +1,11 @@
+2007-05-05  zdennis  <zdennis@elijah.local>
+
+	* Added ActiveRecord::Base::AbstractAdapter#synchronize method which allows a mass re-synchronization of ActiveRecord instances. This is similar to ActiveRecord::Base#reload except that it works on multiple instances at a time rather then one. This sends one query for all instances rather then 1 per instance reloaded.
+
+	* Fixed bug with URI encoded strings with a workaround in the Comparison extension. ActiveRecord needs to be fixed to not use the String#%  method so strings that do contains percentage signs will not fail
+
+	* Applied patch from Grant Goodale to allow the Like extension to support arrays when using the '_contains' suffix
+
 2007-03-14  zdennis  <zdennis@elijah.xrite.com>
 
 	* Fixed a bug by renaming the alias for the ActiveRecord::Base#quote method in finders.rb. See rubyforge bug #8996

data/README

@@ -9,6 +9,13 @@ Email: zach.dennis@gmail.com
  - For How-To information see http://www.continuousthinking.com/tags/arext
  - For project information and feedback please consult http://rubyforge.org/projects/arext/
  - For release information please see below
+ 
+ActiveRecord::Extensions 0.6.0
+------------------------------
+May 5th, 2007
+ - Fixed bug with URI escaped strings and the Comparison better finder extension
+ - Added support for arrays with the Like better finder extension when using the '_contains' suffix
+ - Added 'synchronize' support for ActiveRecord::Base instances when using Import functionality
 
 ActiveRecord::Extensions 0.5.2
 ------------------------------

data/db/migrate/generic_schema.rb

@@ -49,6 +49,7 @@ ActiveRecord::Schema.define do
     t.column :publisher, :string, :null=>false
     t.column :author_name, :string, :null=>false
     t.column :created_at, :time
+    t.column :topic_id, :integer
   end  
 
   create_table :languages, :force=>true do |t|

data/db/migrate/mysql_schema.rb

@@ -20,6 +20,7 @@ ActiveRecord::Schema.define do
     t.column :publisher, :string, :null=>false
     t.column :author_name, :string, :null=>false
     t.column :created_at, :datetime
+    t.column :topic_id, :integer
   end
   execute "ALTER TABLE books ADD FULLTEXT( `title`, `publisher`, `author_name` )"
 

data/db/migrate/version.rb

@@ -1,4 +1,4 @@
 class SchemaInfo < ActiveRecord::Base
   set_table_name 'schema_info'
-  VERSION = 5
+  VERSION = 6
 end

data/init.rb

@@ -24,6 +24,8 @@ require File.expand_path( File.join(  dir, 'lib/ar-extensions', 'import', 'postg
 
 require File.expand_path( File.join(  dir, 'lib/ar-extensions', 'finders' ) )
 
+require File.expand_path( File.join(  dir, 'lib/ar-extensions', 'synchronize' ) )
+
 require File.expand_path( File.join(  dir, 'lib/ar-extensions', 'temporary_table' ) )
 require File.expand_path( File.join(  dir, 'lib/ar-extensions', 'temporary_table', 'mysql' ) )
 

data/lib/ar-extensions/adapters/abstract_adapter.rb

@@ -44,6 +44,12 @@ module ActiveRecord # :nodoc:
         
         number_of_inserts
       end
+      
+      # Synchronizes the passed in ActiveRecord instances with the records in
+      # the database by calling +reload+ on each instance.
+      def after_import_synchronize( instances )
+        instances.each { |e| e.reload }
+      end
 
       # Returns the sum of the sizes of the passed in objects. This should
       # probably be moved outside this class, but to where?

data/lib/ar-extensions/extensions.rb

@@ -216,10 +216,9 @@ module ActiveRecord::Extensions
       if val.nil?
         str = "#{caller.table_name}.#{caller.connection.quote_column_name( key )} IS NULL"
       else
-        str = "#{caller.table_name}.#{caller.connection.quote_column_name( key )}=" +
-          "#{caller.connection.quote( val, caller.columns_hash[ key ] )} "
+        str = "#{caller.table_name}.#{caller.connection.quote_column_name( key )}=?" 
       end
-      Result.new( str, nil )
+      Result.new( str, val )
     end
 
     def self.process_with_suffix( key, val, caller )
@@ -257,22 +256,29 @@ module ActiveRecord::Extensions
     ENDS_WITH_RGX =  /(.+)_ends_with$/
     
     def self.process( key, val, caller )
-      if match_data=key.to_s.match( LIKE_RGX )
-        fieldname = match_data.captures[0]
-        str = "#{caller.table_name}.#{caller.connection.quote_column_name( fieldname )} LIKE ?"
-        return Result.new( str, "%#{val}%" )
-      elsif match_data=key.to_s.match( STARTS_WITH_RGX )
-        fieldname = match_data.captures[0]
-        str = "#{caller.table_name}.#{caller.connection.quote_column_name( fieldname )} LIKE ?"
-        return Result.new( str, "#{val}%" )
-      elsif match_data=key.to_s.match( ENDS_WITH_RGX )
-        fieldname = match_data.captures[0]
-        str = "#{caller.table_name}.#{caller.connection.quote_column_name( fieldname )} LIKE ?"
-        return Result.new( str, "%#{val}" )
+      values = [*val]
+      case key.to_s
+      when LIKE_RGX
+        str = values.collect do |v|
+           "#{caller.table_name}.#{caller.connection.quote_column_name( $1 )} LIKE " +
+            "#{caller.connection.quote( '%%' + v + '%%', caller.columns_hash[ $1 ] )} "
+        end
+      when STARTS_WITH_RGX
+        str = values.collect do |v|
+           "#{caller.table_name}.#{caller.connection.quote_column_name( $1 )} LIKE " +
+            "#{caller.connection.quote( v + '%%', caller.columns_hash[ $1 ] )} "
+        end
+      when ENDS_WITH_RGX
+        str = values.collect do |v|
+           "#{caller.table_name}.#{caller.connection.quote_column_name( $1 )} LIKE " +
+            "#{caller.connection.quote( '%%' + v, caller.columns_hash[ $1 ] )} "
+        end
+      else
+        return nil
       end
-      nil
+
+      return Result.new( str.join(' OR '), nil)
     end
-    
   end
 
 
@@ -461,8 +467,8 @@ end
   
 
   register Comparison, :adapters=>:all
-  register Like, :adapters=>:all 
   register ArrayExt, :adapters=>:all  
+  register Like, :adapters=>:all 
   register RangeExt, :adapters=>:all  
   register MySQLRegexp, :adapters=>[ :mysql ]
   register PostgreSQLRegexp, :adapters=>[ :postgresql ]

data/lib/ar-extensions/finders.rb

@@ -21,11 +21,11 @@ class ActiveRecord::Base
     def sanitize_sql( arg ) # :nodoc:
       return sanitize_sql_orig( arg ) if arg.nil?
       if arg.respond_to?( :to_sql )
-        arg = sanitize_sql_by_way_of_duck_typing( arg ) #if arg.respond_to?( :to_sql )
+        arg = sanitize_sql_by_way_of_duck_typing( arg )
       elsif arg.is_a?( Hash )
-        arg = sanitize_sql_from_hash( arg ) #if arg.is_a?( Hash )
+        arg = sanitize_sql_from_hash( arg ) 
       elsif arg.size == 2 and arg.first.is_a?( String ) and arg.last.is_a?( Hash )
-         arg = sanitize_sql_from_string_and_hash( arg ) # if arg.size == 2 and arg.first.is_a?( String ) and arg.last.is_a?( Hash )
+        arg = sanitize_sql_from_string_and_hash( arg ) 
       end
       sanitize_sql_orig( arg )
     end

data/lib/ar-extensions/import.rb

@@ -80,6 +80,9 @@ class ActiveRecord::Base
     # * +on_duplicate_key_update+ - an Array or Hash, tells import to \
     #    use MySQL's ON DUPLICATE KEY UPDATE ability. See On Duplicate\
     #    Key Update below.
+    # * +synchronize+ - an array of ActiveRecord instances for the model
+    #   that you are currently importing data into. This synchronizes
+    #   existing model instances in memory with updates from the import.
     #
     # == Examples  
     #  class BlogPost < ActiveRecord::Base ; end
@@ -100,6 +103,14 @@ class ActiveRecord::Base
     #  values = [ [ 'zdennis', 'test post' ], [ 'jdoe', 'another test post' ] ]
     #  BlogPost.import( columns, values, :validate => false  )
     #
+    #  # Example synchronizing existing instances in memory
+    #  post = BlogPost.find_by_author_name( 'zdennis' )
+    #  puts post.author_name # => 'zdennis'
+    #  columns = [ :author_name, :title ]
+    #  values = [ [ 'yoda', 'test post' ] ]
+    #  BlogPost.import posts, :synchronize=>[ post ]
+    #  puts post.author_name # => 'yoda'
+    #
     # == On Duplicate Key Update (MySQL only)
     #
     # The :on_duplicate_key_update option can be either an Array or a Hash. 
@@ -154,11 +165,17 @@ class ActiveRecord::Base
       
       # dup the passed in array so we don't modify it unintentionally
       array_of_attributes = array_of_attributes.dup
-      if is_validating
+      number_of_inserts = if is_validating
         import_with_validations( column_names, array_of_attributes, options )
       else
         import_without_validations_or_callbacks( column_names, array_of_attributes, options )
       end
+      
+      if options[:synchronize]
+        synchronize( options[:synchronize] )
+      end
+      
+      number_of_inserts
     end
     
     # TODO import_from_table needs to be implemented. 

data/lib/ar-extensions/import/mysql.rb

@@ -12,8 +12,8 @@ module ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter # :nodoc:
     post_sql_statements
   end
   
-  def multiple_value_sets_insert_sql( table_name, column_names, options ) # :nodoc:
-    "INSERT #{options[:ignore]?'IGNORE ':''}INTO #{table_name} (#{column_names.join(',')}) VALUES "
+  def multiple_value_sets_insert_sql( table_name, column_names, options ) # :nodoc:    
+    "INSERT #{options[:ignore] ? 'IGNORE ':''} INTO #{table_name} (#{column_names.join(',')}) VALUES "
   end
   
   # Returns a generated ON DUPLICATE KEY UPDATE statement given the passed
@@ -64,7 +64,7 @@ module ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter # :nodoc:
     end   
     values_arr = values.map{ |arr| '(' + arr.join( ',' ) + ')' }
   end
-  
+    
 end
 
 ActiveRecord::ConnectionAdapters::MysqlAdapter.send( 'include', ActiveRecord::Extensions::ConnectionAdapters::MysqlAdapter )

data/lib/ar-extensions/synchronize.rb

@@ -0,0 +1,30 @@
+module ActiveRecord # :nodoc:
+  class Base # :nodoc:
+      
+    # Synchronizes the passed in ActiveRecord instances with data
+    # from the database. This is like calling reload
+    # on an individual ActiveRecord instance but it is intended for use on
+    # multiple instances. 
+    #
+    # This uses one query for all instance updates and then updates existing
+    # instances rather sending one query for each instance
+    def self.synchronize(instances, key=ActiveRecord::Base.primary_key)
+      return if instances.empty?
+      
+      keys = instances.map(&"#{key}".to_sym)
+      klass = instances.first.class
+      fresh_instances = klass.find( :all, :conditions=>{ key=>keys }, :order=>"#{key} ASC" )
+
+      instances.each_with_index do |instance, index|
+        instance.clear_aggregation_cache
+        instance.clear_association_cache
+        instance.instance_variable_set '@attributes', fresh_instances[index].attributes
+      end
+    end
+
+    # See ActiveRecord::ConnectionAdapters::AbstractAdapter.synchronize
+    def synchronize(instances, key=ActiveRecord::Base.primary_key)
+      self.class.synchronize(instances, key)
+    end
+  end
+end

data/lib/ar-extensions/temporary_table.rb

@@ -117,7 +117,7 @@ class ActiveRecord::TemporaryTable < ActiveRecord::Base
       Object.send( :remove_const, self.name.to_sym )
       @@temporary_table_hsh.delete( self )
     else
-      raise StandardError.new "Trying to drop nonexistance temporary table: #{self.name}"
+      raise StandardError.new( "Trying to drop nonexistance temporary table: #{self.name}" )
     end
   end
   

data/lib/ar-extensions/version.rb

@@ -2,7 +2,7 @@
 module ActiveRecord # :nodoc:
   module Extensions # :nodoc: 
     module VERSION  
-      MAJOR, MINOR, REVISION = %W( 0 5 2 )
+      MAJOR, MINOR, REVISION = %W( 0 6 0 )
       STRING = [ MAJOR, MINOR, REVISION ].join( '.' )
     end
   end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: ar-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
-date: 2007-03-15 00:00:00 -04:00
+  version: 0.6.0
+date: 2007-05-05 00:00:00 -04:00
 summary: Extends ActiveRecord functionality.
 require_paths: 
 - lib
@@ -42,22 +42,23 @@ files:
 - config/database.yml.template
 - config/mysql.schema
 - config/postgresql.schema
-- lib/ar-extensions.rb
+- lib/ar-extensions/adapters/abstract_adapter.rb
+- lib/ar-extensions/adapters/mysql_adapter.rb
+- lib/ar-extensions/adapters/postgresql.rb
 - lib/ar-extensions/csv.rb
 - lib/ar-extensions/extensions.rb
 - lib/ar-extensions/finders.rb
 - lib/ar-extensions/foreign_keys.rb
-- lib/ar-extensions/fulltext.rb
-- lib/ar-extensions/import.rb
-- lib/ar-extensions/temporary_table.rb
-- lib/ar-extensions/version.rb
-- lib/ar-extensions/adapters/abstract_adapter.rb
-- lib/ar-extensions/adapters/mysql_adapter.rb
-- lib/ar-extensions/adapters/postgresql.rb
 - lib/ar-extensions/fulltext/mysql.rb
+- lib/ar-extensions/fulltext.rb
 - lib/ar-extensions/import/mysql.rb
 - lib/ar-extensions/import/postgresql.rb
+- lib/ar-extensions/import.rb
+- lib/ar-extensions/synchronize.rb
 - lib/ar-extensions/temporary_table/mysql.rb
+- lib/ar-extensions/temporary_table.rb
+- lib/ar-extensions/version.rb
+- lib/ar-extensions.rb
 test_files: []
 
 rdoc_options: