mince_mongo_db 1.0.0.pre.1 → 1.0.0.pre.2

data/lib/mince_mongo_db/config.rb

@@ -0,0 +1,43 @@
+module MinceMongoDb # :nodoc:
+  require 'singleton'
+
+  # = Config
+  #
+  # Config specifies the configuration settings
+  #
+  # @author Matt Simpson
+  class Config
+    include Singleton
+
+    # Returns the primary key identifier for records.  This is necessary because not all databases use the same
+    # primary key.
+    #
+    # @return [Symbol] the name of the primary key field.
+    def self.primary_key
+      instance.primary_key
+    end
+
+    def self.database_name
+      instance.database_name
+    end
+
+    def self.database_name=(val)
+      instance.database_name = val
+    end
+
+    def self.test_env_number
+      ENV['TEST_ENV_NUMBER']
+    end
+
+    attr_accessor :primary_key, :database_name
+
+    def initialize
+      self.primary_key = :_id
+      self.database_name = 'mince'
+    end
+
+    def database_name=(name)
+      @database_name = [name, self.class.test_env_number].compact.join("-")
+    end
+  end
+end

data/lib/mince_mongo_db/connection.rb

@@ -0,0 +1,32 @@
+module MinceMongoDb
+  require_relative 'config'
+  require 'mongo'
+  require 'singleton'
+
+  class Connection
+    include Singleton
+
+    attr_accessor :connection, :db
+
+    def self.connection
+      instance.connection
+    end
+
+    def self.db
+      instance.db
+    end
+
+    def initialize
+      self.connection = Mongo::Connection.new
+    end
+
+    def connection=(con)
+      @connection = con
+      self.db = connection.db(database_name)
+    end
+
+    def database_name
+      Config.database_name
+    end
+  end
+end

data/lib/mince_mongo_db/data_store.rb

@@ -0,0 +1,26 @@
+module MinceMongoDb
+  require 'singleton'
+  require_relative 'connection'
+
+  class DataStore
+    include Singleton
+
+    def self.collection(collection_name)
+      instance.collection(collection_name)
+    end
+
+    def self.db
+      instance.db
+    end
+
+    def collection(collection_name)
+      db.collection(collection_name)
+    end
+
+    attr_accessor :db
+
+    def initialize
+      self.db = Connection.db
+    end
+  end
+end

data/lib/mince_mongo_db/interface.rb

@@ -0,0 +1,112 @@
+module MinceMongoDb
+  module Interface
+    require_relative 'data_store'
+    require_relative 'config'
+
+    def self.generate_unique_id(*args)
+      BSON::ObjectId.new.to_s
+    end
+
+    def self.primary_key
+      Config.primary_key
+    end
+
+    def self.delete_field(collection_name, key)
+      collection(collection_name).update({}, {"$unset" => { key => 1 } }, multi: true)
+    end
+
+    def self.delete_by_params(collection_name, params)
+      collection(collection_name).remove(params)
+    end
+
+    def self.add(collection_name, hash)
+      collection(collection_name).insert(hash)
+    end
+
+    def self.replace(collection_name, hash)
+      collection(collection_name).update({primary_key => hash[primary_key]}, hash)
+    end
+
+    def self.update_field_with_value(collection_name, primary_key_value, field_name, new_value)
+      collection(collection_name).update({primary_key => primary_key_value}, {'$set' => { field_name => new_value } })
+    end
+
+    def self.increment_field_by_amount(collection_name, primary_key_value, field_name, amount)
+      collection(collection_name).update({primary_key => primary_key_value}, {'$inc' => { field_name => amount } })
+    end
+
+    def self.get_all_for_key_with_value(collection_name, key, value)
+      get_by_params(collection_name, key.to_s => value)
+    end
+
+    def self.get_for_key_with_value(collection_name, key, value)
+      get_all_for_key_with_value(collection_name, key, value).first
+    end
+
+    def self.get_by_params(collection_name, hash)
+      collection(collection_name).find(hash)
+    end
+
+    def self.find_all(collection_name)
+      collection(collection_name).find
+    end
+
+    def self.find(collection_name, key, value)
+      collection(collection_name).find_one({key.to_s => value})
+    end
+
+    def self.push_to_array(collection_name, identifying_key, identifying_value, array_key, value_to_push)
+      collection(collection_name).update({identifying_key.to_s => identifying_value}, {'$push' => {array_key.to_s => value_to_push}})
+    end
+
+    def self.remove_from_array(collection_name, identifying_key, identifying_value, array_key, value_to_remove)
+      collection(collection_name).update({identifying_key.to_s => identifying_value}, {'$pull' => {array_key.to_s => value_to_remove}})
+    end
+
+    def self.containing_any(collection_name, key, values)
+      collection(collection_name).find({key.to_s => {"$in" => values}})
+    end
+
+    def self.array_contains(collection_name, key, value)
+      collection(collection_name).find(key.to_s => value)
+    end
+
+    def self.clear
+      db.collection_names.each do |collection_name|
+        db.drop_collection collection_name unless collection_name.include?('system')
+      end
+    end
+
+    def self.delete_collection(collection_name)
+      collection(collection_name).drop
+    end
+
+    def self.insert(collection_name, data)
+      data.each do |datum|
+        add collection_name, datum
+      end
+    end
+
+    def self.set_data(data)
+      clear
+
+      data.each do |key, value|
+        insert key, value
+      end
+    end
+
+    def self.data
+      db.collection_names.map do |collection_name|
+        find_all collection_name
+      end
+    end
+
+    def self.collection(collection_name)
+      DataStore.collection(collection_name)
+    end
+
+    def self.db
+      DataStore.db
+    end
+  end
+end

data/lib/mince_mongo_db/version.rb

@@ -0,0 +1,19 @@
+module MinceMongoDb
+  module Version
+    def self.major
+      1
+    end
+
+    def self.minor
+      0
+    end
+
+    def self.patch
+      "0.pre.2"
+    end
+  end
+
+  def self.version
+    [Version.major, Version.minor, Version.patch].join(".")
+  end
+end

data/lib/mince_mongo_db.rb

@@ -0,0 +1,7 @@
+module MinceMongoDb
+  require_relative 'mince_mongo_db/config'
+  require_relative 'mince_mongo_db/connection'
+  require_relative 'mince_mongo_db/version'
+  require_relative 'mince_mongo_db/data_store'
+  require_relative 'mince_mongo_db/interface'
+end

data/spec/integration/mince_interface_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../../lib/mongo_db'
+require_relative '../../lib/mince_mongo_db'
 require 'mince/shared_examples/interface_example'
 
 describe 'Mince Interface with MongoDb' do
   before do
-    Mince::Config.interface = Mince::MongoDb::Interface
+    Mince::Config.interface = MinceMongoDb::Interface
   end
 
   it_behaves_like 'a mince interface'

data/spec/units/{mongo_db → mince_mongo_db}/config_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../../../lib/mongo_db/config'
+require_relative '../../../lib/mince_mongo_db/config'
 
-describe Mince::MongoDb::Config do
+describe MinceMongoDb::Config do
   it 'contains the primary key to used by the db interface' do
     described_class.primary_key.should == :_id
   end

data/spec/units/{mongo_db → mince_mongo_db}/connection_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../../../lib/mongo_db/connection'
+require_relative '../../../lib/mince_mongo_db/connection'
 
-describe Mince::MongoDb::Connection do
+describe MinceMongoDb::Connection do
   subject { described_class.instance }
 
   let(:mongo_connection) { mock 'a mongo connection object', :db => db }
@@ -8,7 +8,7 @@ describe Mince::MongoDb::Connection do
   let(:database_name) { mock }
 
   before do
-    Mince::MongoDb::Config.stub(database_name: database_name)
+    MinceMongoDb::Config.stub(database_name: database_name)
     subject.connection = mongo_connection
   end
 

data/spec/units/{mongo_db → mince_mongo_db}/data_store_spec.rb

@@ -1,6 +1,6 @@
-require_relative '../../../lib/mongo_db/data_store'
+require_relative '../../../lib/mince_mongo_db/data_store'
 
-describe Mince::MongoDb::DataStore do
+describe MinceMongoDb::DataStore do
   let(:db) { mock }
   let(:collection) { mock }
   let(:collection_name) { mock }

data/spec/units/{mongo_db → mince_mongo_db}/interface_spec.rb

@@ -1,9 +1,9 @@
-require_relative '../../../lib/mongo_db/interface'
+require_relative '../../../lib/mince_mongo_db/interface'
 
-describe Mince::MongoDb::Interface do
+describe MinceMongoDb::Interface do
 
   let(:interface) { described_class }
-  let(:primary_key) { Mince::MongoDb::Config.primary_key }
+  let(:primary_key) { MinceMongoDb::Config.primary_key }
 
   let(:db) { mock 'mongo database' }
   let(:mongo_data_store_connection) { mock 'mongo_data_store_connection', :db => db}
@@ -15,9 +15,9 @@ describe Mince::MongoDb::Interface do
   let(:return_data) { mock 'return data' }
 
   before do
-    Mince::MongoDb::DataStore.stub(:db).and_return(db)
-    Mince::MongoDb::DataStore.stub(:collection).with(collection_name).and_return(collection)
-    Mince::MongoDb::Config.stub(primary_key: primary_key)
+    MinceMongoDb::DataStore.stub(:db).and_return(db)
+    MinceMongoDb::DataStore.stub(:collection).with(collection_name).and_return(collection)
+    MinceMongoDb::Config.stub(primary_key: primary_key)
   end
 
   it 'uses the correct collection' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mince_mongo_db
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -197,17 +197,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mongo_db.rb
-- lib/mongo_db/config.rb
-- lib/mongo_db/connection.rb
-- lib/mongo_db/data_store.rb
-- lib/mongo_db/interface.rb
-- lib/mongo_db/version.rb
+- lib/mince_mongo_db.rb
+- lib/mince_mongo_db/config.rb
+- lib/mince_mongo_db/connection.rb
+- lib/mince_mongo_db/data_store.rb
+- lib/mince_mongo_db/interface.rb
+- lib/mince_mongo_db/version.rb
 - spec/integration/mince_interface_spec.rb
-- spec/units/mongo_db/config_spec.rb
-- spec/units/mongo_db/connection_spec.rb
-- spec/units/mongo_db/data_store_spec.rb
-- spec/units/mongo_db/interface_spec.rb
+- spec/units/mince_mongo_db/config_spec.rb
+- spec/units/mince_mongo_db/connection_spec.rb
+- spec/units/mince_mongo_db/data_store_spec.rb
+- spec/units/mince_mongo_db/interface_spec.rb
 homepage: https://github.com/coffeencoke/mince_mongo_db
 licenses: []
 post_install_message: 
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 682498058529759032
+      hash: -3411619680046133823
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -237,8 +237,8 @@ specification_version: 3
 summary: Lightweight MongoDB ORM for Ruby.
 test_files:
 - spec/integration/mince_interface_spec.rb
-- spec/units/mongo_db/config_spec.rb
-- spec/units/mongo_db/connection_spec.rb
-- spec/units/mongo_db/data_store_spec.rb
-- spec/units/mongo_db/interface_spec.rb
+- spec/units/mince_mongo_db/config_spec.rb
+- spec/units/mince_mongo_db/connection_spec.rb
+- spec/units/mince_mongo_db/data_store_spec.rb
+- spec/units/mince_mongo_db/interface_spec.rb
 has_rdoc: 

data/lib/mongo_db/config.rb

@@ -1,45 +0,0 @@
-module Mince # :nodoc:
-  module MongoDb # :nodoc:
-    require 'singleton'
-
-    # = Config
-    #
-    # Config specifies the configuration settings
-    #
-    # @author Matt Simpson
-    class Config
-      include Singleton
-
-      # Returns the primary key identifier for records.  This is necessary because not all databases use the same
-      # primary key.
-      #
-      # @return [Symbol] the name of the primary key field.
-      def self.primary_key
-        instance.primary_key
-      end
-
-      def self.database_name
-        instance.database_name
-      end
-
-      def self.database_name=(val)
-        instance.database_name = val
-      end
-
-      def self.test_env_number
-        ENV['TEST_ENV_NUMBER']
-      end
-
-      attr_accessor :primary_key, :database_name
-
-      def initialize
-        self.primary_key = :_id
-        self.database_name = 'mince'
-      end
-
-      def database_name=(name)
-        @database_name = [name, self.class.test_env_number].compact.join("-")
-      end
-    end
-  end
-end

data/lib/mongo_db/connection.rb

@@ -1,34 +0,0 @@
-module Mince
-  module MongoDb
-    require_relative 'config'
-    require 'mongo'
-    require 'singleton'
-
-    class Connection
-      include Singleton
-
-      attr_accessor :connection, :db
-
-      def self.connection
-        instance.connection
-      end
-
-      def self.db
-        instance.db
-      end
-
-      def initialize
-        self.connection = Mongo::Connection.new
-      end
-
-      def connection=(con)
-        @connection = con
-        self.db = connection.db(database_name)
-      end
-
-      def database_name
-        Config.database_name
-      end
-    end
-  end
-end

data/lib/mongo_db/data_store.rb

@@ -1,28 +0,0 @@
-module Mince
-  module MongoDb
-    require 'singleton'
-    require_relative 'connection'
-
-    class DataStore
-      include Singleton
-
-      def self.collection(collection_name)
-        instance.collection(collection_name)
-      end
-
-      def self.db
-        instance.db
-      end
-
-      def collection(collection_name)
-        db.collection(collection_name)
-      end
-
-      attr_accessor :db
-
-      def initialize
-        self.db = Mince::MongoDb::Connection.db
-      end
-    end
-  end
-end

data/lib/mongo_db/interface.rb

@@ -1,114 +0,0 @@
-module Mince
-  module MongoDb
-    module Interface
-      require_relative 'data_store'
-      require_relative 'config'
-
-      def self.generate_unique_id(*args)
-        BSON::ObjectId.new.to_s
-      end
-
-      def self.primary_key
-        Config.primary_key
-      end
-
-      def self.delete_field(collection_name, key)
-        collection(collection_name).update({}, {"$unset" => { key => 1 } }, multi: true)
-      end
-
-      def self.delete_by_params(collection_name, params)
-        collection(collection_name).remove(params)
-      end
-
-      def self.add(collection_name, hash)
-        collection(collection_name).insert(hash)
-      end
-
-      def self.replace(collection_name, hash)
-        collection(collection_name).update({primary_key => hash[primary_key]}, hash)
-      end
-
-      def self.update_field_with_value(collection_name, primary_key_value, field_name, new_value)
-        collection(collection_name).update({primary_key => primary_key_value}, {'$set' => { field_name => new_value } })
-      end
-
-      def self.increment_field_by_amount(collection_name, primary_key_value, field_name, amount)
-        collection(collection_name).update({primary_key => primary_key_value}, {'$inc' => { field_name => amount } })
-      end
-
-      def self.get_all_for_key_with_value(collection_name, key, value)
-        get_by_params(collection_name, key.to_s => value)
-      end
-
-      def self.get_for_key_with_value(collection_name, key, value)
-        get_all_for_key_with_value(collection_name, key, value).first
-      end
-
-      def self.get_by_params(collection_name, hash)
-        collection(collection_name).find(hash)
-      end
-
-      def self.find_all(collection_name)
-        collection(collection_name).find
-      end
-
-      def self.find(collection_name, key, value)
-        collection(collection_name).find_one({key.to_s => value})
-      end
-
-      def self.push_to_array(collection_name, identifying_key, identifying_value, array_key, value_to_push)
-        collection(collection_name).update({identifying_key.to_s => identifying_value}, {'$push' => {array_key.to_s => value_to_push}})
-      end
-
-      def self.remove_from_array(collection_name, identifying_key, identifying_value, array_key, value_to_remove)
-        collection(collection_name).update({identifying_key.to_s => identifying_value}, {'$pull' => {array_key.to_s => value_to_remove}})
-      end
-
-      def self.containing_any(collection_name, key, values)
-        collection(collection_name).find({key.to_s => {"$in" => values}})
-      end
-
-      def self.array_contains(collection_name, key, value)
-        collection(collection_name).find(key.to_s => value)
-      end
-
-      def self.clear
-        db.collection_names.each do |collection_name|
-          db.drop_collection collection_name unless collection_name.include?('system')
-        end
-      end
-
-      def self.delete_collection(collection_name)
-        collection(collection_name).drop
-      end
-
-      def self.insert(collection_name, data)
-        data.each do |datum|
-          add collection_name, datum
-        end
-      end
-
-      def self.set_data(data)
-        clear
-
-        data.each do |key, value|
-          insert key, value
-        end
-      end
-
-      def self.data
-        db.collection_names.map do |collection_name|
-          find_all collection_name
-        end
-      end
-
-      def self.collection(collection_name)
-        DataStore.collection(collection_name)
-      end
-
-      def self.db
-        DataStore.db
-      end
-    end
-  end
-end

data/lib/mongo_db/version.rb

@@ -1,21 +0,0 @@
-module Mince
-  module MongoDb
-    module Version
-      def self.major
-        1
-      end
-
-      def self.minor
-        0
-      end
-
-      def self.patch
-        "0.pre.1"
-      end
-    end
-
-    def self.version
-      [Version.major, Version.minor, Version.patch].join(".")
-    end
-  end
-end

data/lib/mongo_db.rb

@@ -1,9 +0,0 @@
-module Mince
-  module MongoDb
-    require_relative 'mongo_db/config'
-    require_relative 'mongo_db/connection'
-    require_relative 'mongo_db/version'
-    require_relative 'mongo_db/data_store'
-    require_relative 'mongo_db/interface'
-  end
-end