inline_fixtures 0.0.1 → 0.1.0

data/README.md

@@ -23,26 +23,23 @@ That's a trivial example to give you a feel. The real benefit comes when you wan
 
       describe ".last_3_months_revenue" do
         it "should return the revenue report" do
+          account_ids = inline_fixture :accounts, [:name] { [["Example Account 1"], ["Example Account 2"], ["Example Account 3"]] }
+          two_months_ago = 2.months.ago.to_s(:db)
+          last_month     = 1.month.ago.to_s(:db)
+          this_month     = Date.today.to_s(:db)
           inline_fixture :invoices, [:date, :amount, :account_id] do
-            two_months_ago = 2.months.ago.to_s(:db)
-            last_month     = 1.month.ago.to_s(:db)
-            this_month     = Date.today.to_s(:db)
-            acct_1_id      = inline_fixture(:accounts, :name => "Example Account 1")
-            acct_2_id      = inline_fixture(:accounts, :name => "Example Account 2")
-            acct_3_id      = inline_fixture(:accounts, :name => "Example Account 3")
-
             [
-              [3.months.ago.to_s(:db), "14.00", acct_2_id],
-              [two_months_ago, "27.00", acct_1_id],
-              [two_months_ago, "88.00", acct_2_id],
-              [two_months_ago, "104.00", acct_3_id],
-              [last_month, "30.00", acct_1_id],
-              [last_month, "120.00", acct_2_id],
-              [last_month, "96.00", acct_3_id],
-              [this_month, "63.00", acct_1_id],
-              [this_month, "144.00", acct_2_id],
-              [this_month, "103.00", acct_3_id]
-              [1.months.from_now.to_s(:db), "29.00", acct_1_id],
+              [3.months.ago.to_s(:db), "14.00", account_ids[1]],
+              [two_months_ago, "27.00", account_ids[0]],
+              [two_months_ago, "88.00", account_ids[1]],
+              [two_months_ago, "104.00", account_ids[2]],
+              [last_month, "30.00", account_ids[0]],
+              [last_month, "120.00", account_ids[1]],
+              [last_month, "96.00", account_ids[2]],
+              [this_month, "63.00", account_ids[0]],
+              [this_month, "144.00", account_ids[1]],
+              [this_month, "103.00", account_ids[2]]
+              [1.months.from_now.to_s(:db), "29.00", account_ids[0]],
             ]
           end
           Report.last_3_months_revenue.should == 775.0

data/lib/inline_fixtures.rb

@@ -1,9 +1,6 @@
 require "inline_fixtures/version"
 
 module InlineFixtures
-  def self.included(othermod)
-    puts "hello #{othermod}!"
-  end
   def inline_fixture(table_name, data_or_columns=nil)
 
     if block_given? && data_or_columns
@@ -17,6 +14,8 @@ module InlineFixtures
       columns = data_or_columns.keys
       values = [data_or_columns.values]
     end
-    ActiveRecord::Base.connection.insert_sql("INSERT INTO #{table_name} (#{columns.join(', ')}) VALUES ('#{values.map { |row_vals| row_vals.join("', '") }.join("'), ('")}')")
+    last_insert_id = ActiveRecord::Base.connection.insert_sql("INSERT INTO #{table_name} (#{columns.join(', ')}) VALUES ('#{values.map { |row_vals| row_vals.join("', '") }.join("'), ('")}')")
+    auto_generated_ids = (last_insert_id..(last_insert_id+values.length-1)).to_a
+    auto_generated_ids.length == 1 ? auto_generated_ids.first : auto_generated_ids
   end
 end

data/lib/inline_fixtures/version.rb

@@ -1,3 +1,3 @@
 module InlineFixtures
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/lib/inline_fixtures_spec.rb

@@ -11,6 +11,7 @@ describe InlineFixtures do
   let(:ar_connection) { mock('ar_connection') }
   before do
     ActiveRecord::Base.stub(:connection).and_return(ar_connection)
+    ar_connection.stub(:insert_sql).and_return(19)
   end
   describe "#inline_fixture" do
     context "when a hash is given" do
@@ -18,33 +19,42 @@ describe InlineFixtures do
         ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (bar) VALUES ('quux')")
         ExampleClass.inline_fixture :foos, :bar => "quux"
 
-        ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (baz, bar) VALUES ('grault', 'quux')")
-        ExampleClass.inline_fixture :foos, :baz => 'grault', :bar => "quux"
+        attributes = {:baz => 'grault', :bar => "quux"}
+        key_list = attributes.keys.join(', ')
+        value_list = "'#{attributes.values.join("', '")}'"
+        ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (#{key_list}) VALUES (#{value_list})")
+        ExampleClass.inline_fixture :foos, attributes
+      end
+      it "should return the auto generated id" do
+        ExampleClass.inline_fixture(:foos, :bar => "quux").should == 19
       end
     end
     context "when a block is given with column names" do
+      let(:column_names) { [:first, :second, :third, :fourth, :fifth, :sixth] }
+      let(:fixture_records) { [%w{1 2 3 4 5 6}, %w{x y z a b c}, %w{word word word word word word}] }
       it "should create and execute sql" do
         ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (first, second, third, fourth, fifth, sixth) VALUES ('1', '2', '3', '4', '5', '6'), ('x', 'y', 'z', 'a', 'b', 'c'), ('word', 'word', 'word', 'word', 'word', 'word')")
-        ExampleClass.inline_fixture :foos, [:first, :second, :third, :fourth, :fifth, :sixth] do
-          [
-            %w{1 2 3 4 5 6},
-            %w{x y z a b c},
-            %w{word word word word word word}
-          ]
-        end
+        ExampleClass.inline_fixture(:foos, column_names) { fixture_records }
+      end
+      it "should return the auto generated ids" do
+        ExampleClass.inline_fixture(:foos, column_names) { fixture_records }.should == [19, 20, 21]
       end
     end
     context "when a block is given without column names" do
+      let(:attributes_1) { {:first => 1, :second => 2, :third => 3, :fourth => 4, :fifth => 5, :sixth => 6} }
+      let(:attributes_2) { {:first => 'x', :second => 'y', :third => 'z', :fourth => 'a', :fifth => 'b', :sixth => 'c'} }
+      let(:attributes_3) { {:first => 'word', :second => 'word', :third => 'word', :fourth => 'word', :fifth => 'word', :sixth => 'word'} }
+      let(:fixture_records) { [attributes_1, attributes_2, attributes_3] }
       it "should create and execute sql" do
-        ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (sixth, second, third, fourth, first, fifth) VALUES ('6', '2', '3', '4', '1', '5'), ('c', 'y', 'z', 'a', 'x', 'b'), ('word', 'word', 'word', 'word', 'word', 'word')")
-        ExampleClass.inline_fixture :foos do
-          [
-            {:first => 1, :second => 2, :third => 3, :fourth => 4, :fifth => 5, :sixth => 6},
-            {:first => 'x', :second => 'y', :third => 'z', :fourth => 'a', :fifth => 'b', :sixth => 'c'},
-            {:first => 'word', :second => 'word', :third => 'word', :fourth => 'word', :fifth => 'word', :sixth => 'word'}
-          ]
-        end
+        key_list = attributes_3.keys.join(', ')
+        value_list = "'#{attributes_1.values.join("', '")}'), ('#{attributes_2.values.join("', '")}'), ('#{attributes_3.values.join("', '")}'"
+
+        ar_connection.should_receive(:insert_sql).with("INSERT INTO foos (#{key_list}) VALUES (#{value_list})")
+        ExampleClass.inline_fixture(:foos) { fixture_records }
+      end
+      it "should return the auto generated ids" do
+        ExampleClass.inline_fixture(:foos) { fixture_records }.should == [19, 20, 21]
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'inline_fixtures'))
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: inline_fixtures
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jason Edwards
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-16 00:00:00 Z
+date: 2013-01-17 00:00:00 Z
 dependencies: []
 
 description: Fast inline fixtures