couch_potato 0.7.0.pre.1 → 0.7.0

data/.travis.yml

@@ -1,8 +1,6 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - 1.8.7
-  - ree
 gemfile:
   - active_support_3_0
   - active_support_3_1

data/CHANGES.md

@@ -11,6 +11,8 @@
 * improve compatibility with state_machine (Alexander Lang)
 * allow false as default value for properties (Matthias Jakel)
 * support for Erlang views (Alexander Lang)
+* don't crash, only warn if couchdb.yml is missing (Alexander Lang)
+* use the therubyracer gem to run view specs instead of relying on a `js` executable (Alexander Lang)
 
 ### 0.6.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couch_potato (0.6.0)
+    couch_potato (0.7.0.pre.1)
       activemodel
       couchrest (>= 1.0.1)
       json (~> 1.6.0)
@@ -9,11 +9,11 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
+    activesupport (3.2.1)
       i18n (~> 0.6)
-    activesupport (3.1.1)
       multi_json (~> 1.0)
     builder (3.0.0)
     couchrest (1.1.2)
@@ -22,10 +22,10 @@ GEM
       rest-client (~> 1.6.1)
     diff-lcs (1.1.3)
     i18n (0.6.0)
-    json (1.6.1)
+    json (1.6.5)
     libv8 (3.3.10.4)
-    mime-types (1.16)
-    multi_json (1.0.3)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
     rake (0.9.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/README.md

@@ -22,7 +22,7 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 
 ### Supported Environments
 
-* Ruby 1.8.7, 1.9.2
+* Ruby 1.9.2
 * CouchDB 1.1.0
 
 (Supported means I run the specs against those before releasing a new gem.)

data/active_support_3_0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couch_potato (0.6.0)
+    couch_potato (0.7.0.pre.1)
       activemodel
       couchrest (>= 1.0.1)
       json (~> 1.6.0)
@@ -21,10 +21,10 @@ GEM
       rest-client (~> 1.6.1)
     diff-lcs (1.1.2)
     i18n (0.5.0)
-    json (1.6.1)
+    json (1.6.5)
     libv8 (3.3.10.4)
-    mime-types (1.16)
-    multi_json (1.0.3)
+    mime-types (1.17.2)
+    multi_json (1.0.4)
     rake (0.8.7)
     rest-client (1.6.7)
       mime-types (>= 1.16)

data/active_support_3_1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couch_potato (0.6.0)
+    couch_potato (0.7.0.pre.1)
       activemodel
       couchrest (>= 1.0.1)
       json (~> 1.6.0)
@@ -24,9 +24,9 @@ GEM
       rest-client (~> 1.6.1)
     diff-lcs (1.1.2)
     i18n (0.6.0)
-    json (1.6.1)
+    json (1.6.5)
     libv8 (3.3.10.4)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     rake (0.9.2)
     rest-client (1.6.7)

data/active_support_3_2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    couch_potato (0.6.0)
+    couch_potato (0.7.0.pre.1)
       activemodel
       couchrest (>= 1.0.1)
       json (~> 1.6.0)

data/lib/couch_potato/database.rb

@@ -64,6 +64,7 @@ module CouchPotato
 
     # returns the first result from a #view query or nil
     def first(spec)
+      spec.view_parameters = spec.view_parameters.merge({:limit => 1})
       view(spec).first
     end
 

data/lib/couch_potato/railtie.rb

@@ -3,13 +3,18 @@ require 'erb'
 
 module CouchPotato
   def self.rails_init
-    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
+    path = Rails.root.join('config/couchdb.yml')
+    if File.exist?(path)
+      config = YAML::load(ERB.new(File.read(path)).result)[Rails.env]
+      if config.is_a?(String)
+        CouchPotato::Config.database_name = config
+      else
+        CouchPotato::Config.database_name = config['database']
+        CouchPotato::Config.split_design_documents_per_view = config['split_design_documents_per_view'] if config['split_design_documents_per_view']
+        CouchPotato::Config.default_language = config['default_language'] if config['default_language']
+      end
     else
-      CouchPotato::Config.database_name = config['database']
-      CouchPotato::Config.split_design_documents_per_view = config['split_design_documents_per_view'] if config['split_design_documents_per_view']
-      CouchPotato::Config.default_language = config['default_language'] if config['default_language']
+      Rails.logger.warn "Rails.root/config/couchdb.yml does not exist. Not configuring a database."
     end
   end
 

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "0.7.0.pre.1"
+  VERSION = "0.7.0"
 end

data/lib/couch_potato/view/base_view_spec.rb

@@ -1,8 +1,9 @@
 module CouchPotato
   module View
     class BaseViewSpec
-      attr_reader :reduce_function, :list_name, :list_function, :design_document, :view_name,
-        :view_parameters, :klass, :options, :language
+      attr_reader :reduce_function, :list_name, :list_function, :design_document, :view_name, :klass, :options, :language
+      attr_accessor :view_parameters
+      
       private :klass, :options
 
       def initialize(klass, view_name, options, view_parameters)

data/spec/railtie_spec.rb

@@ -6,6 +6,7 @@ module Rails
   def self.env
     'test'
   end
+
   class Railtie
     def self.initializer(*args)
     end
@@ -14,6 +15,10 @@ module Rails
   def self.root
     RSpec::Mocks::Mock.new :join => ''
   end
+
+  def self.logger
+    RSpec::Mocks::Mock.new :warn => nil
+  end
 end
 
 require 'couch_potato/railtie'
@@ -29,6 +34,22 @@ describe "railtie" do
     CouchPotato::Config.default_language = @default_language
   end
 
+  before(:each) do
+    File.stub(exist?: true)
+  end
+
+  context 'when the yml file does not exist' do
+    before(:each) do
+      File.stub(exist?: false)
+    end
+
+    it 'does not configure the database' do
+      CouchPotato::Config.should_not_receive(:database_name=)
+
+      CouchPotato.rails_init
+    end
+  end
+
   context 'yaml file contains only database names' do
     it "should set the database name from the yaml file" do
       File.stub(:read => "test: test_db")

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.1
-  prerelease: 6
+  version: 0.7.0
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70113496423300 !ruby/object:Gem::Requirement
+  requirement: &70254093121880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113496423300
+  version_requirements: *70254093121880
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &70113496422680 !ruby/object:Gem::Requirement
+  requirement: &70254093121340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70113496422680
+  version_requirements: *70254093121340
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70113496422120 !ruby/object:Gem::Requirement
+  requirement: &70254093120940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113496422120
+  version_requirements: *70254093120940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70113496421240 !ruby/object:Gem::Requirement
+  requirement: &70254093120100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70113496421240
+  version_requirements: *70254093120100
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70113496436300 !ruby/object:Gem::Requirement
+  requirement: &70254093119400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113496436300
+  version_requirements: *70254093119400
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70113496434780 !ruby/object:Gem::Requirement
+  requirement: &70254093134340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113496434780
+  version_requirements: *70254093134340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70113496434200 !ruby/object:Gem::Requirement
+  requirement: &70254093133340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113496434200
+  version_requirements: *70254093133340
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &70113496433500 !ruby/object:Gem::Requirement
+  requirement: &70254093132300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70113496433500
+  version_requirements: *70254093132300
 description: Ruby persistence layer for CouchDB
 email: alex@upstre.am
 executables: []
@@ -209,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11