couch_potato 1.1.1 → 1.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 25d897ae6682560bf5d76b11e037d2aab1cb67ed
+  data.tar.gz: 22d1dc7f80cf657bfa12957dd0ac7454b4a09bbe
+SHA512:
+  metadata.gz: eb2dc8906dc29cdbd33137bbe94f2336757ab79d38d6082671b4f4d0f5292cfd583c0e4eafcb0dff5ffe79b9d01897f253aa9d1f8c6a4db11d1099b8e0b4c2dc
+  data.tar.gz: 0598953fcca4915c144ff632cb9d41630dd3493cb42bace24f7550f12f14221baeb159510a7338e51747a87cca02ce5be89cbbc60d13b5944575af8859d6f06d

data/.travis.yml

@@ -1,8 +1,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
 gemfile:
   - active_support_3_2
   - active_support_4_0

data/CHANGES.md

@@ -1,5 +1,13 @@
 ## Changes
 
+### 1.1.2
+
+* fixes `CouchPotato.models` did not include subclasses
+* adds `CouchPotato.use` (Daniel Lohse)
+* fixes MapReduceToMatcher when reduce uses `sum` (Daniel Lohse)
+* adds `CouchPotato::Config.database_host` for using multiple databases in a project (Daniel Lohse)
+* makes `cast_native` cast floats with no leading digits (wrshawn)
+
 ### 1.1.1
 
 * fixes properties were leaked to sibling classes (Alexander Lang)

data/README.md

@@ -27,7 +27,7 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 
 ### Supported Environments
 
-* Ruby 1.9.3, 2.0, Rubinius
+* Ruby 1.9.3, 2.0, 2.1, Rubinius
 * CouchDB 1.2.0
 * ActiveSupport 3.2, 4.0
 
@@ -52,6 +52,11 @@ The server URL will default to http://localhost:5984/ unless specified:
 
     CouchPotato::Config.database_name = "http://example.com:5984/name_of_the_db"
 
+But you can also specify the database host separately from the database name:
+
+    CouchPotato::Config.database_host = "http://example.com:5984"
+    CouchPotato::Config.database_name = "name_of_the_db"
+
 Or with authentication
 
     CouchPotato::Config.database_name = "http://username:password@example.com:5984/name_of_the_db"
@@ -414,6 +419,11 @@ Couch Potato supports accessing multiple CouchDBs:
 
 Unless configured otherwise this would save the customer model to _http://127.0.0.1:5984/couch_customer_.
 
+You can also first retrieve the database instance:
+
+    db = CouchPotato.use('couch_customer')
+    db.save @customer
+
 #### Testing
 
 To make testing easier and faster database logic has been put into its own class, which you can replace and stub out in whatever way you want:

data/lib/couch_potato.rb

@@ -8,14 +8,15 @@ JSON.create_id = 'ruby_class'
 CouchRest.decode_json_objects = true
 
 module CouchPotato
-  Config = Struct.new(:database_name, :split_design_documents_per_view, :default_language).new
+  Config = Struct.new(:database_host, :database_name, :split_design_documents_per_view, :default_language).new
   Config.split_design_documents_per_view = false
   Config.default_language = :javascript
+  Config.database_host = "http://127.0.0.1:5984"
 
   class NotFound < StandardError; end
   class Conflict < StandardError; end
 
-  # returns all the classes that implement the CouchPotato::Persistence module
+  # returns all the classes that include the CouchPotato::Persistence module
   def self.models
     @models ||= []
     @models
@@ -28,7 +29,14 @@ module CouchPotato
 
   # Returns the underlying CouchRest database object if you want low level access to your CouchDB. You have to set the CouchPotato::Config.database_name before this works.
   def self.couchrest_database
-    @@__couchrest_database ||= CouchRest.database(full_url_to_database)
+    @@__couchrest_database ||= CouchRest.database(full_url_to_database(CouchPotato::Config.database_name, CouchPotato::Config.database_host))
+  end
+
+  # Returns a specific database instance
+  def self.use(database_name)
+    @@__databases ||= {}
+    @@__databases["#{database_name}"] = Database.new(couchrest_database_for_name!(database_name)) unless @@__databases["#{database_name}"]
+    @@__databases["#{database_name}"]
   end
 
   # Executes a block of code and yields a datbase with the given name.
@@ -44,19 +52,24 @@ module CouchPotato
     yield(@@__databases["#{database_name}"])
   end
 
-  # Creates a CouchRest-Database for directly accessing that functionality.
+  # Returns a CouchRest-Database for directly accessing that functionality.
   def self.couchrest_database_for_name(database_name)
-    CouchRest.database(full_url_to_database(database_name))
+    CouchRest.database(full_url_to_database(database_name, CouchPotato::Config.database_host))
+  end
+
+  # Creates a CouchRest-Database for directly accessing that functionality.
+  def self.couchrest_database_for_name!(database_name)
+    CouchRest.database!(full_url_to_database(database_name))
   end
 
   private
 
-  def self.full_url_to_database(database_name=CouchPotato::Config.database_name)
+  def self.full_url_to_database(database_name=CouchPotato::Config.database_name, database_host = CouchPotato::Config.database_host)
     raise('No Database configured. Set CouchPotato::Config.database_name') unless database_name
     if database_name.match(%r{https?://})
       database_name
     else
-      "http://127.0.0.1:5984/#{database_name}"
+      "#{database_host}/#{database_name}"
     end
   end
 end

data/lib/couch_potato/persistence.rb

@@ -27,11 +27,17 @@ module CouchPotato
         attr_accessor :_id, :_rev, :_deleted, :database
         alias_method :id, :_id
         alias_method :id=, :_id=
+
+        def self.inherited(child)
+          super
+          CouchPotato.models << child
+        end
       end
 
       CouchPotato.models << base
     end
 
+
     # initialize a new instance of the model optionally passing it a hash of attributes.
     # the attributes have to be declared using the #property method.
     # the new model will be yielded to an optionally given block.

data/lib/couch_potato/persistence/type_caster.rb

@@ -1,7 +1,7 @@
 module CouchPotato
   module Persistence
     class TypeCaster #:nodoc:
-      NUMBER_REGEX = /-?\d+\.?\d*/
+      NUMBER_REGEX = /-?\d*\.?\d*/
 
       def cast(value, type)
         if type == :boolean

data/lib/couch_potato/rspec/matchers/map_reduce_to_matcher.rb

@@ -50,6 +50,9 @@ module CouchPotato
           var emit = function(key, value) {
             mapResults.push({key: key, value: value});
           };
+          var sum = function(values) {
+            return values.reduce(function(memo, value) { return memo + value; });
+          };
           for (var i in docs) {
             map(docs[i]);
           }

data/lib/couch_potato/version.rb

@@ -1,3 +1,3 @@
 module CouchPotato
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/couch_potato/view/custom_view_spec.rb

@@ -26,7 +26,7 @@ module CouchPotato
                       results['rows'].first.try(:[], 'value') || 0
                     else
                       results['rows'].map do |row|
-                        if row['doc'].instance_of?(klass)
+                        if row['doc'].kind_of?(klass)
                           row['doc']
                         else
                           result = row['doc'] || (row['value'].merge(:_id => row['id'] || row['key']) unless view_parameters[:include_docs])

data/spec/property_spec.rb

@@ -12,6 +12,7 @@ class Watch
   property :custom_address, :type => [Address]
   property :overwritten_read
   property :overwritten_write
+  property :diameter, :type => Float
 
   def overwritten_read
     super.to_s
@@ -73,6 +74,20 @@ describe 'properties' do
     c.title.should == 3
   end
 
+  it "should persist a float with leading digits" do
+    w = Watch.new :diameter => "46.5"
+    CouchPotato.database.save_document! w
+    w = CouchPotato.database.load_document w.id
+    w.diameter.should == 46.5
+  end
+
+  it "should persist a float with no leading digits" do
+    w = Watch.new :diameter => ".465"
+    CouchPotato.database.save_document! w
+    w = CouchPotato.database.load_document w.id
+    w.diameter.should == 0.465
+  end
+
   it "should persist a big decimal" do
     require 'bigdecimal'
     c = BigDecimalContainer.new :number => BigDecimal.new( '42.42' )

data/spec/unit/couch_potato_spec.rb

@@ -7,23 +7,38 @@ describe CouchPotato, 'full_url_to_database' do
   after(:each) do
     CouchPotato::Config.database_name = @original_database_name
   end
-  
+
   it "should add the default localhost and port if only a name is set" do
     CouchPotato::Config.database_name = 'test'
     CouchPotato.full_url_to_database.should == 'http://127.0.0.1:5984/test'
   end
-  
+
   it "should return the set url" do
     CouchPotato::Config.database_name = 'http://db.local/test'
     CouchPotato.full_url_to_database.should == 'http://db.local/test'
   end
 end
 
+describe CouchPotato, 'use' do
+  it 'should return the db object' do
+    db = CouchPotato.use("testdb")
+    db.couchrest_database.root.should == 'http://127.0.0.1:5984/testdb'
+  end
+end
+
 describe CouchPotato, '.models' do
   it "returns all classes that have implemented CouchPotato::Persistence" do
     clazz = Class.new
     clazz.send(:include, CouchPotato::Persistence)
-    
-    CouchPotato.models.should include(clazz)
+
+    expect(CouchPotato.models).to include(clazz)
+  end
+
+  it 'returns all subclasses of classes that have implemented CouchPotato::Persistence' do
+    clazz = Class.new
+    clazz.send(:include, CouchPotato::Persistence)
+    subclazz = Class.new clazz
+
+    expect(CouchPotato.models).to include(subclazz)
   end
-end
+end

data/spec/unit/rspec_matchers_spec.rb

@@ -145,6 +145,13 @@ describe CouchPotato::RSpec::MapReduceToMatcher do
     spec.should map_reduce({}).to({"key" => nil, "value" => "test"})
   end
 
+  it "should handle sum function" do
+    spec = stub(
+      :map_function => "function(doc) { emit(null, doc.age); }",
+      :reduce_function => "function(keys, values) { return sum(values); }")
+    spec.should map_reduce(@docs).to({"key" => nil, "value" => 103})
+  end
+
   context "without grouping" do
     it "should not group by key by default" do
       @view_spec.should map_reduce(@docs).to({"key" => nil, "value" => 8})

data/spec/views_spec.rb

@@ -5,6 +5,7 @@ class Build
 
   property :state
   property :time
+  property :type, :type => String, :default => 'Build'
 
   view :timeline, :key => :time
   view :count, :key => :time, :reduce => true
@@ -17,9 +18,11 @@ class Build
   view :raw, :type => :raw, :map => "function(doc) {emit(doc._id, doc.state)}"
   view :filtered_raw, :type => :raw, :map => "function(doc) {emit(doc._id, doc.state)}", :results_filter => lambda{|res| res['rows'].map{|row| row['value']}}
   view :with_view_options, :group => true, :key => :time
+  view :all, :map => "function(doc) { if (doc && doc.type == 'Build') emit(doc._id, 1); }", :include_docs => true, :type => :custom
 end
 
 class CustomBuild < Build
+  property :server
 end
 
 class ErlangBuild
@@ -239,6 +242,13 @@ describe 'views' do
       @db.view(CustomBuild.timeline).size.should == 1
       @db.view(CustomBuild.timeline).first.should be_kind_of(CustomBuild)
     end
+
+    it "should return instances of subclasses as well if a special view exists" do
+      @db.save_document Build.new(:state => 'success', :time => '2008-01-01')
+      @db.save_document CustomBuild.new(:state => 'success', :time => '2008-01-01', :server => 'Jenkins')
+      results = @db.view(Build.all)
+      results.map(&:class).should == [CustomBuild, Build]
+    end
   end
 
   describe "list functions" do

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: couch_potato
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: couchrest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby persistence layer for CouchDB
@@ -129,8 +114,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGES.md
 - CREDITS
 - Gemfile
@@ -220,27 +205,26 @@ files:
 - spec/views_spec.rb
 homepage: http://github.com/langalex/couch_potato
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby persistence layer for CouchDB
 test_files:
 - spec/attachments_spec.rb