couchrest 1.0.1 → 1.0.2

data/.gitignore

@@ -0,0 +1,4 @@
+.DS_Store
+html/*
+pkg
+*.swp

data/Gemfile

@@ -0,0 +1,4 @@
+
+source :rubygems
+gemspec
+

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    couchrest (1.0.2)
+      json (~> 1.5.1)
+      mime-types (~> 1.15)
+      rest-client (~> 1.6.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    json (1.5.1-java)
+    mime-types (1.16)
+    rest-client (1.6.1)
+      mime-types (>= 1.16)
+    rspec (1.3.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  couchrest!
+  rspec (~> 1.3.0)

data/README.md

@@ -18,17 +18,30 @@ CouchRest is designed to make a simple base for application and framework-specif
 
 CouchRest rests on top of a HTTP abstraction layer using by default Heroku’s excellent REST Client Ruby HTTP wrapper.
 
+## Modelling
+
+For more complete modelling support based on Rails 3's ActiveModel, please checkout CouchRest's sister project: [CouchRest Model](https://github.com/couchrest/couchrest_model).
+
 ## Extended Document
 
 As of May 2010 support for the popular CouchRest::ExtendedDocument mixin has been moved to its own gem: [couchrest_extended_document](http://github.com/couchrest/couchrest_extended_document).
 
-Most people will probably want to use this library (or one of the alternatives) to make it slightly easier to access your documents.
+If you're starting a new project however, we recommend you use the more actively maintained [CouchRest Model](https://github.com/couchrest/couchrest_model) project, supported by the same team of developers.
 
 ## Running the Specs
 
 The most complete documentation is the spec/ directory. To validate your
-CouchRest install, from the project root directory run `rake`, or `autotest`
-(requires RSpec and optionally ZenTest for autotest support).
+CouchRest install, from the project root directory use bundler to install 
+the dependencies and then run the tests:
+
+    $ bundle install
+    $ bundle exec spec spec
+
+To date, the couchrest specs have been show to run on:
+
+ * Ruby 1.8.7
+ * Ruby 1.9.2
+ * JRuby 1.5.6
 
 ## Docs
 

data/Rakefile

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake'
 require "rake/rdoctask"
 
@@ -14,29 +18,6 @@ EOS
   exit(0)
 end
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "couchrest"
-    gemspec.summary = "Lean and RESTful interface to CouchDB."
-    gemspec.description = "CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments."
-    gemspec.email = "jchris@apache.org"
-    gemspec.homepage = "http://github.com/couchrest/couchrest"
-    gemspec.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber", "Sam Lown"]
-    gemspec.extra_rdoc_files = %w( README.md LICENSE THANKS.md )
-    gemspec.files = %w( LICENSE README.md Rakefile THANKS.md history.txt couchrest.gemspec) + Dir["{examples,lib,spec,utils}/**/*"] - Dir["spec/tmp"]
-    gemspec.has_rdoc = true
-    gemspec.add_dependency("rest-client", ">= 1.5.1")
-    gemspec.add_dependency("mime-types", ">= 1.15")
-    gemspec.add_dependency("json", ">= 1.4.6")
-    gemspec.version = CouchRest::VERSION
-    gemspec.date = Time.now.strftime("%Y-%m-%d")
-    gemspec.require_path = "lib"
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
 desc "Run all specs"
 Spec::Rake::SpecTask.new('spec') do |t|
 	t.spec_opts = ["--color"]

data/couchrest.gemspec

@@ -1,111 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["J. Chris Anderson", "Matt Aimonetti", "Marcos Tapajos", "Will Leinweber", "Sam Lown"]
-  s.date = %q{2010-08-18}
+  s.date = %q{2011-03-13}
   s.description = %q{CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.}
   s.email = %q{jchris@apache.org}
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md",
-     "THANKS.md"
-  ]
-  s.files = [
-    "LICENSE",
-     "README.md",
-     "Rakefile",
-     "THANKS.md",
-     "couchrest.gemspec",
-     "examples/word_count/markov",
-     "examples/word_count/views/books/chunked-map.js",
-     "examples/word_count/views/books/united-map.js",
-     "examples/word_count/views/markov/chain-map.js",
-     "examples/word_count/views/markov/chain-reduce.js",
-     "examples/word_count/views/word_count/count-map.js",
-     "examples/word_count/views/word_count/count-reduce.js",
-     "examples/word_count/word_count.rb",
-     "examples/word_count/word_count_query.rb",
-     "examples/word_count/word_count_views.rb",
-     "history.txt",
-     "lib/couchrest.rb",
-     "lib/couchrest/commands/generate.rb",
-     "lib/couchrest/commands/push.rb",
-     "lib/couchrest/database.rb",
-     "lib/couchrest/design.rb",
-     "lib/couchrest/document.rb",
-     "lib/couchrest/helper/attachments.rb",
-     "lib/couchrest/helper/pager.rb",
-     "lib/couchrest/helper/streamer.rb",
-     "lib/couchrest/helper/upgrade.rb",
-     "lib/couchrest/middlewares/logger.rb",
-     "lib/couchrest/monkeypatches.rb",
-     "lib/couchrest/response.rb",
-     "lib/couchrest/rest_api.rb",
-     "lib/couchrest/server.rb",
-     "lib/couchrest/support/inheritable_attributes.rb",
-     "spec/couchrest/couchrest_spec.rb",
-     "spec/couchrest/database_spec.rb",
-     "spec/couchrest/design_spec.rb",
-     "spec/couchrest/document_spec.rb",
-     "spec/couchrest/helpers/pager_spec.rb",
-     "spec/couchrest/helpers/streamer_spec.rb",
-     "spec/couchrest/server_spec.rb",
-     "spec/fixtures/attachments/README",
-     "spec/fixtures/attachments/couchdb.png",
-     "spec/fixtures/attachments/test.html",
-     "spec/fixtures/views/lib.js",
-     "spec/fixtures/views/test_view/lib.js",
-     "spec/fixtures/views/test_view/only-map.js",
-     "spec/fixtures/views/test_view/test-map.js",
-     "spec/fixtures/views/test_view/test-reduce.js",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "utils/remap.rb",
-     "utils/subset.rb"
+    "README.md",
+    "THANKS.md"
   ]
   s.homepage = %q{http://github.com/couchrest/couchrest}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/couchrest/couchrest_spec.rb",
-     "spec/couchrest/server_spec.rb",
-     "spec/couchrest/document_spec.rb",
-     "spec/couchrest/design_spec.rb",
-     "spec/couchrest/database_spec.rb",
-     "spec/couchrest/helpers/pager_spec.rb",
-     "spec/couchrest/helpers/streamer_spec.rb",
-     "examples/word_count/word_count_views.rb",
-     "examples/word_count/word_count_query.rb",
-     "examples/word_count/word_count.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency(%q<rest-client>, ["~> 1.6.1"])
+  s.add_dependency(%q<mime-types>, ["~> 1.15"])
+  s.add_dependency(%q<json>, ["~> 1.5.1"])
+  s.add_development_dependency(%q<rspec>, "~> 1.3.0")
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
-      s.add_runtime_dependency(%q<json>, [">= 1.4.6"])
-    else
-      s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_dependency(%q<mime-types>, [">= 1.15"])
-      s.add_dependency(%q<json>, [">= 1.4.6"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-    s.add_dependency(%q<mime-types>, [">= 1.15"])
-    s.add_dependency(%q<json>, [">= 1.4.6"])
-  end
 end
-

data/history.txt

@@ -1,8 +1,10 @@
-== Next Version
-
-* Major enhancements
+== 1.0.2
 
 * Minor enhancements
+  * Bundler
+  * Dependency versions upgrade
+  * Removed reduce option from view's defaults. Now detected according to presence of reduce function.
+  * Design#has_view? and Design#can_reduce_view? now available publically
 
 == 1.0.1
 

data/init.rb

@@ -0,0 +1 @@
+require File.join(File.dirname(__FILE__),'lib', 'couchrest.rb')

data/lib/couchrest/design.rb

@@ -9,13 +9,10 @@ module CouchRest
       if opts[:map]
         view = {}
         view['map'] = opts.delete(:map)
-        if opts[:reduce]
-          view['reduce'] = opts.delete(:reduce)
-          opts[:reduce] = false
-        end
+        view['reduce'] = opts.delete(:reduce) if opts[:reduce]
         self['views'][method_name] = view
       else
-        doc_keys = keys.collect{|k|"doc['#{k}']"} # this is where :require => 'doc.x == true' would show up
+        doc_keys = keys.collect{|k| "doc['#{k}']"}
         key_emit = doc_keys.length == 1 ? "#{doc_keys.first}" : "[#{doc_keys.join(', ')}]"
         guards = opts.delete(:guards) || []
         guards += doc_keys.map{|k| "(#{k} != null)"}
@@ -41,11 +38,15 @@ JAVASCRIPT
     end
 
     # Dispatches to any named view in a specific database
-    def view_on db, view_name, query={}, &block
+    def view_on db, view_name, query = {}, &block
       view_name = view_name.to_s
       view_slug = "#{name}/#{view_name}"
-      defaults = (self['views'][view_name] && self['views'][view_name]["couchrest-defaults"]) || {}
-      db.view(view_slug, defaults.merge(query), &block)
+      # Set the default query options
+      query = view_defaults(view_name).merge(query)
+      # Ensure reduce is set if dealing with a reduceable view
+      # This is a requirement of CouchDB.
+      query['reduce'] ||= false if can_reduce_view?(view_name)
+      db.view(view_slug, query, &block)
     end
 
     def name
@@ -61,19 +62,27 @@ JAVASCRIPT
       super
     end
 
-    private
+    # Return the hash of default values to include in all queries sent
+    # to a view from couchrest.
+    def view_defaults(name)
+      (self['views'][name.to_s] && self['views'][name.to_s]["couchrest-defaults"]) || {}
+    end
+
+    # Returns true or false if the view is available.
+    def has_view?(name)
+      !self['views'][name.to_s].nil?
+    end
 
-    # returns stored defaults if the there is a view named this in the design doc
-    def has_view?(view)
-      view = view.to_s
-      self['views'][view] &&
-        (self['views'][view]["couchrest-defaults"] || {})
+    # Check if the view has a reduce method defined.
+    def can_reduce_view?(name)
+      has_view?(name) && !self['views'][name.to_s]['reduce'].to_s.empty?
     end
 
+    private
+
     def fetch_view view_name, opts, &block
       database.view(view_name, opts, &block)
     end
 
   end
-  
 end

data/spec/.gitignore

@@ -0,0 +1 @@
+tmp

data/spec/couchrest/design_spec.rb

@@ -154,5 +154,29 @@ describe CouchRest::Design do
     end
   end
 
+  describe "a view with a reduce function" do
+    before(:all) do
+      @db = reset_test_db!
+      @des = CouchRest::Design.new
+      @des.name = "test"
+      @des.view_by :code, :map => "function(d){ if(d['code']) { emit(d['code'], 1); } }", :reduce => "function(k,v,r){ return sum(v); }"
+      @des.database = @db
+      @des.save
+      @db.bulk_save([{"code" => "a", "age" => 2},
+        {"code" => 'b', "age" => 4},{"code" => 'c', "age" => 9}])
+    end
+    it "should not set a default parameter" do
+      @des['views']['by_code']['couchrest-defaults'].should be_nil
+    end
+    it "should include reduce parameter in query" do
+      res = @des.view :by_code
+      res["rows"][0]["key"].should == 'a'
+    end
+    it "should allow reduce to be performed" do
+      res = @des.view :by_code, :reduce => true
+      res["rows"][0]["value"].should eql(3)
+    end
+  end
+
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-18 00:00:00 +02:00
+date: 2011-03-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 5
+        - 6
         - 1
-        version: 1.5.1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -56,15 +56,30 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 4
-        - 6
-        version: 1.4.6
+        - 5
+        - 1
+        version: 1.5.1
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id004
 description: CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API, as well as including some utility scripts for managing views and attachments.
 email: jchris@apache.org
 executables: []
@@ -76,6 +91,9 @@ extra_rdoc_files:
 - README.md
 - THANKS.md
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -92,6 +110,7 @@ files:
 - examples/word_count/word_count_query.rb
 - examples/word_count/word_count_views.rb
 - history.txt
+- init.rb
 - lib/couchrest.rb
 - lib/couchrest/commands/generate.rb
 - lib/couchrest/commands/push.rb
@@ -108,6 +127,7 @@ files:
 - lib/couchrest/rest_api.rb
 - lib/couchrest/server.rb
 - lib/couchrest/support/inheritable_attributes.rb
+- spec/.gitignore
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
 - spec/couchrest/design_spec.rb
@@ -147,11 +167,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -159,15 +181,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
-test_files: 
-- spec/spec_helper.rb
-- spec/couchrest/couchrest_spec.rb
-- spec/couchrest/server_spec.rb
-- spec/couchrest/document_spec.rb
-- spec/couchrest/design_spec.rb
-- spec/couchrest/database_spec.rb
-- spec/couchrest/helpers/pager_spec.rb
-- spec/couchrest/helpers/streamer_spec.rb
-- examples/word_count/word_count_views.rb
-- examples/word_count/word_count_query.rb
-- examples/word_count/word_count.rb
+test_files: []
+