couchrest 0.38 → 1.0.0.beta

data/README.md

@@ -14,12 +14,17 @@ CouchRest is designed to make a simple base for application and framework-specif
 
     $ sudo gem install couchrest
    
-### Relax, it's RESTful
+## Relax, it's RESTful
 
 CouchRest rests on top of a HTTP abstraction layer using by default Heroku’s excellent REST Client Ruby HTTP wrapper.
-Other adapters can be added to support more http libraries.
 
-### Running the Specs
+## 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.
+
+## 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`
@@ -38,9 +43,4 @@ Please post bugs, suggestions and patches to the bug tracker at [http://github.c
 Follow us on Twitter: [http://twitter.com/couchrest](http://twitter.com/couchrest)
 
 Also, check [http://twitter.com/#search?q=%23couchrest](http://twitter.com/#search?q=%23couchrest)
-      
-## Ruby on Rails
 
-CouchRest is compatible with rails and can even be used a Rails plugin.
-However, you might be interested in the CouchRest companion rails project:
-[http://github.com/hpoydar/couchrest-rails](http://github.com/hpoydar/couchrest-rails)      

data/Rakefile

@@ -24,11 +24,10 @@ begin
     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", ">= 0.5")
-    gemspec.add_dependency("mime-types", ">= 1.15")
-    gemspec.add_dependency("json", "1.2.4")
+    gemspec.add_dependency("rest-client", ">= 1.5.1")
+#    gemspec.add_dependency("couchrest_extended_document", ">= 1.0.0")
     gemspec.version = CouchRest::VERSION
-    gemspec.date = Time.now.strftime("%Y-%m-%d")
+    gemspec.date = "2008-11-22"
     gemspec.require_path = "lib"
   end
 rescue LoadError

data/couchrest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "0.38"
+  s.version = "1.0.0.beta"
 
-  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"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-06-15}
   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.extra_rdoc_files = [
@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
      "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",
@@ -38,82 +37,29 @@ Gem::Specification.new do |s|
      "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",
@@ -127,37 +73,17 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{Lean and RESTful interface to CouchDB.}
   s.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"
@@ -167,19 +93,13 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0.5"])
-      s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
-      s.add_runtime_dependency(%q<json>, ["= 1.2.4"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.1"])
     else
-      s.add_dependency(%q<rest-client>, [">= 0.5"])
-      s.add_dependency(%q<mime-types>, [">= 1.15"])
-      s.add_dependency(%q<json>, ["= 1.2.4"])
+      s.add_dependency(%q<rest-client>, [">= 1.5.1"])
     end
   else
-    s.add_dependency(%q<rest-client>, [">= 0.5"])
-    s.add_dependency(%q<mime-types>, [">= 1.15"])
-    s.add_dependency(%q<json>, ["= 1.2.4"])
+    s.add_dependency(%q<rest-client>, [">= 1.5.1"])
   end
 end
 

data/history.txt

@@ -1,16 +1,17 @@
 == Next Version
 
 * Major enhancements
+	* Add create_target option to Database#replicate_to and #replicate_from. http://github.com/couchrest/couchrest/issues/#issue/26 (Alexander Uvarov) 
 
 * Minor enhancements
 
-== 0.38
+== 1.0.0.beta 
 
 * Major enhancements
-	* Add create_target option to Database#replicate_to and #replicate_from. http://github.com/couchrest/couchrest/issues/#issue/26 (Alexander Uvarov) 
+  * Moved ExtendedDocument and friends into own library, couchrest_extended_document. (Sam Lown)
+  * Removed HttpAbstraction component for direct interface with RestClient. (Sam Lown)
+  * Changed version to more conventional format starting from 1.0.0 to avoid ambiguity issues with order. (Sam Lown)
 
-* Minor enhancements
-  * Support for CouchDB 1.0
 
 == 0.37
 

data/lib/couchrest.rb

@@ -16,40 +16,33 @@ require 'rubygems'
 begin
   require 'json'
 rescue LoadError
-  raise "You need install and require your own json compatible library since couchrest rest couldn't load the json/json_pure gem" unless Kernel.const_defined?("JSON")
+  raise "No compatible json library found, install either json or json_pure gem" unless Kernel.const_defined?("JSON")
 end
 require 'rest_client'
 
+# 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__)))
+ $:.include?(File.dirname(__FILE__)) ||
+ $:.include?(File.expand_path(File.dirname(__FILE__)))
     
 require 'couchrest/monkeypatches'
+require 'couchrest/rest_api'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.38' unless self.const_defined?("VERSION")
+  VERSION    = '1.0.0.beta'
   
-  autoload :Server,       'couchrest/core/server'
-  autoload :Database,     'couchrest/core/database'
-  autoload :Response,     'couchrest/core/response'
-  autoload :Document,     'couchrest/core/document'
-  autoload :Design,       'couchrest/core/design'
-  autoload :View,         'couchrest/core/view'
-  autoload :Model,        'couchrest/core/model'
+  autoload :Server,       'couchrest/server'
+  autoload :Database,     'couchrest/database'
+  autoload :Response,     'couchrest/response'
+  autoload :Document,     'couchrest/document'
+  autoload :Design,       'couchrest/design'
+  autoload :Model,        'couchrest/model'
   autoload :Pager,        'couchrest/helper/pager'
-  autoload :FileManager,  'couchrest/helper/file_manager'
   autoload :Streamer,     'couchrest/helper/streamer'
+  autoload :Attachments,  'couchrest/helper/attachments'
   autoload :Upgrade,      'couchrest/helper/upgrade'
-  
-  autoload :ExtendedDocument,     'couchrest/more/extended_document'
-  autoload :CastedModel,          'couchrest/more/casted_model'
-  
-  require File.join(File.dirname(__FILE__), 'couchrest', 'core', 'rest_api')
-  require File.join(File.dirname(__FILE__), 'couchrest', 'core', 'http_abstraction')
-  require File.join(File.dirname(__FILE__), 'couchrest', 'mixins')
-  require File.join(File.dirname(__FILE__), 'couchrest', 'support', 'rails') if defined?(Rails)
-
+ 
   # we extend CouchRest with the RestAPI module which gives us acess to
   # the get, post, put, delete and copy
   CouchRest.extend(::RestAPI)
@@ -59,35 +52,6 @@ module CouchRest
   # some helpers for tasks like instantiating a new Database or Server instance.
   class << self
 
-    # extracted from Extlib
-    #
-    # Constantize tries to find a declared constant with the name specified
-    # in the string. It raises a NameError when the name is not in CamelCase
-    # or is not initialized.
-    #
-    # @example
-    # "Module".constantize #=> Module
-    # "Class".constantize #=> Class
-    def constantize(camel_cased_word)
-      unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ camel_cased_word
-        raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!"
-      end
-
-      Object.module_eval("::#{$1}", __FILE__, __LINE__)
-    end
-    
-    # extracted from Extlib
-    #    
-    # Capitalizes the first word and turns underscores into spaces and strips _id.
-    # Like titleize, this is meant for creating pretty output.
-    #
-    # @example
-    #   "employee_salary" #=> "Employee salary"
-    #   "author_id" #=> "Author"
-    def humanize(lower_case_and_underscored_word)
-      lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
-    end
-    
     # todo, make this parse the url and instantiate a Server or Database instance
     # depending on the specificity.
     def new(*opts)
@@ -130,9 +94,9 @@ module CouchRest
 
     # set proxy to use
     def proxy url
-      HttpAbstraction.proxy = url
+      RestClient.proxy = url
     end
-
+    
     # ensure that a database exists
     # creates it if it isn't already there
     # returns it after it's been created
@@ -160,3 +124,18 @@ module CouchRest
     end
   end # class << self
 end
+
+# For the sake of backwards compatability, generate a dummy ExtendedDocument class
+# which should be replaced by real library: couchrest_extended_document.
+#
+# Added 2010-05-10 by Sam Lown. Please remove at some point in the future.
+#
+class CouchRest::ExtendedDocument < CouchRest::Document
+
+  def self.inherited(subclass)
+    raise "ExtendedDocument is no longer included in CouchRest base driver, see couchrest_extended_document gem"
+  end
+
+end
+
+

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

@@ -65,7 +65,7 @@ module CouchRest
       keys = params.delete(:keys)
       funcs = funcs.merge({:keys => keys}) if keys
       url = CouchRest.paramify_url "#{@root}/_temp_view", params
-      CouchRest.post(url, funcs)
+      JSON.parse(RestClient.post(url, funcs.to_json, {"Content-Type" => 'application/json'}))
     end
     
     # backwards compatibility is a plus
@@ -108,14 +108,14 @@ module CouchRest
     # GET an attachment directly from CouchDB
     def fetch_attachment(doc, name)
       uri = url_for_attachment(doc, name)
-      HttpAbstraction.get uri
+      RestClient.get uri
     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(HttpAbstraction.put(uri, file, CouchRest.default_headers.update(options)))
+      JSON.parse(RestClient.put(uri, file, options))
     end
     
     # DELETE an attachment directly from CouchDB
@@ -123,13 +123,13 @@ module CouchRest
       uri = url_for_attachment(doc, name)
       # this needs a rev
       begin
-        CouchRest.delete(uri)
+        JSON.parse(RestClient.delete(uri))
       rescue Exception => error
         if force
           # get over a 409
           doc = get(doc['_id'])
           uri = url_for_attachment(doc, name)
-          CouchRest.delete(uri)
+          JSON.parse(RestClient.delete(uri))
         else
           error
         end
@@ -174,7 +174,7 @@ module CouchRest
           uri = "#{@root}/#{slug}"
           uri << "?batch=ok" if batch
           CouchRest.put uri, doc
-        rescue HttpAbstraction::ResourceNotFound
+        rescue RestClient::ResourceNotFound
           p "resource not found when saving even tho an id was passed"
           slug = doc['_id'] = @server.next_uuid
           CouchRest.put "#{@root}/#{slug}", doc
@@ -316,7 +316,6 @@ module CouchRest
     # DELETE the database itself. This is not undoable and could be rather
     # catastrophic. Use with care!
     def delete!
-      clear_extended_doc_fresh_cache
       CouchRest.delete @root
     end
 
@@ -334,10 +333,6 @@ module CouchRest
       payload[:continuous] = continuous
       CouchRest.post "#{@host}/_replicate", payload
     end
-    
-    def clear_extended_doc_fresh_cache
-      ::CouchRest::ExtendedDocument.subclasses.each{|klass| klass.design_doc_fresh = false if klass.respond_to?(:design_doc_fresh=) }
-    end
 
     def uri_for_attachment(doc, name)
       if doc.is_a?(String)

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

@@ -67,7 +67,7 @@ JAVASCRIPT
     def has_view?(view)
       view = view.to_s
       self['views'][view] &&
-        (self['views'][view]["couchrest-defaults"]||{})
+        (self['views'][view]["couchrest-defaults"] || {})
     end
 
     def fetch_view view_name, opts, &block
@@ -76,4 +76,4 @@ JAVASCRIPT
 
   end
   
-end
+end