couchrest 1.0.0.beta2 → 1.0.0.beta3

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rake'
 require "rake/rdoctask"
-require File.join(File.expand_path(File.dirname(__FILE__)),'lib','couchrest')
+
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require 'couchrest'
 
 begin
   require 'spec/rake/spectask'
@@ -25,7 +27,7 @@ begin
     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", ">= 1.5.1")
-    gemspec.add_dependency("json", "<= 1.4.2")
+    gemspec.add_dependency("json", "= 1.2.4") # json 1.4.3 has stack overflow issues!
 #    gemspec.add_dependency("couchrest_extended_document", ">= 1.0.0")
     gemspec.version = CouchRest::VERSION
     gemspec.date = "2010-07-01"
@@ -65,4 +67,4 @@ module Rake
 end
 
 Rake.remove_task("github:release")
-Rake.remove_task("release")
+Rake.remove_task("release")

data/couchrest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{couchrest}
-  s.version = "1.0.0.beta2"
+  s.version = "1.0.0.beta3"
 
   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-01}
+  s.date = %q{2010-07-25}
   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 = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
      "lib/couchrest/response.rb",
      "lib/couchrest/rest_api.rb",
      "lib/couchrest/server.rb",
-     "lib/couchrest/support/class.rb",
+     "lib/couchrest/support/inheritable_attributes.rb",
      "spec/couchrest/couchrest_spec.rb",
      "spec/couchrest/database_spec.rb",
      "spec/couchrest/design_spec.rb",
@@ -95,14 +95,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_runtime_dependency(%q<json>, ["<= 1.4.2"])
+      s.add_runtime_dependency(%q<json>, ["= 1.2.4"])
     else
       s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-      s.add_dependency(%q<json>, ["<= 1.4.2"])
+      s.add_dependency(%q<json>, ["= 1.2.4"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 1.5.1"])
-    s.add_dependency(%q<json>, ["<= 1.4.2"])
+    s.add_dependency(%q<json>, ["= 1.2.4"])
   end
 end
 

data/history.txt

@@ -2,8 +2,12 @@
 
 * Major enhancements
 	* Add create_target option to Database#replicate_to and #replicate_from. http://github.com/couchrest/couchrest/issues/#issue/26 (Alexander Uvarov) 
+  * Removing unused core extensions and moving extlib_inhertiable_* methods to use couchrest_inheritable_* 
+    to avoid conflicts with Rails. (Geoff Buesing)
 
 * Minor enhancements
+  * Added Document#id= support (issue detected by Rory Franklin with RSpec model stubs)
+  * Fixing issues with CouchDB 1.0 and RestClient
 
 == 1.0.0.beta 
 

data/lib/couchrest.rb

@@ -13,9 +13,11 @@
 #    limitations under the License.
 
 require 'rubygems'
-gem 'json', "<= 1.4.2"
-require 'json'
 gem 'rest-client', ">= 1.5.1"
+unless Kernel.const_defined?("JSON")
+  gem 'json', '1.2.4'
+  require 'json'
+end
 require 'rest_client'
 
 # Not sure why this is required, so removed until a reason is found!
@@ -25,10 +27,11 @@ $:.unshift File.dirname(__FILE__) unless
     
 require 'couchrest/monkeypatches'
 require 'couchrest/rest_api'
+require 'couchrest/support/inheritable_attributes'
 
 # = CouchDB, close to the metal
 module CouchRest
-  VERSION    = '1.0.0.beta2'
+  VERSION    = '1.0.0.beta3'
   
   autoload :Server,       'couchrest/server'
   autoload :Database,     'couchrest/database'
@@ -134,4 +137,4 @@ class CouchRest::ExtendedDocument < CouchRest::Document
     raise "ExtendedDocument is no longer included in CouchRest base driver, see couchrest_extended_document gem"
   end
 
-end
+end

data/lib/couchrest/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
-      JSON.parse(RestClient.post(url, funcs.to_json, {"Content-Type" => 'application/json'}))
+      JSON.parse(RestClient.post(url, funcs.to_json, CouchRest.default_headers))
     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)
-      RestClient.get uri
+      RestClient.get uri, CouchRest.default_headers
     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, options))
+      JSON.parse(RestClient.put(uri, file, CouchRest.default_headers.merge(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
-        JSON.parse(RestClient.delete(uri))
+        CouchRest.delete(uri)
       rescue Exception => error
         if force
           # get over a 409
           doc = get(doc['_id'])
           uri = url_for_attachment(doc, name)
-          JSON.parse(RestClient.delete(uri))
+          CouchRest.delete(uri)
         else
           error
         end

data/lib/couchrest/design.rb

@@ -18,7 +18,7 @@ module CouchRest
         doc_keys = keys.collect{|k|"doc['#{k}']"} # this is where :require => 'doc.x == true' would show up
         key_emit = doc_keys.length == 1 ? "#{doc_keys.first}" : "[#{doc_keys.join(', ')}]"
         guards = opts.delete(:guards) || []
-        guards.concat doc_keys
+        guards += doc_keys.map{|k| "(#{k} != null)"}
         map_function = <<-JAVASCRIPT
 function(doc) {
   if (#{guards.join(' && ')}) {

data/lib/couchrest/document.rb

@@ -3,8 +3,9 @@ require 'delegate'
 module CouchRest  
   class Document < Response
     include CouchRest::Attachments
+    extend CouchRest::InheritableAttributes
     
-    extlib_inheritable_accessor :database
+    couchrest_inheritable_accessor :database
     attr_accessor :database
     
     # override the CouchRest::Model-wide default_database
@@ -17,6 +18,10 @@ module CouchRest
     def id
       self['_id']
     end
+
+    def id=(id)
+      self['_id'] = id
+    end
     
     def rev
       self['_rev']

data/lib/couchrest/monkeypatches.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), 'support', 'class')
 require 'timeout'
 
 # This file must be loaded after the JSON gem and any other library that beats up the Time class.

data/lib/couchrest/rest_api.rb

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

data/lib/couchrest/server.rb

@@ -73,6 +73,8 @@ 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/lib/couchrest/support/inheritable_attributes.rb

@@ -0,0 +1,107 @@
+# Copyright (c) 2006-2009 David Heinemeier Hansson
+#  
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#  
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#  
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Extracted From
+# http://github.com/rails/rails/commit/971e2438d98326c994ec6d3ef8e37b7e868ed6e2
+
+module CouchRest
+  module InheritableAttributes
+    
+    # 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 couchrest_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.dup : ivar
+          end
+        RUBY
+        unless instance_reader == false
+          self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def #{ivar}
+              self.class.#{ivar}
+            end
+          RUBY
+        end
+      end
+    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 couchrest_inheritable_writer(*ivars)
+      instance_writer = ivars.pop[: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
+
+        self.send("#{ivar}=", yield) if block_given?
+      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 couchrest_inheritable_accessor(*syms, &block)
+      couchrest_inheritable_reader(*syms)
+      couchrest_inheritable_writer(*syms, &block)
+    end
+  end
+end

data/spec/couchrest/couchrest_spec.rb

@@ -28,6 +28,13 @@ 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
@@ -137,7 +144,7 @@ describe CouchRest do
 
   describe "ensuring the db exists" do
     it "should be super easy" do
-      db = CouchRest.database! "http://127.0.0.1:5984/couchrest-test-2"
+      db = CouchRest.database! "#{COUCHHOST}/couchrest-test-2"
       db.name.should == 'couchrest-test-2'
       db.info["db_name"].should == 'couchrest-test-2'
     end

data/spec/couchrest/database_spec.rb

@@ -180,7 +180,7 @@ describe CouchRest::Database do
       
       docs = [{'key' => 'value'}, {'_id' => 'totally-uniq'}]
       id_docs = [{'key' => 'value', '_id' => 'asdf6sgadkfhgsdfusdf'}, {'_id' => 'totally-uniq'}]
-      CouchRest.should_receive(:post).with("http://127.0.0.1:5984/couchrest-test/_bulk_docs", {:docs => id_docs})
+      CouchRest.should_receive(:post).with("#{COUCHHOST}/couchrest-test/_bulk_docs", {:docs => id_docs})
       
       @db.bulk_save(docs)
     end
@@ -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) # Allow some time to replicate
+        sleep(1.5) # 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) # Allow some time to replicate
+        sleep(1.5) # Allow some time to replicate
         doc = @other_db.get('test_doc_after')
         doc['some-value'].should == 'bar'
       end

data/spec/couchrest/design_spec.rb

@@ -134,5 +134,25 @@ describe CouchRest::Design do
       res["rows"].first["key"].should == ["a",2]
     end
   end
-  
+
+  describe "a view with nil and 0 values" do
+    before(:all) do
+      @db = reset_test_db!
+      @des = CouchRest::Design.new
+      @des.name = "test"
+      @des.view_by :code
+      @des.database = @db
+      @des.save
+      @db.bulk_save([{"code" => "a", "age" => 2},
+        {"code" => nil, "age" => 4},{"code" => 0, "age" => 9}])
+    end
+    it "should work" do
+      res = @des.view :by_code
+      res["rows"][0]["key"].should == 0
+      res["rows"][1]["key"].should == "a"
+      res["rows"][2].should be_nil
+    end
+  end
+
+
 end

data/spec/couchrest/document_spec.rb

@@ -62,6 +62,10 @@ describe CouchRest::Document do
       @doc.rev.should be_nil
       @doc.id.should be_nil
     end
+    it "should be possible to set id" do
+      @doc.id = 1
+      @doc.id.should eql(1)
+    end
     
     it "should freak out when saving without a database" do
       lambda{@doc.save}.should raise_error(ArgumentError)

data/spec/couchrest/server_spec.rb

@@ -4,7 +4,7 @@ describe CouchRest::Server do
   
   describe "available databases" do
     before(:each) do
-      @couch = CouchRest::Server.new
+      @couch = CouchRest::Server.new COUCHHOST
     end
 
     after(:each) do

data/spec/spec_helper.rb

@@ -8,10 +8,10 @@ unless defined?(FIXTURE_PATH)
   FIXTURE_PATH = File.join(File.dirname(__FILE__), '/fixtures')
   SCRATCH_PATH = File.join(File.dirname(__FILE__), '/tmp')
 
-  COUCHHOST = "http://127.0.0.1:5984"
+  COUCHHOST = ENV['COUCHHOST'] || "http://127.0.0.1:5984"
   TESTDB    = 'couchrest-test'
   REPLICATIONDB = 'couchrest-test-replication'
-  TEST_SERVER    = CouchRest.new
+  TEST_SERVER    = CouchRest.new COUCHHOST
   TEST_SERVER.default_database = TESTDB
   DB = TEST_SERVER.database(TESTDB)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest
 version: !ruby/object:Gem::Version 
-  hash: -1848230054
+  hash: -1848230053
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - J. Chris Anderson
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -03:00
+date: 2010-07-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,14 +44,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
         - 1
-        - 4
         - 2
-        version: 1.4.2
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id002
 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.
@@ -96,7 +96,7 @@ files:
 - lib/couchrest/response.rb
 - lib/couchrest/rest_api.rb
 - lib/couchrest/server.rb
-- lib/couchrest/support/class.rb
+- lib/couchrest/support/inheritable_attributes.rb
 - spec/couchrest/couchrest_spec.rb
 - spec/couchrest/database_spec.rb
 - spec/couchrest/design_spec.rb

data/lib/couchrest/support/class.rb

@@ -1,190 +0,0 @@
-# Copyright (c) 2006-2009 David Heinemeier Hansson
-#  
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#  
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#  
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Extracted From
-# http://github.com/rails/rails/commit/971e2438d98326c994ec6d3ef8e37b7e868ed6e2
-
-# Extends the class object with class and instance accessors for class attributes,
-# just like the native attr* accessors for instance attributes.
-#
-#  class Person
-#    cattr_accessor :hair_colors
-#  end
-#
-#  Person.hair_colors = [:brown, :black, :blonde, :red]
-class Class
-  def cattr_reader(*syms)
-    syms.flatten.each do |sym|
-      next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}  # unless defined? @@hair_colors
-          @@#{sym} = nil          #   @@hair_colors = nil
-        end                       # end
-                                  #
-        def self.#{sym}           # def self.hair_colors
-          @@#{sym}                #   @@hair_colors
-        end                       # end
-                                  #
-        def #{sym}                # def hair_colors
-          @@#{sym}                #   @@hair_colors
-        end                       # end
-      EOS
-    end
-  end unless Class.respond_to?(:cattr_reader)
-
-  def cattr_writer(*syms)
-    options = syms.extract_options!
-    syms.flatten.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        unless defined? @@#{sym}                       # unless defined? @@hair_colors
-          @@#{sym} = nil                               #   @@hair_colors = nil
-        end                                            # end
-                                                       #
-        def self.#{sym}=(obj)                          # def self.hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-                                                       #
-        #{"                                            #
-        def #{sym}=(obj)                               # def hair_colors=(obj)
-          @@#{sym} = obj                               #   @@hair_colors = obj
-        end                                            # end
-        " unless options[:instance_writer] == false }  # # instance writer above is generated unless options[:instance_writer] == false
-      EOS
-    end
-  end unless Class.respond_to?(:cattr_writer)
-
-  def cattr_accessor(*syms)
-    cattr_reader(*syms)
-    cattr_writer(*syms)
-  end unless Class.respond_to?(:cattr_accessor)
-  
-  # 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 extlib_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.dup : ivar
-        end
-      RUBY
-      unless instance_reader == false
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{ivar}
-            self.class.#{ivar}
-          end
-        RUBY
-      end
-    end
-  end unless Class.respond_to?(:extlib_inheritable_reader)
-
-  # 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 extlib_inheritable_writer(*ivars)
-    instance_writer = ivars.pop[: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
-
-      self.send("#{ivar}=", yield) if block_given?
-    end
-  end unless Class.respond_to?(:extlib_inheritable_writer)
-
-  # 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 extlib_inheritable_accessor(*syms, &block)
-    extlib_inheritable_reader(*syms)
-    extlib_inheritable_writer(*syms, &block)
-  end unless Class.respond_to?(:extlib_inheritable_accessor)
-end
-
-class Array
-  # Extracts options from a set of arguments. Removes and returns the last
-  # element in the array if it's a hash, otherwise returns a blank hash.
-  #
-  #   def options(*args)
-  #     args.extract_options!
-  #   end
-  #
-  #   options(1, 2)           # => {}
-  #   options(1, 2, :a => :b) # => {:a=>:b}
-  def extract_options!
-    last.is_a?(::Hash) ? pop : {}
-  end unless Array.new.respond_to?(:extract_options!)
-  
-  # Wraps the object in an Array unless it's an Array.  Converts the
-  # object to an Array using #to_ary if it implements that.
-  def self.wrap(object)
-    case object
-    when nil
-      []
-    when self
-      object
-    else
-      if object.respond_to?(:to_ary)
-        object.to_ary
-      else
-        [object]
-      end
-    end
-  end unless Array.respond_to?(:wrap)
-end
-