mince 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mince (1.0.0)
+    mince (1.1.0)
       activesupport (~> 3.0)
       bson_ext (~> 1.5.2)
       mongo (~> 1.5.2)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.7)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     bson (1.5.2)
     bson_ext (1.5.2)
       bson (= 1.5.2)
     diff-lcs (1.1.3)
-    i18n (0.6.0)
+    i18n (0.6.1)
     mongo (1.5.2)
       bson (= 1.5.2)
     multi_json (1.3.6)

data/README.md

@@ -18,6 +18,12 @@ Start MongoDB at localhost (currently does not support authentication against Mo
 From there you can use Mince to add and retrieve data.
 
 <pre>
+# Has default db name
+Mince::Config.database_name # => 'mince'
+
+# Set the database name
+Mince::Config.database_name = 'my_custom_db_name'
+
 # Add a book to the books collection
 Mince::DataStore.add 'books', title: 'The World In Photographs', publisher: 'National Geographic'
 

data/lib/mince/config.rb

@@ -0,0 +1,24 @@
+require 'active_support/core_ext/object/blank'
+require 'singleton'
+
+class Mince::Config
+  include Singleton
+
+  attr_reader :database_name
+
+  def initialize
+    self.database_name = "mince"
+  end
+
+  def database_name=(val)
+    @database_name = [val, ENV['TEST_ENV_NUMBER']].compact.join("-")
+  end
+
+  def self.database_name
+    instance.database_name
+  end
+
+  def self.database_name=(val)
+    instance.database_name = val
+  end
+end

data/lib/mince/connection.rb

@@ -1,6 +1,6 @@
 require 'mongo'
 require 'singleton'
-require 'active_support/core_ext/object/blank'
+require_relative 'config'
 
 module Mince
   class Connection
@@ -10,17 +10,7 @@ module Mince
 
     def initialize
       @connection = Mongo::Connection.new
-      @db = connection.db(database)
-    end
-
-    # todo: push this into a config class which uses yaml or something like that to pull in the different environment settings?
-    def database
-      env_suffix = if (ENV['TEST_ENV_NUMBER'].blank?)
-        ""
-      else
-        "-#{ENV['TEST_ENV_NUMBER']}"
-      end
-      "mince#{env_suffix}"
+      @db = connection.db(Mince::Config.database_name)
     end
   end
-end
+end

data/lib/mince/version.rb

@@ -1,3 +1,3 @@
 module Mince
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/lib/config_spec.rb

@@ -0,0 +1,32 @@
+require_relative '../../lib/mince/config'
+
+describe Mince::Config do
+  it 'has a default database name' do
+    described_class.database_name.should == 'mince'
+  end
+
+  context 'when running multi threaded tests' do
+    before do
+      ENV['TEST_ENV_NUMBER'] = '3'
+      described_class.database_name = 'test'
+    end
+
+    after do
+      ENV['TEST_ENV_NUMBER'] = nil
+    end
+
+    it 'appends the test number to the database name' do
+      described_class.database_name.should == 'test-3'
+    end
+  end
+
+  context 'when specifying a custom database name' do
+    before do
+      described_class.database_name = 'custom'
+    end
+
+    it 'uses the custom database name' do
+      described_class.database_name.should == 'custom'
+    end
+  end
+end

data/spec/lib/connection_spec.rb

@@ -5,11 +5,16 @@ describe Mince::Connection do
 
   let(:mongo_connection) { mock 'a mongo connection object', :db => db }
   let(:db) { mock 'db'}
+  let(:config_database_name) { mock }
+
+  before do
+    Mince::Config.stub(database_name: config_database_name)
+  end
 
   it 'is a mongo connection' do
     Mongo::Connection.should_receive(:new).and_return(mongo_connection)
-    mongo_connection.should_receive(:db).with("mince").and_return(db)
+    mongo_connection.should_receive(:db).with(config_database_name).and_return(db)
 
     subject.connection.should == mongo_connection
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mince
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,10 +110,12 @@ files:
 - README.md
 - Rakefile
 - lib/mince.rb
+- lib/mince/config.rb
 - lib/mince/connection.rb
 - lib/mince/data_store.rb
 - lib/mince/version.rb
 - mince.gemspec
+- spec/lib/config_spec.rb
 - spec/lib/connection_spec.rb
 - spec/lib/data_store_spec.rb
 homepage: https://github.com/asynchrony/mince
@@ -136,11 +138,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mince
-rubygems_version: 1.8.24
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Lightweight MongoDB ORM for Ruby.
 test_files:
+- spec/lib/config_spec.rb
 - spec/lib/connection_spec.rb
 - spec/lib/data_store_spec.rb
-has_rdoc: