mongify 0.0.5 → 0.0.6

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 0.0.6 / 16 Jan 2011
+* Added the ability to embed tables into collections (currently only one to many relationship)
+* Few tweaks and improvements in code
 == 0.0.5 / 15 Jan 2011
 * Improved description for mongify.
 == 0.0.4 / 15 Jan 2011

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongify (0.0.5)
+    mongify (0.0.6)
       activerecord (>= 2.3.10)
       activesupport (>= 2.3.10)
       bson_ext (>= 1.1.5)

data/features/process.feature

@@ -11,7 +11,9 @@ Feature: Processing a translation
   Then it succeeds
 	And there should be 3 users in mongodb
 	And there should be 3 posts in mongodb
-	And there should be 3 comments in mongodb
+	And the first post's owner_id should be first user
+	And there should be 0 comments in mongodb
+	And the first post should have 1 comment
 	
 	
 	

data/features/step_definitions/mongo_steps.rb

@@ -5,3 +5,11 @@ end
 Then /^there should be (\d+) (.*) in mongodb$/ do |count, collection|
   GenerateDatabase.mongo_connection.db[collection].count.should == count.to_i
 end
+
+Then /^the (first|sencond|third) (.+)'s (.+) should be (first|second|thrid) (.+)$/ do |collection_place, collection, field, target_place, target|
+  GenerateDatabase.mongo_connection.db[collection.pluralize].find.to_a.send(collection_place.to_sym)[field].should == GenerateDatabase.mongo_connection.db[target.pluralize].find.to_a.send(target_place)['_id']
+end
+
+Then /^the (first|sencond|third) (.+) should have (\d+) (.+)$/ do |collection_place, collection, count, target|
+  GenerateDatabase.mongo_connection.db[collection.pluralize].find.to_a.send(collection_place.to_sym)[target.pluralize].count == count
+end

data/lib/mongify/database/no_sql_connection.rb

@@ -48,6 +48,10 @@ module Mongify
         db[colleciton_name].update({"_id" => id}, attributes)
       end
       
+      def find_one(collection_name, query)
+        db[collection_name].find_one(query)
+      end
+      
       def get_id_using_pre_mongified_id(colleciton_name, pre_mongified_id)
         db[colleciton_name].find_one('pre_mongified_id' => pre_mongified_id).try(:[], '_id')
       end

data/lib/mongify/database/table.rb

@@ -55,6 +55,19 @@ module Mongify
         end
         new_row
       end
+      
+      def embed_in
+        @options['embed_in'].to_s unless @options['embed_in'].nil?
+      end
+      
+      def embed?
+        embed_in.present?
+      end
+      
+      def embed_on
+        return nil unless embed?
+        (@options['on'] || "#{@options['embed_in'].singularize}_id").to_s
+      end
             
       #######
       private

data/lib/mongify/translation/process.rb

@@ -19,7 +19,8 @@ module Mongify
         self.no_sql_connection = no_sql_connection
         raise "noSql Connection is not valid" unless self.no_sql_connection.valid?
         
-        copy
+        copy_data
+        copy_embedded_tables
         update_reference_ids
         nil
       end
@@ -28,28 +29,45 @@ module Mongify
       private
       #######
       
-      def copy
-        self.tables.each do |t|
+      def copy_data
+        self.copy_tables.each do |t|
           sql_connection.select_rows(t.name).each do |row|
             no_sql_connection.insert_into(t.name, t.translate(row))
           end
         end
       end
       
+      def copy_embedded_tables
+        self.embed_tables.each do |t|
+          sql_connection.select_rows(t.name).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)
+            row.merge!(fetch_reference_ids(t, row))
+            no_sql_connection.update(t.embed_in, target_row['_id'], {'$addToSet' => {t.name => row}})
+          end
+        end
+      end
+      
       def update_reference_ids
         self.tables.each do |t|
           no_sql_connection.select_rows(t.name).each do |row|
             id = row["_id"]
-            attributes = {}
-            t.reference_columns.each do |c|
-              new_id = no_sql_connection.get_id_using_pre_mongified_id(c.references.to_s, row[c.name])
-              attributes.merge!(c.name => new_id) unless new_id.nil?
-            end
+            attributes = fetch_reference_ids(t, row)
             no_sql_connection.update(t.name, id, {"$set" => attributes}) unless attributes.blank?
           end
         end
       end
       
+      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])
+          attributes.merge!(c.name => new_id) unless new_id.nil?
+        end
+        attributes
+      end
+      
     end
   end
 end

data/lib/mongify/translation.rb

@@ -45,6 +45,14 @@ module Mongify
       @tables << table
     end
     
+    def copy_tables
+      tables.reject{|t| t.embed?}
+    end
+    
+    def embed_tables
+      tables.reject{|t| !t.embed?}
+    end
+    
     #######
     private
     #######

data/lib/mongify/version.rb

@@ -1,3 +1,3 @@
 module Mongify
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/mongify/database/no_sql_connection_spec.rb

@@ -109,6 +109,14 @@ describe Mongify::Database::NoSqlConnection do
         @mongodb_connection.update('users', 1, attributes)
       end
     end
+    
+    context "find_one" do
+      it "should call find_one on collection" do
+        query= {'pre_mongified_id' => 1}
+        @collection.should_receive(:find_one).with(query)
+        @mongodb_connection.find_one('users', query)
+      end
+    end
   end
 
   

data/spec/mongify/database/table_spec.rb

@@ -96,6 +96,37 @@ describe Mongify::Database::Table do
     end
   end
   
+  context "dealing with embedding," do
+    context "embed_on" do
+      it "should return embed_on option" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id').embed_in.should == 'posts'
+      end
+      it "should be nil when not embedded table" do
+        Mongify::Database::Table.new('users').embed_in.should be_nil
+      end
+    end
+    context "embed?" do
+      it "should be true" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id').should be_embed
+      end
+      it "should be false" do
+        Mongify::Database::Table.new('users').should_not be_embed
+      end
+    end
+    
+    context "embed_on" do
+      it "should be post_id" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id').embed_on.should == 'post_id'
+      end
+      it "should be nil when not embed?" do
+        Mongify::Database::Table.new('users', :on => 'test').embed_on.should be_nil
+      end
+      it "should calculate embed_on from embed_in" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts').embed_on.should == 'post_id'
+      end
+    end
+  end
+  
   context "translate" do
     before(:each) do
       @column1 = mock(:translate => {'first_name' => 'Timmy'}, :name => 'first_name')

data/spec/mongify/translation/process_spec.rb

@@ -16,35 +16,61 @@ describe Mongify::Translation::Process do
     lambda { @translation.process(@sql_connection, 'bad param2') }.should raise_error(Mongify::NoSqlConnectionRequired)
   end
   
-  it "should call copy" do
-    @translation.should_receive(:copy)
+  it "should call copy_data" do
+    @translation.should_receive(:copy_data)
     @translation.stub(:update_reference_ids)
     @translation.process(@sql_connection, @no_sql_connection)
   end
   it "should call update_reference_ids" do
     @translation.should_receive(:update_reference_ids)
-    @translation.stub(:copy)
+    @translation.stub(:copy_data)
     @translation.process(@sql_connection, @no_sql_connection)
   end
   
+  context "fetch_reference_ids" do
+    it "should get correct information" do
+      @no_sql_connection = mock()
+      @translation.stub(:no_sql_connection).and_return(@no_sql_connection)
+      @table = mock(:translate => {}, :name => 'users', :embed? => false)
+      @column = mock(:name => 'user_id', :references => 'users')
+      @table.stub(:reference_columns).and_return([@column])
+      @no_sql_connection.should_receive(:get_id_using_pre_mongified_id).with('users', 1).once.and_return(500)
+      @translation.send(:fetch_reference_ids, @table, {'user_id' => 1}).should == {'user_id' => 500}
+    end
+  end
   
   context "processing actions" do
     before(:each) do
-      @sql_connection = mock(:select_rows => [{'first_name'=> 'Timmy', 'last_name' => 'Zuza'}])
+      @sql_connection = mock(:select_rows => [{'first_name'=> 'Timmy', 'last_name' => 'Zuza', 'preference_id' => 1}])
       @translation.stub(:sql_connection).and_return(@sql_connection)
   
       @no_sql_connection = mock()
       @translation.stub(:no_sql_connection).and_return(@no_sql_connection)
       
-      @table = mock(:translate => {}, :name => 'users')
+      @table = mock(:translate => {}, :name => 'users', :embed? => false)
       @translation.stub(:tables).and_return([@table])
     end
     
-    context "copy" do
+    context "copy_data" do
       it "should call translate on the tables" do
         @no_sql_connection.should_receive(:insert_into).and_return(true)
         @table.should_receive(:translate).once.and_return({})
-        @translation.send(:copy)
+        @translation.send(:copy_data)
+      end
+    end
+    
+    context "copy_embed_tables" do
+      before(:each) do
+        @target_table = mock(:name => 'posts', :embed? => false)
+        @embed_table = mock(:translate => {}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts')
+        @translation.stub(:tables).and_return([@target_table, @embed_table])
+        @translation.stub(:fetch_reference_ids).and_return({})
+      end
+      it "should loop through embedded tables" do
+        @translation.should_receive(:embed_tables).and_return([@embed_table])
+        @no_sql_connection.should_receive(:find_one).and_return({'_id' => 500})
+        @no_sql_connection.should_receive(:update)
+        @translation.send(:copy_embedded_tables)
       end
     end
     

data/spec/mongify/translation_spec.rb

@@ -47,6 +47,25 @@ describe Mongify::Translation do
     end
   end
   
+  context "tables reference" do
+    before(:each) do
+      @copy_table = mock(:name => 'users', :embed? => false)
+      @embed_table = mock(:name => 'comments', :embed? => true)
+      @translation = Mongify::Translation.new()
+      @translation.stub(:tables).and_return([@copy_table, @embed_table])
+    end
+    context "copy_tables" do
+      it "should return tables that are not embeded" do
+        @translation.copy_tables.should == [@copy_table]
+      end
+    end
+    context "embed_tables" do
+      it "should return only tables for embedding" do
+        @translation.embed_tables.should == [@embed_table]
+      end
+    end
+  end
+  
   context "add_table" do
     before(:each) do
       @table = Mongify::Database::Table.new("users")

data/spec/support/generate_database.rb

@@ -15,8 +15,7 @@ class GenerateDatabase
     @sqlite_connecton ||= Mongify::Database::SqlConnection.new(:adapter => CONNECTION_CONFIG.sqlite['adapter'], :database => @db_path)
   end
   def self.sqlite(include_data=true)
-    puts ">\n\n>>sqlite_connection.database: #{sqlite_connection.database} :: Exists? #{File.exists?(sqlite_connection.database)}"
-    puts ("DELETING>>>>") && File.delete(sqlite_connection.database) if File.exists?(sqlite_connection.database)
+    File.delete(sqlite_connection.database) if File.exists?(sqlite_connection.database)
 
     conn = sqlite_connection.connection
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongify
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andrew Kalek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-16 00:00:00 -05:00
 default_executable: mongify
 dependencies: 
 - !ruby/object:Gem::Dependency