ar-extensions 0.9.2 → 0.9.3

data/Rakefile

@@ -1,79 +1,61 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
+require "pathname"
+require "rubygems"
+require "rake"
+require "rake/testtask"
 
-DIR = File.dirname( __FILE__ )
+DIR      = Pathname.new(File.dirname(__FILE__))
+ADAPTERS = %w(mysql postgresql sqlite sqlite3 oracle)
 
-task :default => [ "test:mysql" ]
+task :default => ["test:mysql"]
 
 task :boot do 
-  require File.expand_path( File.join( DIR, 'lib', 'ar-extensions' ) )
-  require File.expand_path( File.join( DIR, 'tests', 'connections', "native_#{ENV['ARE_DB']}", 'connection' ) )
-  require File.expand_path( File.join( DIR, 'db/migrate/version' ) )
+  require DIR.join("lib", "ar-extensions").expand_path
+  require DIR.join("db", "migrate", "version").expand_path
 end
 
-ADAPTERS = %w( mysql postgresql sqlite sqlite3 oracle )
-
-namespace :db do
-
-  namespace :test do
-    ADAPTERS.each do |adapter|
-      desc "builds test database for #{adapter}"
-      task "prepare_#{adapter}" do |t|
-        file2run = File.join( DIR, 'tests/prepare.rb' )
-        system( "ruby #{file2run} #{adapter}" )
+ADAPTERS.each do |adapter|
+  namespace :db do
+    namespace :test do
+      desc "Builds test database for #{adapter}"
+      task "prepare_#{adapter}" do
+        ruby "#{DIR.join('tests', 'prepare.rb')} #{adapter}"
       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
-      rescue Exception => ex        
-      end
-      task.invoke if task
-        
-      system "ruby #{File.join( DIR, 'tests/run.rb ' )} #{adapter}" 
+  namespace :test do
+    desc "Test base extensions for #{adapter}"
+    task(adapter) do
+      ENV["ARE_DB"] = adapter
+      Rake::Task["db:test:prepare_#{adapter}"].invoke
+      ruby "#{DIR.join('tests', 'run.rb')} #{adapter}" 
     end
   end
   
   namespace :activerecord do
-
-    ADAPTERS.each do |adapter|
-      desc "runs ActiveRecord unit tests for #{adapter} with ActiveRecord::Extensions"
-      task adapter.to_sym do |t|
-        activerecord_dir = ARGV[1]
-        if activerecord_dir.nil? or ! File.directory?( activerecord_dir )
-          STDERR.puts "ERROR: Pass in the path to ActiveRecord. Eg: /home/zdennis/rails_trunk/activerecord"
-          exit
-        end
-        
-        old_dir, old_env = Dir.pwd, ENV['RUBYOPT']
-        Dir.chdir( activerecord_dir )
-        ENV['RUBYOPT'] = "-r#{File.join(old_dir,'init.rb')}"
-
-        load "Rakefile"
-        Rake::Task[ "test_#{adapter}" ].invoke
-        Dir.chdir( old_dir )
-        ENV['RUBYOPT'] = old_env
-      end      
-
-      desc "runs ActiveRecord unit tests for #{adapter} with ActiveRecord::Extensions with ALL available #{adapter} functionality"
-      task "#{adapter}_all" do |t|
-        ENV['LOAD_ADAPTER_EXTENSIONS'] = adapter.to_s
-        Rake::Task["test:activerecord:#{adapter}"].invoke
+    desc "Runs ActiveRecord unit tests for #{adapter} with ActiveRecord::Extensions"
+    task(adapter) do
+      activerecord_dir = ARGV[1]
+      if activerecord_dir.nil? || !File.directory?(activerecord_dir)
+        puts "ERROR: Pass in the path to ActiveRecord. Eg: /home/zdennis/rails_trunk/activerecord"
+        exit
       end
-    end  
-          
+      
+      old_dir, old_env = Dir.pwd, ENV["RUBYOPT"]
+      Dir.chdir(activerecord_dir)
+      ENV["RUBYOPT"] = "-r#{File.join(old_dir,'init.rb')}"
+
+      load "Rakefile"
+
+      Rake::Task["test_#{adapter}"].invoke
+      Dir.chdir(old_dir)
+      ENV["RUBYOPT"] = old_env
+    end      
+
+    desc "Runs ActiveRecord unit tests for #{adapter} with ActiveRecord::Extensions with ALL available #{adapter} functionality"
+    task "#{adapter}_all" do
+      ENV["LOAD_ADAPTER_EXTENSIONS"] = adapter
+      Rake::Task["test:activerecord:#{adapter}"].invoke
+    end
   end    
-
- end
+end

data/db/migrate/generic_schema.rb

@@ -59,6 +59,7 @@ ActiveRecord::Schema.define do
     t.column :created_on, :datetime
     t.column :updated_at, :datetime
     t.column :updated_on, :datetime
+    t.column :publish_date, :date
     t.column :topic_id, :integer
     t.column :for_sale, :boolean, :default => true
   end  

data/db/migrate/mysql_schema.rb

@@ -23,6 +23,7 @@ ActiveRecord::Schema.define do
     t.column :created_on, :datetime
     t.column :updated_at, :datetime
     t.column :updated_on, :datetime
+    t.column :publish_date, :date
     t.column :topic_id, :integer
     t.column :for_sale, :boolean, :default => true
   end

data/db/migrate/version.rb

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

data/lib/ar-extensions/extensions.rb

@@ -206,7 +206,7 @@ module ActiveRecord::Extensions
   class Comparison
 
     SUFFIX_MAP = { 'eq'=>'=', 'lt'=>'<', 'lte'=>'<=', 'gt'=>'>', 'gte'=>'>=', 'ne'=>'!=', 'not'=>'!=' }
-    ACCEPTABLE_COMPARISONS = [ String, Numeric, Time, DateTime ]
+    ACCEPTABLE_COMPARISONS = [ String, Numeric, Time, DateTime, Date ]
     
     def self.process( key, val, caller )
       process_without_suffix( key, val, caller ) || process_with_suffix( key, val, caller )

data/lib/ar-extensions/temporary_table.rb

@@ -1,14 +1,10 @@
-
 module ActiveRecord::Extensions::TemporaryTableSupport # :nodoc:
   def supports_temporary_tables? #:nodoc:
     true
   end
 end
 
-
 class ActiveRecord::Base
-  @@temporary_table_hsh ||= {}		
-
   # Returns true if the underlying database connection supports temporary tables
   def self.supports_temporary_tables?
     connection.supports_temporary_tables?
@@ -26,99 +22,110 @@ class ActiveRecord::Base
   # * options - the options hash used to define the temporary table. 
   # 
   # ==== Options
-  # * :table_name - the desired name of the temporary table. If not supplied \
-  #   then a name of "temp_" + the current table_name of the current model \
+  # <tt>:table_name</tt>::the desired name of the temporary table. If not supplied 
+  #   then a name of "temp_" + the current table_name of the current model 
   #   will be used.
-  # * :like - the table model you want to base the temporary tables \
-  #   structure off from. If this is not supplied then the table_name of the \
+  # <tt>:like</tt>:: the table model you want to base the temporary tables 
+  #   structure off from. If this is not supplied then the table_name of the 
   #   current model will be used.
-  # * :model_name - the name of the model you want to use for the temporary \
-  #   table. This must be compliant with Ruby's naming conventions for \
-  #   constants. If this is not supplied a rails-generated table name will \
-  #   be created which is based off from the table_name of the temporary table. \
+  # <tt>:model_name</tt>:: the name of the model you want to use for the temporary 
+  #   table. This must be compliant with Ruby's naming conventions for 
+  #   constants. If this is not supplied a rails-generated table name will 
+  #   be created which is based off from the table_name of the temporary table. 
   #   IE: Account.create_temporary_table creates the TempAccount model class
   #
   # ==== Example 1, using defaults
-  #  class Project < ActiveRecord::Base ; end
   #
-  #  Project.create_temporary_table
+  #  class Project < ActiveRecord::Base
+  #  end
+  #
+  #  > t = Project.create_temporary_table
+  #  > t.class
+  #  => "TempProject"
+  #  > t.superclass
+  #  => Project
   #
   # This creates a temporary table named 'temp_projects' and creates a constant
-  # name TempProject. The table structure is copied from the _projects_ table.
+  # name TempProject. The table structure is copied from the 'projects' table. 
+  # TempProject is a subclass of Project as you would expect.
   #
-  # ==== Example 2, using :table_name and :model options
-  #   Project.create_temporary_table :table_name=>'my_projects', :model=>'MyProject'
+  # ==== Example 2, using <tt>:table_name</tt> and <tt>:model options</tt>
+  #
+  #   Project.create_temporary_table :table_name => 'my_projects', :model => 'MyProject'
   #
   # This creates a temporary table named 'my_projects' and creates a constant named
-  # MyProject. The table structure is copied from the _projects_ table.
+  # MyProject. The table structure is copied from the 'projects' table.
+  #
+  # ==== Example 3, using <tt>:like</tt>
   #
-  # ==== Example 3, using :like
-  #   ActiveRecord::Base.create_temporary_table :like=>Project 
+  #   ActiveRecord::Base.create_temporary_table :like => Project 
   #  
   # This is the same as calling Project.create_temporary_table.
   #
   # ==== Example 4, using block form
+  #
   #   Project.create_temporary_table do |t|
   #     # ...
   #   end
   # 
   # Using the block form will automatically drop the temporary table
-  # when the block exits. _t_ which is passed into the block is the temporary
-  # table class. In the above example _t_ equals TempProject. The block form
+  # when the block exits. +t+ which is passed into the block is the temporary
+  # table class. In the above example +t+ equals TempProject. The block form
   # can be used with all of the available options.
   #
   # === See
-  # * drop
+  #
+  # * +drop+
+  #
   ######################################################################
-  def self.create_temporary_table( options={} )
-    options[:table_name] = "temp_#{self.table_name}" unless options[:table_name]
-    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] || 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
-    sql = "CREATE #{options[:temporary] ? 'TEMPORARY' : ''} TABLE #{table_name} LIKE #{like_table_name}"
-    connection.execute( sql )		
-    
-    eval "class ::#{model_name} < #{ActiveRecord::TemporaryTable.name}
-					set_table_name :#{table_name}
-				end"
+  def self.create_temporary_table(opts={})
+    opts[:temporary]  ||= !opts[:permanent]
+    opts[:like]       ||= self
+    opts[:table_name] ||= "temp_#{self.table_name}"
+    opts[:model_name] ||= ActiveSupport::Inflector.classify(opts[:table_name])
 
-    @@temporary_table_hsh[ model = Object.const_get( model_name ) ] = true
-    if block_given?
-      yield model
-      model.drop
-      nil
-    else
-      model
+    if Object.const_defined?(opts[:model_name])
+      raise Exception, "Model #{opts[:model_name]} already exists!"
     end
-  end
 
-end
+    like_table_name = opts[:like].table_name || self.table_name
 
-class ActiveRecord::TemporaryTable < ActiveRecord::Base
-  
-  # Drops a temporary table from the database and removes
-  # the temporary table constant.
-  #
-  # ==== Example
-  #   Project.create_temporary_table
-  #   Object.const_defined?( :TempProject ) # => true
-  #   TempProject.drop
-  #   Object.const_defined?( :TempProject ) # => false
-  #
-  def self.drop
-    if @@temporary_table_hsh[ self ]
-      sql = 'DROP TABLE ' + self.table_name + ';'
-      connection.execute( sql )
-      Object.send( :remove_const, self.name.to_sym )
-      @@temporary_table_hsh.delete( self )
+    connection.execute <<-SQL
+      CREATE #{opts[:temporary] ? 'TEMPORARY' : ''} TABLE #{opts[:table_name]}
+        LIKE #{like_table_name}
+    SQL
+    
+    # Sample evaluation:
+    #
+    #   class ::TempFood < Food
+    #     set_table_name :temp_food
+    #
+    #     def self.drop
+    #       connection.execute "DROP TABLE temp_foo"
+    #       Object.send(:remove_const, self.name.to_sym)
+    #     end
+    #   end
+    class_eval(<<-RUBY, __FILE__, __LINE__)
+      class ::#{opts[:model_name]} < #{self.name}
+        set_table_name :#{opts[:table_name]}
+
+        def self.drop
+          connection.execute "DROP TABLE #{opts[:table_name]};"
+          Object.send(:remove_const, self.name.to_sym)
+        end
+      end
+    RUBY
+
+    model = Object.const_get(opts[:model_name])
+
+    if block_given?
+      begin
+        yield(model)
+      ensure
+        model.drop
+      end
     else
-      raise StandardError.new( "Trying to drop nonexistance temporary table: #{self.name}" )
+      return model
     end
   end
-  
 end
-

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-extensions
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  hash: 61
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Zach Dennis
@@ -11,19 +17,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -04:00
+date: 2010-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.1.2
-    version: 
+        hash: 1
+        segments: 
+        - 2
+        - 1
+        version: "2.1"
+  type: :runtime
+  version_requirements: *id001
 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
 executables: []
@@ -34,7 +45,6 @@ extra_rdoc_files:
 - README
 files: 
 - init.rb
-- db/migrate
 - db/migrate/generic_schema.rb
 - db/migrate/mysql_schema.rb
 - db/migrate/oracle_schema.rb
@@ -80,6 +90,8 @@ files:
 - lib/ar-extensions.rb
 has_rdoc: true
 homepage: http://www.continuousthinking.com/tags/arext
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -87,23 +99,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: arext
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Extends ActiveRecord functionality.
 test_files: []