couchrest 0.38 → 1.0.0.beta

data/lib/couchrest/{core/document.rb → document.rb}

@@ -2,7 +2,7 @@ require 'delegate'
 
 module CouchRest  
   class Document < Response
-    include CouchRest::Mixins::Attachments
+    include CouchRest::Attachments
     
     extlib_inheritable_accessor :database
     attr_accessor :database

data/lib/couchrest/helper/attachments.rb

@@ -0,0 +1,29 @@
+module CouchRest
+  module Attachments
+  
+    # saves an attachment directly to couchdb
+    def put_attachment(name, file, options={})
+      raise ArgumentError, "doc must be saved" unless self.rev
+      raise ArgumentError, "doc.database required to put_attachment" unless database
+      result = database.put_attachment(self, name, file, options)
+      self['_rev'] = result['rev']
+      result['ok']
+    end
+
+    # returns an attachment's data
+    def fetch_attachment(name)
+      raise ArgumentError, "doc must be saved" unless self.rev
+      raise ArgumentError, "doc.database required to put_attachment" unless database
+      database.fetch_attachment(self, name)
+    end
+
+    # deletes an attachment directly from couchdb
+    def delete_attachment(name, force=false)
+      raise ArgumentError, "doc.database required to delete_attachment" unless database
+      result = database.delete_attachment(self, name, force)
+      self['_rev'] = result['rev']
+      result['ok']
+    end
+  
+  end
+end

data/lib/couchrest/middlewares/logger.rb

@@ -53,8 +53,8 @@ module CouchRest
   end
 end
 
-# inject our logger into CouchRest HTTP abstraction layer
-module HttpAbstraction
+# inject our logger into key RestClient methods
+module RestClient 
  
   def self.get(uri, headers=nil)
     start_query = Time.now
@@ -260,4 +260,4 @@ end
 #     end
 #     
 #   end
-# end             
+# end             

data/lib/couchrest/monkeypatches.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__), 'support', 'class')
-require File.join(File.dirname(__FILE__), 'support', 'blank')
 require 'timeout'
 
 # This file must be loaded after the JSON gem and any other library that beats up the Time class.
@@ -15,16 +14,6 @@ class Time
     %("#{u.strftime("%Y/%m/%d %H:%M:%S +0000")}")
   end
 
-  # Decodes the JSON time format to a UTC time.
-  # Based on Time.parse from ActiveSupport. ActiveSupport's version
-  # is more complete, returning a time in your current timezone, 
-  # rather than keeping the time in UTC. YMMV.
-  # def self.parse string, fallback=nil
-  #   d = DateTime.parse(string).new_offset
-  #   self.utc(d.year, d.month, d.day, d.hour, d.min, d.sec)
-  # rescue
-  #   fallback
-  # end
 end
 
 # Monkey patch for faster net/http io
@@ -51,63 +40,4 @@ if RUBY_VERSION.to_f < 1.9
   end
 end
 
-# module RestClient
-#   # def self.copy(url, headers={})
-#   #   Request.execute(:method => :copy,
-#   #     :url => url,
-#   #     :headers => headers)
-#   # end  
-# 
-# #   class Request
-# #     
-# #     def establish_connection(uri)
-# #       Thread.current[:connection].finish if (Thread.current[:connection] && Thread.current[:connection].started?)
-# #       p net_http_class
-# #       net = net_http_class.new(uri.host, uri.port)
-# #       net.use_ssl = uri.is_a?(URI::HTTPS)
-# #       net.verify_mode = OpenSSL::SSL::VERIFY_NONE
-# #       Thread.current[:connection] = net
-# #       Thread.current[:connection].start
-# #       Thread.current[:connection]
-# #     end
-# #     
-# #     def transmit(uri, req, payload)
-# #       setup_credentials(req)
-# #       
-# #       Thread.current[:host] ||= uri.host
-# #       Thread.current[:port] ||= uri.port
-# #       
-# #       if (Thread.current[:connection].nil? || (Thread.current[:host] != uri.host))
-# #         p "establishing a connection"
-# #         establish_connection(uri)
-# #       end
-# # 
-# #       display_log request_log
-# #       http = Thread.current[:connection]
-# #       http.read_timeout = @timeout if @timeout
-# #       
-# #       begin
-# #         res = http.request(req, payload)
-# #       rescue
-# #         p "Net::HTTP connection failed, reconnecting"
-# #         establish_connection(uri)
-# #         http = Thread.current[:connection]
-# #         require 'ruby-debug'
-# #         req.body_stream = nil
-# #         
-# #         res = http.request(req, payload)
-# #         display_log response_log(res)
-# #         result res
-# #       else
-# #         display_log response_log(res)
-# #         process_result res
-# #       end
-# #       
-# #     rescue EOFError
-# #       raise RestClient::ServerBrokeConnection
-# #     rescue Timeout::Error
-# #       raise RestClient::RequestTimeout
-# #     end
-# #   end
-#   
-# end 
+

data/lib/couchrest/{core/rest_api.rb → rest_api.rb}

@@ -1,16 +1,9 @@
 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(HttpAbstraction.put(uri, payload, default_headers))
+      JSON.parse(RestClient.put(uri, payload))
     rescue Exception => e
       if $DEBUG
         raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
@@ -22,7 +15,7 @@ module RestAPI
 
   def get(uri)
     begin
-      JSON.parse(HttpAbstraction.get(uri, default_headers), :max_nesting => false)
+      JSON.parse(RestClient.get(uri), :max_nesting => false)
     rescue => e
       if $DEBUG
         raise "Error while sending a GET request #{uri}\n: #{e}"
@@ -35,7 +28,7 @@ module RestAPI
   def post(uri, doc = nil)
     payload = doc.to_json if doc
     begin
-      JSON.parse(HttpAbstraction.post(uri, payload, default_headers))
+      JSON.parse(RestClient.post(uri, payload))
     rescue Exception => e
       if $DEBUG
         raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
@@ -46,11 +39,14 @@ module RestAPI
   end
 
   def delete(uri)
-    JSON.parse(HttpAbstraction.delete(uri, default_headers))
+    JSON.parse(RestClient.delete(uri))
   end
 
   def copy(uri, destination) 
-    JSON.parse(HttpAbstraction.copy(uri, default_headers.merge('Destination' => destination)))
+    JSON.parse(RestClient::Request.execute( :method => :copy,
+                                            :url => uri,
+                                            :headers => {'Destination' => destination}
+                                          ).to_s)
   end 
 
 end

data/lib/couchrest/{core/server.rb → server.rb}

@@ -73,8 +73,6 @@ module CouchRest
     # Restart the CouchDB instance
     def restart!
       CouchRest.post "#{@uri}/_restart"
-    rescue RestClient::ServerBrokeConnection
-      # Shouldn't really happen, but does in CouchDB 1.0.0
     end
 
     # Retrive an unused UUID from CouchDB. Server instances manage caching a list of unused UUIDs.

data/spec/couchrest/{core/couchrest_spec.rb → couchrest_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe CouchRest do
 
@@ -28,13 +28,6 @@ describe CouchRest do
   
   it "should restart" do
     @cr.restart!
-    begin
-      @cr.info
-    rescue
-      # Give the couchdb time to restart
-      sleep 0.2
-      retry
-    end
   end
 
   it "should provide one-time access to uuids" do
@@ -181,11 +174,24 @@ describe CouchRest do
   describe "using a proxy for RestClient connections" do
     it "should set proxy url for RestClient" do
       CouchRest.proxy 'http://localhost:8888/'
-      proxy_uri = URI.parse(HttpAbstraction.proxy)
+      proxy_uri = URI.parse(RestClient.proxy)
       proxy_uri.host.should eql( 'localhost' )
       proxy_uri.port.should eql( 8888 )
       CouchRest.proxy nil
     end
   end
 
+
+  describe "Including old ExtendedDocument library" do
+
+    it "should raise an exception" do
+      lambda do
+        class TestDoc < CouchRest::ExtendedDocument
+          attr_reader :fail
+        end
+      end.should raise_error(RuntimeError)
+    end
+
+  end
+
 end

data/spec/couchrest/{core/database_spec.rb → database_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe CouchRest::Database do
   before(:each) do
@@ -391,7 +391,7 @@ describe CouchRest::Database do
     
     it "should force a delete even if we get a 409" do
       @doc['new_attribute'] = 'something new'
-      @db.put_attachment(@doc, 'test', File.open(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'attachments', 'test.html')).read)
+      @db.put_attachment(@doc, 'test', File.open(File.join(FIXTURE_PATH, 'attachments', 'test.html')).read)
       # at this point the revision number changed, if we try to save doc one more time
       # we would get a 409.
       lambda{ @db.save_doc(@doc) }.should raise_error
@@ -761,14 +761,14 @@ describe CouchRest::Database do
 
     shared_examples_for "continuously replicated" do
       it "contains the document from the original database" do
-        sleep(1.5) # Allow some time to replicate
+        sleep(1) # Allow some time to replicate
         doc = @other_db.get('test_doc')
         doc['some-value'].should == 'foo'
       end
 
       it "contains documents saved after replication initiated" do
         @db.save_doc({'_id' => 'test_doc_after', 'some-value' => 'bar'})
-        sleep(1.5) # Allow some time to replicate
+        sleep(1) # Allow some time to replicate
         doc = @other_db.get('test_doc_after')
         doc['some-value'].should == 'bar'
       end

data/spec/couchrest/{core/design_spec.rb → design_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe CouchRest::Design do
   
@@ -135,4 +135,4 @@ describe CouchRest::Design do
     end
   end
   
-end
+end

data/spec/couchrest/{core/document_spec.rb → document_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 class Video < CouchRest::Document; end
 

data/spec/couchrest/{core/server_spec.rb → server_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path("../../../spec_helper", __FILE__)
+require File.expand_path("../../spec_helper", __FILE__)
 
 describe CouchRest::Server do
   
@@ -32,4 +32,4 @@ describe CouchRest::Server do
     end
   end
   
-end
+end

data/spec/spec.opts

@@ -3,4 +3,3 @@
 progress
 --loadby
 mtime
---reverse

data/spec/spec_helper.rb

@@ -16,10 +16,6 @@ unless defined?(FIXTURE_PATH)
   DB = TEST_SERVER.database(TESTDB)
 end
 
-class Basic < CouchRest::ExtendedDocument
-  use_database TEST_SERVER.default_database
-end
-
 def reset_test_db!
   DB.recreate! rescue nil 
   DB

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
+  - 1
+  - 0
   - 0
-  - 38
-  version: "0.38"
+  - beta
+  version: 1.0.0.beta
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -16,52 +18,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -03:00
+date: 2010-06-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        version: "0.5"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 15
-        version: "1.15"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
+        - 5
         - 1
-        - 2
-        - 4
-        version: 1.2.4
+        version: 1.5.1
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id001
 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: []
@@ -78,7 +51,6 @@ files:
 - Rakefile
 - THANKS.md
 - couchrest.gemspec
-- examples/model/example.rb
 - examples/word_count/markov
 - examples/word_count/views/books/chunked-map.js
 - examples/word_count/views/books/united-map.js
@@ -93,82 +65,29 @@ files:
 - lib/couchrest.rb
 - lib/couchrest/commands/generate.rb
 - lib/couchrest/commands/push.rb
-- lib/couchrest/core/adapters/restclient.rb
-- lib/couchrest/core/database.rb
-- lib/couchrest/core/design.rb
-- lib/couchrest/core/document.rb
-- lib/couchrest/core/http_abstraction.rb
-- lib/couchrest/core/response.rb
-- lib/couchrest/core/rest_api.rb
-- lib/couchrest/core/server.rb
-- lib/couchrest/core/view.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/mixins.rb
-- lib/couchrest/mixins/attachments.rb
-- lib/couchrest/mixins/attribute_protection.rb
-- lib/couchrest/mixins/callbacks.rb
-- lib/couchrest/mixins/class_proxy.rb
-- lib/couchrest/mixins/collection.rb
-- lib/couchrest/mixins/design_doc.rb
-- lib/couchrest/mixins/document_queries.rb
-- lib/couchrest/mixins/extended_attachments.rb
-- lib/couchrest/mixins/extended_document_mixins.rb
-- lib/couchrest/mixins/properties.rb
-- lib/couchrest/mixins/validation.rb
-- lib/couchrest/mixins/views.rb
 - lib/couchrest/monkeypatches.rb
-- lib/couchrest/more/casted_model.rb
-- lib/couchrest/more/extended_document.rb
-- lib/couchrest/more/property.rb
-- lib/couchrest/more/typecast.rb
-- lib/couchrest/support/blank.rb
+- lib/couchrest/response.rb
+- lib/couchrest/rest_api.rb
+- lib/couchrest/server.rb
 - lib/couchrest/support/class.rb
-- lib/couchrest/support/rails.rb
-- lib/couchrest/validation/auto_validate.rb
-- lib/couchrest/validation/contextual_validators.rb
-- lib/couchrest/validation/validation_errors.rb
-- lib/couchrest/validation/validators/absent_field_validator.rb
-- lib/couchrest/validation/validators/confirmation_validator.rb
-- lib/couchrest/validation/validators/format_validator.rb
-- lib/couchrest/validation/validators/formats/email.rb
-- lib/couchrest/validation/validators/formats/url.rb
-- lib/couchrest/validation/validators/generic_validator.rb
-- lib/couchrest/validation/validators/length_validator.rb
-- lib/couchrest/validation/validators/method_validator.rb
-- lib/couchrest/validation/validators/numeric_validator.rb
-- lib/couchrest/validation/validators/required_field_validator.rb
-- spec/couchrest/core/couchrest_spec.rb
-- spec/couchrest/core/database_spec.rb
-- spec/couchrest/core/design_spec.rb
-- spec/couchrest/core/document_spec.rb
-- spec/couchrest/core/server_spec.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/more/attribute_protection_spec.rb
-- spec/couchrest/more/casted_extended_doc_spec.rb
-- spec/couchrest/more/casted_model_spec.rb
-- spec/couchrest/more/extended_doc_attachment_spec.rb
-- spec/couchrest/more/extended_doc_inherited_spec.rb
-- spec/couchrest/more/extended_doc_spec.rb
-- spec/couchrest/more/extended_doc_subclass_spec.rb
-- spec/couchrest/more/extended_doc_view_spec.rb
-- spec/couchrest/more/property_spec.rb
+- spec/couchrest/server_spec.rb
 - spec/fixtures/attachments/README
 - spec/fixtures/attachments/couchdb.png
 - spec/fixtures/attachments/test.html
-- spec/fixtures/more/article.rb
-- spec/fixtures/more/card.rb
-- spec/fixtures/more/cat.rb
-- spec/fixtures/more/course.rb
-- spec/fixtures/more/event.rb
-- spec/fixtures/more/invoice.rb
-- spec/fixtures/more/person.rb
-- spec/fixtures/more/question.rb
-- spec/fixtures/more/service.rb
-- spec/fixtures/more/user.rb
 - spec/fixtures/views/lib.js
 - spec/fixtures/views/test_view/lib.js
 - spec/fixtures/views/test_view/only-map.js
@@ -188,7 +107,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -196,49 +114,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 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: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Lean and RESTful interface to CouchDB.
 test_files: 
-- spec/couchrest/core/couchrest_spec.rb
-- spec/couchrest/core/database_spec.rb
-- spec/couchrest/core/design_spec.rb
-- spec/couchrest/core/document_spec.rb
-- spec/couchrest/core/server_spec.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/more/attribute_protection_spec.rb
-- spec/couchrest/more/casted_extended_doc_spec.rb
-- spec/couchrest/more/casted_model_spec.rb
-- spec/couchrest/more/extended_doc_attachment_spec.rb
-- spec/couchrest/more/extended_doc_inherited_spec.rb
-- spec/couchrest/more/extended_doc_spec.rb
-- spec/couchrest/more/extended_doc_subclass_spec.rb
-- spec/couchrest/more/extended_doc_view_spec.rb
-- spec/couchrest/more/property_spec.rb
-- spec/fixtures/more/article.rb
-- spec/fixtures/more/card.rb
-- spec/fixtures/more/cat.rb
-- spec/fixtures/more/course.rb
-- spec/fixtures/more/event.rb
-- spec/fixtures/more/invoice.rb
-- spec/fixtures/more/person.rb
-- spec/fixtures/more/question.rb
-- spec/fixtures/more/service.rb
-- spec/fixtures/more/user.rb
+- spec/couchrest/server_spec.rb
 - spec/spec_helper.rb
-- examples/model/example.rb
 - examples/word_count/word_count.rb
 - examples/word_count/word_count_query.rb
 - examples/word_count/word_count_views.rb