mongify 0.1.7 → 0.2.0

data/CHANGELOG.rdoc

@@ -1,3 +1,5 @@
+== 0.2.0 / 01 Jun 2011
+* Added the ability to modify parent table when working with embedded tables
 == 0.1.7 / 03 May 2011
 * Changed logic to NOT translate columns that are not in the translation file. If column is not listed, it's not moved over.
 * Fixed issue with case sensitivity of column names

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongify (0.1.7)
+    mongify (0.2.0)
       activerecord (>= 3.0.3)
       activesupport (>= 3.0.3)
       bson_ext (>= 1.1.5)

data/README.rdoc

@@ -179,6 +179,12 @@ Table Options are as follow:
     end                                                     # Moving records around, renaming records, changing values in row based on
   end                                                       # some values! Checkout Mongify::Database::DataRow to learn more
 
+  table "preferences", :embed_in => "users" do              # As of version 0.2, embedded tables with a before_save will take an
+    before_save do |pref_row, user_row|                     # extra argument which is the parent row of the embedded table.
+      user_row.email_me = pref_row.delete('email_me')       # This gives you the ability to move things from an embedded table row
+    end                                                     # to the parent row.
+  end
+
 More documentation can be found at {Mongify::Database::Table}
 
 === Columns

data/features/process.feature

@@ -13,4 +13,12 @@ Feature: Processing a translation
   And the first post's user_id should be first user
   And there should be 0 comments in mongodb
   And the first post should have 1 comment
-
+  
+  Scenario: Processing while modifying embedding parent.
+  Given a database exists
+  And a blank mongodb
+  When I run mongify process spec/files/embedded_parent_translation.rb -c spec/files/base_configuration.rb
+  Then it succeeds
+  And there should be 3 users in mongodb
+  And the first user's notify_by_email attribute should be true
+  And the third user's notify_by_email attribute should be false

data/features/step_definitions/process_steps.rb

@@ -0,0 +1,4 @@
+Then /^the (first|sencond|third) (.+)'s (.+) attribute should be (.+)$/ do |collection_place, collection_name, field, value|
+  DatabaseGenerator.mongo_connection.db[collection_name.pluralize].
+                   find.to_a.send(collection_place.to_sym)[field].to_s.should == value.to_s
+end

data/lib/mongify/database/data_row.rb

@@ -3,6 +3,7 @@ module Mongify
     # Class that will be used to allow user to modify data for the given row
     class DataRow
       def initialize(hash={})
+        hash = {} if hash.nil?
         @hash = hash.dup.stringify_keys!
       end
       

data/lib/mongify/database/table.rb

@@ -47,6 +47,14 @@ module Mongify
     #       row.admin = row.delete('permission').to_i > 50        # This gives you the ability to do very powerful things like:
     #     end                                                     # Moving records around, renaming records, changing values in row based on
     #   end                                                       # some values! Checkout Mongify::Database::DataRow to learn more
+    # 
+    # 
+    #   table "preferences", :embed_in => "users" do               # As of version 0.2, embedded tables with a before_save will take an
+    #     before_save do |pref_row, user_row|                      # extra argument which is the parent row of the embedded table.
+    #       user_row.email_me = pref_row.delete('email_me')        # This gives you the ability to move things from an embedded table row
+    #     end                                                      # to the parent row.
+    #   end
+    # 
 
     class Table
       
@@ -114,13 +122,13 @@ module Mongify
       
       # Returns a translated row
       # Takes in a hash of values
-      def translate(row)
+      def translate(row, parent=nil)
         new_row = {}
         row.each do |key, value|
           c = find_column(key)
           new_row.merge!(c.translate(value)) if c.present?
         end
-        run_before_save(new_row)
+        run_before_save(new_row, parent)
       end
       
       
@@ -154,7 +162,12 @@ module Mongify
       
       # Used to save a block to be ran after the row has been processed but before it's saved to the no sql database
       def before_save(&block)
-        @before_save = block
+        @before_save_callback = block
+      end
+      
+      #Used to remove any before save filter
+      def remove_before_save_filter!
+        @before_save_callback = nil
       end
             
       #######
@@ -163,11 +176,15 @@ module Mongify
       
       # Runs the before save
       # Returns: a new modified row
-      def run_before_save(row)
-        return row unless @before_save
+      def run_before_save(row, parent=nil)
+        parentrow = Mongify::Database::DataRow.new(parent) unless parent.nil?
         datarow = Mongify::Database::DataRow.new(row)
-        @before_save.call(datarow)
-        datarow.to_hash
+        @before_save_callback.call(datarow, parentrow) unless @before_save_callback.nil?
+        if parentrow            
+          [datarow.to_hash, parentrow.to_hash]
+        else
+          datarow.to_hash
+        end
       end
       
       # Indexes the column on the sql_name and adds column to the array

data/lib/mongify/translation/process.rb

@@ -59,12 +59,16 @@ module Mongify
           rows.each do |row|
             target_row = no_sql_connection.find_one(t.embed_in, {:pre_mongified_id => row[t.embed_on]})
             next unless target_row.present?
-            row = t.translate(row)
+            # puts "target_row = #{target_row.inspect}", "---"
+            row, parent_row = t.translate(row, target_row)
+            parent_row ||= {}
+            parent_row.delete("_id")
+            #puts "parent_row = #{parent_row.inspect}", "---"
             row.delete(t.embed_on)
             row.merge!(fetch_reference_ids(t, row))
             row.delete('pre_mongified_id')
             save_function_call = t.embedded_as_object? ? '$set' : '$addToSet'
-            no_sql_connection.update(t.embed_in, target_row['_id'], {save_function_call => {t.name => row}})
+            no_sql_connection.update(t.embed_in, target_row['_id'], append_parent_object({save_function_call => {t.name => row}}, parent_row))
             Mongify::Status.publish('copy_embedded')
           end
           Mongify::Status.publish('copy_embedded', :action => 'finish')
@@ -125,7 +129,7 @@ module Mongify
       def fetch_reference_ids(table, row)
         attributes = {}
         table.reference_columns.each do |c|
-          new_id = no_sql_connection.get_id_using_pre_mongified_id(c.references.to_s, row[c.name])
+          new_id = no_sql_connection.get_id_using_pre_mongified_id(c.references.to_s, row[c.name.to_s])
           attributes.merge!(c.name => new_id) unless new_id.nil?
         end
         attributes
@@ -141,6 +145,14 @@ module Mongify
         end
       end
       
+      # Used to append parent object values to an embedded update call
+      def append_parent_object(object, parent)
+        return object if parent.blank?
+        object["$set"] = object.has_key?('$set') ? object["$set"].merge(parent) : parent
+        object
+      end
+      
+      
     end
   end
 end

data/lib/mongify/version.rb

@@ -1,4 +1,4 @@
 module Mongify
   # Mongify's Current Version Number
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/spec/files/embedded_parent_translation.rb

@@ -0,0 +1,21 @@
+table "users" do
+  column "id", :key
+  column "first_name", :string
+  column "last_name", :string
+  column "created_at", :datetime
+  column "updated_at", :datetime
+end
+
+table "preferences", :embed_in => :users, :as => :array do
+	column "id", :key
+	column "user_id", :integer, :references => "users"
+	column "notify_by_email", :boolean
+	column "created_at", :datetime, :ignore => true
+	column "updated_at", :datetime, :ignore => true
+	
+	before_save do |row, parent|
+	  parent.notify_by_email = row.delete('notify_by_email')
+	end
+end
+
+

data/spec/mongify/database/table_spec.rb

@@ -195,6 +195,14 @@ describe Mongify::Database::Table do
         row.admin = row.delete('permission').to_i > 50
       end
     end
+    it "should be resetable" do
+      @table.before_save do |row|
+        row.test = "removed!"
+      end
+      @table.remove_before_save_filter!
+      result = @table.send(:run_before_save, {'test'=>true})
+      result.should == {'test' => true}
+    end
     context "run_before_save" do
       it "should create a new DataRow" do
         row = {'first_name' => 'Bob'}
@@ -207,6 +215,25 @@ describe Mongify::Database::Table do
       @table.translate({'permission' => 51}).should == {'admin' => true}
     end
   end
+  context "before_save sending parent" do
+    before(:each) do
+      @parent_table = Mongify::Database::Table.new('users')
+      @table = Mongify::Database::Table.new('preferences')
+      @table.column "preferences"
+      @table.before_save do |row, parent|
+        parent.preferences = row.delete('preferences')
+      end
+    end
+    it "should work" do
+      @table.translate({'preferences' => 'yes'}, {}).should == [{}, {'preferences' => 'yes'}]
+    end
+    it "should return blank hash if parent is unchanged" do
+      @table.remove_before_save_filter!
+      @table.translate({'preferences' => "true"}, {}).should == [{'preferences' => "true"}, {}]
+    end
+  end
+  
+  
   
   context "polymorphic" do
     before(:each) do

data/spec/mongify/translation/process_spec.rb

@@ -136,6 +136,40 @@ describe Mongify::Translation::Process do
         @no_sql_connection.should_receive(:update).with("posts", 500, {"$set"=>{"notes"=>{'first_name' => 'bob'}}})
         @translation.send(:copy_embedded_tables)
       end
+      
+      context "parent modification" do
+        it "should work with embedded objects" do
+          @embed_table = mock(:translate => [{}, {'email' => 'true'}], :name => 'preferences', :sql_name => 'preferences', :embedded? => true, :embed_on => 'post_id', :embed_in => 'posts', :embedded_as_object? => true)
+          @translation.stub(:tables).and_return([@target_table, @embed_table])
+          @no_sql_connection.should_receive(:update).with("posts", 500, {"$set"=>{"preferences"=>{}, "email"=>"true"}})
+          @translation.send(:copy_embedded_tables)
+        end
+        it "should work with embedded arrays" do
+          @embed_table = mock(:translate => [{}, {'email' => 'true'}], :name => 'preferences', :sql_name => 'preferences', :embedded? => true, :embed_on => 'post_id', :embed_in => 'posts', :embedded_as_object? => false)
+          @translation.stub(:tables).and_return([@target_table, @embed_table])
+          @no_sql_connection.should_receive(:update).with("posts", 500, {"$addToSet"=>{"preferences"=>{}}, "$set" => {"email"=>"true"}})
+          @translation.send(:copy_embedded_tables)
+        end
+      end
+    end
+    
+    context "append_parent_object" do
+      before(:each) do
+        @parent = {"preference" => "email"}
+      end
+      it "should work when $set is already present" do
+        @obj = {"$set" => {"existing" => true}}
+        @translation.send(:append_parent_object, @obj, @parent).should == {"$set" => {"existing" => true, "preference" => "email"}}
+      end
+      it "should create $set if one is missing" do
+        @obj = {"$setAppend" => {"existing" => "true"}}
+        @translation.send(:append_parent_object, @obj, @parent).should == {"$set" => {"preference" => "email"}, "$setAppend" => {"existing" => "true"}}
+      end
+      it "should do nothing if no parent is given" do
+        @parent = {}
+        @obj = {"$setAppend" => {"existing" => "true"}}
+        @translation.send(:append_parent_object, @obj, @parent).should == {"$setAppend" => {"existing" => "true"}}
+      end
     end
     
     context "update_reference_ids" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongify
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-03 00:00:00.000000000Z
+date: 2011-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153452920 !ruby/object:Gem::Requirement
+  requirement: &2153201840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153452920
+  version_requirements: *2153201840
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153452460 !ruby/object:Gem::Requirement
+  requirement: &2153201280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153452460
+  version_requirements: *2153201280
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2153452080 !ruby/object:Gem::Requirement
+  requirement: &2153200840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153452080
+  version_requirements: *2153200840
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2153451540 !ruby/object:Gem::Requirement
+  requirement: &2153200200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153451540
+  version_requirements: *2153200200
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153451040 !ruby/object:Gem::Requirement
+  requirement: &2153199640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153451040
+  version_requirements: *2153199640
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153450580 !ruby/object:Gem::Requirement
+  requirement: &2153130820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153450580
+  version_requirements: *2153130820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153450120 !ruby/object:Gem::Requirement
+  requirement: &2153130320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2153450120
+  version_requirements: *2153130320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153449660 !ruby/object:Gem::Requirement
+  requirement: &2153129740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2153449660
+  version_requirements: *2153129740
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153449200 !ruby/object:Gem::Requirement
+  requirement: &2153129180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *2153449200
+  version_requirements: *2153129180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153448740 !ruby/object:Gem::Requirement
+  requirement: &2153128680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2153448740
+  version_requirements: *2153128680
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153448280 !ruby/object:Gem::Requirement
+  requirement: &2153128100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2153448280
+  version_requirements: *2153128100
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2153464180 !ruby/object:Gem::Requirement
+  requirement: &2153127600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2153464180
+  version_requirements: *2153127600
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153463720 !ruby/object:Gem::Requirement
+  requirement: &2153127020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2153463720
+  version_requirements: *2153127020
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2153463260 !ruby/object:Gem::Requirement
+  requirement: &2153126440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2153463260
+  version_requirements: *2153126440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153462880 !ruby/object:Gem::Requirement
+  requirement: &2153126000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153462880
+  version_requirements: *2153126000
 description: Mongify allows you to map your sql data into a mongodb document database
   with a simple DSL.
 email:
@@ -200,6 +200,7 @@ files:
 - features/process.feature
 - features/step_definitions/mongify_steps.rb
 - features/step_definitions/mongo_steps.rb
+- features/step_definitions/process_steps.rb
 - features/support/env.rb
 - lib/mongify.rb
 - lib/mongify/cli.rb
@@ -227,6 +228,7 @@ files:
 - mongify.gemspec
 - spec/default.watch
 - spec/files/base_configuration.rb
+- spec/files/embedded_parent_translation.rb
 - spec/files/translation.rb
 - spec/mongify/cli/application_spec.rb
 - spec/mongify/cli/help_command_spec.rb
@@ -279,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Translate your SQL data to MongoDB with ease
@@ -289,9 +291,11 @@ test_files:
 - features/process.feature
 - features/step_definitions/mongify_steps.rb
 - features/step_definitions/mongo_steps.rb
+- features/step_definitions/process_steps.rb
 - features/support/env.rb
 - spec/default.watch
 - spec/files/base_configuration.rb
+- spec/files/embedded_parent_translation.rb
 - spec/files/translation.rb
 - spec/mongify/cli/application_spec.rb
 - spec/mongify/cli/help_command_spec.rb
@@ -318,4 +322,3 @@ test_files:
 - spec/support/database_generator.rb
 - spec/support/database_output.txt
 - spec/tmp/.gitignore
-has_rdoc: