couch_potato 0.5.4 → 0.5.5

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
 .bundle
 Gemfile.lock
-pkg/*
 couch_potato_js_runner.js
+pkg
+.rvmrc
+*.swp

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.9.2
+  - 1.8.7
+  - ree
+env: "DATABASE='http://couchpotato.iriscouch.com/couch_potato_test' "

data/CHANGES.md

@@ -1,5 +1,11 @@
 ## Changes
 
+### 0.5.5
+
+* support for split_design_documents_per_view (jweiss)
+* errors now returns a Hash instead of an Array (bterkuile)
+* support passing in list names as symbols in view specs (langalex)
+
 ### 0.5.4
 * cast 'false' to false for boolean properties (langalex)
 

data/README.md

@@ -20,8 +20,8 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 
 ### Supported Environments
 
-* Ruby 1.8.7, 1.9.1, 1.9.2
-* CouchDB 1.0.1
+* Ruby 1.8.7, 1.9.2
+* CouchDB 1.0.2
 
 (Supported means I run the specs against those before releasing a new gem.)
 
@@ -51,13 +51,18 @@ Or with authentication
 Optionally you can configure which framework you want to use for validations (either validatable or ActiveModel (default))
 
     CouchPotato::Config.validation_framework = :validatable | :active_model
+    
+Another switch allows you to store each CouchDB view in its own design document. Otherwise views are grouped by model.
+
+    CouchPotato::Config.split_design_documents_per_view = true
 
 #### Using with Rails
 
 Create a config/couchdb.yml:
 
     default: &default
-      validation_framework: :active_model #optional
+      validation_framework: :active_model # optional
+      split_design_documents_per_view: true # optional
 
     development:
       <<: *default
@@ -262,9 +267,9 @@ If you have larger structures and you only want to load some attributes you can
 
 If you want Rails to automatically show a 404 page when `CouchPotato::NotFound` is raised add this to your `ApplicationController`:
     
-    rescue_from CouchPotato::NotFound {
-      render(:file => '404.html', :status => :not_found, :layout => false)
-    }
+    rescue_from CouchPotato::NotFound do
+      render(:file => 'public/404.html', :status => :not_found, :layout => false)
+    end
 
 You can also pass in custom map/reduce functions with the custom view spec:
 

data/couch_potato.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>=2.0'
   s.add_development_dependency 'timecop'
   s.add_development_dependency 'tzinfo'
+  s.add_development_dependency 'rake'
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/couch_potato/persistence/active_model_compliance.rb

@@ -13,7 +13,7 @@ module CouchPotato
         end
 
         def errors
-          super || []
+          super || {}
         end
         
         def persisted?

data/lib/couch_potato/railtie.rb

@@ -3,12 +3,13 @@ require 'erb'
 
 module CouchPotato
   def self.rails_init
-    config = YAML::load(ERB.new(File.read(Rails.root.join('config/couchdb.yml'))).result)[RAILS_ENV]
+    config = YAML::load(ERB.new(File.read(Rails.root.join('config/couchdb.yml'))).result)[Rails.env]
     if config.is_a?(String)
       CouchPotato::Config.database_name = config
     else
       CouchPotato::Config.database_name = config['database']
-      CouchPotato::Config.validation_framework = config['validation_framework']
+      CouchPotato::Config.validation_framework = config['validation_framework'] if config['validation_framework']
+      CouchPotato::Config.split_design_documents_per_view = config['split_design_documents_per_view'] if config['split_design_documents_per_view']
     end
   end
 

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/couch_potato/view/base_view_spec.rb

@@ -11,7 +11,7 @@ module CouchPotato
         
         assert_valid_view_parameters normalized_view_parameters
         @klass = klass
-        @design_document = translate_to_design_doc_name(klass.to_s)
+        @design_document = translate_to_design_doc_name(klass.to_s, view_name, @list_name)
         @view_name = view_name
         @options = options
         
@@ -62,13 +62,19 @@ module CouchPotato
         %w(key keys startkey startkey_docid endkey endkey_docid limit stale descending skip group group_level reduce include_docs inclusive_end)
       end
       
-      def translate_to_design_doc_name(klass_name)
+      def translate_to_design_doc_name(klass_name, view_name, list_name)
         klass_name = klass_name.dup
         klass_name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
         klass_name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
         klass_name.tr!("-", "_")
-        klass_name.downcase
+        doc_name = klass_name.downcase
+
+        if CouchPotato::Config.split_design_documents_per_view
+          doc_name += "_view_#{view_name}"  if view_name.present?
+          doc_name += "_list_#{list_name}" if list_name.present?
+        end
+        doc_name
       end
     end
   end
-end
+end

data/lib/couch_potato.rb

@@ -8,8 +8,9 @@ require 'ostruct'
 JSON.create_id = 'ruby_class'
 
 module CouchPotato
-  Config = Struct.new(:database_name, :validation_framework).new
+  Config = Struct.new(:database_name, :validation_framework, :split_design_documents_per_view).new
   Config.validation_framework = :active_model
+  Config.split_design_documents_per_view = false
   
   class NotFound < StandardError; end
 

data/spec/railtie_spec.rb

@@ -2,8 +2,10 @@ require 'spec_helper'
 require 'yaml'
 require 'spec/mocks'
 
-RAILS_ENV = 'test'
 module Rails
+  def self.env
+    'test'
+  end
   class Railtie
     def self.initializer(*args)
     end
@@ -60,4 +62,4 @@ describe "railtie" do
     
     CouchPotato.rails_init
   end
-end
+end

data/spec/spec_helper.rb

@@ -8,13 +8,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'couch_potato'
 
-if ENV["RUN_CODE_RUN"]
-  CouchPotato::Config.database_name = 'http://langalex.couch.io/couch_potato_test'
-else
-  CouchPotato::Config.database_name = 'couch_potato_test'
-end
-
-
+CouchPotato::Config.database_name = ENV['DATABASE'] || 'couch_potato_test'
 CouchPotato::Config.validation_framework = ENV['VALIDATION_FRAMEWORK'].to_sym unless ENV['VALIDATION_FRAMEWORK'].blank?
 
 # silence deprecation warnings from ActiveModel as the Spec uses Errors#on

data/spec/unit/base_view_spec_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe CouchPotato::View::BaseViewSpec, 'initialize' do
   describe "view parameters" do
+    before(:each) do
+      CouchPotato::Config.split_design_documents_per_view = false
+    end
+
     it "should raise an error when passing invalid view parameters" do
       lambda {
         CouchPotato::View::BaseViewSpec.new Object, 'all', {}, {:start_key => '1'}
@@ -43,20 +47,44 @@ describe CouchPotato::View::BaseViewSpec, 'initialize' do
       spec = CouchPotato::View::BaseViewSpec.new 'Foo::BarBaz', '', {}, ''
       spec.design_document.should == 'foo::bar_baz'
     end
-    
+
+    it "should generate the design document independent of the view name by default" do
+      CouchPotato::Config.split_design_documents_per_view = false
+      spec = CouchPotato::View::BaseViewSpec.new 'User', 'by_login_and_email', {}, ''
+      spec.design_document.should == 'user'
+    end
+
+    it "should generate the design document per view if configured to" do
+      CouchPotato::Config.split_design_documents_per_view = true
+      spec = CouchPotato::View::BaseViewSpec.new 'User', 'by_login_and_email', {}, ''
+      spec.design_document.should == 'user_view_by_login_and_email'
+    end
+
+    it "should generate the design document independent of the list name by default" do
+      CouchPotato::Config.split_design_documents_per_view = false
+      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil, :to_s => 'User'), '', {:list => 'test_list'}, {}
+      spec.design_document.should == 'user'
+    end
+
+    it "should generate the design document per view if configured to" do
+      CouchPotato::Config.split_design_documents_per_view = true
+      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil, :to_s => 'User'), '', {:list => :test_list}, {}
+      spec.design_document.should == 'user_list_test_list'
+    end
+
     it "should extract the list name from the options" do
-      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {:list => 'test_list'}, {}
-      spec.list_name.should == 'test_list'
+      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {:list => :test_list}, {}
+      spec.list_name.should == :test_list
     end
     
     it "should extract the list from the view parameters" do
-      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {}, {:list => 'test_list'}
-      spec.list_name.should == 'test_list'
+      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {}, {:list => :test_list}
+      spec.list_name.should == :test_list
     end
     
     it "should prefer the list name from the view parameters over the one from the options" do
-      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {:list => 'my_list'}, {:list => 'test_list'}
-      spec.list_name.should == 'test_list'
+      spec = CouchPotato::View::BaseViewSpec.new stub(:lists => nil), 'all', {:list => 'my_list'}, {:list => :test_list}
+      spec.list_name.should == :test_list
     end
     
     it "should return the list function" do

metadata

@@ -2,7 +2,7 @@
 name: couch_potato
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Alexander Lang
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-07-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Ruby persistence layer for CouchDB
 email: alex@upstre.am
 executables: []
@@ -90,6 +101,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- .travis.yml
 - CHANGES.md
 - CREDITS
 - Gemfile