couchrest 1.1.0.pre2 → 1.1.0.pre3

data/.gitignore

@@ -4,3 +4,4 @@ pkg
 *.swp
 *.gem
 Gemfile.lock
+*.rvmrc

data/Rakefile

@@ -1,33 +1,20 @@
 require 'rubygems'
 require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rake'
+require 'rspec/core/rake_task'
 require "rake/rdoctask"
 
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'couchrest'
-
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
+Bundler::GemHelper.install_tasks
 
 desc "Run all specs"
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ["--color"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ["--color"]
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 desc "Print specdocs"
-Spec::Rake::SpecTask.new(:doc) do |t|
-  t.spec_opts = ["--format", "specdoc"]
-  t.spec_files = FileList['spec/*_spec.rb']
+RSpec::Core::RakeTask.new(:doc) do |spec|
+  spec.rspec_opts = ["--format", "specdoc"]
+  spec.pattern = 'spec/*_spec.rb'
 end
 
 desc "Generate the rdoc"
@@ -40,3 +27,12 @@ end
 
 desc "Run the rspec"
 task :default => :spec
+
+module Rake
+  def self.remove_task(task_name)
+    Rake.application.instance_variable_get('@tasks').delete(task_name.to_s)
+  end
+end
+
+Rake.remove_task("github:release")
+Rake.remove_task("release")

data/couchrest.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
-
+require File.join(File.dirname(__FILE__),'lib','couchrest','version')
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "1.1.0.pre2"
+  s.version = CouchRest::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"]
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   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")
-
+  s.add_dependency(%q<multi_json>, ["~> 1.0.0"])
+  s.add_development_dependency(%q<json>, ["~> 1.5.1"])
+  s.add_development_dependency(%q<rspec>, "~> 2.6.0")
 end

data/history.txt

@@ -1,3 +1,10 @@
+== 1.1.0.pre3 - 2011-06-06
+
+* Major changes
+  * CouchRest::Response removed
+  * CouchRest::Document now forwards key Hash methods (instead of inheritance) (thanks @karmi for prompting the discussion: https://github.com/crx/tire/commit/abf491d0035843a0a7395c8c32b9b7c2120071f9)
+  * Support multiple JSON gems with multi_json (thanks chrisdurtschi)
+
 == 1.1.0.pre2 - 2011-04-08
 
 * Major changes

data/lib/couchrest.rb

@@ -13,24 +13,24 @@
 #    limitations under the License.
 
 require 'rest_client'
-require 'json'
+require 'multi_json'
 
 # Not sure why this is required, so removed until a reason is found!
 $:.unshift File.dirname(__FILE__) unless
  $:.include?(File.dirname(__FILE__)) ||
  $:.include?(File.expand_path(File.dirname(__FILE__)))
-    
+
 require 'couchrest/monkeypatches'
 require 'couchrest/rest_api'
 require 'couchrest/support/inheritable_attributes'
+require 'couchrest/version'
+
+require 'forwardable'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '1.0.1'
-  
   autoload :Server,       'couchrest/server'
   autoload :Database,     'couchrest/database'
-  autoload :Response,     'couchrest/response'
   autoload :Document,     'couchrest/document'
   autoload :Design,       'couchrest/design'
   autoload :Model,        'couchrest/model'
@@ -38,11 +38,11 @@ module CouchRest
   autoload :Streamer,     'couchrest/helper/streamer'
   autoload :Attachments,  'couchrest/helper/attachments'
   autoload :Upgrade,      'couchrest/helper/upgrade'
- 
+
   # we extend CouchRest with the RestAPI module which gives us acess to
   # the get, post, put, delete and copy
-  CouchRest.extend(::RestAPI)
-  
+  CouchRest.extend(::CouchRest::RestAPI)
+
   # The CouchRest module methods handle the basic JSON serialization 
   # and deserialization, as well as query parameters. The module also includes
   # some helpers for tasks like instantiating a new Database or Server instance.
@@ -53,7 +53,7 @@ module CouchRest
     def new(*opts)
       Server.new(*opts)
     end
-    
+
     def parse url
       case url
       when /^(https?:\/\/)(.*)\/(.*)\/(.*)/
@@ -111,7 +111,7 @@ module CouchRest
     def paramify_url url, params = {}
       if params && !params.empty?
         query = params.collect do |k,v|
-          v = v.to_json if %w{key startkey endkey}.include?(k.to_s)
+          v = MultiJson.encode(v) if %w{key startkey endkey}.include?(k.to_s)
           "#{k}=#{CGI.escape(v.to_s)}"
         end.join("&")
         url = "#{url}?#{query}"

data/lib/couchrest/database.rb

@@ -75,7 +75,7 @@ module CouchRest
 
     # == Retrieving and saving single documents
 
-    # GET a document from CouchDB, by id. Returns a Ruby Hash.
+    # GET a document from CouchDB, by id. Returns a Document or Design.
     def get(id, params = {})
       slug = escape_docid(id)
       url = CouchRest.paramify_url("#{@root}/#{slug}", params)
@@ -118,13 +118,13 @@ module CouchRest
       if bulk
         @bulk_save_cache << doc
         bulk_save if @bulk_save_cache.length >= @bulk_save_cache_limit
-        return {"ok" => true} # Compatibility with Document#save
+        return {'ok' => true} # Compatibility with Document#save
       elsif !bulk && @bulk_save_cache.length > 0
         bulk_save
       end
       result = if doc['_id']
         slug = escape_docid(doc['_id'])
-        begin     
+        begin
           uri = "#{@root}/#{slug}"
           uri << "?batch=ok" if batch
           CouchRest.put uri, doc
@@ -186,11 +186,11 @@ module CouchRest
     # If <tt>bulk</tt> is true (false by default) the deletion is recorded for bulk-saving (bulk-deletion :) later.
     # Bulk saving happens automatically when #bulk_save_cache limit is exceded, or on the next non bulk save.
     def delete_doc(doc, bulk = false)
-      raise ArgumentError, "_id and _rev required for deleting" unless doc['_id'] && doc['_rev']      
+      raise ArgumentError, "_id and _rev required for deleting" unless doc['_id'] && doc['_rev']
       if bulk
-        @bulk_save_cache << { '_id' => doc['_id'], '_rev' => doc['_rev'], '_deleted' => true }
+        @bulk_save_cache << { '_id' => doc['_id'], '_rev' => doc['_rev'], :_deleted => true }
         return bulk_save if @bulk_save_cache.length >= @bulk_save_cache_limit
-        return { "ok" => true } # Mimic the non-deferred version
+        return {'ok' => true} # Mimic the non-deferred version
       end
       slug = escape_docid(doc['_id'])        
       CouchRest.delete "#{@root}/#{slug}?rev=#{doc['_rev']}"
@@ -201,7 +201,7 @@ module CouchRest
     # hash with a '_rev' key
     def copy_doc(doc, dest)
       raise ArgumentError, "_id is required for copying" unless doc['_id']
-      slug = escape_docid(doc['_id'])        
+      slug = escape_docid(doc['_id'])
       destination = if dest.respond_to?(:has_key?) && dest['_id'] && dest['_rev']
         "#{dest['_id']}?rev=#{dest['_rev']}"
       else
@@ -243,7 +243,7 @@ module CouchRest
     # Query a CouchDB view as defined by a <tt>_design</tt> document. Accepts
     # paramaters as described in http://wiki.apache.org/couchdb/HttpViewApi
     def view(name, params = {}, payload = {}, &block)
-      payload[:keys] = params.delete(:keys) if params[:keys]
+      payload['keys'] = params.delete(:keys) if params[:keys]
       # Try recognising the name, otherwise assume already prepared
       view_path = name =~ /^([^_].+?)\/(.*)$/ ? "_design/#{$1}/_view/#{$2}" : name
       url = CouchRest.paramify_url "#{@root}/#{view_path}", params
@@ -306,14 +306,14 @@ module CouchRest
     # GET an attachment directly from CouchDB
     def fetch_attachment(doc, name)
       uri = url_for_attachment(doc, name)
-      RestClient.get uri, CouchRest.default_headers
+      CouchRest.get uri, :raw => true
     end
 
     # PUT an attachment directly to CouchDB
     def put_attachment(doc, name, file, options = {})
       docid = escape_docid(doc['_id'])
       uri = url_for_attachment(doc, name)
-      JSON.parse(RestClient.put(uri, file, CouchRest.default_headers.merge(options)))
+      CouchRest.put(uri, file, options.merge(:raw => true))
     end
 
     # DELETE an attachment directly from CouchDB
@@ -343,12 +343,12 @@ module CouchRest
       raise ArgumentError, "must provide a target or source option" unless (options.key?(:target) || options.key?(:source))
       payload = options
       if options.has_key?(:target)
-        payload[:source] = other_db.root
+        payload['source'] = other_db.root
       else
-        payload[:target] = other_db.root
+        payload['target'] = other_db.root
       end
-      payload[:continuous] = continuous
-      payload[:doc_ids] = options[:doc_ids] if options[:doc_ids]
+      payload['continuous'] = continuous
+      payload['doc_ids'] = options[:doc_ids] if options[:doc_ids]
       CouchRest.post "#{@host}/_replicate", payload
     end
 

data/lib/couchrest/design.rb

@@ -1,11 +1,12 @@
-module CouchRest  
+module CouchRest
   class Design < Document
+
     def view_by *keys
       opts = keys.pop if keys.last.is_a?(Hash)
       opts ||= {}
       self['views'] ||= {}
       method_name = "by_#{keys.join('_and_')}"
-      
+
       if opts[:map]
         view = {}
         view['map'] = opts.delete(:map)
@@ -31,7 +32,7 @@ JAVASCRIPT
       self['views'][method_name]['couchrest-defaults'] = opts unless opts.empty?
       method_name
     end
-    
+
     # Dispatches to any named view.
     # (using the database where this design doc was saved)
     def view view_name, query={}, &block

data/lib/couchrest/document.rb

@@ -1,38 +1,89 @@
-require 'delegate'
 
-module CouchRest  
-  class Document < Response
+#
+# CouchRest::Document
+#
+# Provides basic functions for controlling documents returned from
+# the CouchDB database and provides methods to act as a wrapper around
+# a Hash of @_attributes.
+#
+# The idea is to provide the basic functionality of a Hash, just
+# enought to support the needs of CouchRest, but not inherit all
+# of the functionality found in a basic Hash.
+#
+# A Response is similar to Rails' HashWithIndifferentAccess as all
+# requests will convert the keys into Symbols and be stored in the
+# master hash as such.
+#
+
+module CouchRest
+  class Document
+    extend Forwardable
     include CouchRest::Attachments
     extend CouchRest::InheritableAttributes
-    
+
     couchrest_inheritable_accessor :database
     attr_accessor :database
-    
-    # override the CouchRest::Model-wide default_database
-    # This is not a thread safe operation, do not change the model
-    # database at runtime.
-    def self.use_database(db)
-      self.database = db
-    end
-    
+
+    # Initialize a new CouchRest Document and prepare 
+    # a hidden attributes hash.
+    #
+    # When inherting a Document, it is essential that the 
+    # super method is called before you own changes to ensure
+    # that the attributes hash has been initialized before
+    # you attempt to use it.
+    def initialize(attrs = nil)
+      @_attributes = {}
+      attrs.each{|k,v| self[k] = v} unless attrs.nil?
+    end
+
+    # Hash equivilent methods to access the attributes
+
+    def_delegators :@_attributes, :to_a, :==, :eql?, :keys, :values, :each,
+      :reject, :reject!, :empty?, :clear, :merge, :merge!,
+      :encode_json, :as_json, :to_json
+
+    def []=(key, value)
+      @_attributes[key.to_s] = value
+    end
+    def [](key)
+      @_attributes[key.to_s]
+    end
+    def has_key?(key)
+      @_attributes.has_key?(key.to_s)
+    end
+    def delete(key)
+      @_attributes.delete(key.to_s)
+    end
+    def dup
+      new = super
+      @_attributes = @_attributes.dup
+      new
+    end
+    def clone
+      new = super
+      @_attributes = @_attributes.dup
+      new
+    end
+    def to_hash
+      @_attributes
+    end
+
     def id
       self['_id']
     end
-
     def id=(id)
       self['_id'] = id
     end
-    
     def rev
       self['_rev']
     end
-    
+
     # returns true if the document has never been saved
     def new?
       !rev
     end
     alias :new_document? :new?
-    
+
     # Saves the document to the db using create or update. Also runs the :save
     # callbacks. Sets the <tt>_id</tt> and <tt>_rev</tt> fields based on
     # CouchDB's response.
@@ -57,7 +108,7 @@ module CouchRest
       end
       result['ok']
     end
-    
+
     # copies the document to a new id. If the destination id currently exists, a rev must be provided.
     # <tt>dest</tt> can take one of two forms if overwriting: "id_to_overwrite?rev=revision" or the actual doc
     # hash with a '_rev' key
@@ -66,7 +117,7 @@ module CouchRest
       result = database.copy_doc(self, dest)
       result['ok']
     end
-    
+
     # Returns the CouchDB uri for the document
     def uri(append_rev = false)
       return nil if new?
@@ -78,12 +129,29 @@ module CouchRest
       end
       couch_uri
     end
-    
+
     # Returns the document's database
     def database
       @database || self.class.database
     end
-    
+
+    # Provide details of the current keys in the reponse. Based on ActiveRecord::Base.
+    def inspect
+      attributes_as_nice_string = self.keys.collect { |key|
+        "#{key}: #{self[key].inspect}"
+      }.compact.join(", ")
+      "#<#{self.class} #{attributes_as_nice_string}>"
+    end
+
+    class << self
+      # override the CouchRest::Model-wide default_database
+      # This is not a thread safe operation, do not change the model
+      # database at runtime.
+      def use_database(db)
+        self.database = db
+      end
+    end
+
   end
-  
+
 end

data/lib/couchrest/helper/streamer.rb

@@ -16,7 +16,7 @@ module CouchRest
     end
 
     def post(url, params = {}, &block)
-      open_pipe("curl #{default_curl_opts} -d \"#{escape_quotes(params.to_json)}\" \"#{url}\"", &block)
+      open_pipe("curl #{default_curl_opts} -d \"#{escape_quotes(MultiJson.encode(params))}\" \"#{url}\"", &block)
     end
 
     protected
@@ -40,7 +40,7 @@ module CouchRest
     def parse_line line
       return nil unless line
       if /(\{.*\}),?/.match(line.chomp)
-        JSON.parse($1)
+        MultiJson.decode($1)
       end
     end
 
@@ -49,7 +49,7 @@ module CouchRest
       parts = first.split(',')
       parts.pop
       line = parts.join(',')
-      JSON.parse("#{line}}")
+      MultiJson.decode("#{line}}")
     rescue
       nil
     end

data/lib/couchrest/middlewares/logger.rb

@@ -68,7 +68,7 @@ module RestClient
   
   def self.post(uri, payload, headers=nil)
     start_query = Time.now
-    log = {:method => :post, :uri => uri, :payload =>  (payload ? (JSON.load(payload) rescue 'parsing error') : nil), :headers => headers}
+    log = {:method => :post, :uri => uri, :payload =>  (payload ? (MultiJson.decode(payload) rescue 'parsing error') : nil), :headers => headers}
     response = super(uri, payload, headers=nil)
     end_query = Time.now
     log[:duration] = (end_query - start_query)
@@ -78,7 +78,7 @@ module RestClient
    
   def self.put(uri, payload, headers=nil)
     start_query = Time.now
-    log = {:method => :put, :uri => uri, :payload => (payload ? (JSON.load(payload) rescue 'parsing error') : nil), :headers => headers}
+    log = {:method => :put, :uri => uri, :payload => (payload ? (MultiJson.decode(payload) rescue 'parsing error') : nil), :headers => headers}
     response = super(uri, payload, headers=nil)
     end_query = Time.now
     log[:duration] = (end_query - start_query)

data/lib/couchrest/rest_api.rb

@@ -1,59 +1,77 @@
-module RestAPI
+module CouchRest
 
-  def default_headers
-    {
-      :content_type => :json,
-      :accept       => :json
-    }
-  end
+  module RestAPI
+
+    def default_headers
+      {
+        :content_type => :json,
+        :accept       => :json
+      }
+    end
 
-  def put(uri, doc = nil)
-    payload = doc.to_json if doc
-    begin
-      JSON.parse(RestClient.put(uri, payload, default_headers))
-    rescue Exception => e
-      if $DEBUG
-        raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
-      else
-        raise e
+    def get(uri, options = {})
+      begin
+        parse_response(RestClient.get(uri, default_headers), options.dup)
+      rescue => e
+        if $DEBUG
+          raise "Error while sending a GET request #{uri}\n: #{e}"
+        else
+          raise e
+        end
       end
     end
-  end
 
-  def get(uri)
-    begin
-      JSON.parse(RestClient.get(uri, default_headers), :max_nesting => false)
-    rescue => e
-      if $DEBUG
-        raise "Error while sending a GET request #{uri}\n: #{e}"
-      else
-        raise e
+    def put(uri, doc = nil, options = {})
+      opts = options.dup
+      payload = payload_from_doc(doc, opts)
+      begin
+        parse_response(RestClient.put(uri, payload, default_headers.merge(opts)), opts)
+      rescue Exception => e
+        if $DEBUG
+          raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
+        else
+          raise e
+        end
       end
     end
-  end
 
-  def post(uri, doc = nil)
-    payload = doc.to_json if doc
-    begin
-      JSON.parse(RestClient.post(uri, payload, default_headers))
-    rescue Exception => e
-      if $DEBUG
-        raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
-      else
-        raise e
+    def post(uri, doc = nil, options = {})
+      opts = options.dup
+      payload = payload_from_doc(doc, opts)
+      begin
+        parse_response(RestClient.post(uri, payload, default_headers.merge(opts)), opts)
+      rescue Exception => e
+        if $DEBUG
+          raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
+        else
+          raise e
+        end
       end
     end
-  end
 
-  def delete(uri)
-    JSON.parse(RestClient.delete(uri, default_headers))
-  end
+    def delete(uri, options = {})
+      parse_response(RestClient.delete(uri, default_headers), options.dup)
+    end
 
-  def copy(uri, destination) 
-    JSON.parse(RestClient::Request.execute( :method => :copy,
-                                            :url => uri,
-                                            :headers => default_headers.merge('Destination' => destination)
-                                          ).to_s)
-  end 
+    def copy(uri, destination, options = {})
+      parse_response(RestClient::Request.execute( :method => :copy,
+                                              :url => uri,
+                                              :headers => default_headers.merge('Destination' => destination)
+                                            ).to_s, options)
+    end
+
+    protected
+
+    # Check if the provided doc is nil or special IO device or temp file. If not, 
+    # encode it into a string.
+    def payload_from_doc(doc, opts = {})
+      (opts.delete(:raw) || doc.nil? || doc.is_a?(IO) || doc.is_a?(Tempfile)) ? doc : MultiJson.encode(doc)
+    end
 
+    # Parse the response provided.
+    def parse_response(result, opts = {})
+      opts.delete(:raw) ? result : MultiJson.decode(result, opts.update(:max_nesting => false))
+    end
+
+  end
 end

data/lib/couchrest/version.rb

@@ -0,0 +1,3 @@
+module CouchRest
+  VERSION = '1.1.0.pre3'
+end

data/spec/couchrest/database_spec.rb

@@ -257,7 +257,7 @@ describe CouchRest::Database do
           ])
       rescue RestClient::RequestFailed => e
         # soon CouchDB will provide _which_ docs conflicted
-        JSON.parse(e.response.body)['error'].should == 'conflict'
+        MultiJson.decode(e.response.body)['error'].should == 'conflict'
       end
     end
   end

data/spec/couchrest/document_spec.rb

@@ -9,6 +9,36 @@ describe CouchRest::Document do
     @db    = @couch.database!(TESTDB)
   end
 
+  describe "#new" do
+    it "should not be a Hash" do
+      @doc = CouchRest::Document.new
+      @doc.class.should eql(CouchRest::Document)
+      @doc.is_a?(Hash).should be_false
+    end
+
+    it "should be possible to initialize a new Document with attributes" do
+      @doc = CouchRest::Document.new('foo' => 'bar', :test => 'foo')
+      @doc['foo'].should eql('bar')
+      @doc['test'].should eql('foo')
+    end
+
+    it "should accept new with _id" do
+      @doc = CouchRest::Document.new('_id' => 'sample', 'foo' => 'bar')
+      @doc['_id'].should eql('sample')
+      @doc['foo'].should eql('bar')
+    end
+  end
+
+  describe "hash methods" do
+    it "should respond to forwarded hash methods" do
+      @doc = CouchRest::Document.new(:foo => 'bar')
+      [:to_a, :==, :eql?, :keys, :values, :each, :reject, :reject!, :empty?,
+        :clear, :merge, :merge!, :encode_json, :as_json, :to_json].each do |call|
+        @doc.should respond_to(call)
+      end
+    end
+  end
+
   describe "[]=" do
     before(:each) do
       @doc = CouchRest::Document.new
@@ -29,6 +59,57 @@ describe CouchRest::Document do
     end
   end
 
+  describe "#has_key?" do
+    before :each do
+      @doc = CouchRest::Document.new
+    end
+    it "should confirm existance of key" do
+      @doc[:test] = 'example'
+      @doc.has_key?('test').should be_true
+      @doc.has_key?(:test).should be_true
+    end
+    it "should deny existance of key" do
+      @doc.has_key?(:bardom).should be_false
+      @doc.has_key?('bardom').should be_false
+    end
+  end
+
+  describe "#dup" do
+    it "should also clone the attributes" do
+      @doc = CouchRest::Document.new('foo' => 'bar')
+      @doc2 = @doc.dup
+      @doc2.delete('foo')
+      @doc2['foo'].should be_nil
+      @doc['foo'].should eql('bar')
+    end
+  end
+
+  describe "#clone" do
+    it "should also clone the attributes" do
+      @doc = CouchRest::Document.new('foo' => 'bar')
+      @doc2 = @doc.clone
+      @doc2.delete('foo')
+      @doc2['foo'].should be_nil
+      @doc['foo'].should eql('bar')
+    end
+  end
+
+
+  describe "#inspect" do
+    it "should provide a string of keys and values of the Response" do
+      @doc = CouchRest::Document.new('foo' => 'bar')
+      @doc.inspect.should eql("#<CouchRest::Document foo: \"bar\">")
+    end
+  end
+
+  describe "responding to Hash methods" do
+    it "should delegate requests" do
+      @doc = CouchRest::Document.new('foo' => 'bar')
+      @doc.keys.should eql(['foo'])
+      @doc.values.should eql(['bar'])
+    end
+  end
+
   describe  "default database" do
     before(:each) do
       Video.use_database nil
@@ -220,7 +301,7 @@ describe "dealing with attachments" do
     response = @db.save_doc({'key' => 'value'})
     @doc = @db.get(response['id'])
   end
-  
+
   def append_attachment(name='test.html', attach=@attach)
     @doc['_attachments'] ||= {}
     @doc['_attachments'][name] = {
@@ -230,50 +311,50 @@ describe "dealing with attachments" do
     @doc.save
     @rev = @doc['_rev']
   end
-  
+
   describe "PUTing an attachment directly to the doc" do
     before do
       @doc.put_attachment('test.html', @attach)
     end
-    
+
     it "is there" do
       @db.fetch_attachment(@doc, 'test.html').should == @attach
     end
-    
+
     it "updates the revision" do
-      @doc['_rev'].should_not == @rev
+      @doc[:_rev].should_not == @rev
     end
-    
+
     it "updates attachments" do
       @attach2 = "<html><head><title>My Doc</title></head><body><p>Is Different.</p></body></html>"
       @doc.put_attachment('test.html', @attach2)
       @db.fetch_attachment(@doc, 'test.html').should == @attach2
     end
   end
-  
+
   describe "fetching an attachment from a doc directly" do
     before do
       append_attachment
     end
-    
+
     it "pulls the attachment" do
       @doc.fetch_attachment('test.html').should == @attach
     end
   end
-  
+
   describe "deleting an attachment from a doc directly" do
     before do
       append_attachment
       @doc.delete_attachment('test.html')
     end
-    
+
     it "removes it" do
       lambda { @db.fetch_attachment(@doc, 'test.html').should }.should raise_error(RestClient::ResourceNotFound)
     end
-    
+
     it "updates the revision" do
-      @doc['_rev'].should_not == @rev
+      @doc[:_rev].should_not == @rev
     end
   end
-  
+
 end

data/spec/couchrest/helpers/pager_spec.rb

@@ -7,6 +7,11 @@ describe CouchRest::Pager do
     @db.delete! rescue nil
     @db = @cr.create_db(TESTDB) rescue nil
     @pager = CouchRest::Pager.new(@db)
+    @docs = []
+    100.times do |i|
+      @docs << ({:number => (i % 10)})
+    end
+    @db.bulk_save(@docs)
   end
   
   after(:all) do
@@ -21,13 +26,6 @@ describe CouchRest::Pager do
   end
   
   describe "paging all docs" do
-    before(:all) do
-      @docs = []
-      100.times do |i|
-        @docs << ({:number => (i % 10)})
-      end
-      @db.bulk_save(@docs)
-    end
     it "should yield total_docs / limit times" do
       n = 0
       @pager.all_docs(10) do |doc|
@@ -55,11 +53,6 @@ describe CouchRest::Pager do
   
   describe "Pager with a view and docs" do
     before(:all) do
-      @docs = []
-      100.times do |i|
-        @docs << ({:number => (i % 10)})
-      end
-      @db.bulk_save(@docs)
       @db.save_doc({
         '_id' => '_design/magic',
         'views' => {
@@ -119,4 +112,4 @@ describe CouchRest::Pager do
       results[9].should be_nil
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
+require "bundler/setup"
 require "rubygems"
-require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "rspec"
 
 require File.join(File.dirname(__FILE__), '..','lib','couchrest')
 # check the following file to see how to use the spec'd features.
@@ -21,7 +22,7 @@ def reset_test_db!
   DB
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:all) { reset_test_db! }
   
   config.after(:all) do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 1
-  - 0
-  - pre2
-  version: 1.1.0.pre2
+  prerelease: 6
+  version: 1.1.0.pre3
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -30,10 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id001
@@ -45,42 +36,42 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 15
         version: "1.15"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: multi_json
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 1.5.1
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.6.0
+  type: :development
+  version_requirements: *id005
 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: []
@@ -123,10 +114,10 @@ files:
 - 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
+- lib/couchrest/version.rb
 - spec/.gitignore
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
@@ -161,23 +152,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.9.1
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.

data/lib/couchrest/response.rb

@@ -1,16 +0,0 @@
-module CouchRest
-  class Response < Hash
-    def initialize(pkeys = {})
-      pkeys ||= {}
-      pkeys.each do |k,v|
-        self[k.to_s] = v
-      end
-    end
-    def []=(key, value)
-      super(key.to_s, value)
-    end
-    def [](key)
-      super(key.to_s)
-    end
-  end
-end