couch_potato 0.6.0 → 0.7.0.pre.1

data/spec/unit/validation_spec.rb

@@ -1,12 +1,6 @@
 require 'spec_helper'
 
-describe 'CouchPotato::Config.validation_framework' do
-  before(:each) do
-    @original_validation_framework = CouchPotato::Config.validation_framework
-  end
-  after(:each) do
-    CouchPotato::Config.validation_framework = @original_validation_framework
-  end
+describe 'CouchPotato Validation' do
   
   describe "access to errors object" do
     it "should description" do
@@ -16,52 +10,4 @@ describe 'CouchPotato::Config.validation_framework' do
     end
   end
 
-  begin
-    require 'active_model'
-
-    describe 'with :active_model' do
-      before(:each) do
-        CouchPotato::Config.validation_framework = :active_model
-      end
-
-      it "should include ActiveModel::Validations upon inclusion of CouchPotato::Persistence" do
-        model_class = Class.new
-        ActiveModel::Validations.should_receive(:included).with(model_class)
-        model_class.send(:include, CouchPotato::Persistence)
-      end
-    end
-
-  rescue LoadError
-    STDERR.puts "WARNING: active_model gem not installed. Not running ActiveModel validation specs."
-  end
-
-  begin
-    require 'validatable'
-
-    describe 'with :validatable' do
-      before(:each) do
-        CouchPotato::Config.validation_framework = :validatable
-      end
-
-      it "should include ActiveModel::Validations upon inclusion of CouchPotato::Persistence" do
-        model_class = Class.new
-        Validatable.should_receive(:included).with(model_class)
-        model_class.send(:include, CouchPotato::Persistence)
-      end
-    end
-
-  rescue LoadError
-    STDERR.puts "WARNING: validatable gem not installed. Not running Validatable validation specs."
-  end
-
-  describe 'with an unknown framework' do
-    before(:each) do
-      CouchPotato::Config.validation_framework = :unknown_validation_framework
-    end
-
-    it "should raise an error" do
-      model_class = Class.new
-      lambda { model_class.send(:include, CouchPotato::Persistence) }.should raise_error
-    end
-  end
 end

data/spec/unit/view_query_spec.rb

@@ -4,46 +4,68 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
   before(:each) do
     CouchRest.stub(:get => nil)
   end
-  
-  it "should not pass a key if conditions are empty" do
+
+  it "does not pass a key if conditions are empty" do
     db = mock 'db', :get => nil, :save_doc => nil
     db.should_receive(:view).with(anything, {})
     CouchPotato::View::ViewQuery.new(db, '', {:view0 => {}}).query_view!
   end
-  
-  it "should not update a view when the map/reduce functions haven't changed" do
+
+  it 'updates a view if it does not exist' do
+    db = mock 'db', :get => nil, :view => nil
+
+    db.should_receive(:save_doc).with(
+      'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
+      'lists' => {}, "_id" => "_design/design", "language" => "javascript")
+
+    CouchPotato::View::ViewQuery.new(db, 'design', :view => {:map => '<map_code>', :reduce => '<reduce_code>'}).query_view!
+  end
+
+  it 'updates a view in erlang if it does not exist' do
+    db = mock 'db', :get => nil, :view => nil
+
+    db.should_receive(:save_doc).with(
+      'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
+      'lists' => {}, "_id" => "_design/design", "language" => "erlang")
+
+    CouchPotato::View::ViewQuery.new(db, 'design',
+      {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}},
+      nil, :erlang).query_view!
+  end
+
+  it "does not update a view when the map/reduce functions haven't changed" do
     db = mock 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
     db.should_not_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', :view => {:map => '<map_code>', :reduce => '<reduce_code>'}).query_view!
   end
-  
-  it "should not update a view when the list function hasn't changed" do
+
+  it "does not update a view when the list function hasn't changed" do
     db = mock 'db', :get => {'views' => {'view' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}, 'lists' => {'list0' => '<list_code>'}}, :view => nil
     db.should_not_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', {:view => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list0 => '<list_code>').query_view!
   end
-  
-  it "should update a view when the map function has changed" do
+
+  it "updates a view when the map function has changed" do
     db = mock 'db', :get => {'views' => {'view2' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
     db.should_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', :view2 => {:map => '<new map_code>', :reduce => '<reduce_code>'}).query_view!
   end
-  
-  it "should not pass in a reduce key if there is no reduce function" do
+
+  it "does not pass in a reduce key if there is no reduce function" do
     db = mock 'db', :get => {'views' => {}}, :view => nil
-    
+
     db.should_receive(:save_doc).with('views' => {'view3' => {'map' => '<map code>'}})
-    
+
     CouchPotato::View::ViewQuery.new(db, 'design', :view3 => {:map => '<map code>', :reduce => nil}).query_view!
   end
-  
-  it "should update a view when the reduce function has changed" do
+
+  it "updates a view when the reduce function has changed" do
     db = mock 'db', :get => {'views' => {'view4' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}}, :view => nil
     db.should_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', :view4 => {:map => '<map_code>', :reduce => '<new reduce_code>'}).query_view!
   end
-  
-  it "should update a view when the list function has changed" do
+
+  it "updates a view when the list function has changed" do
     db = mock 'db', :get => {
       'views' => {'view5' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
       'lists' => {'list1' => '<list_code>'}
@@ -51,16 +73,16 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
     db.should_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', {:view5 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!
   end
-  
-  it "should update a view when there wasn't a list function but now there is one" do
+
+  it "updates a view when there wasn't a list function but now there is one" do
     db = mock 'db', :get => {
       'views' => {'view6' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}
       }, :view => nil
     db.should_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', {:view6 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!
   end
-  
-  it "should not update a view when there is a list function but no list function is passed" do
+
+  it "does not update a view when there is a list function but no list function is passed" do
     db = mock 'db', :get => {
       'views' => {'view7' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}},
       'lists' => {'list1' => '<list_code>'}
@@ -68,19 +90,19 @@ describe CouchPotato::View::ViewQuery, 'query_view!' do
     db.should_not_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', {:view7 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, {}).query_view!
   end
-  
-  it "should not update a view when there were no lists before and no list function is passed" do
+
+  it "does not update a view when there were no lists before and no list function is passed" do
     db = mock 'db', :get => {
       'views' => {'view8' => {'map' => '<map_code>', 'reduce' => '<reduce_code>'}}
       }, :view => nil
     db.should_not_receive(:save_doc)
     CouchPotato::View::ViewQuery.new(db, 'design', {:view8 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, {}).query_view!
   end
-  
-  it "should query CouchRest directly when querying a list" do
+
+  it "queries CouchRest directly when querying a list" do
     db = stub('db').as_null_object
     CouchRest.should_receive(:get).with('http://127.0.0.1:5984/couch_potato_test/_design/my_design/_list/list1/view9?key=1')
     CouchPotato::View::ViewQuery.new(db, 'my_design', {:view9 => {:map => '<map_code>', :reduce => '<reduce_code>'}}, :list1 => '<new_list_code>').query_view!(:key => 1)
   end
-  
-end
+
+end

data/spec/{custom_view_spec.rb → views_spec.rb}

@@ -22,18 +22,61 @@ end
 class CustomBuild < Build
 end
 
-describe 'view' do
+class ErlangBuild
+  include CouchPotato::Persistence
+  property :name
+  property :code
+
+  view :by_name, :key => :name, :language => :erlang
+  view :by_name_and_code, :key => [:name, :code], :language => :erlang
+end
+
+describe 'views' do
   before(:each) do
     recreate_db
     @db = CouchPotato.database
   end
 
+  context 'in erlang' do
+    it 'builds views with single keys' do
+      build = ErlangBuild.new(:name => 'erlang')
+      @db.save_document build
+
+      results = @db.view(ErlangBuild.by_name('erlang'))
+      results.should == [build]
+    end
+
+    it 'does not crash couchdb when a document does not have the key' do
+      build = {'ruby_class' => 'ErlangBuild'}
+      @db.couchrest_database.save_doc build
+
+      results = @db.view(ErlangBuild.by_name(:key => nil))
+      results.size.should == 1
+    end
+
+    it 'builds views with composite keys' do
+      build = ErlangBuild.new(:name => 'erlang', :code => '123')
+      @db.save_document build
+
+      results = @db.view(ErlangBuild.by_name_and_code(['erlang', '123']))
+      results.should == [build]
+    end
+
+    it 'can reduce over erlang views' do
+      build = ErlangBuild.new(:name => 'erlang')
+      @db.save_document build
+
+      results = @db.view(ErlangBuild.by_name(:reduce => true))
+      results.should == 1
+    end
+  end
+
   it "should return instances of the class" do
     @db.save_document Build.new(:state => 'success', :time => '2008-01-01')
     results = @db.view(Build.timeline)
     results.map(&:class).should == [Build]
   end
-  
+
   it "should return the ids if there document was not included" do
     build = Build.new(:state => 'success', :time => '2008-01-01')
     @db.save_document build
@@ -61,19 +104,19 @@ describe 'view' do
   it "should count zero documents" do
     @db.view(Build.count(:reduce => true)).should == 0
   end
-  
+
   it "should return the total_rows" do
     @db.save_document! Build.new(:state => 'success', :time => '2008-01-01')
     @db.view(Build.count(:reduce => false)).total_rows.should == 1
   end
-  
+
   describe "with multiple keys" do
     it "should return the documents with matching keys" do
       build = Build.new(:state => 'success', :time => '2008-01-01')
       @db.save! build
       @db.view(Build.timeline(:keys => ['2008-01-01'])).should == [build]
     end
-    
+
     it "should not return documents with non-matching keys" do
       build = Build.new(:state => 'success', :time => '2008-01-01')
       @db.save! build
@@ -128,7 +171,7 @@ describe 'view' do
       CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01'})
       @db.view(Build.custom_timeline).map(&:time).should == [nil]
     end
-    
+
     describe "that returns null documents" do
       it "should return instances of the class" do
         CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01'})
@@ -139,7 +182,7 @@ describe 'view' do
         CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01'})
         @db.view(Build.custom_timeline_returns_docs).map(&:state).should == ['success']
       end
-      
+
       it "should still return instance of class if document included JSON.create_id" do
         CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01', JSON.create_id.to_sym => "Build"})
         view_data = @db.view(Build.custom_timeline_returns_docs)
@@ -147,14 +190,14 @@ describe 'view' do
         view_data.map(&:state).should == ['success']
       end
     end
-    
+
     describe "additional reduce function given" do
       it "should still assign the id" do
         doc = CouchPotato.couchrest_database.save_doc({})
         CouchPotato.couchrest_database.save_doc({:foreign_key => doc['id']})
         @db.view(Build.custom_with_reduce).map(&:_id).should == [doc['id']]
       end
-      
+
       describe "when the additional reduce function is a typical count" do
         it "should parse the reduce count" do
           doc = CouchPotato.couchrest_database.save_doc({})
@@ -169,7 +212,7 @@ describe 'view' do
     it "should create a map function with the composite key" do
       CouchPotato::View::ViewQuery.should_receive(:new) do |db, design_name, view, list|
         view['key_array_timeline'][:map].should match(/emit\(\[doc\['time'\], doc\['state'\]\]/)
-        
+
         stub('view query', :query_view! => {'rows' => []})
       end
       @db.view Build.key_array_timeline
@@ -202,16 +245,16 @@ describe 'view' do
       @db.view(CustomBuild.timeline).first.should be_kind_of(CustomBuild)
     end
   end
-  
+
   describe "list functions" do
     class Coworker
       include CouchPotato::Persistence
-      
+
       property :name
-      
+
       view :all_with_list, :key => :name, :list => :append_doe
       view :all, :key => :name
-      
+
       list :append_doe, <<-JS
         function(head, req) {
           var row;
@@ -224,16 +267,15 @@ describe 'view' do
         }
       JS
     end
-    
+
     it "should use the list function declared at class level" do
       @db.save! Coworker.new(:name => 'joe')
       @db.view(Coworker.all_with_list).first.name.should == 'joe doe'
     end
-    
+
     it "should use the list function passed at runtime" do
       @db.save! Coworker.new(:name => 'joe')
       @db.view(Coworker.all(:list => :append_doe)).first.name.should == 'joe doe'
     end
-    
   end
 end

metadata

@@ -1,106 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couch_potato
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.6.0
+version: !ruby/object:Gem::Version
+  version: 0.7.0.pre.1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-23 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70113496423300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: couchrest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496423300
+- !ruby/object:Gem::Dependency
+  name: couchrest
+  requirement: &70113496422680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496422680
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70113496422120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496422120
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70113496421240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496421240
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70113496436300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496436300
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70113496434780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70113496434780
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: &70113496434200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70113496434200
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: &70113496433500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70113496433500
 description: Ruby persistence layer for CouchDB
 email: alex@upstre.am
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - CHANGES.md
 - CREDITS
@@ -113,12 +118,11 @@ files:
 - active_support_3_0.lock
 - active_support_3_1
 - active_support_3_1.lock
+- active_support_3_2
+- active_support_3_2.lock
 - couch_potato.gemspec
 - init.rb
 - lib/core_ext/date.rb
-- lib/core_ext/object.rb
-- lib/core_ext/string.rb
-- lib/core_ext/symbol.rb
 - lib/core_ext/time.rb
 - lib/couch_potato.rb
 - lib/couch_potato/database.rb
@@ -143,8 +147,6 @@ files:
 - lib/couch_potato/rspec/matchers/reduce_to_matcher.rb
 - lib/couch_potato/rspec/stub_db.rb
 - lib/couch_potato/validation.rb
-- lib/couch_potato/validation/with_active_model.rb
-- lib/couch_potato/validation/with_validatable.rb
 - lib/couch_potato/version.rb
 - lib/couch_potato/view/base_view_spec.rb
 - lib/couch_potato/view/custom_view_spec.rb
@@ -159,7 +161,6 @@ files:
 - spec/attachments_spec.rb
 - spec/callbacks_spec.rb
 - spec/create_spec.rb
-- spec/custom_view_spec.rb
 - spec/default_property_spec.rb
 - spec/destroy_spec.rb
 - spec/fixtures/address.rb
@@ -192,39 +193,35 @@ files:
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
 - spec/view_updates_spec.rb
-has_rdoc: true
+- spec/views_spec.rb
 homepage: http://github.com/langalex/couch_potato
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Ruby persistence layer for CouchDB
-test_files: 
+test_files:
 - spec/attachments_spec.rb
 - spec/callbacks_spec.rb
 - spec/create_spec.rb
-- spec/custom_view_spec.rb
 - spec/default_property_spec.rb
 - spec/destroy_spec.rb
 - spec/fixtures/address.rb
@@ -257,3 +254,4 @@ test_files:
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
 - spec/view_updates_spec.rb
+- spec/views_spec.rb

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2@couch_potato

data/lib/core_ext/object.rb

@@ -1,5 +0,0 @@
-Object.class_eval do
-  def try(method, *args)
-    self.send method, *args if self.respond_to?(method)
-  end
-end

data/lib/core_ext/string.rb

@@ -1,12 +0,0 @@
-module ActiveSupportMethods
-  def camelize
-    sub(/^([a-z])/) {$1.upcase}.gsub(/_([a-z])/) do
-      $1.upcase
-    end
-  end
-
-  def blank?
-    empty?
-  end
-end
-String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)

data/lib/core_ext/symbol.rb

@@ -1,15 +0,0 @@
-# taken from ActiveSupport 2.3.2
-unless :to_proc.respond_to?(:to_proc)
-  class Symbol
-    # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
-    #
-    #   # The same as people.collect { |p| p.name }
-    #   people.collect(&:name)
-    #
-    #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
-    #   people.select(&:manager?).collect(&:salary)
-    def to_proc
-      Proc.new { |*args| args.shift.__send__(self, *args) }
-    end
-  end
-end