couchrest 1.1.1 → 1.1.2

data/VERSION

@@ -0,0 +1 @@
+1.1.2

data/couchrest.gemspec

@@ -1,12 +1,12 @@
 # -*- encoding: utf-8 -*-
-require File.join(File.dirname(__FILE__),'lib','couchrest','version')
+
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = CouchRest::VERSION
+  s.version = `cat VERSION`.strip
 
   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{2011-04-06}
+  s.date = File.mtime('VERSION')
   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}
 

data/history.txt

@@ -1,3 +1,8 @@
+== 1.1.2 - 2011-07-18
+
+* Minor changes
+  * Added `as_couch_json` method. If available, will be called before sending document to JSON encoder.
+
 == 1.1.1 - 2011-07-04
 
 * Urgent change

data/lib/couchrest.rb

@@ -23,7 +23,6 @@ $:.unshift File.dirname(__FILE__) unless
 require 'couchrest/monkeypatches'
 require 'couchrest/rest_api'
 require 'couchrest/support/inheritable_attributes'
-require 'couchrest/version'
 
 require 'forwardable'
 

data/lib/couchrest/attributes.rb

@@ -54,6 +54,13 @@ module CouchRest
       _attributes
     end
 
+    # Provide JSON data hash that can be stored in the database.
+    # Will go through each attribute value and request the `as_couch_json` method
+    # on each if available, or return the value as-is.
+    def as_couch_json
+      _attributes.inject({}) {|h, (k,v)| h[k] = v.respond_to?(:as_couch_json) ? v.as_couch_json : v; h}
+    end
+
     # Freeze the object's attributes instead of the actual document.
     # This prevents further modifications to stored data, but does allow access
     # to local variables useful for callbacks or cached data.

data/lib/couchrest/rest_api.rb

@@ -96,10 +96,10 @@ module CouchRest
       end
     end
 
-    # Prepare a two hashes, one for the request to the REST backend and a second
+    # Prepare two hashes, one for the request to the REST backend and a second
     # for the JSON parser.
     #
-    # Returns and array of request options and parser options.
+    # Returns an array of request and parser options.
     #
     def prepare_and_split_options(url, method, options)
       request = {
@@ -132,7 +132,11 @@ module CouchRest
     # * :raw TrueClass, if true the payload will not be altered.
     #
     def payload_from_doc(doc, opts = {})
-      (opts.delete(:raw) || doc.nil? || doc.is_a?(IO) || doc.is_a?(Tempfile)) ? doc : MultiJson.encode(doc)
+      if (opts.delete(:raw) || doc.nil? || doc.is_a?(IO) || doc.is_a?(Tempfile))
+        doc
+      else
+        MultiJson.encode(doc.respond_to?(:as_couch_json) ? doc.as_couch_json : doc)
+      end
     end
 
     # Parse the response provided.

data/spec/couchrest/document_spec.rb

@@ -119,6 +119,21 @@ describe CouchRest::Document do
     end
   end
 
+  describe "#as_couch_json" do
+    it "should provide a hash of data from normal document" do
+      @doc = CouchRest::Document.new('foo' => 'bar')
+      h = @doc.as_couch_json
+      h.should be_a(Hash)
+      h['foo'].should eql('bar')
+    end
+
+    it "should handle nested documents" do
+      @doc = CouchRest::Document.new('foo' => 'bar', 'doc' => CouchRest::Document.new('foo2' => 'bar2'))
+      h = @doc.as_couch_json
+      h['doc'].should be_a(Hash)
+      h['doc']['foo2'].should eql('bar2')
+    end
+  end
 
   describe "#inspect" do
     it "should provide a string of keys and values of the Response" do

data/spec/couchrest/rest_api_spec.rb

@@ -152,7 +152,15 @@ describe CouchRest::RestAPI do
         f.close
       end
 
-
+      it "should use as_couch_json method if available" do
+        h = {'foo' => 'bar'}
+        doc = CouchRest::Document.new(h)
+        doc.should_receive(:as_couch_json).and_return(h)
+        request.should_receive(:execute).and_return(simple_response)
+        parser.should_receive(:encode).with(h)
+        parser.should_receive(:decode).with(simple_response, parser_opts)
+        CouchRest.post('foo', doc)
+      end
     end
 
 

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 1.1.1
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -14,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +02:00
+date: 2011-07-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +30,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id001
@@ -36,6 +46,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 1
+        - 15
         version: "1.15"
   type: :runtime
   version_requirements: *id002
@@ -47,6 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id003
@@ -58,6 +77,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
   type: :development
   version_requirements: *id004
@@ -69,6 +93,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
   version_requirements: *id005
@@ -89,6 +118,7 @@ files:
 - README.md
 - Rakefile
 - THANKS.md
+- VERSION
 - couchrest.gemspec
 - examples/word_count/markov
 - examples/word_count/views/books/chunked-map.js
@@ -118,7 +148,6 @@ files:
 - lib/couchrest/rest_api.rb
 - lib/couchrest/server.rb
 - lib/couchrest/support/inheritable_attributes.rb
-- lib/couchrest/version.rb
 - spec/.gitignore
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
@@ -154,17 +183,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.

data/lib/couchrest/version.rb

@@ -1,3 +0,0 @@
-module CouchRest
-  VERSION = '1.1.1'
-end