rapids 0.1.3 → 0.1.4

data/lib/rapids/batch/columns_helper.rb

@@ -4,8 +4,9 @@ module Rapids
       include Enumerable
       include ModelExtensions
       
-      def initialize(model,find_or_creates)
-        @hash = generate_columns_hash(model,find_or_creates)
+      def initialize(model,batch)
+        @hash = update_columns_hash(model,batch.updates)
+        @hash.merge!(generate_columns_hash(model,batch.find_or_creates))
       end
       
       def each(&block)
@@ -76,6 +77,17 @@ module Rapids
         
         hash        
       end
+      
+      def update_columns_hash(model,updates)
+        updates.inject({}) do |hash,update|
+          if model.reflections[update.name]
+            hash[{:type => :update, :name => update.name}] = generate_columns_hash(model.reflections[update.name].klass,[])
+            hash
+          else
+            hash
+          end
+        end
+      end
     end
   end
 end

data/lib/rapids/batch/create_table.rb

@@ -12,11 +12,16 @@ module Rapids
       end
       
       def to_sql
-        columns_helper = ColumnsHelper.new(@model,@batch.find_or_creates)
+        columns_helper = ColumnsHelper.new(@model,@batch)
         columns_sql = columns_helper.map do |column,path|
           association = nil
           model = @model
-          path.each do |association_name|
+          path.each do |association_name_or_hash|
+            association_name = if association_name_or_hash.is_a?(Hash)
+              association_name_or_hash[:name]
+            else
+              association_name_or_hash
+            end
             if model.reflections[association_name]
               association = model.reflections[association_name]
               model = model.reflections[association_name].klass

data/lib/rapids/batch/create_trigger.rb

@@ -17,7 +17,7 @@ module Rapids
           "declare #{variable_name(find_or_create.name,[])} integer;"
         end.join("\n")
 
-        columns_helper = ColumnsHelper.new(@model,@batch.find_or_creates)
+        columns_helper = ColumnsHelper.new(@model,@batch)
         main_columns = columns_helper.find_all{|column,path| path == []}
 
         insert_header = (main_columns.map(&:first) + criteria_columns(@model,association_find_or_creates.map(&:name))).map{|a|sql_column_name(a,[])}
@@ -28,10 +28,11 @@ module Rapids
           begin
             #{declares}
             
-            #{find_or_create_sql(@model,@batch.find_or_creates)}
+            #{find_or_create_sql(@model,@batch)}
             
             #{@options[:replace] ? "replace" : "insert"} into `#{@model.table_name}` (#{insert_header.join(",")})
                                         values (#{insert_values.join(",")});
+            #{updates_sql(@model,@batch)}
           end
         TRIGGER_SQL
       end
@@ -41,10 +42,10 @@ module Rapids
         find_or_creates.reject{|foc|model.reflections[foc.name].nil?}
       end
       
-      def find_or_create_sql(model,find_or_creates, recursion_path = [])
-        columns_helper = ColumnsHelper.new(model,find_or_creates)
+      def find_or_create_sql(model,batch,recursion_path = [])
+        columns_helper = ColumnsHelper.new(model,batch)
         
-        find_or_creates.map do |find_or_create|
+        batch.find_or_creates.map do |find_or_create|
           name,criteria = find_or_create.name,find_or_create.find_columns
           if model.reflections[name]
             sub_model = model.reflections[name].klass
@@ -173,6 +174,22 @@ module Rapids
           end
         end
       end
+      
+      def updates_sql(model,batch)
+        columns_helper = ColumnsHelper.new(model,batch)
+        
+        batch.updates.map do |update|
+          association = model.reflections[update.name]
+          update_model = association.klass
+          
+          update_columns = columns_helper.find_all{|column,path| path == update.path}.map do |pair|
+            column,path = *pair
+            "`#{column.name}` = IFNULL(new.#{sql_column_name(*pair)},`#{column.name}`)" #TODO should later add support for setting null in this update
+          end
+
+          "update `#{update_model.table_name}` set #{update_columns.join(",")} where `#{update_model.table_name}`.id = new.`#{association.primary_key_name}`;"
+        end.join("\n")
+      end
     end
   end
 end

data/lib/rapids/batch/insert_into.rb

@@ -14,7 +14,7 @@ module Rapids
       end
       
       def to_sql
-        columns_helper = ColumnsHelper.new(@model,@batch.find_or_creates)
+        columns_helper = ColumnsHelper.new(@model,@batch)
         insert_header_sql = columns_helper.map{|column,path|sql_column_name(column,path)}.join(",")
         
         values_sql = @values.map do |row|
@@ -28,12 +28,17 @@ module Rapids
               end
             end
           
-            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)
+            specific_object = path.inject(row) do |memo,hash_or_association_name|
+              association_name = if hash_or_association_name.is_a?(Hash)
+                hash_or_association_name[:name]
+              else
+                hash_or_association_name
+              end
+              if memo.respond_to?(association_name)
+                memo.send(association_name)
+              elsif memo.is_a?(Hash) && memo[association_name.to_s]
+                memo[association_name.to_s]
+              elsif association_name.is_a?(String)
                 memo
               end
             end

data/lib/rapids/batch/model_extensions.rb

@@ -10,8 +10,20 @@ module Rapids
       end
       
       def sql_column_name(column,hash_path)
-        prefix = hash_path.empty? ? "" : "foc$"
-        association_list = (hash_path + [column.name]).map(&:to_s).join("$")
+        prefix = if hash_path.empty?
+          ""
+        elsif path_type = hash_path.first and path_type.is_a?(Hash) and path_type[:type] == :update
+          "update$"
+        else
+          "foc$"
+        end
+        association_list = (hash_path + [column.name]).map do |path_type|
+          if path_type.is_a?(Hash)
+            path_type[:name]
+          else
+            path_type.to_s
+          end
+        end.join("$")
         "`#{prefix+association_list}`"
       end
       

data/lib/rapids/batch/update.rb

@@ -0,0 +1,15 @@
+module Rapids
+  module Batch
+    class Update
+      attr_reader :name
+      
+      def initialize(name)
+        @name = name
+      end
+      
+      def path
+        [{:type => :update, :name => name}]
+      end
+    end
+  end
+end

data/lib/rapids/batch.rb

@@ -2,19 +2,25 @@ require 'rapids/batch/create_table'
 require 'rapids/batch/insert_into'
 require 'rapids/batch/create_trigger'
 require 'rapids/batch/find_or_create'
+require 'rapids/batch/update'
 
 module Rapids
   module Batch
     class DefineBatch
-      attr_reader :find_or_creates
+      attr_reader :find_or_creates, :updates
       
       def initialize
         @find_or_creates = []
+        @updates = []
       end
       
       def find_or_create(name,find_columns,*fill_columns_plus_other_params)
         @find_or_creates << FindOrCreate.new(name,find_columns,fill_columns_plus_other_params.first)
       end
+      
+      def update(name)
+        @updates << Update.new(name)
+      end
     end
     
     def batch_create(collection,options = {})

data/lib/rapids/version.rb

@@ -1,3 +1,3 @@
 module Rapids
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/batch/columns_helper_spec.rb

@@ -3,20 +3,23 @@ require 'batch/spec_helper'
 module Rapids::Batch
   describe ColumnsHelper do
     it "should intialize with an empty find or create list" do
-      ColumnsHelper.new(Post,[])
+      batch = Rapids::Batch::DefineBatch.new
+      ColumnsHelper.new(Post,batch)
     end
 
     it "should initialize with the association find or create" do
-      find_or_creates = [FindOrCreate.new(:author,[:name],[])]
-      columns_helper = ColumnsHelper.new(Post,find_or_creates)
+      batch = Rapids::Batch::DefineBatch.new
+      batch.find_or_create(:author,[:name])
+      columns_helper = ColumnsHelper.new(Post,batch)
       
       columns_helper.map{|a|a.first.name}.include?("name").should be_true
       columns_helper.map{|a|a.first.name}.include?("author_id").should be_false, "expected author_id not to be present in this list:\n#{columns_helper.to_a.inspect}"
     end
     
     it "should initialize with the manual find or create format" do
-      find_or_creates = [FindOrCreate.new("Category",[:category],[])]
-      columns_helper = ColumnsHelper.new(Post,find_or_creates)
+      batch = Rapids::Batch::DefineBatch.new
+      batch.find_or_create("Category",[:category])
+      columns_helper = ColumnsHelper.new(Post,batch)
       
       columns_helper.any? do |pair|
         column,path = *pair
@@ -25,13 +28,25 @@ module Rapids::Batch
     end
     
     it "should initialize with the association find or create with a has_many find or create" do
-      find_or_creates = [FindOrCreate.new(:post,[:name,{:post_tags => [:tag_id]}],[])]
-      columns_helper = ColumnsHelper.new(Comment,find_or_creates)
+      batch = Rapids::Batch::DefineBatch.new
+      batch.find_or_create(:post,[:name,{:post_tags => [:tag_id]}])
+      columns_helper = ColumnsHelper.new(Comment,batch)
       
       columns_helper.any? do |pair|
         column,path = *pair
         column.name == "tag_id" && path == [:post,:post_tags]
       end.should be_true, "expected to find a column named 'tag_id' and the path to be [:post,:post_tags] in the following:\n#{columns_helper.to_a.inspect}"
     end
+    
+    it "should initialize with the update definition and have the appropriate columns" do
+      batch = Rapids::Batch::DefineBatch.new
+      batch.update(:author)
+      columns_helper = ColumnsHelper.new(Post,batch)
+      
+      columns_helper.any? do |pair|
+        column,path = *pair
+        column.name == "name" && path == [{:type => :update,:name => :author}]
+      end.should be_true, "expected to find a column named 'name' and the path to be [{:type => :update,:name => :author}] in the following:\n#{columns_helper.to_a.inspect}"
+    end
   end
 end

data/spec/batch/create_table_spec.rb

@@ -40,5 +40,13 @@ module Rapids::Batch
       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 COLLATE=utf8_general_ci"
     end
+    
+    it "should generate sql for a update definition" do
+      batch = Rapids::Batch::DefineBatch.new
+      batch.update(:author)
+      
+      create_table = CreateTable.new(Post,batch)
+      create_table.to_sql.should == "CREATE TABLE `$posts_batch` (`author_id` int(11),`category` varchar(255),`name` varchar(255),`update$author$name` varchar(255)) ENGINE=BLACKHOLE DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci"
+    end
   end
 end

data/spec/batch/create_trigger_spec.rb

@@ -39,5 +39,13 @@ module Rapids::Batch
       create_trigger = CreateTrigger.new(Category,batch,:replace => true)
       clean_sql(create_trigger.to_sql).should == "create trigger `$categories_batch_trigger` after insert on `$categories_batch` for each row\nbegin\nreplace into `categories` (`category`)\nvalues (new.`category`);\nend"
     end
+    
+    it "should generate sql for a basic definition" do
+      batch = Rapids::Batch::DefineBatch.new
+      batch.update(:author)
+      
+      create_trigger = CreateTrigger.new(Post,batch)
+      clean_sql(create_trigger.to_sql).should == "create trigger `$posts_batch_trigger` after insert on `$posts_batch` for each row\nbegin\ninsert into `posts` (`author_id`,`category`,`name`)\nvalues (new.`author_id`,new.`category`,new.`name`);\nupdate `authors` set `name` = IFNULL(new.`update$author$name`,`name`) where `authors`.id = new.`author_id`;\nend"
+    end
   end
 end

data/spec/batch/insert_into_spec.rb

@@ -49,6 +49,15 @@ module Rapids::Batch
       clean_sql(insert_into.to_sql).should == "INSERT INTO `$categories_batch` (`category`) VALUES ('food'),('politics')"
     end
     
+    it "should generate sql for an update definition" do
+      batch = Rapids::Batch::DefineBatch.new
+      batch.update(:author)
+      collection = [Post.new(:name => "Dining at 323 Butter St",:category => "food",:author_id => 1,:author => Author.new(:name => "Joe"))]
+      
+      insert_into = InsertInto.new(Post,batch,collection)
+      clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`author_id`,`category`,`name`,`update$author$name`) VALUES (1,'food','Dining at 323 Butter St','Joe')"
+    end
+    
     describe "Without model objects" do
       it "should generate sql for a simple batch definition" do
         batch = Rapids::Batch::DefineBatch.new
@@ -95,6 +104,15 @@ module Rapids::Batch
         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
+      
+      it "should generate sql for an update definition" do
+        batch = Rapids::Batch::DefineBatch.new
+        batch.update(:author)
+        collection = [{"name" => "Dining at 323 Butter St","category" => "food","author_id" => 1,"author" => {"name" => "Joe"}}]
+
+        insert_into = InsertInto.new(Post,batch,collection)
+        clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`author_id`,`category`,`name`,`update$author$name`) VALUES (1,'food','Dining at 323 Butter St','Joe')"
+      end
     end
   end
 end

data/spec/batch/update_spec.rb

@@ -0,0 +1,15 @@
+require 'batch/spec_helper'
+
+module Rapids::Batch
+  describe Update do
+    it "should initialize with a name and the name should be retrievable" do
+      u = Update.new(:hello)
+      u.name.should == :hello
+    end
+    
+    it "should give me it's path hash" do
+      u = Update.new(:hello)
+      u.path.should == [{:type => :update, :name => :hello}]
+    end
+  end
+end

data/spec/rapids_batch_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 class RapidsBatchTestCase < ActiveRecord::Base
   extend Rapids::Batch
+  
+  belongs_to :a_belongs_to
+  
+  batch do
+    update :a_belongs_to
+  end
 end
 
 describe Rapids::Batch do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapids
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-26 00:00:00 -04:00
+date: 2011-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/rapids/batch/find_or_create.rb
 - lib/rapids/batch/insert_into.rb
 - lib/rapids/batch/model_extensions.rb
+- lib/rapids/batch/update.rb
 - lib/rapids/version.rb
 - rapids.gemspec
 - spec/batch/columns_helper_spec.rb
@@ -96,6 +97,7 @@ files:
 - spec/batch/create_trigger_spec.rb
 - spec/batch/insert_into_spec.rb
 - spec/batch/spec_helper.rb
+- spec/batch/update_spec.rb
 - spec/rapids_batch_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -140,5 +142,6 @@ test_files:
 - spec/batch/create_trigger_spec.rb
 - spec/batch/insert_into_spec.rb
 - spec/batch/spec_helper.rb
+- spec/batch/update_spec.rb
 - spec/rapids_batch_spec.rb
 - spec/spec_helper.rb