mongify 0.1.6 → 0.1.7

data/.gitignore

@@ -7,6 +7,9 @@ vendor/gems/gems
 vendor/gems/specifications
 vendor/gems/doc
 vendor/gems/environment.rb
+vendor/ruby
+#not sure if this is the right way of doing this
+vendor/cache
 
 coverage.data
 
@@ -17,4 +20,6 @@ spec/tmp/*
 
 .rvmrc
 
-spec/support/database.yml
+spec/support/database.yml
+
+

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 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
+* Made sure that default value returned is a string (when translating)
+* Ensured to_s/to_print would output correct column name (even if it's renamed_to)
 == 0.1.6 / 13 Apr 2011
 * Removed no longer needed dependencies
 * Small tweak to the cucumber tests to ensure correct feedback

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongify (0.1.6)
+    mongify (0.1.7)
       activerecord (>= 3.0.3)
       activesupport (>= 3.0.3)
       bson_ext (>= 1.1.5)
@@ -12,16 +12,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.6)
+    activesupport (3.0.7)
     arel (2.0.9)
     bson (1.3.0)
     bson_ext (1.3.0)

data/README.rdoc

@@ -24,7 +24,7 @@ In order for Mongify to do it's job, it needs to know where your databases are l
 Building a config file is as simple as this:
 
   sql_connection do
-    adaptor   "mysql"
+    adapter   "mysql"
     host      "localhost"
     username  "root"
     password  "passw0rd"
@@ -190,8 +190,10 @@ Structure for defining a column is as follows:
 <em>Columns with no type given will be set to <tt>:string</tt></em>
 
 ==== Notes
-Leaving a column out when defining a table will result in a copy of the information (as a string).
-  
+
+<em>as of version 0.2:</em> 
+Leaving a column out when defining a table will result in the column being *ignored*
+
 ==== Types
 
 Before we cover the options, you need to know what types of columns are supported:

data/lib/mongify/database/column.rb

@@ -121,17 +121,17 @@ module Mongify
       def translate(value)
         return {} if ignored?
         case type
-        when :key
-          {"pre_mongified_id" => value.to_i}
-        else
-          {"#{name}" => type_cast(value)}
+          when :key
+            {"pre_mongified_id" => value.to_i}
+          else
+            {"#{self.name}" => type_cast(value)}
         end
       end
       
       # Returns a string representation of the column as it would show in a translation file.
       # Mainly used during print out of translation file
       def to_print
-        "column \"#{name}\", :#{type}".tap do |output|
+        "column \"#{sql_name}\", :#{type}".tap do |output|
           output_options = options.map{|k, v| (v == nil) ? nil : ":#{k} => \"#{v}\""}.compact
           output << ", #{output_options.join(', ')}" unless output_options.blank?
         end
@@ -230,8 +230,8 @@ module Mongify
       def type_cast(value)
         return nil if value.nil?
         case type
-          when :string    then value
-          when :text      then value
+          when :string    then value.to_s
+          when :text      then value.to_s
           when :integer   then value.to_i
           when :float     then value.to_f
           when :decimal
@@ -247,7 +247,7 @@ module Mongify
           when :date      then ActiveRecord::ConnectionAdapters::Column.string_to_time(value)
           when :binary    then ActiveRecord::ConnectionAdapters::Column.binary_to_string(value)
           when :boolean   then ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
-          else value
+          else value.to_s
         end
       end
 

data/lib/mongify/database/sql_connection.rb

@@ -7,7 +7,7 @@ module Mongify
     # Basic format should look something like this:
     # 
     #   sql_connection do
-    #     adaptor   "mysql"
+    #     adapter   "mysql"
     #     host      "localhost"
     #     username  "root"
     #     password  "passw0rd"

data/lib/mongify/database/table.rb

@@ -103,7 +103,7 @@ module Mongify
       
       # Returns the column if found by the sql_name
       def find_column(name)
-        return nil unless (index = @column_lookup[name.to_s.downcase])
+        return nil unless (index = @column_lookup[name.to_s.downcase.to_sym])
         @columns[index]
       end
       
@@ -118,7 +118,7 @@ module Mongify
         new_row = {}
         row.each do |key, value|
           c = find_column(key)
-          new_row.merge!(c.present? ? c.translate(value) : {"#{key}" => value})
+          new_row.merge!(c.translate(value)) if c.present?
         end
         run_before_save(new_row)
       end
@@ -172,7 +172,7 @@ module Mongify
       
       # Indexes the column on the sql_name and adds column to the array
       def add_and_index_column(column)
-        @column_lookup[column.sql_name] = @columns.size
+        @column_lookup[column.sql_name.downcase.to_sym] = @columns.size
         @columns << column
         column
       end

data/lib/mongify/ui.rb

@@ -53,7 +53,7 @@ module Mongify
       # Creates an instance of HighLine
       # which lets us figure out width of console
       # plus a whole lot more
-      # @reutrn [HighLine] instance 
+      # @return [HighLine] instance 
       def terminal_helper
         @terminal_helper ||= HighLine.new
       end

data/lib/mongify/version.rb

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

data/spec/mongify/database/base_connection_spec.rb

@@ -42,7 +42,7 @@ describe Mongify::Database::BaseConnection do
     @base_connection.respond_to?(:host).should be_true
   end
 
-  it "should force adaptor to a string" do
+  it "should force adapter to a string" do
     @base_connection.adapter :sqlite
     @base_connection.adapter.should == 'sqlite'
   end

data/spec/mongify/database/column_spec.rb

@@ -100,6 +100,11 @@ describe Mongify::Database::Column do
       @column.translate('value').should == {'last_name' => 'value'}
     end
     
+    it "should rename this" do
+      @column = Mongify::Database::Column.new("geoCode_longitude", :string, :rename_to => 'longitude')
+      @column.translate(42.2222).should == {'longitude' => '42.2222'}
+    end
+    
     it "should be renamed" do
       @column.should be_renamed
     end
@@ -258,7 +263,7 @@ describe Mongify::Database::Column do
         @column.send(:type_cast, 101.43).should be_a_kind_of String
       end
       
-      context "as integer" do
+      context :integer do
         before(:each) do
           @column = Mongify::Database::Column.new('price', :decimal, :as => 'integer')
           @value = 101.123455
@@ -322,6 +327,12 @@ describe Mongify::Database::Column do
         @column.send(:type_cast, "Something of a body").should == "Something of a body"
       end
     end
+    context :string do
+      it "should return a string" do
+        @column = Mongify::Database::Column.new('body', :string)
+        @column.send(:type_cast, 42.222).should == "42.222"
+      end
+    end
     context :boolean do
       before(:each) do
         @column = Mongify::Database::Column.new('email_me', :boolean)

data/spec/mongify/database/table_spec.rb

@@ -68,6 +68,12 @@ describe Mongify::Database::Table do
       @table.find_column('dark').should == col
     end
     
+    it "should be able to find (case sensitive)" do
+      col = @table.column 'geoCode'
+      @table.column 'filler'
+      @table.find_column('geoCode').should == col
+    end
+    
     it "should be searchable with sql_name only" do
       col = @table.column 'surname', :string, :rename_to => 'last_name'
       @table.find_column('surname').should == col
@@ -184,6 +190,7 @@ describe Mongify::Database::Table do
   context "before_save" do
     before(:each) do
       @table = Mongify::Database::Table.new('users')
+      @table.column "permission"
       @table.before_save do |row|
         row.admin = row.delete('permission').to_i > 50
       end
@@ -243,8 +250,8 @@ describe Mongify::Database::Table do
       @table.translate({'first_name' => 'Timmy', 'last_name' => 'Zuza'})
     end
     
-    it "should return same values if column doesn't exist in the translation" do
-      @table.translate({'age' => 18}).should == {'age' => 18}
+    it "should not return any value if column doesn't exist in the translation" do
+      @table.translate({'age' => 18}).should == {}
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongify
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-13 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-05-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153527240 !ruby/object:Gem::Requirement
+  requirement: &2153452920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153527240
+  version_requirements: *2153452920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153526780 !ruby/object:Gem::Requirement
+  requirement: &2153452460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153526780
+  version_requirements: *2153452460
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2153526400 !ruby/object:Gem::Requirement
+  requirement: &2153452080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153526400
+  version_requirements: *2153452080
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2153525860 !ruby/object:Gem::Requirement
+  requirement: &2153451540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153525860
+  version_requirements: *2153451540
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153525360 !ruby/object:Gem::Requirement
+  requirement: &2153451040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153525360
+  version_requirements: *2153451040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153524900 !ruby/object:Gem::Requirement
+  requirement: &2153450580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153524900
+  version_requirements: *2153450580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153524440 !ruby/object:Gem::Requirement
+  requirement: &2153450120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2153524440
+  version_requirements: *2153450120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153523980 !ruby/object:Gem::Requirement
+  requirement: &2153449660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +98,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2153523980
+  version_requirements: *2153449660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2153523520 !ruby/object:Gem::Requirement
+  requirement: &2153449200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +109,10 @@ dependencies:
         version: '0.10'
   type: :development
   prerelease: false
-  version_requirements: *2153523520
+  version_requirements: *2153449200
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153523060 !ruby/object:Gem::Requirement
+  requirement: &2153448740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +120,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2153523060
+  version_requirements: *2153448740
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153522600 !ruby/object:Gem::Requirement
+  requirement: &2153448280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +131,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2153522600
+  version_requirements: *2153448280
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &2153522140 !ruby/object:Gem::Requirement
+  requirement: &2153464180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +142,10 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *2153522140
+  version_requirements: *2153464180
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153521680 !ruby/object:Gem::Requirement
+  requirement: &2153463720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +153,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *2153521680
+  version_requirements: *2153463720
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2153521220 !ruby/object:Gem::Requirement
+  requirement: &2153463260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +164,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2153521220
+  version_requirements: *2153463260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153520840 !ruby/object:Gem::Requirement
+  requirement: &2153462880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153520840
+  version_requirements: *2153462880
 description: Mongify allows you to map your sql data into a mongodb document database
   with a simple DSL.
 email:
@@ -254,7 +253,6 @@ files:
 - spec/support/database_generator.rb
 - spec/support/database_output.txt
 - spec/tmp/.gitignore
-has_rdoc: true
 homepage: http://mongify.com
 licenses: []
 post_install_message: 
@@ -281,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Translate your SQL data to MongoDB with ease
@@ -320,3 +318,4 @@ test_files:
 - spec/support/database_generator.rb
 - spec/support/database_output.txt
 - spec/tmp/.gitignore
+has_rdoc: