couchrest_model_config 0.0.2 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.1.0
+  -- `use_database` no longer supported when using CouchRest::Model::Config
+
 v0.0.2
   -- alias_method_chain both the class and instance `database` methods 
      on CouchRest::Model::Base

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/features/configure_database.feature

@@ -65,12 +65,10 @@ Feature: Configure CouchRest::Model database connections
     And the database should use the domain provided for the server instead of the default server
 
   @focus
-  Scenario: Database configured directly on the model takes highest precedence
-    Given I have configured the database for a model directly on the model via `use_database`
-    And I have configured the database for that model via CouchRest::Model::Config
-    When I call the `database` method on the model
-    Then I should receive the database configured directly on the model via `use_database`
-  
+  Scenario: CouchRest::Model::Base.use_database method no longer support
+    When I call the `use_database` method on CouchRest::Model::Base
+    Then I should receive an exception that the `use_database` method is not suported with couchrest_model_config
+
   @focus
   Scenario: Looking up the model's database via the model itself
     Given I have configured the database for a model via CouchRest::Model::Config

data/features/step_definitions/configure_steps.rb

@@ -221,3 +221,11 @@ end
 When /^I call the `database` method on an instance of the model$/ do
   @model_database = IndirectlyConfiguredModel.new.database
 end
+
+When /^I call the `use_database` method on CouchRest::Model::Base$/ do
+  @call = proc { CouchRest::Model::Base.use_database }
+end
+
+Then /^I should receive an exception that the `use_database` method is not suported with couchrest_model_config$/ do
+  @call.should raise_exception("We're sorry, but the `use_database` method is not supported with couchrest_model_config.")
+end

data/lib/couchrest_model_config/couchrest_model_base.rb

@@ -2,18 +2,18 @@ module CouchRest
   module Model
     class Base
       class << self
-        def database_with_couchrest_model_config
-          database_without_couchrest_model_config || CouchRest::Model::Config.for(self).current_database
+        def database
+          CouchRest::Model::Config.for(self).current_database
         end
 
-        alias_method_chain :database, :couchrest_model_config
+        def use_database(*args)
+          raise "We're sorry, but the `use_database` method is not supported with couchrest_model_config."
+        end
       end
       
-      def database_with_couchrest_model_config
-        database_without_couchrest_model_config || CouchRest::Model::Config.for(self.class).current_database
+      def database
+        CouchRest::Model::Config.for(self.class).current_database
       end
-
-      alias_method_chain :database, :couchrest_model_config
     end
   end
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matt Parker