mongify 0.2.0 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.2.2 / 11 Sep 2012
+* Fix broken specs (Pranas Kiziela)
+* Fix translation process when embedding multiple objects (Pranas Kiziela)
+* Fix typos (Pranas Kiziela)
+* Rake file fixed to work in Ruby 1.8 and Ruby 1.9
+== 0.2.1 / 11 Sep 2012
+* This version was skipped (internal issues)
 == 0.2.0 / 01 Jun 2011
 * Added the ability to modify parent table when working with embedded tables
 == 0.1.7 / 03 May 2011

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongify (0.2.0)
+    mongify (0.2.2)
       activerecord (>= 3.0.3)
       activesupport (>= 3.0.3)
       bson_ext (>= 1.1.5)
@@ -26,24 +26,23 @@ GEM
     bson (1.3.0)
     bson_ext (1.3.0)
     builder (2.1.2)
-    cucumber (0.10.0)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
+      json (>= 1.4.6)
+    diff-lcs (1.1.3)
+    gherkin (2.11.2)
+      json (>= 1.4.6)
     highline (1.6.1)
     i18n (0.5.0)
-    json (1.4.6)
+    json (1.7.5)
     mocha (0.9.12)
     mongo (1.3.0)
       bson (>= 1.3.0)
     mysql (2.8.1)
     mysql2 (0.2.7)
-    rake (0.8.7)
+    rake (0.9.2.2)
     rcov (0.9.9)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -56,7 +55,6 @@ GEM
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.5)
     tzinfo (0.3.26)
     watchr (0.7)
     yard (0.6.4)

data/README.rdoc

@@ -81,7 +81,7 @@ Creating a translation is pretty straight forward. It looks something like this:
   table "comments", :embed_in => :posts, :on => :post_id do
     column "id", :key
     column "body", :text
-    column "post_id", :integer, :referneces => :posts
+    column "post_id", :integer, :references => :posts
     column "user_id", :integer, :references => :users
     column "created_at", :datetime
     column "updated_at", :datetime
@@ -218,7 +218,7 @@ Before we cover the options, you need to know what types of columns are supporte
 
 ==== Options
 
-  column "post_id", :integer, :referneces => :posts   # Referenced columns need to be marked as such, this will mean that they will be updated
+  column "post_id", :integer, :references => :posts   # Referenced columns need to be marked as such, this will mean that they will be updated
                                                       # with the new BSON::ObjectID.
                                                       # NOTE: if you rename the table 'posts', you should set the :references to the new name
 
@@ -272,6 +272,7 @@ Just want to thank my wife (Alessia) who not only puts up with me working on my
 I would also like to thank Mon_Ouie on the Ruby IRC channel for helping me figure out how to setup the internal configuration file reading.
 
 Another thanks goes out to eimermusic for his feedback on the gem, and a few bugs that he helps flush out.
+And to Pranas Kiziela who committed some bug and typo fixes that make Mongify even better!
 
 == About
 

data/Rakefile

@@ -16,31 +16,36 @@ task :clobber do
   rm "Gemfile.lock" if File.exist?("Gemfile.lock")
 end
 
-namespace :rcov do
-  Cucumber::Rake::Task.new(:cucumber) do |t|    
-    t.rcov = true
-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
-    t.rcov_opts << %[-o "coverage"]
-  end
- 
-  RSpec::Core::RakeTask.new(:rspec) do |t|
-    t.rcov = true
-    t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/}
-  end
- 
-  desc "Run both specs and features to generate aggregated coverage"
-  task :all do |t|
-    rm "coverage.data" if File.exist?("coverage.data")
-    Rake::Task["rcov:cucumber"].invoke
-    Rake::Task["rcov:rspec"].invoke
+if RUBY_VERSION.to_f == 1.8
+  namespace :rcov do
+    Cucumber::Rake::Task.new(:cucumber) do |t|    
+      t.rcov = true
+      t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/ --aggregate coverage.data}
+      t.rcov_opts << %[-o "coverage"]
+    end
+   
+    RSpec::Core::RakeTask.new(:rspec) do |t|
+      t.rcov = true
+      t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/,features\/}
+    end
+   
+    desc "Run both specs and features to generate aggregated coverage"
+    task :all do |t|
+      rm "coverage.data" if File.exist?("coverage.data")
+      Rake::Task["rcov:cucumber"].invoke
+      Rake::Task["rcov:rspec"].invoke
+    end
   end
 end
 
-
 desc "Run rspec test"
 task :test do
   Rake::Task["test:rspec"].invoke
-  Rake::Task["rcov:cucumber"].invoke
+  if RUBY_VERSION.to_f < 1.9
+    Rake::Task["rcov:cucumber"].invoke 
+  else
+    Rake::Task["test:cucumber"].invoke 
+  end
 end
 namespace :test do
   RSpec::Core::RakeTask.new(:rspec)

data/features/process.feature

@@ -10,9 +10,10 @@ Feature: Processing a translation
   Then it succeeds
   And there should be 3 users in mongodb
   And there should be 3 posts in mongodb
-  And the first post's user_id should be first user
+  And the "First Post" author should be Timmy
   And there should be 0 comments in mongodb
-  And the first post should have 1 comment
+  And the post with title "First Post" should have 1 comment
+  And the post with title "Second Post" should have 2 comments
   
   Scenario: Processing while modifying embedding parent.
   Given a database exists

data/features/step_definitions/mongo_steps.rb

@@ -6,10 +6,17 @@ Then /^there should be (\d+) (.*) in mongodb$/ do |count, collection|
   DatabaseGenerator.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|
+Then /^the (first|second|third) (.+)'s (.+) should be (first|second|thrid) (.+)$/ do |collection_place, collection, field, target_place, target|
   DatabaseGenerator.mongo_connection.db[collection.pluralize].find.to_a.send(collection_place.to_sym)[field].should == DatabaseGenerator.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|
-  DatabaseGenerator.mongo_connection.db[collection.pluralize].find.to_a.send(collection_place.to_sym)[target.pluralize].count == count
-end
+Then /^the "(.+)" author should be (.+)$/ do |post_title, user_name|
+  post = DatabaseGenerator.mongo_connection.find_one(:posts, { title: post_title })
+  user = DatabaseGenerator.mongo_connection.find_one(:users, { first_name: user_name})
+  post['user_id'].should == user['_id']
+end
+
+Then /^the (.+) with (.+) "(.+)" should have (\d+) (.+)$/ do |collection, find_by, find_value, count, target|
+  DatabaseGenerator.mongo_connection.find_one(collection.pluralize, { find_by => find_value })[target.pluralize].count.should == count.to_i
+end
+

data/features/step_definitions/process_steps.rb

@@ -1,4 +1,4 @@
-Then /^the (first|sencond|third) (.+)'s (.+) attribute should be (.+)$/ do |collection_place, collection_name, field, value|
+Then /^the (first|second|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/column.rb

@@ -31,7 +31,7 @@ module Mongify
     # 
     # ==== Options
     # 
-    #   column "post_id", :integer, :referneces => :posts   # Referenced columns need to be marked as such, this will mean that they will be updated
+    #   column "post_id", :integer, :references => :posts   # Referenced columns need to be marked as such, this will mean that they will be updated
     #                                                       # with the new BSON::ObjectID.
     # <b>NOTE: if you rename the table 'posts', you should set the :references to the new name</b>
     # 

data/lib/mongify/translation/process.rb

@@ -63,6 +63,7 @@ module Mongify
             row, parent_row = t.translate(row, target_row)
             parent_row ||= {}
             parent_row.delete("_id")
+            parent_row.delete(t.name.to_s)
             #puts "parent_row = #{parent_row.inspect}", "---"
             row.delete(t.embed_on)
             row.merge!(fetch_reference_ids(t, row))

data/lib/mongify/translation.rb

@@ -26,7 +26,7 @@ module Mongify
   #   table "comments", :embed_in => :posts, :on => :post_id do
   #     column "id", :key
   #     column "body", :text
-  #     column "post_id", :integer, :referneces => :posts
+  #     column "post_id", :integer, :references => :posts
   #     column "user_id", :integer, :references => :users
   #     column "created_at", :datetime
   #     column "updated_at", :datetime

data/lib/mongify/version.rb

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

data/spec/files/translation.rb

@@ -19,7 +19,7 @@ end
 table "comments", :embed_in => :posts, :on => :post_id do
   column "id", :key
   column "body", :text
-  column "post_id", :integer, :referneces => :posts
+  column "post_id", :integer, :references => :posts
   column "user_id", :integer, :references => :users
   column "created_at", :datetime
   column "updated_at", :datetime

data/spec/mongify/database/column_spec.rb

@@ -66,7 +66,7 @@ describe Mongify::Database::Column do
         @col.should_receive('references=').never
         Mongify::Database::Column.auto_detect(@col)
       end
-      it "should not detect column referneces if column type is not :integer" do
+      it "should not detect column references if column type is not :integer" do
         @col.stub(:type).and_return(:string)
         @col.should_receive('references=').never
         Mongify::Database::Column.auto_detect(@col)

data/spec/mongify/database/table_spec.rb

@@ -191,7 +191,7 @@ describe Mongify::Database::Table do
     before(:each) do
       @table = Mongify::Database::Table.new('users')
       @table.column "permission"
-      @table.before_save do |row|
+      @table.before_save do |row, _|
         row.admin = row.delete('permission').to_i > 50
       end
     end

data/spec/mongify/translation/process_spec.rb

@@ -150,6 +150,12 @@ describe Mongify::Translation::Process do
           @no_sql_connection.should_receive(:update).with("posts", 500, {"$addToSet"=>{"preferences"=>{}}, "$set" => {"email"=>"true"}})
           @translation.send(:copy_embedded_tables)
         end
+        it "should not set embedded attribute in parent" do
+          @embed_table = mock(:translate => [{'first_name' => 'joe'}, {'email' => 'true', 'comments' => [{'first_name' => 'bob'}]}], :name => 'comments', :sql_name => 'comments', :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" => {"comments" => {"first_name" => "joe"}}, "$set" => {"email" => "true"}})
+          @translation.send(:copy_embedded_tables)
+        end
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153201840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153201840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153201280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153201280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2153200840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153200840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2153200200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153200200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153199640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153199640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153130820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153130820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153130320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2153130320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153129740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2153129740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153129180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *2153129180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153128680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2153128680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153128100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2153128100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2153127600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2153127600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153127020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2153127020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2153126440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2153126440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153126000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +245,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153126000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Mongify allows you to map your sql data into a mongodb document database
   with a simple DSL.
 email:
@@ -279,9 +354,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -558955689900705187
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Translate your SQL data to MongoDB with ease