couchrest 0.33 → 0.34

data/lib/couchrest/more/property.rb

@@ -32,9 +32,28 @@ module CouchRest
         @alias              = options.delete(:alias)      if options[:alias]
         @default            = options.delete(:default)    unless options[:default].nil?
         @casted             = options[:casted] ? true : false
-        @init_method        = options[:send] ? options.delete(:send) : 'new'
+        @init_method        = options[:init_method] ? options.delete(:init_method) : 'new'
         @options            = options
       end
     
   end
 end
+
+class CastedArray < Array
+  attr_accessor :casted_by
+  
+  def << obj
+    obj.casted_by = self.casted_by if obj.respond_to?(:casted_by)
+    super(obj)
+  end
+  
+  def push(obj)
+    obj.casted_by = self.casted_by if obj.respond_to?(:casted_by)
+    super(obj)
+  end
+  
+  def []= index, obj
+    obj.casted_by = self.casted_by if obj.respond_to?(:casted_by)
+    super(index, obj)
+  end
+end

data/lib/couchrest/support/class.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2004-2008 David Heinemeier Hansson
-#
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -18,79 +18,59 @@
 # 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.
- 
-# Allows attributes to be shared within an inheritance hierarchy, but where
-# each descendant gets a copy of their parents' attributes, instead of just a
-# pointer to the same. This means that the child can add elements to, for
-# 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.
+#
+# 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
-  # 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 #{sym}
-          @@#{sym}
-        end
-      RUBY
+      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)
 
-  # 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 : {}
+    options = syms.extract_options!
     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
-
-      unless options[:instance_writer] == false
-        class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-          def #{sym}=(obj)
-            @@#{sym} = obj
-          end
-        RUBY
-      end
+      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)
 
-  # 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)
@@ -156,6 +136,8 @@ class Class
           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)
 
@@ -168,9 +150,41 @@ class Class
   # @return <Array[#to_s]> An Array of attributes turned into inheritable accessors.
   #
   # @api public
-  def extlib_inheritable_accessor(*syms)
+  def extlib_inheritable_accessor(*syms, &block)
     extlib_inheritable_reader(*syms)
-    extlib_inheritable_writer(*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
+

data/lib/couchrest/support/rails.rb

@@ -1,8 +1,4 @@
 # This file contains various hacks for Rails compatibility.
-# To use, just require in environment.rb, like so:
-#
-#   require 'couchrest/support/rails'
-
 class Hash
   # Hack so that CouchRest::Document, which descends from Hash,
   # doesn't appear to Rails routing as a Hash of options
@@ -12,8 +8,10 @@ class Hash
   end
 end
 
-
 CouchRest::Document.class_eval do
+  # Need this when passing doc to a resourceful route
+  alias_method :to_param, :id
+
   # Hack so that CouchRest::Document, which descends from Hash,
   # doesn't appear to Rails routing as a Hash of options
   def is_a?(o)
@@ -23,6 +21,15 @@ CouchRest::Document.class_eval do
   alias_method :kind_of?, :is_a?
 end
 
+CouchRest::CastedModel.class_eval do
+  # The to_param method is needed for rails to generate resourceful routes.
+  # In your controller, remember that it's actually the id of the document.
+  def id
+    return nil if base_doc.nil?
+    base_doc.id
+  end
+  alias_method :to_param, :id
+end
 
 require Pathname.new(File.dirname(__FILE__)).join('..', 'validation', 'validation_errors')
 

data/lib/couchrest/validation/auto_validate.rb

@@ -65,7 +65,7 @@ module CouchRest
       #       validator to be automatically created on the property
       #
       #   Integer type
-      #       Using a Integer type causes a validates_is_number
+      #       Using a Integer type causes a validates_numericality_of
       #       validator to be created for the property.  integer_only
       #       is set to true
       #
@@ -97,8 +97,7 @@ module CouchRest
 
         # presence
         if opts[:allow_nil] == false
-          # validates_present property.name, opts
-          validates_present property.name, options_with_message(opts, property, :presence)
+          validates_presence_of property.name, options_with_message(opts, property, :presence)
         end
 
         # length
@@ -111,8 +110,7 @@ module CouchRest
           else
             opts[:maximum] = len
           end
-          # validates_length property.name, opts
-          validates_length property.name, options_with_message(opts, property, :length)
+          validates_length_of property.name, options_with_message(opts, property, :length)
         end
 
         # format
@@ -142,13 +140,11 @@ module CouchRest
         # numeric validator
         if "Integer" == property.type
           opts[:integer_only] = true
-          # validates_is_number property.name, opts
-          validates_is_number property.name, options_with_message(opts, property, :is_number)
+          validates_numericality_of property.name, options_with_message(opts, property, :is_number)
         elsif Float == property.type
           opts[:precision] = property.precision
           opts[:scale]     = property.scale
-          # validates_is_number property.name, opts
-          validates_is_number property.name, options_with_message(opts, property, :is_number)
+          validates_numericality_of property.name, options_with_message(opts, property, :is_number)
         end
         
         # marked the property has checked

data/lib/couchrest/validation/validators/confirmation_validator.rb

@@ -81,18 +81,26 @@ module CouchRest
       #     attr_accessor :password_confirmation
       #     attr_accessor :email_repeated
       #
-      #     validates_is_confirmed :password
-      #     validates_is_confirmed :email, :confirm => :email_repeated
+      #     validates_confirmation_of :password
+      #     validates_confirmation_of :email, :confirm => :email_repeated
       #
       #     # a call to valid? will return false unless:
       #     # password == password_confirmation
       #     # and
       #     # email == email_repeated
       #
-      def validates_is_confirmed(*fields)
+      def validates_confirmation_of(*fields)
         opts = opts_from_validator_args(fields)
         add_validator_to_context(opts, fields, CouchRest::Validation::ConfirmationValidator)
       end
+      
+      def validates_is_confirmed(*fields)
+        warn "[DEPRECATION] `validates_is_confirmed` is deprecated.  Please use `validates_confirmation_of` instead."
+        validates_confirmation_of(*fields)
+      end
+      
+      
+      
 
     end # module ValidatesIsConfirmed
   end # module Validation

data/lib/couchrest/validation/validators/format_validator.rb

@@ -99,18 +99,23 @@ module CouchRest
       #     property :email, String
       #     property :zip_code, String
       #
-      #     validates_format :email, :as => :email_address
-      #     validates_format :zip_code, :with => /^\d{5}$/
+      #     validates_format_of :email, :as => :email_address
+      #     validates_format_of :zip_code, :with => /^\d{5}$/
       #
       #     # a call to valid? will return false unless:
       #     # email is formatted like an email address
       #     # and
       #     # zip_code is a string of 5 digits
       #
-      def validates_format(*fields)
+      def validates_format_of(*fields)
         opts = opts_from_validator_args(fields)
         add_validator_to_context(opts, fields, CouchRest::Validation::FormatValidator)
       end
+      
+      def validates_format(*fields)
+        warn "[DEPRECATION] `validates_format` is deprecated.  Please use `validates_format_of` instead."
+        validates_format_of(*fields)
+      end
 
     end # module ValidatesFormat
   end # module Validation

data/lib/couchrest/validation/validators/length_validator.rb

@@ -115,20 +115,25 @@ module CouchRest
       #     property low, Integer
       #     property just_right, Integer
       #
-      #     validates_length :high, :min => 100000000000
-      #     validates_length :low, :equals => 0
-      #     validates_length :just_right, :within => 1..10
+      #     validates_length_of :high, :min => 100000000000
+      #     validates_length_of :low, :equals => 0
+      #     validates_length_of :just_right, :within => 1..10
       #
       #     # a call to valid? will return false unless:
       #     # high is greater than or equal to 100000000000
       #     # low is equal to 0
       #     # just_right is between 1 and 10 (inclusive of both 1 and 10)
       #
-      def validates_length(*fields)
+      def validates_length_of(*fields)
         opts = opts_from_validator_args(fields)
         add_validator_to_context(opts, fields, CouchRest::Validation::LengthValidator)
       end
-
+      
+      def validates_length(*fields)
+        warn "[DEPRECATION] `validates_length` is deprecated.  Please use `validates_length_of` instead."
+        validates_length_of(*fields)
+      end
+      
     end # module ValidatesLength
   end # module Validation
 end # module CouchRest

data/lib/couchrest/validation/validators/numeric_validator.rb

@@ -94,10 +94,15 @@ module CouchRest
 
       # Validate whether a field is numeric
       #
-      def validates_is_number(*fields)
+      def validates_numericality_of(*fields)
         opts = opts_from_validator_args(fields)
         add_validator_to_context(opts, fields, CouchRest::Validation::NumericValidator)
       end
+      
+      def validates_is_number(*fields)
+        warn "[DEPRECATION] `validates_is_number` is deprecated.  Please use `validates_numericality_of` instead."
+        validates_numericality_of(*fields)
+      end
 
     end # module ValidatesIsNumber
   end # module Validation

data/lib/couchrest/validation/validators/required_field_validator.rb

@@ -93,16 +93,21 @@ module CouchRest
       #     property :another_required, String
       #     property :yet_again, String
       #
-      #     validates_present :required_attribute
-      #     validates_present :another_required, :yet_again
+      #     validates_presence_of :required_attribute
+      #     validates_presence_of :another_required, :yet_again
       #
       #     # a call to valid? will return false unless
       #     # all three attributes are !blank?
       #   end
-      def validates_present(*fields)
+      def validates_presence_of(*fields)
         opts = opts_from_validator_args(fields)
         add_validator_to_context(opts, fields, CouchRest::Validation::RequiredFieldValidator)
       end
+      
+      def validates_present(*fields)
+        warn "[DEPRECATION] `validates_present` is deprecated.  Please use `validates_presence_of` instead."
+        validates_presence_of(*fields)
+      end
 
     end # module ValidatesPresent
   end # module Validation

data/spec/couchrest/core/couchrest_spec.rb

@@ -54,7 +54,7 @@ describe CouchRest do
       db[:host].should == "127.0.0.1"
     end
     it "should parse a host and db with http" do
-      db = CouchRest.parse "http://127.0.0.1/my-db"
+      db = CouchRest.parse "https://127.0.0.1/my-db"
       db[:database].should == "my-db"
       db[:host].should == "127.0.0.1"
     end
@@ -68,16 +68,31 @@ describe CouchRest do
       db[:database].should == "my-db"
       db[:host].should == "127.0.0.1:5555"
     end
+    it "should parse a host with a port and db with https" do
+      db = CouchRest.parse "https://127.0.0.1:5555/my-db"
+      db[:database].should == "my-db"
+      db[:host].should == "127.0.0.1:5555"
+    end
     it "should parse just a host" do
       db = CouchRest.parse "http://127.0.0.1:5555/"
       db[:database].should be_nil
       db[:host].should == "127.0.0.1:5555"
     end
+    it "should parse just a host with https" do
+      db = CouchRest.parse "https://127.0.0.1:5555/"
+      db[:database].should be_nil
+      db[:host].should == "127.0.0.1:5555"
+    end
     it "should parse just a host no slash" do
       db = CouchRest.parse "http://127.0.0.1:5555"
       db[:host].should == "127.0.0.1:5555"
       db[:database].should be_nil
     end
+    it "should parse just a host no slash and https" do
+      db = CouchRest.parse "https://127.0.0.1:5555"
+      db[:host].should == "127.0.0.1:5555"
+      db[:database].should be_nil
+    end
     it "should get docid" do
       db = CouchRest.parse "127.0.0.1:5555/my-db/my-doc"
       db[:database].should == "my-db"
@@ -90,7 +105,12 @@ describe CouchRest do
       db[:host].should == "127.0.0.1:5555"
       db[:doc].should == "my-doc"
     end
-
+    it "should get docid with https" do
+      db = CouchRest.parse "https://127.0.0.1:5555/my-db/my-doc"
+      db[:database].should == "my-db"
+      db[:host].should == "127.0.0.1:5555"
+      db[:doc].should == "my-doc"
+    end
     it "should parse a host and db" do
       db = CouchRest.parse "127.0.0.1/my-db"
       db[:database].should == "my-db"
@@ -101,6 +121,11 @@ describe CouchRest do
       db[:database].should == "my-db"
       db[:host].should == "127.0.0.1"
     end
+    it "should parse a host and db with https" do
+      db = CouchRest.parse "https://127.0.0.1/my-db"
+      db[:database].should == "my-db"
+      db[:host].should == "127.0.0.1"
+    end
     it "should parse a host with a port and db" do
       db = CouchRest.parse "127.0.0.1:5555/my-db"
       db[:database].should == "my-db"
@@ -111,16 +136,31 @@ describe CouchRest do
       db[:database].should == "my-db"
       db[:host].should == "127.0.0.1:5555"
     end
+    it "should parse a host with a port and db with https" do
+      db = CouchRest.parse "http://127.0.0.1:5555/my-db"
+      db[:database].should == "my-db"
+      db[:host].should == "127.0.0.1:5555"
+    end
     it "should parse just a host" do
       db = CouchRest.parse "http://127.0.0.1:5555/"
       db[:database].should be_nil
       db[:host].should == "127.0.0.1:5555"
     end
+    it "should parse just a host with https" do
+      db = CouchRest.parse "https://127.0.0.1:5555/"
+      db[:database].should be_nil
+      db[:host].should == "127.0.0.1:5555"
+    end
     it "should parse just a host no slash" do
       db = CouchRest.parse "http://127.0.0.1:5555"
       db[:host].should == "127.0.0.1:5555"
       db[:database].should be_nil
     end
+    it "should parse just a host no slash and https" do
+      db = CouchRest.parse "https://127.0.0.1:5555"
+      db[:host].should == "127.0.0.1:5555"
+      db[:database].should be_nil
+    end
     it "should get docid" do
       db = CouchRest.parse "127.0.0.1:5555/my-db/my-doc"
       db[:database].should == "my-db"
@@ -133,6 +173,12 @@ describe CouchRest do
       db[:host].should == "127.0.0.1:5555"
       db[:doc].should == "my-doc"
     end
+    it "should get docid with https" do
+      db = CouchRest.parse "https://127.0.0.1:5555/my-db/my-doc"
+      db[:database].should == "my-db"
+      db[:host].should == "127.0.0.1:5555"
+      db[:doc].should == "my-doc"
+    end
   end
 
   describe "easy initializing a database adapter" do