seedomatic 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d14bc3c7282abf61784cf857ce53b3890a0c99b5
-  data.tar.gz: ac308741f84c8700f338cfbd38f832f1552bfece
+  metadata.gz: a16c4b79ede1def8b4ebb5296cbfba2992338dea
+  data.tar.gz: 95115a41a7c0e5cbad651a50bdefd533a156fcb0
 SHA512:
-  metadata.gz: 994dc21a1ea0fee69afb95d2eca165ea0939ee84a8472c869a73e1006a7b2981cd7f984481d179563983ba299fdfa589f4bc3b612e48bef4f7081a5638d0b7f1
-  data.tar.gz: 8c52da3a650a20f84bb1416cc207c367e15dd7dfd55202f5c924e53232ec5cf4a4a29b9a2e3c403e7617bbb16b4174a125c0456de9f5d1076ab0fc059577f65c
+  metadata.gz: b0e996b5e9925063b6de42264f06cce282d335b444fc625ca8a2abf63e72dd18bf918c26b75391dd53ac7447100eb2ae2a1cf5d46817e712986aca686ca9bf15
+  data.tar.gz: bb3a49ee1de51d99e4311318ec5745856c648cac064e33d483ade905764bf03f67ca0ba6225b9dde54b08bb48724b092d45efcdb10829c93ccc3df11233b4ac9

data/lib/seedomatic/seeder.rb

@@ -15,7 +15,7 @@ module SeedOMatic
       updated_records = 0
 
       items.each do |attrs|
-        model = model_class.unscoped.send(create_method, *create_args(attrs))
+        model = model_class.unscoped.send(create_method, create_args(attrs))
 
         if model.new_record?
           new_records += 1
@@ -60,11 +60,14 @@ module SeedOMatic
     end
 
     def create_method
-      match_on.empty? ? 'new' : "find_or_initialize_by_#{match_on.join('_and_')}"
+      match_on.empty? ? 'new' : "find_or_initialize_by"
     end
 
     def create_args(item)
-      match_on.map{|m| item[m] }
+      match_on.inject({}) do |result,m|
+        result[m] = item[m]
+        result
+      end
     end
 
     def model_class

data/lib/seedomatic/version.rb

@@ -1,3 +1,3 @@
 module Seedomatic
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/spec/lib/seeder_spec.rb

@@ -60,7 +60,7 @@ describe SeedOMatic::Seeder do
         let(:match_on) { 'code' }
 
         specify {
-          MyModel.should_receive(:find_or_initialize_by_code).with('uniquecode').and_return(MyModel.new)
+          MyModel.should_receive(:find_or_initialize_by).with('code' => 'uniquecode').and_return(MyModel.new)
           subject
         }
       end
@@ -68,7 +68,7 @@ describe SeedOMatic::Seeder do
         let(:match_on) { ['code', 'code_category'] }
 
         specify {
-          MyModel.should_receive(:find_or_initialize_by_code_and_code_category).with('uniquecode', 'more_unique').and_return(MyModel.new)
+          MyModel.should_receive(:find_or_initialize_by).with('code' => 'uniquecode', 'code_category' => 'more_unique').and_return(MyModel.new)
           subject
         }
       end
@@ -85,12 +85,12 @@ describe SeedOMatic::Seeder do
 
     context "one matching field" do
       let(:match_on) { 'code' }
-      it { should == 'find_or_initialize_by_code' }
+      it { should == 'find_or_initialize_by' }
     end
 
     context "multiple matching fields" do
       let(:match_on) { ['code', 'code_category'] }
-      it { should == 'find_or_initialize_by_code_and_code_category' }
+      it { should == 'find_or_initialize_by' }
     end
   end
 
@@ -102,8 +102,8 @@ describe SeedOMatic::Seeder do
     }
     let(:match_on) { 'code' }
     before {
-      MyModel.stub(:find_or_initialize_by_code).with('existing').and_return(existing_mock)
-      MyModel.stub(:find_or_initialize_by_code).with('new').and_return(new_mock)
+      MyModel.stub(:find_or_initialize_by).with('code' => 'existing').and_return(existing_mock)
+      MyModel.stub(:find_or_initialize_by).with('code' => 'new').and_return(new_mock)
     }
 
     context "once" do
@@ -163,22 +163,17 @@ describe SeedOMatic::Seeder do
 
     context "no matching fields" do
       let(:match_on) { nil }
-      it { should == [] }
+      it { should == {} }
     end
 
     context "one matching field" do
       let(:match_on) { 'code' }
-      it { should == [1] }
+      it { should == {'code' => 1} }
     end
 
     context "multiple matching fields" do
       let(:match_on) { ['code', 'code_category'] }
-      it { should == [1,2] }
-    end
-
-    context "order sensitivity" do
-      let(:match_on) { ['code_category', 'code'] }
-      it { should == [2,1] }
+      it { should == {'code' => 1, 'code_category' => 2} }
     end
   end
 

data/spec/support/my_model.rb

@@ -40,6 +40,11 @@ class MyModel
     self
   end
 
+  def save
+    save!
+    true
+  end
+
   def new_record?
     @new_record
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seedomatic
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec