couch_potato 0.2.27 → 0.2.28

data/CHANGES.md

@@ -1,5 +1,11 @@
 ## Changes
 
+### 0.2.28
+* fixed reloading nested classes (langalex)
+* fixed constant missing error when loading models with uninitialized classes via views (langalex)
+* added rspec helpers for stubbing out views (langalex)
+* fixed design document names for nested model classes (svenfuchs)
+
 ### 0.2.27
 * workaround for Rails apps using bundler: database name was not initialized from couchdb.yml (langalex)
 

data/README.md

@@ -304,6 +304,20 @@ To make testing easier and faster database logic has been put into its own class
 
 By creating you own instances of CouchPotato::Database and passing them a fake CouchRest database instance you can completely disconnect your unit tests/spec from the database.
 
+For stubbing out the database couch potato offers some helpers:
+
+    class Comment
+      view :by_commenter_id, :key => :commenter_id
+    end
+    
+    # RSpec
+    require 'couch_potato/rspec'
+    
+    db = stub_db # stubs CouchPotato.database
+    db.stub_view(Comment, :by_commenter_id).with('23').and_return([:comment1, :comment2])
+    
+    CouchPotato.database.view(Comment.by_commenter_id('23)) # => [:comment1, :comment2]
+
 ##### Testing map/reduce functions
 
 Couch Potato provides custom RSpec matchers for testing the map and reduce functions of your views. For example you can do this:
@@ -316,11 +330,11 @@ Couch Potato provides custom RSpec matchers for testing the map and reduce funct
     end
     
     #RSpec
-    require 'couch_potato/rspec/matchers'
+    require 'couch_potato/rspec'
     
     describe User, 'by_name' do
       it "should map users to their name" do
-        User.by_name.should map({:name => 'bill', :age => 23}).to(['bill', null])
+        User.by_name.should map(User.new(:name => 'bill', :age => 23)).to(['bill', null])
       end
       
       it "should reduce the users to the sum of their age" do

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 0
 :minor: 2
-:patch: 27
+:patch: 28
 :build: 
+:major: 0

data/lib/core_ext/string.rb

@@ -4,16 +4,16 @@ module ActiveSupportMethods
       $1.upcase
     end
   end
-  
-  # Source
-  # http://github.com/rails/rails/blob/b600bf2cd728c90d50cc34456c944b2dfefe8c8d/activesupport/lib/active_support/inflector.rb
-  def underscore
-    gsub(/::/, '/').
-      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-      gsub(/([a-z\d])([A-Z])/,'\1_\2').
-      tr("-", "_").
-      downcase
-  end
 end
+String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)
 
-String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)
+class String
+  # inspired by http://github.com/rails/rails/blob/b600bf2cd728c90d50cc34456c944b2dfefe8c8d/activesupport/lib/active_support/inflector.rb
+  def snake_case(seperator = '/')
+    string = seperator == '::' ? dup : gsub(/::/, '/')
+    string.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+    string.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+    string.tr!("-", "_")
+    string.downcase
+  end
+end

data/lib/couch_potato.rb

@@ -35,11 +35,13 @@ unless defined?(CouchPotato)
   end
 end
 
-require File.dirname(__FILE__) + '/core_ext/object'
-require File.dirname(__FILE__) + '/core_ext/time'
-require File.dirname(__FILE__) + '/core_ext/date'
-require File.dirname(__FILE__) + '/core_ext/string'
-require File.dirname(__FILE__) + '/core_ext/symbol'
-require File.dirname(__FILE__) + '/couch_potato/validation'
-require File.dirname(__FILE__) + '/couch_potato/persistence'
-require File.dirname(__FILE__) + '/couch_potato/railtie' if defined?(Rails)
+$LOAD_PATH << File.dirname(__FILE__)
+
+require 'core_ext/object'
+require 'core_ext/time'
+require 'core_ext/date'
+require 'core_ext/string'
+require 'core_ext/symbol'
+require 'couch_potato/validation'
+require 'couch_potato/persistence'
+require 'couch_potato/railtie' if defined?(Rails)

data/lib/couch_potato/rspec.rb

@@ -0,0 +1,2 @@
+require 'couch_potato/rspec/stub_db'
+require 'couch_potato/rspec/matchers'

data/lib/couch_potato/rspec/matchers.rb

@@ -13,8 +13,8 @@ module CouchPotato
 end
 
 
-require File.dirname(__FILE__) + '/matchers/map_to_matcher'
-require File.dirname(__FILE__) + '/matchers/reduce_to_matcher'
+require 'couch_potato/rspec/matchers/map_to_matcher'
+require 'couch_potato/rspec/matchers/reduce_to_matcher'
 
 module Spec
   module Matchers

data/lib/couch_potato/rspec/stub_db.rb

@@ -0,0 +1,46 @@
+module CouchPotato::RSpec
+  
+  module StubView
+    class ViewStub
+      def initialize(clazz, view, db)
+        @clazz = clazz
+        @view = view
+        @db = db
+      end
+    
+      def with(*args)
+        @args = args
+        self
+      end
+
+      def and_return(return_value)
+        view_stub = Spec::Mocks::Mock.new("#{@clazz}.#{@view}(#{@args.try(:join, ', ')}) view")
+        _stub = @clazz.stub(@view)
+        _stub.with(*@args) if @args
+        _stub.and_return(view_stub)
+        @db.stub(:view).with(view_stub).and_return(return_value)
+      end
+    end
+
+    def stub_view(clazz, view)
+      ViewStub.new clazz, view, self
+    end
+  end
+
+  module StubDb
+    def stub_db(options = {})
+      db = stub('db', options)
+      db.extend CouchPotato::RSpec::StubView
+      CouchPotato.stub(:database => db)
+      db
+    end
+  end
+end
+
+module Spec
+  module Mocks
+    module ExampleMethods
+      include CouchPotato::RSpec::StubDb
+    end
+  end
+end

data/lib/couch_potato/validation.rb

@@ -3,10 +3,10 @@ module CouchPotato
     def self.included(base) #:nodoc:
       case CouchPotato::Config.validation_framework
       when :validatable
-        require File.dirname(__FILE__) + '/validation/with_validatable'
+        require 'couch_potato/validation/with_validatable'
         base.send :include, CouchPotato::Validation::WithValidatable
       when :active_model
-        require File.dirname(__FILE__) + '/validation/with_active_model'
+        require 'couch_potato/validation/with_active_model'
         base.send :include, CouchPotato::Validation::WithActiveModel
       else
         raise "Unknown CouchPotato::Config.validation_framework #{CouchPotato::Config.validation_framework.inspect}, options are :validatable or :active_model"

data/lib/couch_potato/view/base_view_spec.rb

@@ -8,7 +8,7 @@ module CouchPotato
         normalized_view_parameters = normalize_view_parameters view_parameters
         assert_valid_view_parameters normalized_view_parameters
         @klass = klass
-        @design_document = klass.to_s.underscore
+        @design_document = klass.to_s.snake_case('::')
         @view_name = view_name
         @options = options
         @view_parameters = {}

data/lib/couch_potato/view/custom_views.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/base_view_spec'
-require File.dirname(__FILE__) + '/model_view_spec'
-require File.dirname(__FILE__) + '/properties_view_spec'
-require File.dirname(__FILE__) + '/custom_view_spec'
-require File.dirname(__FILE__) + '/raw_view_spec'
+require 'couch_potato/view/base_view_spec'
+require 'couch_potato/view/model_view_spec'
+require 'couch_potato/view/properties_view_spec'
+require 'couch_potato/view/custom_view_spec'
+require 'couch_potato/view/raw_view_spec'
 
 
 module CouchPotato

data/lib/couch_potato/view/view_query.rb

@@ -14,7 +14,7 @@ module CouchPotato
         update_view unless view_has_been_updated?
         begin
           query_view parameters
-        rescue RestClient::ResourceNotFound# => e
+        rescue RestClient::ResourceNotFound
           update_view
           retry
         end

data/rails/reload_classes.rb

@@ -1,18 +1,44 @@
 module CouchPotato
-  Database.class_eval do
-    def load_document_with_class_reloading(id)
+  
+  module ClassReloading
+    private
+    
+    def with_class_reloading(&block)
       begin
-        load_document_without_class_reloading id
+        yield
       rescue ArgumentError => e
         if(name = e.message.scan(/(can't find const|undefined class\/module) ([\w\:]+)/).first[1])
-          eval name
+          eval name.gsub(/\:+$/, '')
           retry
         else
           raise e
         end
       end
     end
-    
+  end
+  
+  View::ViewQuery.class_eval do
+    include ClassReloading
+
+    def query_view_with_class_reloading(*args)
+      with_class_reloading do
+        query_view_without_class_reloading(*args)
+      end
+    end
+
+    alias_method :query_view_without_class_reloading, :query_view
+    alias_method :query_view, :query_view_with_class_reloading
+  end
+  
+  Database.class_eval do
+    include ClassReloading
+
+    def load_document_with_class_reloading(*args)
+      with_class_reloading do
+        load_document_without_class_reloading *args
+      end
+    end
+
     alias_method :load_document_without_class_reloading, :load_document
     alias_method :load_document, :load_document_with_class_reloading
     alias_method :load, :load_document

data/spec/attachments_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe CouchPotato, 'attachments' do
   it "should persist an attachment" do

data/spec/callbacks_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class CallbackRecorder
   include CouchPotato::Persistence

data/spec/create_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "create" do
   before(:all) do

data/spec/custom_view_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class Build
   include CouchPotato::Persistence

data/spec/default_property_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 class Test
   include CouchPotato::Persistence

data/spec/destroy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'destroy' do
   before(:all) do

data/spec/property_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require File.join(File.dirname(__FILE__), 'fixtures', 'address')
 require File.join(File.dirname(__FILE__), 'fixtures', 'person')
 

data/spec/rails_spec.rb

@@ -1,20 +1,51 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require File.dirname(__FILE__) + '/../rails/reload_classes'
 
-class Autoloader
-  def self.const_missing(name)
-    eval("#{name} = Class.new; #{name}.send(:include, CouchPotato::Persistence)")
+module LoadConst
+  def const_missing(name)
+    name = "#{self.name}::#{name}"
+    eval("#{name} = Class.new; #{name}.send(:include, CouchPotato::Persistence); #{name}.extend(LoadConst)")
   end
 end
 
+class Autoloader
+  extend LoadConst
+end
+
+class WithUnloadedEmbedded
+  include CouchPotato::Persistence
+  extend LoadConst
+  
+  property :embedded
+  
+  view :all, :type => :custom, :map => 'function(doc) {emit(doc._id, null)}', :include_docs => true
+end
+
 
 describe CouchPotato::Database, 'rails specific behavior' do
   
-  it "should load models whose constants are currently uninitialized (like with rails in development mode)" do
+  before(:each) do
     recreate_db
-    CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Uninitialized', '_id' => '1')
-    CouchPotato.database.load('1').class.name.should == 'Autoloader::Uninitialized'
   end
   
+  context 'load a document' do
+    it "should load models whose constants are currently uninitialized (like with rails in development mode)" do
+      CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Uninitialized', '_id' => '1')
+      CouchPotato.database.load('1').class.name.should == 'Autoloader::Uninitialized'
+    end
+  
+    it "should load nested models" do
+      CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Nested::Nested2', '_id' => '1')
+      CouchPotato.database.load('1').class.name.should == 'Autoloader::Nested::Nested2'
+    end
+  end  
+  
+  context 'load documents using a view' do
+    it "should load models from a view whose constants are currently uninitialized" do
+      doc = {JSON.create_id => 'WithUnloadedEmbedded', '_id' => '1', 'embedded' => {JSON.create_id => 'WithUnloadedEmbedded::Uninitialized'}}
+      CouchPotato.couchrest_database.save_doc(doc)
+      CouchPotato.database.view(WithUnloadedEmbedded.all).first.embedded.class.name.should == 'WithUnloadedEmbedded::Uninitialized'
+    end
+  end
 end
 

data/spec/unit/active_model_compliance_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 begin
   require 'active_model'

data/spec/unit/attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 class Plant
   include CouchPotato::Persistence

data/spec/unit/base_view_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CouchPotato::View::BaseViewSpec, 'initialize' do
   describe "view parameters" do
@@ -33,14 +33,19 @@ describe CouchPotato::View::BaseViewSpec, 'initialize' do
       spec = CouchPotato::View::BaseViewSpec.new Object, 'all', {}, {:key => '1'..'2'}
       spec.view_parameters.should == {:startkey => '1', :endkey => '2'}
     end
-    
+
     it "should convert a plain value to a hash with a key" do
       spec = CouchPotato::View::BaseViewSpec.new Object, 'all', {}, '2'
       spec.view_parameters.should == {:key => '2'}
     end
-    
+
+    it "generates the design document path by snake_casing the class name but keeping double colons" do
+      spec = CouchPotato::View::BaseViewSpec.new 'Foo::BarBaz', '', {}, ''
+      spec.design_document.should == 'foo::bar_baz'
+    end
+
   end
-  
+
 end
 
 

data/spec/unit/callbacks_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'before_validation callback' do
   before(:each) do

data/spec/unit/couch_potato_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CouchPotato, 'full_url_to_database' do
   before(:each) do

data/spec/unit/create_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "create" do
   

data/spec/unit/customs_views_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CouchPotato::View::CustomViews do
   

data/spec/unit/database_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 class DbTestUser
 end

data/spec/unit/date_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Date, 'to_json' do
   it "should format the date in a way that i can use it for sorting in couchdb" do

data/spec/unit/dirty_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 class Plate
   include CouchPotato::Persistence

data/spec/unit/json_create_id_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 class Drink
   include CouchPotato::Persistence

data/spec/unit/model_view_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CouchPotato::View::ModelViewSpec, 'map_function' do
   it "should include conditions" do

data/spec/unit/rspec_matchers_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require 'couch_potato/rspec/matchers'
+require 'spec_helper'
+require 'couch_potato/rspec'
 require 'ostruct'
 
 describe CouchPotato::RSpec::MapToMatcher do

data/spec/unit/rspec_stub_db_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'couch_potato/rspec'
+
+class WithStubbedView
+  include CouchPotato::Persistence
+  
+  view :stubbed_view, :key => :x
+end
+
+describe "stubbing the db" do
+  it "should replace CouchPotato.database with a stub" do
+    stub_db
+    CouchPotato.database.should be_a(Spec::Mocks::Mock)
+  end
+  
+  it "should return the stub" do
+    db = stub_db
+    CouchPotato.database.should == db
+  end
+end
+
+describe "stubbing a view" do
+  before(:each) do
+    @db = stub_db
+    @db.stub_view(WithStubbedView, :stubbed_view).with('123').and_return([:result])
+  end
+  
+  it "should stub the view to return a stub" do
+    WithStubbedView.stubbed_view('123').should be_a(Spec::Mocks::Mock)
+  end
+  
+  it "should stub the database to return fake results when called with the stub" do
+    @db.view(WithStubbedView.stubbed_view('123')).should == [:result]
+  end
+end

data/spec/unit/string_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe String, 'camelize' do
   it "should camelize a string" do
@@ -6,8 +6,12 @@ describe String, 'camelize' do
   end
 end
 
-describe String, 'underscore' do
-  it "should underscore a string" do
-    'MyString'.underscore.should == 'my_string'
+describe String, 'snake_case' do
+  it "should snake_case a string" do
+    'MyString'.snake_case.should == 'my_string'
+  end
+
+  it "should snake_case a string using a custom separator" do
+    'My::String'.snake_case('::').should == 'my::string'
   end
 end

data/spec/unit/time_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Time, 'to_json' do
   it "should convert to utc and format the time in a way that i can use it for sorting in couchdb" do

data/spec/unit/validation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'CouchPotato::Config.validation_framework' do
   before(:each) do

data/spec/unit/view_query_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe CouchPotato::View::ViewQuery, 'query_view' do
   it "should not pass a key if conditions are empty" do

data/spec/update_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "create" do
   before(:all) do

data/spec/view_updates_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe "automatic view updates" do
   before(:each) do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.27
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 28
+  version: 0.2.28
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,39 +14,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +01:00
+date: 2010-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: validatable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: couchrest
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 24
         version: "0.24"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Ruby persistence layer for CouchDB
 email: alex@upstream-berlin.com
 executables: []
@@ -75,10 +87,12 @@ files:
 - lib/couch_potato/persistence/simple_property.rb
 - lib/couch_potato/persistence/type_caster.rb
 - lib/couch_potato/railtie.rb
+- lib/couch_potato/rspec.rb
 - lib/couch_potato/rspec/matchers.rb
 - lib/couch_potato/rspec/matchers/map_to_matcher.rb
 - lib/couch_potato/rspec/matchers/print_r.js
 - 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
@@ -116,6 +130,7 @@ files:
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
+- spec/unit/rspec_stub_db_spec.rb
 - spec/unit/string_spec.rb
 - spec/unit/time_spec.rb
 - spec/unit/validation_spec.rb
@@ -135,18 +150,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby persistence layer for CouchDB
@@ -175,6 +192,7 @@ test_files:
 - spec/unit/json_create_id_spec.rb
 - spec/unit/model_view_spec_spec.rb
 - spec/unit/rspec_matchers_spec.rb
+- spec/unit/rspec_stub_db_spec.rb
 - spec/unit/string_spec.rb
 - spec/unit/time_spec.rb
 - spec/unit/validation_spec.rb