mongify 0.2.2 → 0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 0.3 / 12 Sep 2012
+* Added ability to work with :key columns that were not :integer values
+  * You can now specify :as value for a type :key column
+  * Tranlsation generator will prefill :as for :key columns
+* Updated README
+* Improved tests
+* Small refactoring
 == 0.2.2 / 11 Sep 2012
 * Fix broken specs (Pranas Kiziela)
 * Fix translation process when embedding multiple objects (Pranas Kiziela)

data/Gemfile.lock

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

data/README.rdoc

@@ -88,7 +88,7 @@ Creating a translation is pretty straight forward. It looks something like this:
   end
   
   table "preferences", :embed_in => :users, :as => :object do
-    column "id", :key
+    column "id", :key, :as => :string
     column "user_id", :integer, :references => "users"
     column "notify_by_email", :boolean
   end
@@ -203,7 +203,7 @@ Leaving a column out when defining a table will result in the column being *igno
 ==== Types
 
 Before we cover the options, you need to know what types of columns are supported:
-  :key                  # Columns that are primary keys need to be marked as :key type
+  :key                  # Columns that are primary keys need to be marked as :key type. You can provide an :as if your :key is not an integer column
   :integer              # Will be converted to a integer
   :float                # Will be converted to a float
   :decimal              # Will be converted to a string (due to MongoDB Ruby Drivers not supporting BigDecimal, read details in Mongify::Database::Column under Decimal Storage)
@@ -249,6 +249,7 @@ If you have any issues, please feel free to report them here: {issue tracker}[ht
 == TODO
 * Allow deeper embedding
 * Test in different databases
+* Give an ability to mark source DB columns as imported (allowing Mongify to run as a on going converter)
 
 == Known Issues
 * Can't do anything to an embedded table

data/lib/mongify/database/column.rb

@@ -16,7 +16,7 @@ module Mongify
     # ==== Types
     # 
     # Types of columns are supported:
-    #   :key                  # Columns that are primary keys need to be marked as :key type
+    #   :key                  # Columns that are primary keys need to be marked as :key type. You can provide an :as if your :key is not an integer column
     #   :integer              # Will be converted to a integer
     #   :float                # Will be converted to a float
     #   :decimal              # Will be converted to a string *(you can change default behaviour read below)
@@ -86,9 +86,10 @@ module Mongify
       def self.auto_detect(column)
         case column.sql_name.downcase
         when 'id'
-          column.type = :key if column.type == :integer
+          column.as = column.type
+          column.type = :key
         when /(.*)_id/
-          column.references = $1.to_s.pluralize unless column.referenced? || column.type != :integer
+          column.references = $1.to_s.pluralize unless column.referenced?
         end
       end
       
@@ -122,7 +123,7 @@ module Mongify
         return {} if ignored?
         case type
           when :key
-            {"pre_mongified_id" => value.to_i}
+            {"pre_mongified_id" => type_cast(value)}
           else
             {"#{self.name}" => type_cast(value)}
         end
@@ -132,7 +133,10 @@ module Mongify
       # Mainly used during print out of translation file
       def to_print
         "column \"#{sql_name}\", :#{type}".tap do |output|
-          output_options = options.map{|k, v| (v == nil) ? nil : ":#{k} => \"#{v}\""}.compact
+          output_options = options.map do |k, v| 
+            next if v.nil?
+            ":#{k} => #{v.is_a?(Symbol) ? ":#{v}" : %Q["#{v}"] }"
+          end.compact
           output << ", #{output_options.join(', ')}" unless output_options.blank?
         end
       end
@@ -197,17 +201,17 @@ module Mongify
       # Used when trying to figure out how to convert a decimal value
       # @return [String] passed option['as'] or defaults to 'string'
       def as
-        options['as'] ||= 'string'
+        options['as'] ||= :string
       end
       # Sets option['as'] to either 'string' or 'integer', defults to 'string' for unknown values
       # @param [String|Symbol] value, can be either 'string' or 'integer
       def as=(value)
-        value = value.to_s.downcase
-        options['as'] = ['string', 'integer'].include?(value) ? value : 'string'
+        value = value.to_s.downcase.to_sym
+        options['as'] = [:string, :integer].include?(value) ? value : :string
       end
       # Returns true if :as was passed as integer
       def as_integer?
-        self.as == 'integer'
+        self.as == :integer
       end
       
       # Get the scale option for decimal to integer conversion
@@ -230,6 +234,7 @@ module Mongify
       def type_cast(value)
         return nil if value.nil?
         case type
+          when :key       then options['as'] == :string ? value.to_s : value.to_i #If :as is provided, check if it's string, otherwise integer
           when :string    then value.to_s
           when :text      then value.to_s
           when :integer   then value.to_i

data/lib/mongify/translation/process.rb

@@ -142,7 +142,6 @@ module Mongify
           Mongify::Status.publish('remove_pre_mongified', :size => 1, :name => "Removing pre_mongified_id #{t.name}", :action => 'add')
           no_sql_connection.remove_pre_mongified_ids(t.name)
           Mongify::Status.publish('remove_pre_mongified', :action => 'finish')
-          # Mongify::Status.publish('remove_pre_mongified')
         end
       end
       

data/lib/mongify/version.rb

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

data/spec/mongify/database/column_spec.rb

@@ -41,17 +41,26 @@ describe Mongify::Database::Column do
     
     context "id column" do
       before(:each) do
-        @col = mock(:sql_name => 'id', :type => :integer)
+        @col = mock(:sql_name => 'id')
       end
       it "should detect column with type :integer as a :key column" do
+        @col.stub(:type).and_return(:integer)
         @col.should_receive('type=').with(:key)
+        @col.should_receive('as=').with(:integer)
         Mongify::Database::Column.auto_detect(@col)
       end
-      it "should not detect column with type other then :integer as a :key column" do
-        @col.stub(:type).and_return(:string)
-        @col.should_receive('type=').never
-        Mongify::Database::Column.auto_detect(@col)
+      it "should detected as a :key even if type is :string" do
+        @column = Mongify::Database::Column.new('id', :string, :auto_detect => true)
+        @column.should be_key
+        @column.as.should == :string
+      end
+
+      it "should detect as a :key with as == integer " do
+        @column = Mongify::Database::Column.new('id', :integer, :auto_detect => true)
+        @column.should be_key
+        @column.as.should == :integer
       end
+
     end
     context "references" do
       before(:each) do
@@ -66,9 +75,9 @@ describe Mongify::Database::Column do
         @col.should_receive('references=').never
         Mongify::Database::Column.auto_detect(@col)
       end
-      it "should not detect column references if column type is not :integer" do
+      it "should detect column references even if column type is not :integer" do
         @col.stub(:type).and_return(:string)
-        @col.should_receive('references=').never
+        @col.should_receive('references=').once
         Mongify::Database::Column.auto_detect(@col)
       end
     end
@@ -130,17 +139,26 @@ describe Mongify::Database::Column do
   context "as" do
     subject {Mongify::Database::Column.new('total', :decimal)}
     it "should default to string" do
-      subject.as.should == 'string'
+      subject.as.should == :string
     end
     it "should allow it to be set to integer" do
-      subject.as = 'integer'
+      subject.as = :integer
       subject.should be_as_integer
     end
     it "should not allow other values" do
       subject.as = "zuza"
-      subject.as.should == 'string'
+      subject.as.should == :string
+    end
+    it "should not allow other values even as sym" do
+      subject.as = :zuza
+      subject.as.should == :string
+    end
+    it "should convert to symble" do
+      subject.as = 'integer'
+      subject.as.should == :integer
     end
   end
+
   context "scale" do
     subject {Mongify::Database::Column.new('total', :decimal, :as => 'integer')}
     it "should be defaulted to 0" do
@@ -170,6 +188,12 @@ describe Mongify::Database::Column do
       @column = Mongify::Database::Column.new('user_id', :integer, :auto_detect => true)
       @column.to_print.should == %Q[column "user_id", :integer, :references => "users"]
     end
+
+    it "should print :key with :as" do
+      @column.as = :integer
+      @column.type = :key
+      @column.to_print.should == %q{column "first_name", :key, :as => :integer}
+    end
   end
   
   context :referenced? do
@@ -194,9 +218,18 @@ describe Mongify::Database::Column do
       @column = Mongify::Database::Column.new('id', :key)
       @column.translate(123123).should == {"pre_mongified_id" => 123123}
     end
-    it "should return an integer for pre_mongified_id" do
+    it "should return an integer for pre_mongified_id (by default)" do
       @column = Mongify::Database::Column.new('id', :key)
-      @column.translate('123123').should == {"pre_mongified_id" => 123123}
+      result = @column.translate('123123')
+      result.should == {"pre_mongified_id" => 123123}
+      result['pre_mongified_id'].should be_a_kind_of Integer
+
+    end
+    it "should return a string for pre_mongified_id when :as => :string is provided" do
+      @column = Mongify::Database::Column.new('id', :key, :as => :string)
+      result = @column.translate('p123')
+      result.should == {"pre_mongified_id" => 'p123'}
+      result['pre_mongified_id'].should be_a_kind_of String
     end
   end
   context :type_cast do
@@ -265,7 +298,7 @@ describe Mongify::Database::Column do
       
       context :integer do
         before(:each) do
-          @column = Mongify::Database::Column.new('price', :decimal, :as => 'integer')
+          @column = Mongify::Database::Column.new('price', :decimal, :as => :integer)
           @value = 101.123455
         end
         it "should be as_integer" do

data/spec/support/database_generator.rb

@@ -45,7 +45,8 @@ class DatabaseGenerator
       t.timestamps
     end
     
-    conn.create_table(:preferences) do |t|
+    conn.create_table(:preferences, :id => false) do |t|
+      t.string :id
       t.integer :user_id
       t.boolean :notify_by_email
       t.timestamps
@@ -95,9 +96,9 @@ class DatabaseGenerator
         {: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)}')")
+      ].each_with_index do |v, idx|
+          conn.insert("INSERT INTO preferences (id, user_id, notify_by_email, created_at, updated_at) 
+                      VALUES ('p#{idx+1}',#{v[:user_id]}, '#{v[:notify_by_email]}', '#{Time.now.to_s(:db)}', '#{Time.now.to_s(:db)}')")
       end
       
       #Notes

data/spec/support/database_output.txt

@@ -1,5 +1,5 @@
 table "users" do
-	column "id", :key
+	column "id", :key, :as => :integer
 	column "first_name", :string
 	column "last_name", :string
 	column "created_at", :datetime
@@ -7,7 +7,7 @@ table "users" do
 end
 
 table "posts" do
-	column "id", :key
+	column "id", :key, :as => :integer
 	column "title", :string
 	column "owner_id", :integer, :references => "owners"
 	column "body", :text
@@ -17,7 +17,7 @@ table "posts" do
 end
 
 table "comments" do
-	column "id", :key
+	column "id", :key, :as => :integer
 	column "body", :text
 	column "post_id", :integer, :references => "posts"
 	column "user_id", :integer, :references => "users"
@@ -26,7 +26,7 @@ table "comments" do
 end
 
 table "preferences" do
-	column "id", :key
+	column "id", :key, :as => :string
 	column "user_id", :integer, :references => "users"
 	column "notify_by_email", :boolean
 	column "created_at", :datetime
@@ -34,7 +34,7 @@ table "preferences" do
 end
 
 table "notes" do
-	column "id", :key
+	column "id", :key, :as => :integer
 	column "user_id", :integer, :references => "users"
 	column "notable_id", :integer, :references => "notables"
 	column "notable_type", :string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongify
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -356,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -558955689900705187
+      hash: 993534914857598805
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23