activerecord-import 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b90003ff135e948989e264283865779bd79024
-  data.tar.gz: 30ef6b7700896f504f1dd99444d99b7ff712c62d
+  metadata.gz: 5d8742c99d2600b0f4e4c425ef0a427f46f5f220
+  data.tar.gz: 2c421e2f980400b03efc42f087bd68179edd5f78
 SHA512:
-  metadata.gz: 840e755ed27b5f2831c0340cbc7ceeced5ad674b79ea916c5d4b405c7608cf4f8791cae7b557aa513660addb94d9dfaf037d3d981b0fd84ec2a45ddeb048e02e
-  data.tar.gz: cec3b8e8f94af62a68a72ba99c64404a920c11112a1cd21308ac350efb289cf4a2d7120ea5d5cc203f6b2533106d5be09ccf69765932f23ecec0137adc967724
+  metadata.gz: 092393e90fe7bebb3eed9a5c51aca467afe5b64d664d5b1888b25cc6b9c5e2cfdcdbd04505c736e22a4e8d40d9be0a5bd26f2c7f709213927d530f575b81d115
+  data.tar.gz: d130c2a565701477b2344599b267f0bc45f0f2e99f0bc88ac81e54f35b152993558d06340888a12a8245db963e51249b9885ba68d7532d01760c3c626e1f662f

data/.gitignore

@@ -25,6 +25,7 @@ log/*.log
 test.db
 test/database.yml
 
+.ruby-*
 .bundle/
 .redcar/
 .rvmrc

data/Gemfile

@@ -13,7 +13,9 @@ end
 
 platforms :jruby do
   gem "jdbc-mysql"
+  gem "jdbc-postgres"
   gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
 end
 
 # Support libs

data/LICENSE

@@ -0,0 +1,56 @@
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/README.markdown

@@ -18,6 +18,44 @@ Use activerecord-import 0.2.11. As of activerecord-import 0.3.0 we are relying o
 
 For more information on activerecord-import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
 
+## Additional Adapters
+Additional adapters can be provided by gems external to activerecord-import by providing an adapter that matches the naming convention setup by activerecord-import (and subsequently activerecord) for dynamically loading adapters.  This involves also providing a folder on the load path that follows the activerecord-import naming convention to allow activerecord-import to dynamically load the file.
+
+When `ActiveRecord::Import.require_adapter("fake_name")` is called the require will be:
+
+```ruby
+  require 'activerecord-import/active_record/adapters/fake_name_adapter'
+```
+
+This allows an external gem to dyanmically add an adapter without the need to add any file/code to the core activerecord-import gem.
+
+### Load Path Setup
+To understand how rubygems loads code you can reference the following:
+
+  http://guides.rubygems.org/patterns/#loading_code
+
+And an example of how active_record dynamically load adapters:
+  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb 
+
+In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propegate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
+
+If `fake_name` adapter is needed by a gem (potentially called `activerecord-import-fake_name`) then the folder structure should look as follows:
+
+```bash
+activerecord-import-fake_name/
+|-- activerecord-import-fake_name.gemspec
+|-- lib
+|   |-- activerecord-import-fake_name
+|   |   |-- version.rb
+|   |-- activerecord-import
+|   |   |-- active_record
+|   |   |   |-- adapters
+|   |   |       |-- fake_name_adapter.rb
+|--activerecord-import-fake_name.rb
+```
+
+When rubygems pushes the `lib` folder onto the load path a `require` will now find `activerecord-import/active_record/adapters/fake_name_adapter` as it runs through the lookup process for a ruby file under that path in `$LOAD_PATH`
+
 # License
 
 This is licensed under the ruby license. 

data/Rakefile

@@ -13,7 +13,7 @@ namespace :display do
 end
 task :default => ["display:notice"]
 
-ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
+ADAPTERS = %w(mysql mysql2 em_mysql2 jdbcmysql jdbcpostgresql postgresql sqlite3 seamless_database_pool mysqlspatial mysql2spatial spatialite postgis)
 ADAPTERS.each do |adapter|
   namespace :test do
     desc "Runs #{adapter} database tests."

data/activerecord-import.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.summary       = "Bulk-loading extension for ActiveRecord"
   gem.description   = "Extraction of the ActiveRecord::Base#import functionality from ar-extensions for Rails 3 and beyond"
   gem.homepage      = "http://github.com/zdennis/activerecord-import"
+  gem.license       = "Ruby"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/activerecord-import.rb

@@ -10,7 +10,8 @@ end
 
 ActiveSupport.on_load(:active_record_connection_established) do |connection_pool|
   if !ActiveRecord.const_defined?(:Import) || !ActiveRecord::Import.respond_to?(:load_from_connection_pool)
-    require File.join File.dirname(__FILE__),  "activerecord-import/base"
+    require "activerecord-import/base"
   end
+
   ActiveRecord::Import.load_from_connection_pool connection_pool
 end

data/lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb

@@ -0,0 +1,6 @@
+require "active_record/connection_adapters/postgresql_adapter"
+require "activerecord-import/adapters/postgresql_adapter"
+
+class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
+  include ActiveRecord::Import::PostgreSQLAdapter
+end

data/lib/activerecord-import/adapters/em_mysql2_adapter.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/mysql_adapter"
+require "activerecord-import/adapters/mysql_adapter"
 
 module ActiveRecord::Import::EMMysql2Adapter
   include ActiveRecord::Import::MysqlAdapter

data/lib/activerecord-import/adapters/mysql2_adapter.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + "/mysql_adapter"
+require "activerecord-import/adapters/mysql_adapter"
 
 module ActiveRecord::Import::Mysql2Adapter
   include ActiveRecord::Import::MysqlAdapter
-end
+end

data/lib/activerecord-import/base.rb

@@ -3,7 +3,7 @@ require "active_record"
 require "active_record/version"
 
 module ActiveRecord::Import
-  AdapterPath = File.join File.expand_path(File.dirname(__FILE__)), "/active_record/adapters"
+  AdapterPath = "activerecord-import/active_record/adapters"
 
   def self.base_adapter(adapter)
     case adapter
@@ -18,7 +18,11 @@ module ActiveRecord::Import
   # Loads the import functionality for a specific database adapter
   def self.require_adapter(adapter)
     require File.join(AdapterPath,"/abstract_adapter")
-    require File.join(AdapterPath,"/#{base_adapter(adapter)}_adapter")
+    begin
+      require File.join(AdapterPath,"/#{base_adapter(adapter)}_adapter")
+    rescue LoadError
+      # fallback
+    end
   end
 
   # Loads the import functionality for the passed in ActiveRecord connection
@@ -27,9 +31,7 @@ module ActiveRecord::Import
   end
 end
 
-
-this_dir = Pathname.new File.dirname(__FILE__)
-require this_dir.join("import").to_s
-require this_dir.join("active_record/adapters/abstract_adapter").to_s
-require this_dir.join("synchronize").to_s
-require this_dir.join("value_sets_parser").to_s
+require 'activerecord-import/import'
+require 'activerecord-import/active_record/adapters/abstract_adapter'
+require 'activerecord-import/synchronize'
+require 'activerecord-import/value_sets_parser'

data/lib/activerecord-import/em_mysql2.rb

@@ -4,4 +4,4 @@ warn <<-MSG
   http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
 MSG
 
-require File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))
+require "activerecord-import"

data/lib/activerecord-import/import.rb

@@ -370,7 +370,7 @@ class ActiveRecord::Base
 
           if supports_on_duplicate_key_update?
             if options[:on_duplicate_key_update]
-              options[:on_duplicate_key_update] << key.to_sym if options[:on_duplicate_key_update].is_a?(Array)
+              options[:on_duplicate_key_update] << key.to_sym if options[:on_duplicate_key_update].is_a?(Array) && !options[:on_duplicate_key_update].include?(key.to_sym)
               options[:on_duplicate_key_update][key.to_sym] = key.to_sym if options[:on_duplicate_key_update].is_a?(Hash)
             else
               options[:on_duplicate_key_update] = [ key.to_sym ]

data/lib/activerecord-import/mysql.rb

@@ -4,5 +4,4 @@ warn <<-MSG
   http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
 MSG
 
-require File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))
-
+require "activerecord-import"

data/lib/activerecord-import/mysql2.rb

@@ -4,5 +4,4 @@ warn <<-MSG
   http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
 MSG
 
-require File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))
-
+require "activerecord-import"

data/lib/activerecord-import/postgresql.rb

@@ -4,5 +4,4 @@ warn <<-MSG
   http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
 MSG
 
-require File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))
-
+require "activerecord-import"

data/lib/activerecord-import/sqlite3.rb

@@ -4,5 +4,4 @@ warn <<-MSG
   http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
 MSG
 
-require File.expand_path(File.join(File.dirname(__FILE__),  "/../activerecord-import"))
-
+require "activerecord-import"

data/lib/activerecord-import/synchronize.rb

@@ -44,6 +44,7 @@ module ActiveRecord # :nodoc:
           instance.clear_association_cache
           instance.instance_variable_set '@attributes', matched_instance.attributes
           instance.instance_variable_set '@attributes_cache', {}
+          instance.changed_attributes.clear
           # Since the instance now accurately reflects the record in
           # the database, ensure that instance.persisted? is true.
           instance.instance_variable_set '@new_record', false

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
   end
 end

data/test/adapters/jdbcpostgresql.rb

@@ -0,0 +1 @@
+ENV["ARE_DB"] = "jdbcpostgresql"

data/test/jdbcpostgresql/import_test.rb

@@ -0,0 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+#require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/assertions')
+require File.expand_path(File.dirname(__FILE__) + '/../support/postgresql/import_examples')
+
+should_support_postgresql_import_functionality

data/test/support/active_support/test_case_extensions.rb

@@ -47,10 +47,10 @@ class ActiveSupport::TestCase
     alias_method :context, :describe
     
     def let(name, &blk)
-      values = {}
       define_method(name) do
-        return values[name] if values.has_key?(name)
-        values[name] = instance_eval(&blk)
+        instance_variable_name = "@__let_#{name}"
+        return instance_variable_get(instance_variable_name) if instance_variable_defined?(instance_variable_name)
+        instance_variable_set(instance_variable_name, instance_eval(&blk))
       end
     end
     

data/test/synchronize_test.rb

@@ -12,11 +12,22 @@ describe ".synchronize" do
   end
 
   it "reloads data for the specified records" do
-    Book.synchronize topics
+    Topic.synchronize topics
 
     actual_titles = topics.map(&:title)
     assert_equal "#{titles[0]}_haha", actual_titles[0], "the first record was not correctly updated"
     assert_equal "#{titles[1]}_haha", actual_titles[1], "the second record was not correctly updated"
     assert_equal "#{titles[2]}_haha", actual_titles[2], "the third record was not correctly updated"
   end
+
+  it "the synchronized records aren't dirty" do
+    # Update the in memory records so they're dirty
+    topics.each { |topic| topic.title = 'dirty title' }
+
+    Topic.synchronize topics
+
+    assert_equal false, topics[0].changed?, "the first record was dirty"
+    assert_equal false, topics[1].changed?, "the second record was dirty"
+    assert_equal false, topics[2].changed?, "the third record was dirty"
+  end
 end

data/test/test_helper.rb

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require "fileutils"
 
-ENV["AR_ENV"] = "test"
+ENV["RAILS_ENV"] = "test"
 
 require "bundler"
 Bundler.setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -49,6 +49,7 @@ files:
 - .gitignore
 - Brewfile
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
 - activerecord-import.gemspec
@@ -72,6 +73,7 @@ files:
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
+- lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
@@ -95,6 +97,7 @@ files:
 - lib/activerecord-import/version.rb
 - test/adapters/em_mysql2.rb
 - test/adapters/jdbcmysql.rb
+- test/adapters/jdbcpostgresql.rb
 - test/adapters/mysql.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2spatial.rb
@@ -108,6 +111,7 @@ files:
 - test/em_mysql2/import_test.rb
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
+- test/jdbcpostgresql/import_test.rb
 - test/models/book.rb
 - test/models/group.rb
 - test/models/topic.rb
@@ -133,7 +137,8 @@ files:
 - test/value_sets_bytes_parser_test.rb
 - test/value_sets_records_parser_test.rb
 homepage: http://github.com/zdennis/activerecord-import
-licenses: []
+licenses:
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -151,13 +156,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Bulk-loading extension for ActiveRecord
 test_files:
 - test/adapters/em_mysql2.rb
 - test/adapters/jdbcmysql.rb
+- test/adapters/jdbcpostgresql.rb
 - test/adapters/mysql.rb
 - test/adapters/mysql2.rb
 - test/adapters/mysql2spatial.rb
@@ -171,6 +177,7 @@ test_files:
 - test/em_mysql2/import_test.rb
 - test/import_test.rb
 - test/jdbcmysql/import_test.rb
+- test/jdbcpostgresql/import_test.rb
 - test/models/book.rb
 - test/models/group.rb
 - test/models/topic.rb