activerecord-import 0.12.0 → 0.13.0

data/test/models/book.rb

@@ -1,8 +1,7 @@
 class Book < ActiveRecord::Base
-  belongs_to :topic, :inverse_of => :books
-  has_many :chapters, :inverse_of => :book
-  has_many :end_notes, :inverse_of => :book
-  if ENV['AR_VERSION'].to_f >= 4.1
-    enum status: [:draft, :published]
-  end
+  belongs_to :topic, inverse_of: :books
+  has_many :chapters, inverse_of: :book
+  has_many :discounts, as: :discountable
+  has_many :end_notes, inverse_of: :book
+  enum status: [:draft, :published] if ENV['AR_VERSION'].to_f >= 4.1
 end

data/test/models/chapter.rb

@@ -1,4 +1,4 @@
 class Chapter < ActiveRecord::Base
-  belongs_to :book, :inverse_of=>:chapters
-  validates :title, :presence => true
+  belongs_to :book, inverse_of: :chapters
+  validates :title, presence: true
 end

data/test/models/discount.rb

@@ -0,0 +1,3 @@
+class Discount < ActiveRecord::Base
+  belongs_to :discountable, polymorphic: true
+end

data/test/models/end_note.rb

@@ -1,4 +1,4 @@
 class EndNote < ActiveRecord::Base
-  belongs_to :book, :inverse_of=>:end_notes
-  validates :note, :presence => true
+  belongs_to :book, inverse_of: :end_notes
+  validates :note, presence: true
 end

data/test/models/promotion.rb

@@ -1,3 +1,3 @@
 class Promotion < ActiveRecord::Base
-   self.primary_key = :promotion_id
+  self.primary_key = :promotion_id
 end

data/test/models/question.rb

@@ -1,3 +1,3 @@
 class Question < ActiveRecord::Base
-	has_one :rule
+  has_one :rule
 end

data/test/models/rule.rb

@@ -1,3 +1,3 @@
 class Rule < ActiveRecord::Base
-	belongs_to :question
-end
+  belongs_to :question
+end

data/test/models/topic.rb

@@ -2,8 +2,8 @@ class Topic < ActiveRecord::Base
   validates_presence_of :author_name
   validates :title, numericality: { only_integer: true }, on: :context_test
 
-  has_many :books, :inverse_of => :topic
-  belongs_to :parent, :class_name => "Topic"
+  has_many :books, inverse_of: :topic
+  belongs_to :parent, class_name: "Topic"
 
-  composed_of :description, :mapping => [ %w(title title), %w(author_name author_name)], :allow_nil => true, :class_name => "TopicDescription"
+  composed_of :description, mapping: [%w(title title), %w(author_name author_name)], allow_nil: true, class_name: "TopicDescription"
 end

data/test/models/widget.rb

@@ -1,7 +1,7 @@
 class Widget < ActiveRecord::Base
   self.primary_key = :w_id
 
-  default_scope lambda { where(active: true) }
+  default_scope -> { where(active: true) }
 
   serialize :data, Hash
   serialize :json_data, JSON

data/test/postgis/import_test.rb

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

data/test/schema/generic_schema.rb

@@ -1,138 +1,142 @@
 ActiveRecord::Schema.define do
-
-  create_table :schema_info, :force=>true do |t|
-    t.column :version, :integer, :unique=>true
+  create_table :schema_info, force: :cascade do |t|
+    t.integer :version, unique: true
   end
-  SchemaInfo.create :version=>SchemaInfo::VERSION
+  SchemaInfo.create version: SchemaInfo::VERSION
 
-  create_table :group, :force => true do |t|
-    t.column :order, :string
+  create_table :group, force: :cascade do |t|
+    t.string :order
     t.timestamps null: true
   end
 
-  create_table :topics, :force=>true do |t|
-    t.column :title, :string, :null => false
-    t.column :author_name, :string
-    t.column :author_email_address, :string
-    t.column :written_on, :datetime
-    t.column :bonus_time, :time
-    t.column :last_read, :datetime
-    t.column :content, :text
-    t.column :approved, :boolean, :default=>'1'
-    t.column :replies_count, :integer
-    t.column :parent_id, :integer
-    t.column :type, :string
-    t.column :created_at, :datetime
-    t.column :created_on, :datetime
-    t.column :updated_at, :datetime
-    t.column :updated_on, :datetime
+  create_table :topics, force: :cascade do |t|
+    t.string :title, null: false
+    t.string :author_name
+    t.string :author_email_address
+    t.datetime :written_on
+    t.time :bonus_time
+    t.datetime :last_read
+    t.text :content
+    t.boolean :approved, default: '1'
+    t.integer :replies_count
+    t.integer :parent_id
+    t.string :type
+    t.datetime :created_at
+    t.datetime :created_on
+    t.datetime :updated_at
+    t.datetime :updated_on
   end
 
-  create_table :projects, :force=>true do |t|
-    t.column :name, :string
-    t.column :type, :string
+  create_table :projects, force: :cascade do |t|
+    t.string :name
+    t.string :type
   end
 
-  create_table :developers, :force=>true do |t|
-    t.column :name, :string
-    t.column :salary, :integer, :default=>'70000'
-    t.column :created_at, :datetime
-    t.column :team_id, :integer
-    t.column :updated_at, :datetime
+  create_table :developers, force: :cascade do |t|
+    t.string :name
+    t.integer :salary, default: '70000'
+    t.datetime :created_at
+    t.integer :team_id
+    t.datetime :updated_at
   end
 
-  create_table :addresses, :force=>true do |t|
-    t.column :address, :string
-    t.column :city, :string
-    t.column :state, :string
-    t.column :zip, :string
-    t.column :developer_id, :integer
+  create_table :addresses, force: :cascade do |t|
+    t.string :address
+    t.string :city
+    t.string :state
+    t.string :zip
+    t.integer :developer_id
   end
 
-  create_table :teams, :force=>true do |t|
-    t.column :name, :string
+  create_table :teams, force: :cascade do |t|
+    t.string :name
   end
 
-  create_table :books, :force=>true do |t|
-    t.column :title, :string, :null=>false
-    t.column :publisher, :string, :null=>false, :default => 'Default Publisher'
-    t.column :author_name, :string, :null=>false
-    t.column :created_at, :datetime
-    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
-    t.column :status, :integer, :default => 0
+  create_table :books, force: :cascade do |t|
+    t.string :title, null: false
+    t.string :publisher, null: false, default: 'Default Publisher'
+    t.string :author_name, null: false
+    t.datetime :created_at
+    t.datetime :created_on
+    t.datetime :updated_at
+    t.datetime :updated_on
+    t.date :publish_date
+    t.integer :topic_id
+    t.boolean :for_sale, default: true
+    t.integer :status, default: 0
   end
 
-  create_table :chapters, :force => true do |t|
-    t.column :title, :string
-    t.column :book_id, :integer, :null => false
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+  create_table :chapters, force: :cascade do |t|
+    t.string :title
+    t.integer :book_id, null: false
+    t.datetime :created_at
+    t.datetime :updated_at
   end
 
-  create_table :end_notes, :force => true do |t|
-    t.column :note, :string
-    t.column :book_id, :integer, :null => false
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+  create_table :end_notes, force: :cascade do |t|
+    t.string :note
+    t.integer :book_id, null: false
+    t.datetime :created_at
+    t.datetime :updated_at
   end
 
-
-  create_table :languages, :force=>true do |t|
-    t.column :name, :string
-    t.column :developer_id, :integer
+  create_table :languages, force: :cascade do |t|
+    t.string :name
+    t.integer :developer_id
   end
 
-  create_table :shopping_carts, :force=>true do |t|
-    t.column :name, :string, :null => true
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+  create_table :shopping_carts, force: :cascade do |t|
+    t.string :name, null: true
+    t.datetime :created_at
+    t.datetime :updated_at
   end
 
-  create_table :cart_items, :force => true do |t|
-    t.column :shopping_cart_id, :string, :null => false
-    t.column :book_id, :string, :null => false
-    t.column :copies, :integer, :default => 1
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+  create_table :cart_items, force: :cascade do |t|
+    t.string :shopping_cart_id, null: false
+    t.string :book_id, null: false
+    t.integer :copies, default: 1
+    t.datetime :created_at
+    t.datetime :updated_at
   end
 
-  add_index :cart_items, [:shopping_cart_id, :book_id], :unique => true, :name => 'uk_shopping_cart_books'
+  add_index :cart_items, [:shopping_cart_id, :book_id], unique: true, name: 'uk_shopping_cart_books'
 
-  create_table :animals, :force => true do |t|
-    t.column :name, :string, :null => false
-    t.column :size, :string, :default => nil
-    t.column :created_at, :datetime
-    t.column :updated_at, :datetime
+  create_table :animals, force: :cascade do |t|
+    t.string :name, null: false
+    t.string :size, default: nil
+    t.datetime :created_at
+    t.datetime :updated_at
   end
 
-  add_index :animals, [:name], :unique => true, :name => 'uk_animals'
+  add_index :animals, [:name], unique: true, name: 'uk_animals'
 
-  create_table :widgets, :id => false, :force => true do |t|
+  create_table :widgets, id: false, force: :cascade do |t|
     t.integer :w_id
-    t.boolean :active, :default => false
-    t.text    :data
-    t.text    :json_data
+    t.boolean :active, default: false
+    t.text :data
+    t.text :json_data
   end
 
-  create_table "promotions", primary_key: "promotion_id", force: :cascade do |t|
-    t.string   :code
-    t.string   :description
-    t.decimal  :discount
+  create_table :promotions, primary_key: :promotion_id, force: :cascade do |t|
+    t.string :code
+    t.string :description
+    t.decimal :discount
   end
 
-  add_index :promotions, [:code], :unique => true, :name => 'uk_code'
+  add_index :promotions, [:code], unique: true, name: 'uk_code'
+
+  create_table :discounts, force: :cascade do |t|
+    t.decimal :amount
+    t.integer :discountable_id
+    t.string :discountable_type
+  end
 
-  create_table :rules, force: true do |t|
-    t.column :condition_text, :string
-    t.column :question_id, :integer
+  create_table :rules, force: :cascade do |t|
+    t.string :condition_text
+    t.integer :question_id
   end
 
-  create_table :questions, force: true do |t|
-    t.column :body, :string
+  create_table :questions, force: :cascade do |t|
+    t.string :body
   end
 end

data/test/schema/mysql_schema.rb

@@ -1,18 +1,16 @@
 ActiveRecord::Schema.define do
-
-  create_table :books, :options=>'ENGINE=MyISAM', :force=>true do |t|
-    t.column :title, :string, :null=>false
-    t.column :publisher, :string, :null=>false, :default => 'Default Publisher'
-    t.column :author_name, :string, :null=>false
+  create_table :books, options: 'ENGINE=MyISAM', force: true do |t|
+    t.column :title, :string, null: false
+    t.column :publisher, :string, null: false, default: 'Default Publisher'
+    t.column :author_name, :string, null: false
     t.column :created_at, :datetime
     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
+    t.column :for_sale, :boolean, default: true
     t.column :status, :integer
   end
   execute "ALTER TABLE books ADD FULLTEXT( `title`, `publisher`, `author_name` )"
-
 end

data/test/sqlite3/import_test.rb

@@ -47,6 +47,4 @@ describe "#import" do
       assert_equal 2500, Topic.count, "Failed to insert all records. Make sure you have a supported version of SQLite3 (3.7.11 or higher) installed"
     end
   end
-
 end
-

data/test/support/active_support/test_case_extensions.rb

@@ -1,25 +1,24 @@
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
   self.use_transactional_fixtures = true
-  
+
   class << self
     def requires_active_record_version(version_string, &blk)
-      if Gem::Dependency.new("expected",version_string).match?("actual", ActiveRecord::VERSION::STRING)
-        instance_eval(&blk)
-      end
+      return unless Gem::Dependency.new('', version_string).match?('', ActiveRecord::VERSION::STRING)
+      instance_eval(&blk)
     end
 
     def assertion(name, &block)
-      mc = class << self ; self ; end
+      mc = class << self; self; end
       mc.class_eval do
         define_method(name) do
           it(name, &block)
         end
       end
     end
-    
+
     def asssertion_group(name, &block)
-      mc = class << self ; self ; end
+      mc = class << self; self; end
       mc.class_eval do
         define_method(name, &block)
       end
@@ -30,8 +29,8 @@ class ActiveSupport::TestCase
         define_method(name, &block)
       end
     end
-    
-    def describe(description, toplevel=nil, &blk)
+
+    def describe(description, toplevel = nil, &blk)
       text = toplevel ? description : "#{name} #{description}"
       klass = Class.new(self)
 
@@ -48,10 +47,10 @@ class ActiveSupport::TestCase
         end
       end
 
-      klass.instance_eval &blk
+      klass.instance_eval(&blk)
     end
-    alias_method :context, :describe
-    
+    alias context describe
+
     def let(name, &blk)
       define_method(name) do
         instance_variable_name = "@__let_#{name}"
@@ -59,15 +58,13 @@ class ActiveSupport::TestCase
         instance_variable_set(instance_variable_name, instance_eval(&blk))
       end
     end
-    
+
     def it(description, &blk)
       define_method("test_#{name}_#{description}", &blk)
     end
   end
-  
 end
 
 def describe(description, &blk)
   ActiveSupport::TestCase.describe(description, true, &blk)
 end
-

data/test/support/assertions.rb

@@ -30,7 +30,7 @@ class ActiveSupport::TestCase
 
         assertion(:should_not_update_timestamps) do
           Timecop.freeze Chronic.parse("5 minutes from now") do
-            perform_import :timestamps => false
+            perform_import timestamps: false
             assert_in_delta @topic.created_at.to_i, updated_topic.created_at.to_i, 1
             assert_in_delta @topic.created_on.to_i, updated_topic.created_on.to_i, 1
             assert_in_delta @topic.updated_at.to_i, updated_topic.updated_at.to_i, 1

data/test/support/factories.rb

@@ -1,28 +1,28 @@
 FactoryGirl.define do
-  sequence(:book_title) {|n| "Book #{n}"}
-  sequence(:chapter_title) {|n| "Chapter #{n}"}
-  sequence(:end_note) {|n| "Endnote #{n}"}
+  sequence(:book_title) { |n| "Book #{n}" }
+  sequence(:chapter_title) { |n| "Chapter #{n}" }
+  sequence(:end_note) { |n| "Endnote #{n}" }
 
   factory :group do
     sequence(:order) { |n| "Order #{n}" }
   end
 
-  factory :invalid_topic, :class => "Topic" do
-    sequence(:title){ |n| "Title #{n}"}
+  factory :invalid_topic, class: "Topic" do
+    sequence(:title) { |n| "Title #{n}" }
     author_name nil
   end
 
   factory :topic do
-    sequence(:title){ |n| "Title #{n}"}
-    sequence(:author_name){ |n| "Author #{n}"}
+    sequence(:title) { |n| "Title #{n}" }
+    sequence(:author_name) { |n| "Author #{n}" }
   end
 
   factory :widget do
-    sequence(:w_id){ |n| n}
+    sequence(:w_id) { |n| n }
   end
 
   factory :question do
-    sequence(:body) { |n| "Text #{n}"}
+    sequence(:body) { |n| "Text #{n}" }
 
     trait :with_rule do
       after(:build) do |question|
@@ -30,24 +30,23 @@ FactoryGirl.define do
       end
     end
   end
-  
+
   factory :rule do
-    sequence(:condition_text){ |n| "q_#{n}_#{n}"} 
+    sequence(:condition_text) { |n| "q_#{n}_#{n}" }
   end
 
-  factory :topic_with_book, :parent=>:topic do |m|
+  factory :topic_with_book, parent: :topic do
     after(:build) do |topic|
       2.times do
-        book = topic.books.build(:title=>FactoryGirl.generate(:book_title), :author_name=>'Stephen King')
+        book = topic.books.build(title: FactoryGirl.generate(:book_title), author_name: 'Stephen King')
         3.times do
-          book.chapters.build(:title => FactoryGirl.generate(:chapter_title))
+          book.chapters.build(title: FactoryGirl.generate(:chapter_title))
         end
 
         4.times do
-          book.end_notes.build(:note => FactoryGirl.generate(:end_note))
+          book.end_notes.build(note: FactoryGirl.generate(:end_note))
         end
       end
     end
   end
-
 end