mattetti-couchrest 0.2.1.0 → 0.13

data/lib/couchrest/support/class.rb

@@ -25,167 +25,151 @@
 # example, an array without those additions being shared with either their
 # parent, siblings, or children, which is unlike the regular class-level
 # attributes that are shared across the entire hierarchy.
-module CouchRest
-  module ClassExtension
-    def self.included(base)
-      if CouchRest::ClassExtension::InstanceMethods.instance_methods.all? {|m| base.respond_to?(m)}
-        # do nothing
-      elsif CouchRest::ClassExtension::InstanceMethods.instance_methods.any? {|m| base.respond_to?(m)}
-        raise RuntimeError, "Conflicting extentions to Class, work it out"
-      else
-        base.send(:include, CouchRest::ClassExtension::InstanceMethods)
-      end
-    end
-    
-    module InstanceMethods
-      # Defines class-level and instance-level attribute reader.
-      #
-      # @param *syms<Array> Array of attributes to define reader for.
-      # @return <Array[#to_s]> List of attributes that were made into cattr_readers
-      #
-      # @api public
-      #
-      # @todo Is this inconsistent in that it does not allow you to prevent
-      # an instance_reader via :instance_reader => false
-      def cattr_reader(*syms)
-        syms.flatten.each do |sym|
-          next if sym.is_a?(Hash)
-          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-    unless defined? @@#{sym}
-    @@#{sym} = nil
-    end
+class Class
+  # Defines class-level and instance-level attribute reader.
+  #
+  # @param *syms<Array> Array of attributes to define reader for.
+  # @return <Array[#to_s]> List of attributes that were made into cattr_readers
+  #
+  # @api public
+  #
+  # @todo Is this inconsistent in that it does not allow you to prevent
+  # an instance_reader via :instance_reader => false
+  def cattr_reader(*syms)
+    syms.flatten.each do |sym|
+      next if sym.is_a?(Hash)
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+unless defined? @@#{sym}
+@@#{sym} = nil
+end
  
-    def self.#{sym}
-    @@#{sym}
-    end
+def self.#{sym}
+@@#{sym}
+end
  
-    def #{sym}
-    @@#{sym}
+def #{sym}
+@@#{sym}
+end
+RUBY
     end
-    RUBY
-        end
-      end
+  end
  
-      # Defines class-level (and optionally instance-level) attribute writer.
-      #
-      # @param <Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define writer for.
-      # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
-      # @return <Array[#to_s]> List of attributes that were made into cattr_writers
-      #
-      # @api public
-      def cattr_writer(*syms)
-        options = syms.last.is_a?(Hash) ? syms.pop : {}
-        syms.flatten.each do |sym|
-          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-    unless defined? @@#{sym}
-    @@#{sym} = nil
-    end
+  # Defines class-level (and optionally instance-level) attribute writer.
+  #
+  # @param <Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define writer for.
+  # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
+  # @return <Array[#to_s]> List of attributes that were made into cattr_writers
+  #
+  # @api public
+  def cattr_writer(*syms)
+    options = syms.last.is_a?(Hash) ? syms.pop : {}
+    syms.flatten.each do |sym|
+      class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+unless defined? @@#{sym}
+@@#{sym} = nil
+end
  
-    def self.#{sym}=(obj)
-    @@#{sym} = obj
-    end
-    RUBY
+def self.#{sym}=(obj)
+@@#{sym} = obj
+end
+RUBY
  
-          unless options[:instance_writer] == false
-            class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-    def #{sym}=(obj)
-    @@#{sym} = obj
-    end
-    RUBY
-          end
-        end
+      unless options[:instance_writer] == false
+        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+def #{sym}=(obj)
+@@#{sym} = obj
+end
+RUBY
       end
+    end
+  end
  
-      # Defines class-level (and optionally instance-level) attribute accessor.
-      #
-      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define accessor for.
-      # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
-      # @return <Array[#to_s]> List of attributes that were made into accessors
-      #
-      # @api public
-      def cattr_accessor(*syms)
-        cattr_reader(*syms)
-        cattr_writer(*syms)
-      end
+  # Defines class-level (and optionally instance-level) attribute accessor.
+  #
+  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to define accessor for.
+  # @option syms :instance_writer<Boolean> if true, instance-level attribute writer is defined.
+  # @return <Array[#to_s]> List of attributes that were made into accessors
+  #
+  # @api public
+  def cattr_accessor(*syms)
+    cattr_reader(*syms)
+    cattr_writer(*syms)
+  end
  
-      # Defines class-level inheritable attribute reader. Attributes are available to subclasses,
-      # each subclass has a copy of parent's attribute.
-      #
-      # @param *syms<Array[#to_s]> Array of attributes to define inheritable reader for.
-      # @return <Array[#to_s]> Array of attributes converted into inheritable_readers.
-      #
-      # @api public
-      #
-      # @todo Do we want to block instance_reader via :instance_reader => false
-      # @todo It would be preferable that we do something with a Hash passed in
-      # (error out or do the same as other methods above) instead of silently
-      # moving on). In particular, this makes the return value of this function
-      # less useful.
-      def class_inheritable_reader(*ivars)
-        instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
+  # Defines class-level inheritable attribute reader. Attributes are available to subclasses,
+  # each subclass has a copy of parent's attribute.
+  #
+  # @param *syms<Array[#to_s]> Array of attributes to define inheritable reader for.
+  # @return <Array[#to_s]> Array of attributes converted into inheritable_readers.
+  #
+  # @api public
+  #
+  # @todo Do we want to block instance_reader via :instance_reader => false
+  # @todo It would be preferable that we do something with a Hash passed in
+  # (error out or do the same as other methods above) instead of silently
+  # moving on). In particular, this makes the return value of this function
+  # less useful.
+  def class_inheritable_reader(*ivars)
+    instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
  
-        ivars.each do |ivar|
-          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-    def self.#{ivar}
-    return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
-    ivar = superclass.#{ivar}
-    return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
-    @#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) && !ivar.is_a?(Symbol) ? ivar.dup : ivar
-    end
-    RUBY
-          unless instance_reader == false
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-    def #{ivar}
-    self.class.#{ivar}
-    end
-    RUBY
-          end
-        end
+    ivars.each do |ivar|
+      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+def self.#{ivar}
+return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
+ivar = superclass.#{ivar}
+return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
+@#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) && !ivar.is_a?(Symbol) ? ivar.dup : ivar
+end
+RUBY
+      unless instance_reader == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+def #{ivar}
+self.class.#{ivar}
+end
+RUBY
       end
- 
-      # Defines class-level inheritable attribute writer. Attributes are available to subclasses,
-      # each subclass has a copy of parent's attribute.
-      #
-      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-      # define inheritable writer for.
-      # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-      # @return <Array[#to_s]> An Array of the attributes that were made into inheritable writers.
-      #
-      # @api public
-      #
-      # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
-      # class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
-      def class_inheritable_writer(*ivars)
-        instance_writer = ivars.pop[:instance_writer] if ivars.last.is_a?(Hash)
-        ivars.each do |ivar|
-          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-    def self.#{ivar}=(obj)
-    @#{ivar} = obj
     end
-    RUBY
-          unless instance_writer == false
-            self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-    def #{ivar}=(obj) self.class.#{ivar} = obj end
-    RUBY
-          end
-        end
-      end
+  end
  
-      # Defines class-level inheritable attribute accessor. Attributes are available to subclasses,
-      # each subclass has a copy of parent's attribute.
-      #
-      # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
-      # define inheritable accessor for.
-      # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
-      # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
-      #
-      # @api public
-      def class_inheritable_accessor(*syms)
-        class_inheritable_reader(*syms)
-        class_inheritable_writer(*syms)
+  # Defines class-level inheritable attribute writer. Attributes are available to subclasses,
+  # each subclass has a copy of parent's attribute.
+  #
+  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
+  # define inheritable writer for.
+  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
+  # @return <Array[#to_s]> An Array of the attributes that were made into inheritable writers.
+  #
+  # @api public
+  #
+  # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
+  # class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
+  def class_inheritable_writer(*ivars)
+    instance_writer = ivars.pop[:instance_writer] if ivars.last.is_a?(Hash)
+    ivars.each do |ivar|
+      self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+def self.#{ivar}=(obj)
+@#{ivar} = obj
+end
+RUBY
+      unless instance_writer == false
+        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+def #{ivar}=(obj) self.class.#{ivar} = obj end
+RUBY
       end
     end
   end
-end
-
-Class.send(:include, CouchRest::ClassExtension)
+ 
+  # Defines class-level inheritable attribute accessor. Attributes are available to subclasses,
+  # each subclass has a copy of parent's attribute.
+  #
+  # @param *syms<Array[*#to_s, Hash{:instance_writer => Boolean}]> Array of attributes to
+  # define inheritable accessor for.
+  # @option syms :instance_writer<Boolean> if true, instance-level inheritable attribute writer is defined.
+  # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
+  #
+  # @api public
+  def class_inheritable_accessor(*syms)
+    class_inheritable_reader(*syms)
+    class_inheritable_writer(*syms)
+  end
+end

data/lib/couchrest.rb

@@ -22,19 +22,18 @@ $:.unshift File.dirname(__FILE__) unless
   $:.include?(File.dirname(__FILE__)) ||
   $:.include?(File.expand_path(File.dirname(__FILE__)))
   
-$COUCHREST_DEBUG ||= false
   
 require 'couchrest/monkeypatches'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '0.2.1' unless self.const_defined?("VERSION")
+  VERSION = '0.13'
   
   autoload :Server,       'couchrest/core/server'
   autoload :Database,     'couchrest/core/database'
-  autoload :Response,     'couchrest/core/response'
+  autoload :Response,      'couchrest/core/response'
   autoload :Document,     'couchrest/core/document'
-  autoload :Design,       'couchrest/core/design'
+  autoload :Design,     'couchrest/core/design'
   autoload :View,         'couchrest/core/view'
   autoload :Model,        'couchrest/core/model'
   autoload :Pager,        'couchrest/helper/pager'
@@ -125,42 +124,18 @@ module CouchRest
       cr.database(parsed[:database])
     end
     
-    def put(uri, doc = nil)
+    def put uri, doc = nil
       payload = doc.to_json if doc
-      begin
-        JSON.parse(RestClient.put(uri, payload))
-      rescue Exception => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a PUT request #{uri}\npayload: #{payload.inspect}\n#{e}"
-        else
-          raise e
-        end
-      end
+      JSON.parse(RestClient.put(uri, payload))
     end
 
-    def get(uri)
-      begin
-        JSON.parse(RestClient.get(uri), :max_nesting => false)
-      rescue => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a GET request #{uri}\n: #{e}"
-        else
-          raise e
-        end
-      end
+    def get uri
+      JSON.parse(RestClient.get(uri), :max_nesting => false)
     end
   
     def post uri, doc = nil
       payload = doc.to_json if doc
-      begin
-        JSON.parse(RestClient.post(uri, payload))
-      rescue Exception => e
-        if $COUCHREST_DEBUG == true
-          raise "Error while sending a POST request #{uri}\npayload: #{payload.inspect}\n#{e}"
-        else
-          raise e
-        end
-      end
+      JSON.parse(RestClient.post(uri, payload))
     end
   
     def delete uri

data/spec/couchrest/core/database_spec.rb

@@ -247,11 +247,9 @@ describe CouchRest::Database do
       @db.save_doc(@doc)
     end
     
-    # Depreacated
-    # it "should get the attachment with the doc's _id" do
-    #   @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
-    # end
-    
+    it "should get the attachment with the doc's _id" do
+      @db.fetch_attachment("mydocwithattachment", "test.html").should == @attach
+    end
     it "should get the attachment with the doc itself" do
       @db.fetch_attachment(@db.get('mydocwithattachment'), 'test.html').should == @attach
     end
@@ -268,8 +266,7 @@ describe CouchRest::Database do
     it "should save the attachment to a new doc" do
       r = @db.put_attachment({'_id' => 'attach-this'}, 'couchdb.png', image = @file.read, {:content_type => 'image/png'})
       r['ok'].should == true
-      doc = @db.get("attach-this")
-      attachment = @db.fetch_attachment(doc,"couchdb.png")
+      attachment = @db.fetch_attachment("attach-this","couchdb.png")
       attachment.should == image
     end
   end
@@ -277,7 +274,7 @@ describe CouchRest::Database do
   describe "PUT document with attachment" do
     before(:each) do
       @attach = "<html><head><title>My Doc</title></head><body><p>Has words.</p></body></html>"
-      doc = {
+      @doc = {
         "_id" => "mydocwithattachment",
         "field" => ["some value"],
         "_attachments" => {
@@ -287,14 +284,14 @@ describe CouchRest::Database do
           }
         }
       }
-      @db.save_doc(doc)
-      @doc = @db.get("mydocwithattachment")
+      @db.save_doc(@doc)
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
+      doc = @db.get("mydocwithattachment")
+      doc['_attachments']['test.html']['length'].should == @attach.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
   end
@@ -312,15 +309,14 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(doc)
-      doc['_rev'].should_not be_nil
+      doc = @db.get('mydocwithattachment')
       doc['field'] << 'another value'
-      @db.save_doc(doc)["ok"].should be_true
+      @db.save_doc(doc)
     end
     
     it 'should be there' do
-      doc = @db.get('mydocwithattachment')
-      attachment = @db.fetch_attachment(doc, 'test.html')
-      Base64.decode64(attachment).should == @attach
+      attachment = @db.fetch_attachment('mydocwithattachment', 'test.html')
+      attachment.should == @attach
     end
   end
 
@@ -343,18 +339,18 @@ describe CouchRest::Database do
         }
       }
       @db.save_doc(@doc)
-      @doc = @db.get("mydocwithattachment")
     end
     it "should save and be indicated" do
-      @doc['_attachments']['test.html']['length'].should == @attach.length
-      @doc['_attachments']['other.html']['length'].should == @attach2.length
+      doc = @db.get("mydocwithattachment")
+      doc['_attachments']['test.html']['length'].should == @attach.length
+      doc['_attachments']['other.html']['length'].should == @attach2.length
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"test.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","test.html")
       attachment.should == @attach
     end
     it "should be there" do
-      attachment = @db.fetch_attachment(@doc,"other.html")
+      attachment = @db.fetch_attachment("mydocwithattachment","other.html")
       attachment.should == @attach2
     end
   end
@@ -374,9 +370,9 @@ describe CouchRest::Database do
       @doc = @db.get('mydocwithattachment')
     end
     it "should delete the attachment" do
-      lambda { @db.fetch_attachment(@doc,'test.html') }.should_not raise_error
+      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should_not raise_error
       @db.delete_attachment(@doc, "test.html")
-      lambda { @db.fetch_attachment(@doc,'test.html') }.should raise_error(RestClient::ResourceNotFound)
+      lambda { @db.fetch_attachment('mydocwithattachment','test.html') }.should raise_error(RestClient::ResourceNotFound)
     end
   end
 
@@ -399,8 +395,7 @@ describe CouchRest::Database do
       doc['_attachments']['http://example.com/stuff.cgi?things=and%20stuff']['length'].should == @attach.length
     end
     it "should be there" do
-      doc = @db.get(@docid)
-      attachment = @db.fetch_attachment(doc,"http://example.com/stuff.cgi?things=and%20stuff")
+      attachment = @db.fetch_attachment(@docid,"http://example.com/stuff.cgi?things=and%20stuff")
       attachment.should == @attach
     end
   end
@@ -709,7 +704,7 @@ describe CouchRest::Database do
   describe "creating a database" do
     before(:each) do
       @db = @cr.database('couchrest-test-db_to_create')
-      @db.delete! if @cr.databases.include?('couchrest-test-db_to_create')
+      @db.delete!
     end
     
     it "should just work fine" do
@@ -742,4 +737,4 @@ describe CouchRest::Database do
   end
 
 
-end
+end