heart_seed 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf94922ae1a0a622269943b4598ac461fabb7f11
-  data.tar.gz: 84bb1c58325c03d3472656e763a27b892428b6f0
+  metadata.gz: 3eac8531ec734a730680e223a8bb7a58a43dac84
+  data.tar.gz: d8f9f23f4759928cc439363f198292ccc849d900
 SHA512:
-  metadata.gz: 53da2afdc2b19b6cd23a2d299b0540cf221738f5ca09e36cecf06f955e73d9049971b9ed0e4d4277f8227fcfb26fd75175c207262a14214a71c2607b37cf5f00
-  data.tar.gz: 22f75929ad85617f9516b714fe6c2672fdd1cce5de61e52186272438e5ce6d4ceff36b339d8bb0e36cc6c9cdf1548207cbf1b0ba4e23a8a145221fd1e1be96d8
+  metadata.gz: d47173b69ed309859fb0df2e1f28e2ca4e6651c765534bfe2c1fd37b46d057ceae9a6eed19125e836152a6ddd7eaee39b79d3cfda8799849e81f24c9eddfebce
+  data.tar.gz: 1fc16baceacbb9a16ae967250e84c391d077dd87be4b97ec42d38d8be0979a3cdd40687f289905fedefebb645fe48a18ff090d1f2483e59ce23537634ef39eff

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## master
-[full changelog](https://github.com/sue445/heart_seed/compare/v0.0.4...master)
+[full changelog](https://github.com/sue445/heart_seed/compare/v0.0.5...master)
+
+## 0.0.5 (2015/02/09)
+[full changelog](https://github.com/sue445/heart_seed/compare/v0.0.4...v0.0.5)
+
+* Stop db:seed When invalid fixture
+  * https://github.com/sue445/heart_seed/issues/22
+  * https://github.com/sue445/heart_seed/issues/23
+* execute seed do follow the order in catalog file
+  * https://github.com/sue445/heart_seed/issues/24
 
 ## 0.0.4 (2015/01/16)
 [full changelog](https://github.com/sue445/heart_seed/compare/v0.0.3...v0.0.4)

data/heart_seed.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 3.0.0"
   spec.add_dependency "roo", ">= 1.13.2"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "codeclimate-test-reporter"
   spec.add_development_dependency "coveralls"
-  spec.add_development_dependency "database_rewinder", "> 0.2.0"
+  spec.add_development_dependency "database_rewinder", ">= 0.4.2"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "pry-remote"

data/lib/heart_seed/db_seed.rb

@@ -28,7 +28,7 @@ module HeartSeed
       model_class.transaction do
         model_class.delete_all
         fixtures.each do |fixture|
-          model_class.create(fixture)
+          model_class.create!(fixture)
         end
       end
     end
@@ -52,16 +52,31 @@ module HeartSeed
       raise "require TABLES or CATALOGS if production" if HeartSeed::Helper.production? && target_table_names.empty?
 
       ActiveRecord::Migration.verbose = true
-      Dir.glob(File.join(seed_dir, "*.yml")) do |file_path|
-        table_name = File.basename(file_path, '.*')
-        next unless target_table?(table_name, target_table_names)
 
-        ActiveRecord::Migration.say_with_time("#{file_path} -> #{table_name}") do
-          begin
+      if target_table_names.empty?
+        # seed all tables
+        Dir.glob(File.join(seed_dir, "*.yml")) do |file_path|
+          table_name = File.basename(file_path, '.*')
+
+          ActiveRecord::Migration.say_with_time("#{file_path} -> #{table_name}") do
+            insert_seed(file_path: file_path, table_name: table_name, mode: mode)
+            ActiveRecord::Migration.say("[INFO] success", true)
+          end
+        end
+
+      else
+        # seed specified tables (follow the order)
+        target_table_names.each do |table_name|
+          file_path = File.join(seed_dir, "#{table_name}.yml")
+
+          unless File.exists?(file_path)
+            ActiveRecord::Migration.say("[WARN] #{file_path} is not exists")
+            next
+          end
+
+          ActiveRecord::Migration.say_with_time("#{file_path} -> #{table_name}") do
             insert_seed(file_path: file_path, table_name: table_name, mode: mode)
             ActiveRecord::Migration.say("[INFO] success", true)
-          rescue => e
-            ActiveRecord::Migration.say("[ERROR] #{e.message}", true)
           end
         end
       end
@@ -118,12 +133,6 @@ module HeartSeed
       tables.compact
     end
 
-    def self.target_table?(source_table, target_tables)
-      return true if target_tables.empty?
-      target_tables.include?(source_table)
-    end
-    private_class_method :target_table?
-
     # insert yaml file to table
     # @param file_path  [String] source seed yaml file
     # @param table_name [String] output destination table

data/lib/heart_seed/version.rb

@@ -1,3 +1,3 @@
 module HeartSeed
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/db/migration.rb

@@ -5,26 +5,26 @@ ActiveRecord::Schema.define(version: 1) do
     t.string :title
     t.text   :description
 
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :comments do |t|
     t.references :article, index: true
     t.text       :message
 
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :likes do |t|
     t.references :article, index: true
 
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table :shard_articles do |t|
     t.string :title
     t.text   :description
 
-    t.timestamps
+    t.timestamps null: false
   end
 end

data/spec/db/setup.rb

@@ -10,7 +10,7 @@ SHARD_NAMES.each do |shard_name|
       # database: ":memory:",
       database: db_file,
       timeout:  500
-  }
+  }.with_indifferent_access
 
   DatabaseRewinder.create_cleaner(shard_name)
   ActiveRecord::Base.establish_connection(shard_name.to_sym)

data/spec/db/test_models.rb

@@ -4,6 +4,8 @@ end
 
 class Comment < ActiveRecord::Base
   establish_connection(:test)
+
+  validates_numericality_of :article_id, greater_than: 0
 end
 
 class Like < ActiveRecord::Base

data/spec/fixtures/invalid/invalid_comments.yml

@@ -0,0 +1,9 @@
+---
+comments_1:
+  id: 1
+  article_id: 1
+  message: message1
+comments_2:
+  id: 2
+  article_id: 0  # this is invalid!
+  message: message2

data/spec/heart_seed/db_seed_spec.rb

@@ -11,10 +11,20 @@ describe HeartSeed::DbSeed do
   describe "#insert" do
     subject { HeartSeed::DbSeed.insert(file_path: file_path, model_class: model_class) }
 
-    let(:file_path) { "#{FIXTURE_DIR}/comments.yml" }
     let(:model_class) { Comment }
 
-    it{ expect{ subject }.to change(Comment, :count).by(2) }
+    context "When valid data" do
+      let(:file_path) { "#{FIXTURE_DIR}/comments.yml" }
+
+      it{ expect{ subject }.to change(Comment, :count).by(2) }
+    end
+
+    context "When invalid data" do
+      let(:file_path) { "#{FIXTURE_DIR}/invalid/invalid_comments.yml" }
+
+      it{ expect{ subject }.to raise_error ActiveRecord::RecordInvalid }
+      it{ expect{ subject rescue nil }.to change(Comment, :count).by(0) }
+    end
   end
 
   describe "#import_all" do
@@ -25,16 +35,6 @@ describe HeartSeed::DbSeed do
     let(:catalogs)   { [] }
     let(:mode){}
 
-    before do
-      # FIXME can not clear if using `DatabaseRewinder.clean`
-      DatabaseRewinder.clean_all
-    end
-
-    after do
-      # FIXME can not clear if using `DatabaseRewinder.clean`
-      DatabaseRewinder.clean_all
-    end
-
     context "When empty tables" do
       it{ expect{ subject }.to change(Article, :count).by(2) }
       it{ expect{ subject }.to change(Comment, :count).by(2) }
@@ -54,10 +54,17 @@ describe HeartSeed::DbSeed do
 
       before do
         allow(HeartSeed::Helper).to receive(:catalogs){
-          { "article" => ["articles", "likes"] }
+          { "article" => ["articles", "likes", "missing_table"] }
         }
       end
 
+      it "should execute seed do follow the order in catalog file" do
+        expect(HeartSeed::DbSeed).to receive(:insert_seed).with(hash_including(table_name: "articles")).ordered
+        expect(HeartSeed::DbSeed).to receive(:insert_seed).with(hash_including(table_name: "likes")).ordered
+        expect(HeartSeed::DbSeed).not_to receive(:insert_seed).with(hash_including(table_name: "missing_table")).ordered
+        subject
+      end
+
       it{ expect{ subject }.to change(Article, :count).by(2) }
       it{ expect{ subject }.to change(Comment, :count).by(0) }
       it{ expect{ subject }.to change(Like   , :count).by(1) }

data/spec/spec_helper.rb

@@ -16,11 +16,15 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
 if ENV["COVERAGE"]
+  require "simplecov"
+  require "coveralls"
   require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
 
-  require 'coveralls'
-  Coveralls.wear!
+  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    CodeClimate::TestReporter::Formatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+  SimpleCov.start
 end
 
 $LOAD_PATH.unshift(File.join(__dir__, "..", "lib"))
@@ -120,6 +124,12 @@ RSpec.configure do |config|
 
   # database_rewinder
   config.before :suite do
+    # FIXME: fool automatic_reconnect ...
+    # https://github.com/rails/rails/blob/v4.2.0/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb#L444
+    SHARD_NAMES.each do |shard_name|
+      DatabaseRewinder[nil, connection: shard_name].pool.automatic_reconnect = true
+    end
+
     DatabaseRewinder.clean_all
     # or
     # DatabaseRewinder.clean_with :any_arg_that_would_be_actually_ignored_anyway

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heart_seed
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -112,16 +112,16 @@ dependencies:
   name: database_rewinder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -379,6 +379,7 @@ files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/fixtures/articles.yml
 - spec/fixtures/comments.yml
+- spec/fixtures/invalid/invalid_comments.yml
 - spec/fixtures/likes.yml
 - spec/fixtures/shard_articles.yml
 - spec/heart_seed/converter_spec.rb
@@ -386,9 +387,6 @@ files:
 - spec/heart_seed/tasks/heart_seed_rake_spec.rb
 - spec/heart_seed_spec.rb
 - spec/spec_helper.rb
-- spec/support/models/article.rb
-- spec/support/models/comment.rb
-- spec/support/models/like.rb
 - spec/support/shared_contexts/rake_in_app_dir.rb
 homepage: https://github.com/sue445/heart_seed
 licenses:
@@ -477,6 +475,7 @@ test_files:
 - spec/dummy/vendor/assets/stylesheets/.keep
 - spec/fixtures/articles.yml
 - spec/fixtures/comments.yml
+- spec/fixtures/invalid/invalid_comments.yml
 - spec/fixtures/likes.yml
 - spec/fixtures/shard_articles.yml
 - spec/heart_seed/converter_spec.rb
@@ -484,8 +483,5 @@ test_files:
 - spec/heart_seed/tasks/heart_seed_rake_spec.rb
 - spec/heart_seed_spec.rb
 - spec/spec_helper.rb
-- spec/support/models/article.rb
-- spec/support/models/comment.rb
-- spec/support/models/like.rb
 - spec/support/shared_contexts/rake_in_app_dir.rb
 has_rdoc: