sporkd-couchrest 0.30 → 0.31

data/history.txt

@@ -1,3 +1,20 @@
+== 0.40
+
+=== Notes
+
+  This release slightly modifies the API and if you were using a previous version of CouchRest,
+you will need to make the following modifications.
+
+
+
+* Major enhancements
+
+  * 
+  
+* Minor enhancements  
+
+  * Added #amount_pages to a paginated collection. (Matt Aimonetti)
+
 == 0.31
 
 * Major enhancements

data/lib/couchrest/core/adapters/restclient.rb

@@ -0,0 +1,35 @@
+module RestClientAdapter
+   
+  module API
+    def proxy=(url)
+      RestClient.proxy = url
+    end 
+    
+    def proxy
+      RestClient.proxy
+    end
+  
+    def get(uri, headers={})
+      RestClient.get(uri, headers)
+    end
+  
+    def post(uri, payload, headers={})
+      RestClient.post(uri, payload, headers)
+    end
+  
+    def put(uri, payload, headers={})
+      RestClient.put(uri, payload, headers)
+    end
+  
+    def delete(uri, headers={})
+      RestClient.delete(uri, headers)
+    end
+  
+    def copy(uri, headers)
+      RestClient::Request.execute(  :method   => :copy,
+                                    :url      => uri,
+                                    :headers  => headers) 
+    end
+  end 
+  
+end

data/lib/couchrest/core/http_abstraction.rb

@@ -0,0 +1,48 @@
+require 'couchrest/core/adapters/restclient'
+
+# Abstraction layet for HTTP communications.
+#                                           
+# By defining a basic API that CouchRest is relying on,
+# it allows for easy experimentations and implementations of various libraries.
+# 
+# Most of the API is based on the RestClient API that was used in the early version of CouchRest.
+#
+module HttpAbstraction
+  
+  # here is the list of exception expected by CouchRest
+  # please convert the underlying errors in this set of known
+  # exceptions.
+  class ResourceNotFound < StandardError; end
+  class RequestFailed < StandardError; end
+  class RequestTimeout < StandardError; end
+  class ServerBrokeConnection < StandardError; end
+  class Conflict < StandardError; end
+  
+  
+  # # Here is the API you need to implement if you want to write a new adapter
+  # # See adapters/restclient.rb for more information.
+  #
+  # def self.proxy=(url)
+  # end
+  #      
+  # def self.proxy
+  # end
+  #
+  # def self.get(uri, headers=nil)
+  # end
+  # 
+  # def self.post(uri, payload, headers=nil)
+  # end
+  # 
+  # def self.put(uri, payload, headers=nil)
+  # end
+  # 
+  # def self.delete(uri, headers=nil)
+  # end
+  # 
+  # def self.copy(uri, headers)
+  # end    
+ 
+end
+
+HttpAbstraction.extend(RestClientAdapter::API)

data/lib/couchrest/mixins/callbacks.rb

@@ -226,7 +226,7 @@ module CouchRest
             # end
 
             name = "_conditional_callback_#{@kind}_#{next_id}"
-            txt, line = <<-RUBY_EVAL, __LINE__
+            txt, line = <<-RUBY_EVAL, __LINE__ + 1
               def #{name}(halted)
                 #{@compiled_options[0] || "if true"} && !halted
                   #{@filter} do
@@ -388,7 +388,7 @@ module CouchRest
         body = send("_#{symbol}_callback").
           compile(nil, :terminator => send("_#{symbol}_terminator"))
 
-        body, line = <<-RUBY_EVAL, __LINE__
+        body, line = <<-RUBY_EVAL, __LINE__ + 1
           def _run_#{symbol}_callbacks(key = nil, &blk)
             if key
               name = "_run__\#{self.class.name.hash.abs}__#{symbol}__\#{key.hash.abs}__callbacks"

data/lib/couchrest/mixins/collection.rb

@@ -83,6 +83,8 @@ module CouchRest
 
         DEFAULT_PAGE = 1
         DEFAULT_PER_PAGE = 30
+        
+        attr_accessor :amount_pages
 
         # Create a new CollectionProxy to represent the specified view.  If a
         # container class is specified, the proxy will create an object of the
@@ -110,7 +112,8 @@ module CouchRest
         # See Collection.paginate
         def paginate(options = {})
           page, per_page = parse_options(options)
-          results = @database.view(@view_name, pagination_options(page, per_page))
+          results = @database.view(@view_name, pagination_options(page, per_page)) 
+          @amount_pages ||= (results['total_rows'].to_f / per_page.to_f).ceil
           remember_where_we_left_off(results, page)
           convert_to_container_array(results)
         end

data/lib/couchrest/mixins/properties.rb

@@ -27,7 +27,7 @@ module CouchRest
       class IncludeError < StandardError; end
       
       def self.included(base)
-        base.class_eval <<-EOS, __FILE__, __LINE__
+        base.class_eval <<-EOS, __FILE__, __LINE__ + 1
             extlib_inheritable_accessor(:properties) unless self.respond_to?(:properties)
             self.properties ||= []
         EOS
@@ -144,14 +144,14 @@ module CouchRest
           # defines the getter for the property (and optional aliases)
           def create_property_getter(property)
             # meth = property.name
-            class_eval <<-EOS, __FILE__, __LINE__
+            class_eval <<-EOS, __FILE__, __LINE__ + 1
               def #{property.name}
                 self['#{property.name}']
               end
             EOS
 
             if property.alias
-              class_eval <<-EOS, __FILE__, __LINE__
+              class_eval <<-EOS, __FILE__, __LINE__ + 1
                 alias #{property.alias.to_sym} #{property.name.to_sym}
               EOS
             end

data/lib/couchrest/mixins/validation.rb

@@ -50,7 +50,7 @@ module CouchRest
     
     def self.included(base)
       base.extlib_inheritable_accessor(:auto_validation)
-      base.class_eval <<-EOS, __FILE__, __LINE__
+      base.class_eval <<-EOS, __FILE__, __LINE__ + 1
           # Callbacks
           define_callbacks :validate
           
@@ -74,7 +74,7 @@ module CouchRest
       EOS
       
       base.extend(ClassMethods)
-      base.class_eval <<-EOS, __FILE__, __LINE__
+      base.class_eval <<-EOS, __FILE__, __LINE__ + 1
         define_callbacks :validate
         if method_defined?(:_run_save_callbacks)
           set_callback :save, :before, :check_validations
@@ -210,7 +210,7 @@ module CouchRest
       def create_context_instance_methods(context)
         name = "valid_for_#{context.to_s}?"           # valid_for_signup?
         if !self.instance_methods.include?(name)
-          class_eval <<-EOS, __FILE__, __LINE__
+          class_eval <<-EOS, __FILE__, __LINE__ + 1
             def #{name}                               # def valid_for_signup?
               valid?('#{context.to_s}'.to_sym)        #   valid?('signup'.to_sym)
             end                                       # end

data/lib/couchrest/more/extended_document.rb

@@ -21,7 +21,7 @@ module CouchRest
     
     def self.inherited(subklass)
       subklass.send(:include, CouchRest::Mixins::Properties)
-      subklass.class_eval <<-EOS, __FILE__, __LINE__
+      subklass.class_eval <<-EOS, __FILE__, __LINE__ + 1
         def self.inherited(subklass)
           subklass.properties = self.properties.dup
         end
@@ -76,7 +76,7 @@ module CouchRest
     # on the document whenever saving occurs. CouchRest uses a pretty
     # decent time format by default. See Time#to_json
     def self.timestamps!
-      class_eval <<-EOS, __FILE__, __LINE__
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
         property(:updated_at, :read_only => true, :cast_as => 'Time', :auto_validation => false)
         property(:created_at, :read_only => true, :cast_as => 'Time', :auto_validation => false)
         

data/lib/couchrest.rb

@@ -28,7 +28,7 @@ require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.30' unless self.const_defined?("VERSION")
+  VERSION    = '0.31' unless self.const_defined?("VERSION")
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'

data/spec/couchrest/more/extended_doc_view_spec.rb

@@ -365,6 +365,11 @@ describe "ExtendedDocument views" do
       articles.paginated_each(:per_page => 3) do |a|
         a.should_not be_nil
       end
+    end 
+    it "should have the amount of paginated pages" do
+      articles = Article.by_date :key => Date.today
+      articles.paginate(:per_page => 3) 
+      articles.amount_pages.should == 3
     end
     it "should provide a class method to access the collection directly" do
       articles = Article.collection_proxy_for('Article', 'by_date', :descending => true,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sporkd-couchrest
 version: !ruby/object:Gem::Version 
-  version: "0.30"
+  version: "0.31"
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -71,9 +71,12 @@ files:
 - lib/couchrest/commands/generate.rb
 - lib/couchrest/commands/push.rb
 - lib/couchrest/core
+- lib/couchrest/core/adapters
+- 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/server.rb
 - lib/couchrest/core/view.rb