zdzolton-cambric 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/cambric.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cambric}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zachary Zolton", "Geoff Buesing"]
-  s.date = %q{2009-06-05}
+  s.date = %q{2009-06-09}
   s.email = %q{zachary.zolton@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/cambric/assume_design_doc_name.rb

@@ -4,7 +4,12 @@ module Cambric
     attr_accessor :cambric_design_doc_name
   
     def view name, options={}, &block
-      super "#{@cambric_design_doc_name}/#{name}", options, &block
+      case name
+      when String
+        super name, options, &block
+      when Symbol
+        super "#{@cambric_design_doc_name}/#{name}", options, &block
+      end
     end
     
     def cambric_design_doc

data/lib/cambric.rb

@@ -16,14 +16,20 @@ module Cambric
   def self.environment
     @environment
   end
+
+  def self.environment= value
+    @config.environment = value
+    @databases = @config.initialize_databases
+    @environment = @config.environment
+  end
   
   def self.configure
-    config = Configurator.new
-    yield config if block_given?
-    @databases = config.initialize_databases
-    @design_doc_name = config.design_doc_name
-    @db_dir = config.db_dir
-    @environment = config.environment
+    @config = Configurator.new
+    yield @config if block_given?
+    @databases = @config.initialize_databases
+    @design_doc_name = @config.design_doc_name
+    @db_dir = @config.db_dir
+    @environment = @config.environment
   end
   
   def self.create_databases!

data/spec/cambric/assume_design_doc_name_spec.rb

@@ -11,7 +11,11 @@ describe Cambric::AssumeDesignDocName do
     after(:all){ delete_twitter_clone_databases }
     
     it "should be able to query view without re-specifying design doc name" do
-      Cambric[:tweets].view 'by_follower_and_created_at'
+      Cambric[:tweets].view :by_follower_and_created_at
+    end
+    
+    it "should be able to specify design doc name when giving a string" do
+      Cambric[:tweets].view 'twitter-clone/by_follower_and_created_at'
     end
     
     it "should get the design doc specified by configuration" do

data/spec/cambric/cambric_spec.rb

@@ -50,6 +50,20 @@ describe Cambric do
     it "should not blow up when calling push_design_docs for non-existent directories" do
       Cambric.push_design_docs
     end
+    
+    describe "after changing the environment" do
+      before :all do
+        Cambric.environment = 'development'
+      end
+      
+      it "should match the new environment value" do
+        Cambric.environment.should == 'development'
+      end
+      
+      it "should match the expected database URI for the new environment" do
+        Cambric[:tweets].uri.should == 'http://127.0.0.1:5984/tweets-development'
+      end
+    end
   end
     
   describe "after creating databases" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zdzolton-cambric
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Zachary Zolton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency