ar-extensions 0.8.0 → 0.8.1

data/ChangeLog

@@ -1,3 +1,11 @@
+2009-02-09  zdennis  <zach.dennis@gmail.com>
+
+* fixed issue in http://zdennis.lighthouseapp.com/projects/14379/tickets/14-join-table-conditions-broken
+* Updated usage of Inflector to point to ActiveSupport::Inflector
+* Fixed bug where finder conditions which use arext-suffixed keys and normal field keys would fail when using a conditions hash. (Gabe da Silveira)
+* added timestamps options to not automatically add timestamps even if record timestamps is disabled in ActiveRecord::Base (Thibaud Guillaume-Gentil)
+*  Updated to use alias_method_chain so that multiple aliased finders remain intact (Marcus Crafter)
+
 2007-07-20  zdennis  <zdennis@dhcp-22.atomicobject.localnet>
 
 	* Added patch from Michael Flester to fix bug with created_at/updated_at fields to use proper timezone. 

data/Rakefile

@@ -14,12 +14,8 @@ end
 
 ADAPTERS = %w( mysql postgresql sqlite sqlite3 oracle )
 
-desc "Packages a rubygem"
-task "pkg" do
-  
-end
-
 namespace :db do
+
   namespace :test do
     ADAPTERS.each do |adapter|
       desc "builds test database for #{adapter}"
@@ -29,13 +25,16 @@ namespace :db do
       end
     end
   end
+
 end
 
 namespace :test do
+  
   ADAPTERS.each do |adapter|
     desc "test base extensions for #{adapter}"
     task adapter do |t|
       ENV['ARE_DB'] = adapter
+            
       task = Rake::Task[ "db:test:prepare_#{adapter}" ]
       begin
         task = false  if SchemaInfo::VERSION == SchemaInfo.find( :first ).version
@@ -48,6 +47,7 @@ namespace :test do
   end
   
   namespace :activerecord do
+
     ADAPTERS.each do |adapter|
       desc "runs ActiveRecord unit tests for #{adapter} with ActiveRecord::Extensions"
       task adapter.to_sym do |t|
@@ -66,6 +66,9 @@ namespace :test do
         Dir.chdir( old_dir )
         ENV['RUBYOPT'] = old_env
       end      
+  
     end  
+          
   end    
-end
+
+ end

data/db/migrate/generic_schema.rb

@@ -22,6 +22,8 @@ ActiveRecord::Schema.define do
     t.column :replies_count, :integer
     t.column :parent_id, :integer
     t.column :type, :string
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
   end
 
   create_table :projects, :force=>true do |t|

data/lib/ar-extensions/csv.rb

@@ -66,14 +66,16 @@ end
 # although nesting multiple has_one/belongs_to associations.
 #
 module ActiveRecord::Extensions::FindToCSV
-  ALIAS_FOR_FIND = :_original_find_before_arext
 
-  def self.included( cl ) # :nodoc:
-    virtual_class = class << cl ; self ; end
-    if not virtual_class.ancestors.include?( self::ClassMethods )
-      cl.instance_eval "alias #{ALIAS_FOR_FIND} :find"
-      cl.extend( ClassMethods )
-      cl.send( :include, InstanceMethods )
+  def self.included(base)
+    if !base.respond_to?(:find_with_csv)
+      base.class_eval do
+        extend ClassMethods
+        include InstanceMethods        
+      end
+      class << base
+        alias_method_chain :find, :csv
+      end
     end
   end
   
@@ -125,8 +127,8 @@ module ActiveRecord::Extensions::FindToCSV
     
     public
 
-    def find( *args ) # :nodoc:
-      results = self.send( ALIAS_FOR_FIND, *args )
+    def find_with_csv( *args ) # :nodoc:
+      results = find_without_csv( *args )
       results.extend( ArrayInstanceMethods ) if results.is_a?( Array )
       results
     end

data/lib/ar-extensions/extensions.rb

@@ -283,6 +283,7 @@ module ActiveRecord::Extensions
         result_values << $2
         '?'
       end
+      result_values = nil if result_values.empty?
       return Result.new(str , result_values)
     end
   end

data/lib/ar-extensions/finders.rb

@@ -10,7 +10,6 @@ module ActiveRecord::ConnectionAdapters::Quoting
   end
 end
 
-
 class ActiveRecord::Base
 
   class << self
@@ -55,12 +54,14 @@ class ActiveRecord::Base
         if val.respond_to?( :to_sql )  
           conditions << sanitize_sql_by_way_of_duck_typing( val ) 
           next
+        elsif val.is_a?(Hash) # don't mess with ActiveRecord hash nested hash functionality
+          conditions << sanitize_sql_hash_for_conditions(key => val)
         else
           sql = nil
           result = ActiveRecord::Extensions.process( key, val, self )
           if result
             conditions << result.sql
-            values.push( result.value ) 
+            values.push( result.value ) unless result.value.nil?
           else
             # Extract table name from qualified attribute names.
             attr = key.to_s

data/lib/ar-extensions/import.rb

@@ -93,6 +93,8 @@ class ActiveRecord::Base
     # * +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.
+    # * +timestamps+ - true|false, tells import to not add timestamps \
+    #   (if false) even if record timestamps is disabled in ActiveRecord::Base
     #
     # == Examples  
     #  class BlogPost < ActiveRecord::Base ; end
@@ -149,7 +151,7 @@ class ActiveRecord::Base
     def import( *args )
       @logger = Logger.new(STDOUT)
       @logger.level = Logger::DEBUG
-      options = { :validate=>true }
+      options = { :validate=>true, :timestamps=>true }
       options.merge!( args.pop ) if args.last.is_a? Hash
       
       # assume array of model objects
@@ -194,7 +196,7 @@ class ActiveRecord::Base
       array_of_attributes = array_of_attributes.dup
 
       # record timestamps unless disabled in ActiveRecord::Base
-      if record_timestamps
+      if record_timestamps && options.delete( :timestamps )
          add_special_rails_stamps column_names, array_of_attributes, options
       end
 

data/lib/ar-extensions/temporary_table.rb

@@ -75,7 +75,7 @@ class ActiveRecord::Base
     options[:like] = self unless options[:like]	
     options[:temporary] = true if not options[:permanent] and not options.has_key?( :temporary )
     table_name = options[:table_name]
-    model_name = options[:model_name] || Inflector.classify( table_name )	
+    model_name = options[:model_name] || ActiveSupport::Inflector.classify( table_name )	
     raise Exception.new( "Model #{model_name} already exists! \n" ) if Object.const_defined? model_name 
     
     like_table_name = options[:like].table_name || self.table_name

data/lib/ar-extensions/version.rb

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

metadata

@@ -1,26 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: ar-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Zach Dennis
 - Mark Van Holstyn
-autorequire: ar-extensions.rb
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-08-06 00:00:00 -04:00
+date: 2009-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.14.1
+        version: 2.0.2
     version: 
 description: Extends ActiveRecord functionality by adding better finder/query support, as well as supporting mass data import, foreign key, CSV and temporary tables
 email: zach.dennis@gmail.com
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: arext
-rubygems_version: 1.1.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Extends ActiveRecord functionality.