rapids 0.1.0 → 0.1.2

data/lib/rapids/batch/create_table.rb

@@ -30,7 +30,7 @@ module Rapids
           "#{sql_column_name(column,path)} #{column_type}"
         end.join(",")
 
-        "CREATE TABLE `#{batch_table_name}` (#{columns_sql}) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+        "CREATE TABLE `#{batch_table_name}` (#{columns_sql}) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=#{@model.connection.collation}"
       end
     end
   end

data/lib/rapids/batch/insert_into.rb

@@ -30,14 +30,20 @@ module Rapids
             specific_object = path.inject(row) do |memo,association|
               if memo.respond_to?(association)
                 memo.send(association)
+              elsif memo.is_a?(Hash) && memo[association.to_s]
+                memo[association.to_s]
               elsif association.is_a?(String)
                 memo
               end
             end
 
-            if specific_object.respond_to?(:each)
+            if specific_object.is_a?(Array)
               many_attributes = specific_object.map do |s|
-                s.instance_variable_get(:@attributes)[source_column_name]
+                if s.is_a?(ActiveRecord::Base)
+                  s.instance_variable_get(:@attributes)[source_column_name]
+                else
+                  s[source_column_name]
+                end
               end.compact
               if many_attributes.empty?
                 default_on_nil(nil,destination_column)
@@ -45,7 +51,11 @@ module Rapids
                 default_on_nil(many_attributes.sort.join(","),destination_column)
               end
             else
-              val = specific_object.instance_variable_get(:@attributes)[source_column_name] #speeds things up a bit since it's not typed first before being quoted
+              val = if specific_object.is_a?(ActiveRecord::Base)
+                specific_object.instance_variable_get(:@attributes)[source_column_name] #speeds things up a bit since it's not typed first before being quoted
+              else
+                specific_object[source_column_name]
+              end
               default_on_nil(val,destination_column)
             end
           end

data/lib/rapids/version.rb

@@ -1,3 +1,3 @@
 module Rapids
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/spec/batch/create_table_spec.rb

@@ -6,7 +6,7 @@ module Rapids::Batch
       batch = Rapids::Batch::DefineBatch.new
       
       create_table = CreateTable.new(Category,batch)
-      create_table.to_sql.should == "CREATE TABLE `$categories_batch` (`category` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+      create_table.to_sql.should == "CREATE TABLE `$categories_batch` (`category` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
     end
     
     it "should generate sql for a basic definition" do
@@ -14,7 +14,7 @@ module Rapids::Batch
       batch.find_or_create(:author,[:name])
       
       create_table = CreateTable.new(Post,batch)
-      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$author$name` varchar(255),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$author$name` varchar(255),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
     end
     
     it "should generate sql for a manual definition" do
@@ -22,7 +22,7 @@ module Rapids::Batch
       batch.find_or_create("Category",[:category])
       
       create_table = CreateTable.new(Post,batch)
-      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$Category$category` varchar(255),`author_id` int(11),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$Category$category` varchar(255),`author_id` int(11),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
     end
     
     it "should generate sql for a manual definition, with explicit source column" do
@@ -30,7 +30,7 @@ module Rapids::Batch
       batch.find_or_create("AltCategory",[[:name,:category]])
       
       create_table = CreateTable.new(Post,batch)
-      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$AltCategory$name` varchar(255),`author_id` int(11),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`foc$AltCategory$name` varchar(255),`author_id` int(11),`category` varchar(255),`name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
     end
     
     it "should generate sql for a more complicated find or create with reliances on a has_many relationship" do
@@ -38,7 +38,7 @@ module Rapids::Batch
       batch.find_or_create(:post,[:name,{:post_tags => [:tag_id]}])
       
       create_table = CreateTable.new(Comment,batch)
-      create_table.to_sql.should == "CREATE TABLE `$comments_batch` (`body` varchar(255),`foc$post$author_id` int(11),`foc$post$category` varchar(255),`foc$post$name` varchar(255),`foc$post$post_tags$tag_id` varchar(255),`title` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8"
+      create_table.to_sql.should == "CREATE TABLE `$comments_batch` (`body` varchar(255),`foc$post$author_id` int(11),`foc$post$category` varchar(255),`foc$post$name` varchar(255),`foc$post$post_tags$tag_id` varchar(255),`title` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
     end
   end
 end

data/spec/batch/insert_into_spec.rb

@@ -38,5 +38,53 @@ module Rapids::Batch
       insert_into = InsertInto.new(Post,batch,collection)
       clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`foc$AltCategory$name`,`author_id`,`category`,`name`) VALUES ('food',NULL,'food','Dining at 323 Butter St')"
     end
+    
+    describe "Without model objects" do
+      it "should generate sql for a simple batch definition" do
+        batch = Rapids::Batch::DefineBatch.new
+        collection = %w{food politics}.map do |category_name|
+          {"category" => category_name}
+        end
+
+        insert_into = InsertInto.new(Category,batch,collection)
+        clean_sql(insert_into.to_sql).should == "INSERT INTO `$categories_batch` (`category`) VALUES ('food'),('politics')"
+      end
+      
+      it "should generate sql for a basic definition" do
+        batch = Rapids::Batch::DefineBatch.new
+        batch.find_or_create(:author,[:name])
+        collection = [{"name" => "Dining at 323 Butter St","category" => "food","author" => {"name" => "Joe"}}]
+
+        insert_into = InsertInto.new(Post,batch,collection)
+        clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`foc$author$name`,`category`,`name`) VALUES ('Joe','food','Dining at 323 Butter St')"
+      end
+
+      it "should generate sql for a manual definition" do
+        batch = Rapids::Batch::DefineBatch.new
+        batch.find_or_create("Category",[:name])
+        collection = [{"name" => "Dining at 323 Butter St","category" => "food"}]
+
+        insert_into = InsertInto.new(Post,batch,collection)
+        clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`foc$Category$category`,`author_id`,`category`,`name`) VALUES ('food',NULL,'food','Dining at 323 Butter St')"
+      end
+
+      it "should generate sql for a manual definition, with explicit source column" do
+        batch = Rapids::Batch::DefineBatch.new
+        batch.find_or_create("AltCategory",[[:name,:category]])
+        collection = [{"name" => "Dining at 323 Butter St","category" => "food"}]
+
+        insert_into = InsertInto.new(Post,batch,collection)
+        clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`foc$AltCategory$name`,`author_id`,`category`,`name`) VALUES ('food',NULL,'food','Dining at 323 Butter St')"
+      end
+      
+      it "should generate sql for a more complicated find or create with reliances on a has_many relationship" do
+        batch = Rapids::Batch::DefineBatch.new
+        batch.find_or_create(:post,[:name,{:post_tags => [:tag_id]}])
+        collection = [{"title" => "You suck","body" => "Im a troll","post" => {"name" => "I just did something cool","post_tags" => [{"tag_id" => 1},{"tag_id" => 2}]}}]
+
+        create_table = InsertInto.new(Comment,batch,collection)
+        create_table.to_sql.should == "INSERT INTO `$comments_batch` (`body`,`foc$post$author_id`,`foc$post$category`,`foc$post$name`,`foc$post$post_tags$tag_id`,`title`) VALUES ('Im a troll',NULL,NULL,'I just did something cool','1,2','You suck')"
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapids
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 -04:00
+date: 2011-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency