mongify 1.0.1 → 1.1.0

data/spec/mongify/database/data_row_spec.rb

@@ -8,7 +8,7 @@ describe Mongify::Database::DataRow do
   it "should have method access to hash values" do
     @datarow.first_name.should == 'Timmy'
   end
-  
+
   it "should dup the hash" do
     @hash = {:first_name => 'Bob'}
     @hash.should_receive(:dup).and_return(@hash)
@@ -20,11 +20,11 @@ describe Mongify::Database::DataRow do
     @hash.should_receive(:stringify_keys!)
     dr = Mongify::Database::DataRow.new(@hash)
   end
-  
+
   it "should have a working include? method" do
     @datarow.should include('first_name')
   end
-  
+
   it "should be able to set a value" do
     @datarow.first_name = 'Bob'
     @datarow.first_name.should == 'Bob'
@@ -34,15 +34,15 @@ describe Mongify::Database::DataRow do
     @datarow.should include('height')
     @datarow.height.should == 6
   end
-  
+
   it "should to_hash" do
     @datarow.to_hash.should == @hash
   end
-  
+
   it "should allow inspect" do
     @datarow.inspect.should == @hash.inspect
   end
-  
+
   context "delete" do
     it "should delete key" do
       @datarow.delete('age')
@@ -53,16 +53,16 @@ describe Mongify::Database::DataRow do
       @datarow.delete('age').should == age
     end
   end
-  
+
   it "should work with an empty hash" do
     dr = Mongify::Database::DataRow.new({})
     dr.keys.should be_empty
   end
-  
+
   it "should return all keys in object" do
     @datarow.keys.should == @hash.keys
   end
-  
+
   context "respond_to" do
     it "should be true for first_name" do
       @datarow.respond_to?('first_name').should be_true
@@ -71,7 +71,7 @@ describe Mongify::Database::DataRow do
       @datarow.respond_to?('first_name=').should be_true
     end
   end
-  
+
   context "read_attributes" do
     it "should read attributes" do
       @datarow.read_attribute('first_name').should == @hash['first_name']
@@ -84,7 +84,7 @@ describe Mongify::Database::DataRow do
       @datarow.read_attributes('monkey').should be_nil
     end
   end
-  
+
   context "write_attribute" do
     it "should write attributes" do
       @datarow.write_attribute('first_name', 'Sam')

data/spec/mongify/database/no_sql_connection_spec.rb

@@ -6,7 +6,7 @@ describe Mongify::Database::NoSqlConnection do
     @database = 'mongify_test'
     @mongodb_connection = Mongify::Database::NoSqlConnection.new
   end
-  
+
   context "valid?" do
     it "should be true" do
       Mongify::Database::NoSqlConnection.new(:host => 'localhost', :database => 'blue').should be_valid
@@ -14,60 +14,60 @@ describe Mongify::Database::NoSqlConnection do
     it "should be false without any params" do
       Mongify::Database::NoSqlConnection.new().should_not be_valid
     end
-    
+
     it "should be false without database" do
       Mongify::Database::NoSqlConnection.new(:host => 'localhost').should_not be_valid
     end
-    
+
     it "should be false without host" do
       Mongify::Database::NoSqlConnection.new(:database => 'blue').should_not be_valid
     end
   end
-  
+
   it "should rename mongo to mongodb for adapter" do
     Mongify::Database::NoSqlConnection.new(:host => 'localhost', :database => 'blue', :adapter => 'mongo').adapter.should == 'mongodb'
   end
-  
+
   context "connection string" do
     before(:each) do
       @mongodb_connection.host @host
       @mongodb_connection.database @database
     end
-    
+
     context "without username or password" do
       it "should render correctly" do
         @mongodb_connection.connection_string.should == "mongodb://#{@host}"
       end
-      
+
       it "should include port" do
         @mongodb_connection.port 10101
         @mongodb_connection.connection_string.should == "mongodb://#{@host}:10101"
       end
     end
   end
-  
+
   context "connection" do
     before(:each) do
       @mock_connection = mock(:connected? => true)
       Mongo::Connection.stub(:new).and_return(@mock_connection)
     end
-    
+
     it "should only create a connection once" do
       Mongo::Connection.should_receive(:new).once
       @mongodb_connection.connection
       @mongodb_connection.connection
     end
-    
+
     it "should add_auth if username && password is present" do
       @mock_connection.should_receive(:add_auth)
       @mongodb_connection.username "bob"
       @mongodb_connection.password "secret"
       @mongodb_connection.connection
     end
-    
+
   end
-  
-  
+
+
   context "database action:" do
     before(:each) do
        @collection = mock
@@ -81,7 +81,7 @@ describe Mongify::Database::NoSqlConnection do
         @mongodb_connection.insert_into('users', {'first_name' => 'bob'})
       end
     end
-    
+
     context "get_id_using_pre_mongified_id" do
       it "should return new id" do
         @collection.should_receive(:find_one).with({"pre_mongified_id"=>1}).and_return({'_id' => '123'})
@@ -92,14 +92,22 @@ describe Mongify::Database::NoSqlConnection do
         @mongodb_connection.get_id_using_pre_mongified_id('users', 1).should == nil
       end
     end
-    
+
     context "select_rows" do
       it "should return all records" do
         @collection.should_receive(:find).with().and_return([])
         @mongodb_connection.select_rows('users')
       end
     end
-    
+
+    context "select_by_query" do
+      it "should return some records according to a query" do
+        query = {"dummy" => true}
+        @collection.should_receive(:find).with(query).and_return([])
+        @mongodb_connection.select_by_query('users', query)
+      end
+    end
+
     context "update" do
       it "should update the record" do
         attributes = {'post_id' => 123}
@@ -107,7 +115,33 @@ describe Mongify::Database::NoSqlConnection do
         @mongodb_connection.update('users', 1, attributes)
       end
     end
-    
+
+    context "upsert" do
+      it "should update the record if its pre_mongified_id exists" do
+        attributes = {'pre_mongified_id' => 1, 'post_id' => 123}
+        id = 10
+        duplicate = mock
+        duplicate.stub(:[]).with(:_id).and_return(id)
+        @mongodb_connection.stub(:find_one).with('users', {"pre_mongified_id" => 1}).and_return(duplicate)
+        @mongodb_connection.should_receive(:find_one).with('users', {"pre_mongified_id" => 1})
+        @mongodb_connection.should_receive(:update).with('users', id, attributes)
+        @mongodb_connection.upsert('users', attributes)
+      end
+
+      it "should insert a new record if no record having the same pre_mongified_id exists" do
+        attributes = {'pre_mongified_id' => 1, 'post_id' => 123}
+        @mongodb_connection.should_receive(:find_one).with('users', {"pre_mongified_id" => 1})
+        @mongodb_connection.should_receive(:insert_into).with('users', attributes)
+        @mongodb_connection.upsert('users', attributes)
+      end
+
+      it "should delegate the upsert to the save method of Mongo if no pre_mongified_id to match with the _id" do
+        attributes = {'post_id' => 123}
+        @collection.should_receive(:save).with(attributes)
+        @mongodb_connection.upsert('users', attributes)
+      end
+    end
+
     context "find_one" do
       it "should call find_one on collection" do
         query= {'pre_mongified_id' => 1}
@@ -115,12 +149,12 @@ describe Mongify::Database::NoSqlConnection do
         @mongodb_connection.find_one('users', query)
       end
     end
-    
+
     it "should create index for pre_mongified_id" do
       @collection.should_receive(:create_index).with([["pre_mongified_id", Mongo::ASCENDING]]).and_return(true)
       @mongodb_connection.create_pre_mongified_id_index('users')
     end
-    
+
     context "remove_pre_mongified_ids" do
       before(:each) do
         @collection.stub(:index_information).and_return('pre_mongified_id_1' => 'something')
@@ -137,7 +171,7 @@ describe Mongify::Database::NoSqlConnection do
       end
     end
   end
-  
+
   context "force" do
     before(:each) do
       @mock_connection = mock(:connected? => true, :drop_database => true)
@@ -151,12 +185,12 @@ describe Mongify::Database::NoSqlConnection do
     it "should be false" do
       Mongify::Database::NoSqlConnection.new(:host => 'localhost', :database => 'blue', :force => false).should_not be_forced
     end
-    
+
     it "should drop database" do
       @mongodb_connection.connection.should_receive(:drop_database).with('blue').and_return(true)
       @mongodb_connection.send(:drop_database)
     end
-    
+
     context "ask permission" do
       it "should ask to drop database" do
         Mongify::UI.should_receive(:ask).and_return(false)
@@ -165,7 +199,7 @@ describe Mongify::Database::NoSqlConnection do
       it "should not drop database if permission is declined" do
         Mongify::UI.should_receive(:ask).and_return(false)
         @mongodb_connection.should_receive(:drop_database).never
-        @mongodb_connection.send(:ask_to_drop_database)        
+        @mongodb_connection.send(:ask_to_drop_database)
       end
       it "should drop database if permission is granted" do
         Mongify::UI.should_receive(:ask).and_return(true)
@@ -175,21 +209,21 @@ describe Mongify::Database::NoSqlConnection do
     end
   end
 
-  
+
   describe "working connection" do
     before(:each) do
       @mongodb_connection = DatabaseGenerator.mongo_connection
     end
-    
+
     it "should work" do
       @mongodb_connection.should be_valid
       @mongodb_connection.should have_connection
     end
-    
+
     it "should return a db" do
       @mongodb_connection.db.should be_a Mongify::Database::NoSqlConnection::DB
     end
   end
-  
+
 end
 

data/spec/mongify/database/sql_connection_spec.rb

@@ -6,6 +6,7 @@ describe Mongify::Database::SqlConnection do
 
   let(:sqlite_connection){Mongify::Database::SqlConnection.new(:adapter => 'sqlite3', :database => @db_path)}
   let(:mysql_connection){@sql_connection = DatabaseGenerator.mysql_connection}
+  let(:postgresql_connection){@sql_connection = DatabaseGenerator.postgresql_connection}
 
   context "Sqlite 3 config" do
     context "valid?" do
@@ -42,6 +43,27 @@ describe Mongify::Database::SqlConnection do
     end
   end
 
+  context "Postgres config" do
+    context "valid?" do
+      it "should be true" do
+        Mongify::Database::SqlConnection.new(:adapter => 'postgresql', :host => 'localhost', :database => 'mongify_test').should be_valid
+      end
+      it "should be false" do
+        Mongify::Database::SqlConnection.new(:adapter => 'postgresql').should_not be_valid
+      end
+    end
+
+    context "testing connection" do
+      it "should work" do
+        postgresql_connection.should have_connection
+      end
+      it "should call setup_connection_adapter before testing connection" do
+        postgresql_connection.should_receive(:setup_connection_adapter)
+        postgresql_connection.has_connection?
+      end
+    end
+  end
+
   context "Sqlite connection" do
     context "testing connection" do
       it "should call setup_connection_adapter before testing connection" do
@@ -56,7 +78,7 @@ describe Mongify::Database::SqlConnection do
 
     context "tables" do
       it "should be able to get a list" do
-        sqlite_connection.tables.should =~ ['comments', 'notes', 'posts', 'preferences', 'users']
+        sqlite_connection.tables.should =~ %w(comments notes posts preferences users teams coaches)
       end
     end
 
@@ -66,7 +88,7 @@ describe Mongify::Database::SqlConnection do
       end
     end
   end
-  
+
   context "select_all" do
     it "should generate correct select statement" do
       @mock_conn = mock
@@ -75,5 +97,43 @@ describe Mongify::Database::SqlConnection do
       sqlite_connection.select_rows('users')
     end
   end
+
+  context "select_by_query" do
+    it "should select rows based on a query" do
+      query = "SELECT * FROM users WHERE true"
+      @mock_conn = mock
+      @mock_conn.should_receive(:select_all).with(query)
+      sqlite_connection.stub(:connection).and_return(@mock_conn)
+      sqlite_connection.select_by_query(query)
+    end
+  end
+
+  context "count" do
+    it "should get count of all rows in a table" do
+      query = "SELECT COUNT(*) FROM users"
+      @mock_conn = mock
+      @mock_conn.should_receive(:select_value).with(query)
+      sqlite_connection.stub(:connection).and_return(@mock_conn)
+      sqlite_connection.count('users')
+    end
+
+    it "should get count of rows in a table filtered by a query" do
+      query = "SELECT COUNT(*) FROM users WHERE true"
+      @mock_conn = mock
+      @mock_conn.should_receive(:select_value).with(query)
+      sqlite_connection.stub(:connection).and_return(@mock_conn)
+      sqlite_connection.count('users', 'true')
+    end
+  end
+
+  context "execute" do
+    it "should execute an arbitrary query" do
+      query = "CREATE TABLE x(int y);"
+      @mock_conn = mock
+      @mock_conn.should_receive(:execute).with(query)
+      sqlite_connection.stub(:connection).and_return(@mock_conn)
+      sqlite_connection.execute(query)
+    end
+  end
 end
 

data/spec/mongify/database/table_spec.rb

@@ -4,7 +4,7 @@ describe Mongify::Database::Table do
   before(:each) do
     @table = Mongify::Database::Table.new('users')
   end
-  
+
   it "should have name" do
     @table.name.should == "users"
   end
@@ -15,17 +15,17 @@ describe Mongify::Database::Table do
     @table.name = 'accounts'
     @table.name.should == 'accounts'
   end
-  
+
   it "should be ingored" do
     table = Mongify::Database::Table.new('users', :ignore => true)
     table.should be_ignored
   end
-  
+
   it "should get setup options" do
     @table = Mongify::Database::Table.new('users', :embed_in => 'accounts', :as => 'users')
     @table.options.should == {'embed_in' => 'accounts', 'as' => 'users'}
   end
-  
+
   context "rename_to" do
     before(:each) do
       @table = Mongify::Database::Table.new('users', :rename_to => 'people')
@@ -38,53 +38,60 @@ describe Mongify::Database::Table do
       @table.sql_name.should == "users"
     end
   end
-  
+
   context "column_index (find_column)" do
     it "should add column index on column creation" do
       @table.should_receive(:add_and_index_column)
       @table.column('first_name', :string)
     end
   end
-  
+
   context "column" do
     it "should add to count" do
       lambda { @table.column 'name' }.should change{@table.columns.count}.by(1)
     end
-    
+
     it "should work without a type" do
       col = @table.column 'name'
       col.type.should == :string
     end
-    
+
     it "should work without a type with options" do
       col = @table.column 'name', :rename_to => 'first_name'
       col.type.should == :string
       col.should be_renamed
     end
-    
+
     it "should be able to find" do
       @table.column 'another'
       col = @table.column 'dark'
       @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
     end
-    
+
     it "should return nil if not found" do
       @table.column 'dark'
       @table.find_column('blue').should be_nil
     end
+
+    it "should be able to find the key column" do
+      @table.column 'name'
+      col = @table.column 'id', :key, :as => :integer
+      @table.column 'address'
+      @table.key_column.should == col
+    end
   end
-  
+
   context "add_column" do
     it "should require Mongify::Database::Column" do
       lambda { @table.add_column("Not a column") }.should raise_error(Mongify::DatabaseColumnExpected)
@@ -92,17 +99,17 @@ describe Mongify::Database::Table do
     it "shold except Mongify::Database::Column as a parameter" do
       lambda { @table.add_column(Mongify::Database::Column.new('test')) }.should_not raise_error(Mongify::DatabaseColumnExpected)
     end
-    
+
     it "should add to the column count" do
       lambda { @table.add_column(Mongify::Database::Column.new('test')) }.should change{@table.columns.count}.by(1)
     end
-    
+
     it "should be indexed" do
       col = Mongify::Database::Column.new('test')
       @table.add_column(col)
       @table.find_column('test').should == col
     end
-    
+
     context "on initialization" do
       before(:each) do
         @columns = [Mongify::Database::Column.new('test1'), Mongify::Database::Column.new('test2')]
@@ -119,7 +126,7 @@ describe Mongify::Database::Table do
       end
     end
   end
-  
+
   context "reference_colums" do
     before(:each) do
       @col1 = Mongify::Database::Column.new('user_id', :integer, :references => 'users')
@@ -133,7 +140,7 @@ describe Mongify::Database::Table do
       @table.reference_columns.should =~ [@col1, @col2]
     end
   end
-  
+
   context "dealing with embedding," do
     context "embed_on" do
       it "should return embed_on option" do
@@ -173,7 +180,7 @@ describe Mongify::Database::Table do
         Mongify::Database::Table.new('users').should_not be_embedded
       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'
@@ -186,7 +193,7 @@ describe Mongify::Database::Table do
       end
     end
   end
-  
+
   context "before_save" do
     before(:each) do
       @table = Mongify::Database::Table.new('users')
@@ -210,6 +217,13 @@ describe Mongify::Database::Table do
         Mongify::Database::DataRow.should_receive(:new).and_return(dr)
         @table.send(:run_before_save, row)
       end
+      it "should preserve the pre_mongified_id even if user deletes it" do
+        row = {'first_name' => 'Bob', 'pre_mongified_id' => 1}
+        @table.before_save do |row, _|
+          row.delete('pre_mongified_id')
+        end
+        @table.send(:run_before_save, row).should == row
+      end
     end
     it "should work" do
       @table.translate({'permission' => 51}).should == {'admin' => true}
@@ -225,16 +239,26 @@ describe Mongify::Database::Table do
       end
     end
     it "should work" do
-      @table.translate({'preferences' => 'yes'}, {}).should == [{}, {'preferences' => 'yes'}]
+      @table.translate({'preferences' => 'yes'}, {}).should == [{}, {'preferences' => 'yes'}, {}]
     end
     it "should return blank hash if parent is unchanged" do
       @table.remove_before_save_filter!
-      @table.translate({'preferences' => "true"}, {}).should == [{'preferences' => "true"}, {}]
+      @table.translate({'preferences' => "true"}, {}).should == [{'preferences' => "true"}, {}, {}]
+    end
+    it 'should return a hash containing the keys that have been deleted on the parent row' do
+      @parent_table.column('field_1')
+      @parent_table.column('field_2')
+      @table.before_save do |_, parent|
+        parent.delete('field_1')
+      end
+      @table.translate({'preferences' => 'true'},{'field_1' => 'a', 'field_2' => 'b'}).should ==
+          [{'preferences' => 'true'}, {'field_2' => 'b'}, {'field_1' => '1'}]
     end
+
   end
-  
-  
-  
+
+
+
   context "polymorphic" do
     before(:each) do
       @table = Mongify::Database::Table.new('comments', :polymorphic => :commentable)
@@ -248,7 +272,7 @@ describe Mongify::Database::Table do
     it "should return 'commentable'" do
       @table.polymorphic_as.should == 'commentable'
     end
-    
+
     context "embed" do
       before(:each) do
         @table = Mongify::Database::Table.new('comments', :polymorphic => :commentable, :embed_in => true)
@@ -256,10 +280,10 @@ describe Mongify::Database::Table do
       it "should be embedded" do
         @table.should be_embedded
       end
-      
+
     end
   end
-  
+
   context "translate" do
     before(:each) do
       @column1 = mock(:translate => {'first_name' => 'Timmy'}, :name => 'first_name')
@@ -276,7 +300,7 @@ describe Mongify::Database::Table do
       @column2.should_receive(:translate).with('Zuza').and_return({'last_name' => 'Zuza'})
       @table.translate({'first_name' => 'Timmy', 'last_name' => 'Zuza'})
     end
-    
+
     it "should not return any value if column doesn't exist in the translation" do
       @table.translate({'age' => 18}).should == {}
     end