zdzolton-cambric 0.6.4 → 0.7.0

data/README.rdoc

@@ -109,36 +109,38 @@ by the application.
 * Configure Rails:
   * create a config/initializers/cambric.rb file as follows:
   
-    Cambric.configure do |config|
-      config.design_doc_name = 'YOUR_APP_NAME'
-      config.environment = RAILS_ENV
-
-      config.databases = {
-        :YOUR_DB_NAME => {
-          :development => "http://localhost:5984/YOUR_DB_NAME-development",
-          :test => "http://localhost:5984/YOUR_DB_NAME-test"
-        },
-        :YOUR_OTHER_DB => {
-          :development => "http://localhost:5984/YOUR_OTHER_DB-development",
-          :test => "http://localhost:5984/YOUR_OTHER_DB-test"
+      Cambric.configure do |config|
+        config.design_doc_name = 'YOUR_APP_NAME'
+        config.environment = RAILS_ENV
+        
+        config.databases = {
+          :YOUR_DB_NAME => {
+            :development => "http://localhost:5984/YOUR_DB_NAME-development",
+            :test => "http://localhost:5984/YOUR_DB_NAME-test"
+          },
+          :YOUR_OTHER_DB => {
+            :development => "http://localhost:5984/YOUR_OTHER_DB-development",
+            :test => "http://localhost:5984/YOUR_OTHER_DB-test"
+          }
         }
-      }
-    end
-
-    # Push design docs after every request in development, and once in production on app startup
-    ActionController::Dispatcher.to_prepare(:cambric){ Cambric.prepare_databases }
-    
-  * place the following two lines in your test_helper.rb, at the top of the file after the 
-    require statements:
-  
-    Cambric.environment = 'test'
-    Cambric.prepare_databases!
+      end
+      
+      ActionController::Dispatcher.to_prepare(:cambric) do
+        if RAILS_ENV == 'test'
+          # Re-create databases each time in test environment
+          Cambric.prepare_databases!
+        else 
+          # Push design docs after every request in 
+          # development, and once in production on app startup
+          Cambric.prepare_databases
+        end
+      end
 
   * create a couchdb directory within your project:
 
-    $ cd /your/app/root
-    $ mkdir -p ./couchdb/your_db/views/some_view_name
-  
+      $ cd /your/app/root
+      $ mkdir -p ./couchdb/your_db/views/some_view_name
+
 == Copyright
 
 Copyright (c) 2009 Zachary Zolton. See LICENSE for details.

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.homepage = "http://github.com/zdzolton/cambric"
     gem.authors = ["Zachary Zolton", "Geoff Buesing"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency('jchris-couchrest')
+    gem.add_dependency('mattetti-couchrest')
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.7.0

data/cambric.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cambric}
-  s.version = "0.6.4"
+  s.version = "0.7.0"
 
   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-07-08}
+  s.date = %q{2009-08-27}
   s.email = %q{zachary.zolton@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -55,11 +55,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jchris-couchrest>, [">= 0"])
+      s.add_runtime_dependency(%q<mattetti-couchrest>, [">= 0"])
     else
-      s.add_dependency(%q<jchris-couchrest>, [">= 0"])
+      s.add_dependency(%q<mattetti-couchrest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jchris-couchrest>, [">= 0"])
+    s.add_dependency(%q<mattetti-couchrest>, [">= 0"])
   end
 end

data/lib/cambric/assume_design_doc_name.rb

@@ -14,7 +14,7 @@ module Cambric
     
     def get_docs_from_view name, options={}
       cast_as = options.delete(:cast_as) || options.delete('cast_as')
-      results = view name, options.merge(:reduce => false, :include_docs => true)
+      results = view name, options.merge(:include_docs => true)
       mapper = case cast_as
         when String then lambda { |r| CouchRest.constantize(r['doc'][cast_as]).new(r['doc']) }
         when Class then lambda { |r| cast_as.new(r['doc']) }

data/spec/cambric/assume_design_doc_name_spec.rb

@@ -22,8 +22,9 @@ describe Cambric::AssumeDesignDocName do
       Cambric[:tweets].cambric_design_doc.should_not be_nil
     end
     
-    describe "Casting documents from map-only query results" do
+    describe "Casting documents from reduce=false query results" do
       before :all do
+        Cambric[:tweets].save_doc 'author' => 'trevor', 'message' => "'sup, guys?", 'created_at' => '2009-06-06 11:52:34'
         class User < CouchRest::Document; end
         Cambric[:users].bulk_save [
           User.new('_id' => 'trevor', 'following' => %w(bob geoff scott brian zach), 'type' => 'User'),
@@ -32,23 +33,39 @@ describe Cambric::AssumeDesignDocName do
       end
       
       it "should cast to specified type, when cast_as is a type" do
-        followers = Cambric[:users].get_docs_from_view :followers, :cast_as => User, :key => 'bob'
+        followers = Cambric[:users].get_docs_from_view :followers, :cast_as => User, 
+                                                       :key => 'bob', :reduce => false
         followers.should have(2).elements
         followers.each{ |f| f.should be_a(User) }
       end
       
       it "should cast to type per-doc when cast_as is a string" do
-        followers = Cambric[:users].get_docs_from_view :followers, :cast_as => 'type', :key => 'bob'
+        followers = Cambric[:users].get_docs_from_view :followers, :cast_as => 'type', 
+                                                       :key => 'bob', :reduce => false
         followers.should have(2).elements
         followers.each{ |f| f.should be_a(User) }
       end
       
       it "should default to returning the plain doc hashes if cast_as is omitted" do
-        followers = Cambric[:users].get_docs_from_view :followers, :key => 'bob'
+        followers = Cambric[:users].get_docs_from_view :followers, 
+                                                       :key => 'bob', :reduce => false
         followers.should have(2).elements
         followers.each{ |f| f.should be_a(Hash) }
       end
     end
+    
+    describe "Casting documents from query results on a map-only view" do
+      before :all do
+        class Tweet < CouchRest::Document; end
+        Cambric[:tweets].save_doc Tweet.new('author' => 'trevor', 'message' => "'sup, guys?", 'created_at' => '2009-06-06 11:52:34', 'followers' => %w(zach scott geoff))
+      end
+      
+      it "should no longer put reduce=false into the query" do
+        tweets = Cambric[:tweets].get_docs_from_view :by_follower_and_created_at, 
+                                                     :limit => 1, :cast_as => Tweet
+        tweets.first.should be_a(Tweet)
+      end
+    end
         
   end
 end

data/spec/cambric/cambric_spec.rb

@@ -61,7 +61,7 @@ describe Cambric do
       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'
+        Cambric[:tweets].uri.should == '/tweets-development'
       end
     end
   end
@@ -82,7 +82,7 @@ describe Cambric do
     
     it "should have the expected URLs" do
       %w(users tweets).each do |db|
-        Cambric[db].uri.should == "http://127.0.0.1:5984/#{db}-testing"
+        Cambric[db].uri.should == "/#{db}-testing"
       end
     end
     

data/spec/cambric/configurator_spec.rb

@@ -25,7 +25,7 @@ describe Cambric::Configurator do
     
     it "should have the expected URLs for development environment" do
       %w(users tweets).each do |db|
-        @dbs[db.to_sym].uri.should == "http://127.0.0.1:5984/#{db}-development"
+        @dbs[db.to_sym].uri.should == "/#{db}-development"
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spec'
 
 # Gem dependencies... Here?
 require 'rubygems'
-gem 'jchris-couchrest'
+gem 'mattetti-couchrest'
 
 require 'json'
 require 'couchrest'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zdzolton-cambric
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors: 
 - Zachary Zolton
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 -07:00
+date: 2009-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: jchris-couchrest
+  name: mattetti-couchrest
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -58,6 +58,7 @@ files:
 - spec/spec_helper.rb
 has_rdoc: false
 homepage: http://github.com/zdzolton/cambric
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Opinionated management and usage of CouchDB from your Ruby apps.