heart_seed 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7105f8c5625c2b3850966e762eb226f5f6356a89
-  data.tar.gz: e8a85e9eb0083fc5bc132218b34d00727e328758
+  metadata.gz: 72519e6c42efae07fac452d67d5ae4c97f44be5e
+  data.tar.gz: 6ad7ead4918223c3c17b9721021c39be61142452
 SHA512:
-  metadata.gz: bf3d33a5bc7a50dc9dd1018749f425340199dad8de49b556c9e8607a0058c4cbe91c63fb46657649b354ce8b27aa39a8d1944f3b728013ce37c92b544a011c16
-  data.tar.gz: ce8dfb0bb5668ee107b1cb6867be576cc60abb53474414601b84f58c599057c39df01cd3b1444772805de5f174a44aab55e6baaf1f4244c90a0f507b7fe36e07
+  metadata.gz: b5f1a13af6dbfb825cae06b8dc60e5ca1d41d49b3cbdd68b1fcd432ee3238e430888c937ef2e3a2ad3a92debbfbf4eefdbd2ce814d00ab3abab6fb11db1cbb37
+  data.tar.gz: 0dcd02b8bfc8f44f0a6ae6a7f4e0913a241ba3a58a8e3b0f8fbd8991619f024b06fba9faa2aaac94c291a4ee3e4edd2684c5b75520f76b0a229c2ceea8909288

data/.travis.yml

@@ -1,15 +1,18 @@
 language: ruby
 rvm:
-- 2.0
 - 2.1
 - 2.2
+- 2.3.3
+- 2.4.1
 - ruby-head
 bundler_args: "--jobs=2"
 cache: bundler
 before_script:
 - export CODECLIMATE_REPO_TOKEN=9fe512c81149a06ced2b890ab071422bf553cbaf3253fe6830ad75ce92f37516
 - export COVERAGE=true
-script: bundle exec rspec
+script:
+- bundle exec rspec
+- bundle exec codeclimate-test-reporter
 branches:
   only:
   - master
@@ -20,3 +23,4 @@ notifications:
 matrix:
   allow_failures:
   - rvm: ruby-head
+sudo: false

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## master
-[full changelog](https://github.com/sue445/heart_seed/compare/v0.1.0...master)
+[full changelog](https://github.com/sue445/heart_seed/compare/v0.2.0...master)
+
+## 0.2.0 (2017/10/01)
+[full changelog](https://github.com/sue445/heart_seed/compare/v0.1.0...v0.2.0)
+
+* Add :validate parameter
+  * https://github.com/sue445/heart_seed/pull/32
 
 ## 0.1.0 (2015/05/19)
 [full changelog](https://github.com/sue445/heart_seed/compare/v0.0.5...v0.1.0)

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in heart_seed.gemspec
 gemspec
+
+if Gem::Version.create(RUBY_VERSION) < Gem::Version.create("2.2.2")
+  gem "activerecord", "< 5.0.0"
+  gem "activesupport", "< 5.0.0"
+end

data/README.md

@@ -82,8 +82,12 @@ catalogs:
 ```ruby
 # Appended by `rake heart_seed:init`
 HeartSeed::DbSeed.import_all
+
 # If you want to insert by ActiveRecord, replase like this.
 HeartSeed::DbSeed.import_all(mode: HeartSeed::DbSeed::ACTIVE_RECORD)
+
+# If you want to skip model validation in insert, add `validate: false` (default is true)
+HeartSeed::DbSeed.import_all(validate: true)
 ```
 
 ## Specification

data/heart_seed.gemspec

@@ -26,20 +26,21 @@ Gem::Specification.new do |spec|
   spec.add_dependency "roo", ">= 2.0.0"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
   spec.add_development_dependency "coveralls"
   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"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rake_shared_context"
+  spec.add_development_dependency "rake_shared_context", "0.2.2"
   spec.add_development_dependency "roo-xls"
-  spec.add_development_dependency "rspec", "3.0.0"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-collection_matchers"
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "rspec-temp_dir"
+  spec.add_development_dependency "simplecov"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "yard"
 end

data/lib/heart_seed/db_seed.rb

@@ -8,7 +8,8 @@ module HeartSeed
     #
     # @param file_path [String]
     # @param model_class [Class] require. extends {ActiveRecord::Base}
-    def self.bulk_insert(file_path: nil, model_class: nil)
+    # @param validate [Boolean] run ActiveRecord's validation. default: true
+    def self.bulk_insert(file_path: nil, model_class: nil, validate: true)
       fixtures = HeartSeed::Converter.read_fixture_yml(file_path)
       models = fixtures.each_with_object([]) do |fixture, response|
         response << model_class.new(fixture)
@@ -17,7 +18,7 @@ module HeartSeed
 
       model_class.transaction do
         model_class.delete_all
-        model_class.import(models)
+        model_class.import(models, validate: validate)
       end
     end
 
@@ -25,12 +26,13 @@ module HeartSeed
     #
     # @param file_path [String]
     # @param model_class [Class] require. extends {ActiveRecord::Base}
-    def self.insert(file_path: nil, model_class: nil)
+    # @param validate [Boolean] run ActiveRecord's validation. default: true
+    def self.insert(file_path: nil, model_class: nil, validate: true)
       fixtures = HeartSeed::Converter.read_fixture_yml(file_path)
       model_class.transaction do
         model_class.delete_all
         fixtures.each do |fixture|
-          model_class.create!(fixture)
+          model_class.new(fixture).save!(validate: validate)
         end
       end
     end
@@ -39,15 +41,17 @@ module HeartSeed
     #
     # @param file_path [String]
     # @param model_class [Class] require. extends {ActiveRecord::Base}
-    def self.insert_or_update(file_path: nil, model_class: nil)
+    # @param validate [Boolean] run ActiveRecord's validation. default: true
+    def self.insert_or_update(file_path: nil, model_class: nil, validate: true)
       fixtures = HeartSeed::Converter.read_fixture_yml(file_path)
       model_class.transaction do
         fixtures.each do |fixture|
           model = model_class.find_by(id: fixture["id"])
           if model
-            model.update!(fixture)
+            model.attributes = fixture
+            model.save!(validate: validate)
           else
-            model_class.create!(fixture)
+            model_class.new(fixture).save!(validate: validate)
           end
         end
       end
@@ -66,7 +70,8 @@ module HeartSeed
     #                      if `ACTIVE_RECORD`, import with ActiveRecord. (`delete_all` and `create!`)
     #                      if `UPDATE`, import with ActiveRecord. (if exists same record, `update!`)
     #                      other, using bulk insert. (`delete_all` and BULK INSERT)
-    def self.import_all(seed_dir: HeartSeed::Helper.seed_dir, tables: ENV["TABLES"], catalogs: ENV["CATALOGS"], mode: ENV["MODE"])
+    # @param validate    [Boolean] run ActiveRecord's validation. default: true
+    def self.import_all(seed_dir: HeartSeed::Helper.seed_dir, tables: ENV["TABLES"], catalogs: ENV["CATALOGS"], mode: ENV["MODE"], validate: true)
       mode ||= BULK
       target_table_names = parse_target_table_names(tables: tables, catalogs: catalogs)
 
@@ -80,7 +85,7 @@ module HeartSeed
           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)
+            insert_seed(file_path: file_path, table_name: table_name, mode: mode, validate: validate)
             ActiveRecord::Migration.say("[INFO] success", true)
           end
         end
@@ -96,7 +101,7 @@ module HeartSeed
           end
 
           ActiveRecord::Migration.say_with_time("#{file_path} -> #{table_name}") do
-            insert_seed(file_path: file_path, table_name: table_name, mode: mode)
+            insert_seed(file_path: file_path, table_name: table_name, mode: mode, validate: validate)
             ActiveRecord::Migration.say("[INFO] success", true)
           end
         end
@@ -117,12 +122,13 @@ module HeartSeed
     #                      if `UPDATE`, import with ActiveRecord. (if exists same record, `update!`)
     #                      other, using bulk insert. (`delete_all` and BULK INSERT)
     # @param shard_names [Array<String>]
+    # @param validate    [Boolean] run ActiveRecord's validation. default: true
     def self.import_all_with_shards(seed_dir: HeartSeed::Helper.seed_dir, tables: ENV["TABLES"], catalogs: ENV["CATALOGS"],
-                                    mode: ENV["MODE"] || BULK, shard_names: [])
+                                    mode: ENV["MODE"] || BULK, shard_names: [], validate: true)
       shard_names.each do |shard_name|
         ActiveRecord::Migration.say_with_time("import to shard: #{shard_name}") do
           ActiveRecord::Base.establish_connection(shard_name.to_sym)
-          import_all(seed_dir: seed_dir, tables: tables, catalogs: catalogs, mode: mode)
+          import_all(seed_dir: seed_dir, tables: tables, catalogs: catalogs, mode: mode, validate: validate)
         end
       end
     end
@@ -159,16 +165,17 @@ module HeartSeed
     # @param file_path  [String] source seed yaml file
     # @param table_name [String] output destination table
     # @param mode       [String] #{BULK}, #{UPDARE} or #{ACTIVE_RECORD}
-    def self.insert_seed(file_path: nil, table_name: nil, mode: BULK)
+    # @param validate   [Boolean] run ActiveRecord's validation. default: true
+    def self.insert_seed(file_path: nil, table_name: nil, mode: BULK, validate: true)
       model_class = table_name.classify.constantize
       case mode
       when ACTIVE_RECORD
-        insert(file_path: file_path, model_class: model_class)
+        insert(file_path: file_path, model_class: model_class, validate: validate)
       when UPDATE
-        insert_or_update(file_path: file_path, model_class: model_class)
+        insert_or_update(file_path: file_path, model_class: model_class, validate: validate)
       else
         # default is BULK mode
-        bulk_insert(file_path: file_path, model_class: model_class)
+        bulk_insert(file_path: file_path, model_class: model_class, validate: validate)
       end
     end
     private_class_method :insert_seed

data/lib/heart_seed/version.rb

@@ -1,3 +1,3 @@
 module HeartSeed
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/heart_seed/db_seed_spec.rb

@@ -50,6 +50,39 @@ describe HeartSeed::DbSeed do
     end
   end
 
+  context "When validate: false" do
+    subject { HeartSeed::DbSeed.send(method, file_path: file_path, model_class: model_class, validate: false) }
+
+    let(:file_path) { "#{FIXTURE_DIR}/invalid/invalid_comments.yml" }
+    let(:model_class) { Comment }
+
+    describe "#bulk_insert" do
+      let(:method) { :bulk_insert }
+      it{ expect{ subject }.to change(Comment, :count).by(2) }
+    end
+
+    describe "#insert" do
+      let(:method) { :insert }
+      it{ expect{ subject }.to change(Comment, :count).by(2) }
+    end
+
+    describe "#insert_or_update" do
+      let(:method) { :insert_or_update }
+
+      context "When insert" do
+        it{ expect{ subject }.to change(Comment, :count).by(2) }
+      end
+
+      context "When update" do
+        before { HeartSeed::DbSeed.insert(file_path: original_file_path, model_class: model_class) }
+
+        let(:original_file_path) { "#{FIXTURE_DIR}/comments.yml" }
+
+        it{ expect{ subject }.to change{ Comment.find(2).article_id }.from(1).to(0) }
+      end
+    end
+  end
+
   describe "#import_all" do
     subject{ HeartSeed::DbSeed.import_all(seed_dir: seed_dir, tables: tables, catalogs: catalogs, mode: mode) }
 

data/spec/spec_helper.rb

@@ -18,12 +18,8 @@
 if ENV["COVERAGE"]
   require "simplecov"
   require "coveralls"
-  require "codeclimate-test-reporter"
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    CodeClimate::TestReporter::Formatter,
-    Coveralls::SimpleCov::Formatter
-  ]
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
   SimpleCov.start
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heart_seed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - sue445
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -84,16 +84,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -182,16 +182,16 @@ dependencies:
   name: rake_shared_context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: roo-xls
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +210,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -313,9 +327,7 @@ extra_rdoc_files: []
 files:
 - ".coveralls.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
-- ".tachikoma.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -424,7 +436,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: seed util (convert excel to yaml and insert yaml to db)
@@ -501,4 +513,3 @@ test_files:
 - spec/heart_seed_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts/rake_in_app_dir.rb
-has_rdoc: 

data/.hound.yml

@@ -1,31 +0,0 @@
-Style/LineLength:
-  Description: 'Limit lines to 130 characters.'
-  Max: 130
-Style/SpaceInsideParens:
-  Enabled: false
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-StringLiterals:
-  Enabled: false
-Style/TrailingComma:
-  Enabled: false
-Style/BlockComments:
-  Enabled: false
-Style/NilComparison:
-  Enabled: false
-Style/Documentation:
-  Enabled: false
-Style/RegexpLiteral:
-  Enabled: false
-Style/SignalException:
-  Enabled: false
-Style/CaseEquality:
-  Enabled: false
-Style/SpaceInsideBlockBraces:
-  Enabled: false
-Style/SpaceBeforeComma:
-  Enabled: false
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: false
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: false

data/.tachikoma.yml

@@ -1 +0,0 @@
-strategy: 'bundler'