mongify 0.0.7 → 0.0.8

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.0.8 / 18 Jan 2011
+* Added ability to embed as object on an embedded table
+* Some bugs fixed
+* Updated README with new table options
+* Improved data conversion on processing
 == 0.0.7 / 17 Jan 2011
 * Added mysql2 as a dependency
 * Improved error message when configuration file not provided

data/Gemfile.lock

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

data/README.rdoc

@@ -79,7 +79,13 @@ Creating a translation is pretty straight forward. It looks something like this:
     column "created_at", :datetime
     column "updated_at", :datetime
   end
-
+  
+  table "preferences", :embed_in => :users, :as => :object do
+    column "id", :key
+    column "user_id", :integer, :references => "users"
+    column "notify_by_email", :boolean
+  end
+  
 Save the file as <tt>"translation_file.rb"</tt> and run the command:
 
   mongify process translation_file.rb -c database.config
@@ -90,8 +96,15 @@ When dealing with a translation, there is a few options you can set
 
 === Table
 
-Tables have the ability to be embedded into another collection on durring processing by passing :embed_in => 'collection_name'.
-You can also specify :on option (while embedding) to specify which field you're linking the tables together on.
+Table Options are as follow:
+  table "table_name"                                        # Does a straight copy of the table
+  table "table_name", :embed_in => :users                   # Embeds table_name into users, assuming a user_id is present in table_name.
+                                                            # This will also assume you want the table embedded as an array.
+  table "table_name", :embed_in => :users, :on => 'owner_id'# Embeds table_name into users, linking it via a owner_id
+                                                            # This will also assume you want the table embedded as an array.
+  table "table_name", :embed_in => :users, :as => :object   # Embeds table_name into users as a one to one relationship
+                                                            # This also assumes you have a user_id present in table_name
+<em>You can also specify both +:on+ and +:as+ options when embedding</em>
 
 === Columns
 Columns take a few more options:
@@ -122,7 +135,6 @@ More testing will be done once the basic functionality is done
 
 === while processing
 
-* Allow the ability to embed_table with a one to one relationship
 * Allow renaming tables
 * Allow renaming of columns
 * Allow deleting of columns

data/lib/mongify.rb

@@ -2,6 +2,7 @@
 # Mongify's core functionality
 #
 require 'active_support/core_ext'
+require 'active_record'
 
 require 'mongify/ui'
 require 'mongify/exceptions'

data/lib/mongify/database/base_connection.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 module Mongify
   module Database
     #

data/lib/mongify/database/column.rb

@@ -1,3 +1,4 @@
+require 'active_record/connection_adapters/abstract/schema_definitions'
 module Mongify
   module Database
     #
@@ -23,10 +24,8 @@ module Mongify
         case type
         when :key
           {"pre_mongified_#{name}" => value}
-        when :datetime
-          {"#{name}" => value.blank? ? nil : value.to_time}
         else
-          {"#{self.name}" => value}
+          {"#{name}" => type_cast(value)}
         end
       end
       
@@ -62,6 +61,24 @@ module Mongify
       private
       #######
       
+      def type_cast(value)
+        return nil if value.nil?
+        case type
+          when :string    then value
+          when :text      then value
+          when :integer   then value.to_i rescue value ? 1 : 0
+          when :float     then value.to_f
+          when :decimal   then ActiveRecord::ConnectionAdapters::Column.value_to_decimal(value)
+          when :datetime  then ActiveRecord::ConnectionAdapters::Column.string_to_time(value)
+          when :timestamp then ActiveRecord::ConnectionAdapters::Column.string_to_time(value)
+          when :time      then ActiveRecord::ConnectionAdapters::Column.string_to_dummy_time(value)
+          when :date      then ActiveRecord::ConnectionAdapters::Column.string_to_date(value)
+          when :binary    then ActiveRecord::ConnectionAdapters::Column.binary_to_string(value)
+          when :boolean   then ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+          else value
+        end
+      end
+      
       def key?
         self.type == :key
       end

data/lib/mongify/database/table.rb

@@ -8,10 +8,10 @@ module Mongify
       attr_accessor :name
       attr_reader :options, :columns
       
-      def initialize(name, *args, &block)
+      def initialize(name, options={}, &block)
         @columns = []
         @column_lookup = {}
-        @options = args.extract_options!.stringify_keys
+        @options = options.stringify_keys
         self.name = name
         
         self.instance_exec(&block) if block_given?
@@ -60,13 +60,23 @@ module Mongify
         @options['embed_in'].to_s unless @options['embed_in'].nil?
       end
       
+      def embed_as
+        return nil unless embed?
+        return 'object' if @options['as'].to_s.downcase == 'object'
+        'array'
+      end
+      
+      def embed_as_object?
+        embed_as == 'object'
+      end
+      
       def embed?
         embed_in.present?
       end
       
       def embed_on
         return nil unless embed?
-        (@options['on'] || "#{@options['embed_in'].singularize}_id").to_s
+        (@options['on'] || "#{@options['embed_in'].to_s.singularize}_id").to_s
       end
             
       #######

data/lib/mongify/translation/process.rb

@@ -47,7 +47,8 @@ module Mongify
             row.delete(t.embed_on)
             row.merge!(fetch_reference_ids(t, row))
             row.delete('pre_mongified_id')
-            no_sql_connection.update(t.embed_in, target_row['_id'], {'$addToSet' => {t.name => row}})
+            save_function_call = t.embed_as_object? ? '$set' : '$addToSet'
+            no_sql_connection.update(t.embed_in, target_row['_id'], {save_function_call => {t.name => row}})
           end
         end
       end

data/lib/mongify/version.rb

@@ -1,3 +1,3 @@
 module Mongify
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/files/simple_translation.rb

@@ -24,3 +24,12 @@ table "comments", :embed_in => :posts, :on => :post_id do
   column "created_at", :datetime
   column "updated_at", :datetime
 end
+
+table "preferences", :embed_in => :users, :as => :object do
+	column "id", :key
+	column "user_id", :integer, :references => "users"
+	column "notify_by_email", :boolean
+	column "created_at", :datetime
+	column "updated_at", :datetime
+end
+

data/spec/mongify/database/column_spec.rb

@@ -94,13 +94,21 @@ describe Mongify::Database::Column do
     context "datetime" do
       it "should return a datetime format" do
         @column = Mongify::Database::Column.new('created_at', :datetime)
-        @column.translate('2011-01-14 21:23:39').should == {'created_at' => Time.utc(2011, 01, 14, 21, 23,39)}
+        @column.translate('2011-01-14 21:23:39').should == {'created_at' => Time.local(2011, 01, 14, 21, 23,39)}
       end
       it "should return nil if input is nil" do
         @column = Mongify::Database::Column.new('created_at', :datetime)
         @column.translate(nil).should == {'created_at' => nil}
       end
     end
+    context :integer do
+      before(:each) do
+        @column = Mongify::Database::Column.new('account_id', :integer)
+      end
+      it "should return 10" do
+        @column.translate("10").should == {'account_id' => 10}
+      end
+    end
     
     it "should return pre_mongified_id when type is a key" do
       @column = Mongify::Database::Column.new('id', :key)

data/spec/mongify/database/sql_connection_spec.rb

@@ -68,7 +68,7 @@ describe Mongify::Database::SqlConnection do
 
     context "tables" do
       it "should be able to get a list" do
-        @sql_connection.tables.sort.should == ['comments', 'posts', 'users'].sort
+        @sql_connection.tables.sort.should == ['comments', 'posts', 'preferences', 'users'].sort
       end
     end
 

data/spec/mongify/database/table_spec.rb

@@ -105,6 +105,28 @@ describe Mongify::Database::Table do
         Mongify::Database::Table.new('users').embed_in.should be_nil
       end
     end
+    context "embed_as" do
+      it "should return nil if it's not an embed table" do
+        Mongify::Database::Table.new('comments', :as => 'array').embed_as.should be_nil
+      end
+      it "should default to :array" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id').embed_as.should == 'array'
+      end
+      it "should allow Array as a value" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id', :as => :array).embed_as.should == 'array'
+      end
+      it "should allow Object as a value" do
+        Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id', :as => :object).embed_as.should == 'object'
+      end
+      context "embed_as_object?" do
+        it "should be true" do
+          Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id', :as => :object).should be_embed_as_object
+        end
+        it "should be false" do
+          Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id', :as => :array).should_not be_embed_as_object
+        end
+      end
+    end
     context "embed?" do
       it "should be true" do
         Mongify::Database::Table.new('comments', :embed_in => 'posts', :on => 'post_id').should be_embed

data/spec/mongify/translation/process_spec.rb

@@ -78,7 +78,7 @@ describe Mongify::Translation::Process do
     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')
+        @embed_table = mock(:translate => {}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts', :embed_as_object? => false)
         @no_sql_connection.stub(:find_one).and_return({'_id' => 500})
         @translation.stub(:tables).and_return([@target_table, @embed_table])
         @translation.stub(:fetch_reference_ids).and_return({})
@@ -90,17 +90,23 @@ describe Mongify::Translation::Process do
         @translation.send(:copy_embedded_tables)
       end
       it "should remove the pre_mongified_id before embedding" do
-        @embed_table = mock(:translate => {'first_name' => 'bob', 'pre_mongified_id' => 1}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts')
+        @embed_table = mock(:translate => {'first_name' => 'bob', 'pre_mongified_id' => 1}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts', :embed_as_object? => false)
         @translation.stub(:tables).and_return([@target_table, @embed_table])
         @no_sql_connection.should_receive(:update).with("posts", 500, {"$addToSet"=>{"comments"=>{'first_name' => 'bob'}}})
         @translation.send(:copy_embedded_tables)
       end
       it "should remove the parent_id from the embedding row" do
-        @embed_table = mock(:translate => {'first_name' => 'bob', 'post_id' => 1}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts')
+        @embed_table = mock(:translate => {'first_name' => 'bob', 'post_id' => 1}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts', :embed_as_object? => false)
         @translation.stub(:tables).and_return([@target_table, @embed_table])
         @no_sql_connection.should_receive(:update).with("posts", 500, {"$addToSet"=>{"comments"=>{'first_name' => 'bob'}}})
         @translation.send(:copy_embedded_tables)
       end
+      it "should call $addToSet on update of an embed_as_object table" do
+        @embed_table = mock(:translate => {'first_name' => 'bob', 'post_id' => 1}, :name => 'comments', :embed? => true, :embed_on => 'post_id', :embed_in => 'posts', :embed_as_object? => true)
+        @translation.stub(:tables).and_return([@target_table, @embed_table])
+        @no_sql_connection.should_receive(:update).with("posts", 500, {"$set"=>{"comments"=>{'first_name' => 'bob'}}})
+        @translation.send(:copy_embedded_tables)
+      end
     end
     
     context "update_reference_ids" do

data/spec/mongify/translation_spec.rb

@@ -35,8 +35,8 @@ describe Mongify::Translation do
   
   context "parsed content" do
     context "tables" do
-      it "should have 3 tables" do
-        @translation.should have(3).tables
+      it "should have 4 tables" do
+        @translation.should have(4).tables
       end
       
       it "should setup 'comments'" do

data/spec/support/database_output.txt

@@ -25,3 +25,11 @@ table "comments" do
 	column "updated_at", :datetime
 end
 
+table "preferences" do
+	column "id", :key
+	column "user_id", :integer, :references => "users"
+	column "notify_by_email", :boolean
+	column "created_at", :datetime
+	column "updated_at", :datetime
+end
+

data/spec/support/generate_database.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 class GenerateDatabase
   def self.mysql_connection
     @sql_connection ||= Mongify::Database::SqlConnection.new( :adapter => CONNECTION_CONFIG.mysql['adapter'], 
@@ -40,6 +39,12 @@ class GenerateDatabase
       t.timestamps
     end
     
+    conn.create_table(:preferences) do |t|
+      t.integer :user_id
+      t.boolean :notify_by_email
+      t.timestamps
+    end
+    
     if include_data
       
       #Users
@@ -71,6 +76,15 @@ class GenerateDatabase
                     VALUES ('#{v[:body]}', #{v[:post_id]}, #{v[:user_id]}, '#{Time.now.to_s(:db)}', '#{Time.now.to_s(:db)}')")
       end
       
+      [
+        {:user_id => 1, :notify_by_email => true},
+        {:user_id => 2, :notify_by_email => true},
+        {:user_id => 3, :notify_by_email => false}
+      ].each do |v|
+          conn.insert("INSERT INTO preferences (user_id, notify_by_email, created_at, updated_at) 
+                      VALUES (#{v[:user_id]}, '#{v[:notify_by_email]}', '#{Time.now.to_s(:db)}', '#{Time.now.to_s(:db)}')")
+      end
+      
     end
     
     sqlite_connection.database

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongify
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Andrew Kalek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 -05:00
+date: 2011-01-18 00:00:00 -05:00
 default_executable: mongify
 dependencies: 
 - !ruby/object:Gem::Dependency