couchrest_extended_document 1.0.0.beta6 → 1.0.0

data/lib/couchrest/validation/auto_validate.rb

@@ -100,7 +100,7 @@ module CouchRest
         end
 
         # length
-        if property.type == String
+        if property.type_class == String
           # XXX: maybe length should always return a Range, with the min defaulting to 1
           # 52 being the max set 
           len = property.options.fetch(:length, property.options.fetch(:size, 52))
@@ -137,16 +137,16 @@ module CouchRest
         end
 
         # numeric validator
-        if "Integer" == property.type
+        if property.type_class == Integer
           opts[:integer_only] = true
           validates_numericality_of property.name, options_with_message(opts, property, :is_number)
-        elsif Float == property.type
+        elsif Float == property.type_class
           opts[:precision] = property.precision
           opts[:scale]     = property.scale
           validates_numericality_of property.name, options_with_message(opts, property, :is_number)
         end
         
-        # marked the property has checked
+        # marked the property as checked
         property.autovalidation_check = true
         
       end

data/lib/couchrest_extended_document.rb

@@ -5,6 +5,7 @@ gem "builder", ">=2.1.2"
 
 gem 'activesupport', ">= 2.3.0"
 require 'active_support/core_ext'
+require 'active_support/json'
 
 gem "mime-types", ">= 1.15"
 require 'mime/types'

data/spec/couchrest/casted_model_spec.rb

@@ -19,8 +19,11 @@ end
 class DummyModel < CouchRest::ExtendedDocument
   use_database TEST_SERVER.default_database
   raise "Default DB not set" if TEST_SERVER.default_database.nil?
-  property :casted_attribute, :cast_as => 'WithCastedModelMixin'
-  property :keywords,         :cast_as => ["String"]
+  property :casted_attribute, WithCastedModelMixin
+  property :keywords,         ["String"]
+  property :sub_models do |child|
+    child.property :title
+  end
 end
 
 class CastedCallbackDoc < CouchRest::ExtendedDocument
@@ -82,6 +85,20 @@ describe CouchRest::CastedModel do
       @casted_obj.should == nil
     end
   end
+
+  describe "anonymous sub casted models" do
+    before :each do
+      @obj = DummyModel.new
+    end
+    it "should be empty initially" do
+      @obj.sub_models.should_not be_nil
+      @obj.sub_models.should be_empty
+    end
+    it "should be updatable using a hash" do
+      @obj.sub_models << {:title => 'test'}
+      @obj.sub_models.first.title.should eql('test')
+    end
+  end
   
   describe "casted as attribute" do
     before(:each) do
@@ -308,6 +325,7 @@ describe CouchRest::CastedModel do
       @cat.create
       @cat.save
       @cat.favorite_toy.should_not be_new
+      @cat.toys.first.casted_by.should eql(@cat)
       @cat.toys.first.should_not be_new
     end
     

data/spec/couchrest/extended_doc_spec.rb

@@ -226,18 +226,19 @@ describe "ExtendedDocument" do
       @art['title'].should == "something else"
     end
     
-    it "should flip out if an attribute= method is missing" do
+    it "should not flip out if an attribute= method is missing and ignore it" do
       lambda {
-        @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger")        
-      }.should raise_error
+        @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger")
+      }.should_not raise_error
+      @art.slug.should == "big-bad-danger"
     end
     
-    it "should not change other attributes if there is an error" do
-      lambda {
-        @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger")        
-      }.should raise_error
-      @art['title'].should == "big bad danger"
-    end
+    #it "should not change other attributes if there is an error" do
+    #  lambda {
+    #    @art.update_attributes_without_saving('slug' => "new-slug", :title => "super danger")        
+    #  }.should raise_error
+    #  @art['title'].should == "big bad danger"
+    #end
   end
   
   describe "update attributes" do

data/spec/couchrest/property_spec.rb

@@ -57,7 +57,45 @@ describe "ExtendedDocument properties" do
     @card.created_at.should_not be_nil
     @card.updated_at.should_not be_nil
   end
-  
+
+  it "should let you use read_attribute method" do
+    @card.last_name = "Aimonetti"
+    @card.read_attribute(:last_name).should eql('Aimonetti')
+    @card.read_attribute('last_name').should eql('Aimonetti')
+    last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
+    @card.read_attribute(last_name_prop).should eql('Aimonetti')
+  end
+
+  it "should let you use write_attribute method" do
+    @card.write_attribute(:last_name, 'Aimonetti 1')
+    @card.last_name.should eql('Aimonetti 1')
+    @card.write_attribute('last_name', 'Aimonetti 2')
+    @card.last_name.should eql('Aimonetti 2')
+    last_name_prop = @card.properties.find{|p| p.name == 'last_name'}
+    @card.write_attribute(last_name_prop, 'Aimonetti 3')
+    @card.last_name.should eql('Aimonetti 3')
+  end
+
+  it "should let you use write_attribute on readonly properties" do
+    lambda {
+      @card.read_only_value = "foo"
+    }.should raise_error
+    @card.write_attribute(:read_only_value, "foo")
+    @card.read_only_value.should == 'foo'
+  end
+
+  it "should cast via write_attribute" do
+    @card.write_attribute(:cast_alias, {:name => ["Sam", "Lown"]})
+    @card.cast_alias.class.should eql(Person)
+    @card.cast_alias.name.last.should eql("Lown")
+  end
+
+  it "should not cast via write_attribute if property not casted" do
+    @card.write_attribute(:first_name, {:name => "Sam"})
+    @card.first_name.class.should eql(Hash)
+    @card.first_name[:name].should eql("Sam")
+  end
+
   
   describe "mass assignment protection" do
 
@@ -646,3 +684,107 @@ describe "a casted model retrieved from the database" do
     end
   end
 end
+
+describe "Property Class" do
+
+  it "should provide name as string" do
+    property = CouchRest::Property.new(:test, String)
+    property.name.should eql('test')
+    property.to_s.should eql('test')
+  end
+
+  it "should provide class from type" do
+    property = CouchRest::Property.new(:test, String)
+    property.type_class.should eql(String)
+  end
+
+  it "should provide base class from type in array" do
+    property = CouchRest::Property.new(:test, [String])
+    property.type_class.should eql(String)
+  end
+
+  it "should leave type as string if requested" do
+    property = CouchRest::Property.new(:test, 'String')
+    property.type.should eql('String')
+    property.type_class.should eql(String)
+  end
+
+  it "should leave type nil and return string by default" do
+    property = CouchRest::Property.new(:test, nil)
+    property.type.should be_nil
+    # Type cast should never be used on non-casted property!
+    property.type_class.should eql(String)
+  end
+
+  it "should convert empty type array to [String]" do
+    property = CouchRest::Property.new(:test, [])
+    property.type_class.should eql(String)
+  end
+
+  it "should convert boolean text-type TrueClass" do
+    property = CouchRest::Property.new(:test, 'boolean')
+    property.type.should eql('boolean') # no change
+    property.type_class.should eql(TrueClass)
+  end
+
+  it "should set init method option or leave as 'new'" do
+    # (bad example! Time already typecast)
+    property = CouchRest::Property.new(:test, Time)
+    property.init_method.should eql('new')
+    property = CouchRest::Property.new(:test, Time, :init_method => 'parse')
+    property.init_method.should eql('parse')
+  end
+
+  ## Property Casting method. More thoroughly tested earlier.
+
+  describe "casting" do
+    it "should cast a value" do
+      property = CouchRest::Property.new(:test, Date)
+      parent = mock("FooObject")
+      property.cast(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
+      property.cast_value(parent, "2010-06-16").should eql(Date.new(2010, 6, 16))
+    end
+
+    it "should cast an array of values" do
+      property = CouchRest::Property.new(:test, [Date])
+      parent = mock("FooObject")
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).should eql([Date.new(2010, 6, 1), Date.new(2010, 6, 2)])
+    end
+
+    it "should set a CastedArray on array of Objects" do
+      property = CouchRest::Property.new(:test, [Object])
+      parent = mock("FooObject")
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should eql(::CouchRest::CastedArray)
+    end
+
+    it "should not set a CastedArray on array of Strings" do
+      property = CouchRest::Property.new(:test, [String])
+      parent = mock("FooObject")
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).class.should_not eql(::CouchRest::CastedArray)
+    end
+
+    it "should raise and error if value is array when type is not" do
+      property = CouchRest::Property.new(:test, Date)
+      parent = mock("FooClass")
+      lambda {
+        cast = property.cast(parent, [Date.new(2010, 6, 1)])
+      }.should raise_error
+    end
+
+
+    it "should set parent as casted_by object in CastedArray" do
+      property = CouchRest::Property.new(:test, [Object])
+      parent = mock("FooObject")
+      property.cast(parent, ["2010-06-01", "2010-06-02"]).casted_by.should eql(parent)     
+    end
+
+    it "should set casted_by on new value" do
+      property = CouchRest::Property.new(:test, CatToy)
+      parent = mock("CatObject")
+      cast = property.cast(parent, {:name => 'catnip'})
+      cast.casted_by.should eql(parent)
+    end
+
+  end
+
+end

data/spec/fixtures/more/card.rb

@@ -11,7 +11,7 @@ class Card < CouchRest::ExtendedDocument
   property :first_name
   property :last_name,        :alias     => :family_name
   property :read_only_value,  :read_only => true
-  property :cast_alias,       :cast_as   =>  Person,  :alias  => :calias
+  property :cast_alias,       Person,  :alias  => :calias
 
   
   timestamps!

data/spec/fixtures/more/question.rb

@@ -2,5 +2,6 @@ class Question < Hash
   include ::CouchRest::CastedModel
   
   property :q
-  property :a, :type => 'Object'
-end
+  property :a
+
+end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: couchrest_extended_document
 version: !ruby/object:Gem::Version 
-  hash: -1848230058
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - beta6
-  version: 1.0.0.beta6
+  version: 1.0.0
 platform: ruby
 authors: 
 - J. Chris Anderson
 - Matt Aimonetti
 - Marcos Tapajos
 - Will Leinweber
+- Sam Lown
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -03:00
+date: 2010-08-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,13 +30,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31098193
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - beta
-        version: 1.0.0.beta
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -108,6 +107,7 @@ files:
 - lib/couchrest/extended_document.rb
 - lib/couchrest/mixins.rb
 - lib/couchrest/mixins/attribute_protection.rb
+- lib/couchrest/mixins/attributes.rb
 - lib/couchrest/mixins/callbacks.rb
 - lib/couchrest/mixins/class_proxy.rb
 - lib/couchrest/mixins/collection.rb
@@ -115,12 +115,11 @@ files:
 - lib/couchrest/mixins/document_queries.rb
 - lib/couchrest/mixins/extended_attachments.rb
 - lib/couchrest/mixins/properties.rb
-- lib/couchrest/mixins/validation.rb
+- lib/couchrest/mixins/typecast.rb
 - lib/couchrest/mixins/views.rb
 - lib/couchrest/property.rb
 - lib/couchrest/support/couchrest.rb
 - lib/couchrest/support/rails.rb
-- lib/couchrest/typecast.rb
 - lib/couchrest/validation.rb
 - lib/couchrest/validation/auto_validate.rb
 - lib/couchrest/validation/contextual_validators.rb
@@ -188,14 +187,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 

data/lib/couchrest/mixins/validation.rb

@@ -1,245 +0,0 @@
-# Extracted from dm-validations 0.9.10
-#
-# Copyright (c) 2007 Guy van den Berg
-# 
-# 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.
-
-class Object
-  def validatable?
-    false
-  end
-end
-
-require 'pathname'
-
-dir = File.join(Pathname(__FILE__).dirname.expand_path, '..', 'validation')
-
-require File.join(dir, 'validation_errors')
-require File.join(dir, 'contextual_validators')
-require File.join(dir, 'auto_validate')
-
-require File.join(dir, 'validators', 'generic_validator')
-require File.join(dir, 'validators', 'required_field_validator')
-require File.join(dir, 'validators', 'absent_field_validator')
-require File.join(dir, 'validators', 'format_validator')
-require File.join(dir, 'validators', 'length_validator')
-require File.join(dir, 'validators', 'numeric_validator')
-require File.join(dir, 'validators', 'method_validator')
-require File.join(dir, 'validators', 'confirmation_validator')
-
-module CouchRest
-  module Validation
-    
-    def self.included(base)
-      base.extlib_inheritable_accessor(:auto_validation)
-      base.class_eval <<-EOS, __FILE__, __LINE__ + 1
-          # Callbacks
-          define_callbacks :validate
-          
-          # Turn off auto validation by default
-          self.auto_validation ||= false
-          
-          # Force the auto validation for the class properties
-          # This feature is still not fully ported over,
-          # test are lacking, so please use with caution
-          def self.auto_validate!
-            self.auto_validation = true
-          end
-          
-          # share the validations with subclasses
-          def self.inherited(subklass)
-            self.validators.contexts.each do |k, v|
-              subklass.validators.contexts[k] = v.dup
-            end
-            super
-          end
-      EOS
-      
-      base.extend(ClassMethods)
-      base.class_eval <<-EOS, __FILE__, __LINE__ + 1
-        define_callbacks :validate
-        if method_defined?(:_run_save_callbacks)
-          set_callback :save, :before, :check_validations
-        end
-      EOS
-      base.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
-        def self.define_property(name, options={})
-          super
-          auto_generate_validations(properties.last) if properties && properties.size > 0
-          autovalidation_check = true
-        end
-      RUBY_EVAL
-    end
-
-    # Ensures the object is valid for the context provided, and otherwise
-    # throws :halt and returns false.
-    #
-    def check_validations(context = :default)
-      throw(:halt, false) unless context.nil? || valid?(context)
-    end
-    
-    # Return the ValidationErrors
-    #
-    def errors
-      @errors ||= ValidationErrors.new
-    end
-
-    # Mark this resource as validatable. When we validate associations of a
-    # resource we can check if they respond to validatable? before trying to
-    # recursivly validate them
-    #
-    def validatable?
-      true
-    end
-
-    # Alias for valid?(:default)
-    #
-    def valid_for_default?
-      valid?(:default)
-    end
-
-    # Check if a resource is valid in a given context
-    #
-    def valid?(context = :default)
-      recursive_valid?(self, context, true)
-    end
-    
-    # checking on casted objects
-    def validate_casted_arrays
-      result = true
-      array_casted_properties = self.class.properties.select { |property| property.casted && property.type.instance_of?(Array) }
-      array_casted_properties.each do |property|
-        casted_values = self.send(property.name)
-        next unless casted_values.is_a?(Array) && casted_values.first.respond_to?(:valid?)
-        casted_values.each do |value|
-          result = (result && value.valid?) if value.respond_to?(:valid?)
-        end
-      end
-      result
-    end
-
-    # Do recursive validity checking
-    #
-    def recursive_valid?(target, context, state)
-      valid = state
-      target.each do |key, prop|
-        if prop.is_a?(Array)
-          prop.each do |item|
-            if item.validatable?
-              valid = recursive_valid?(item, context, valid) && valid
-            end
-          end
-        elsif prop.validatable?
-          valid = recursive_valid?(prop, context, valid) && valid
-        end
-      end
-      target._run_validate_callbacks do
-        target.class.validators.execute(context, target) && valid
-      end
-    end
-
-
-    def validation_property_value(name)
-      self.respond_to?(name, true) ? self.send(name) : nil
-    end
-
-    # Get the corresponding Object property, if it exists.
-    def validation_property(field_name)
-      properties.find{|p| p.name == field_name}
-    end
-
-    module ClassMethods
-      include CouchRest::Validation::ValidatesPresent
-      include CouchRest::Validation::ValidatesAbsent
-      include CouchRest::Validation::ValidatesIsConfirmed
-      # include CouchRest::Validation::ValidatesIsPrimitive
-      # include CouchRest::Validation::ValidatesIsAccepted
-      include CouchRest::Validation::ValidatesFormat
-      include CouchRest::Validation::ValidatesLength
-      # include CouchRest::Validation::ValidatesWithin
-      include CouchRest::Validation::ValidatesIsNumber
-      include CouchRest::Validation::ValidatesWithMethod
-      # include CouchRest::Validation::ValidatesWithBlock
-      # include CouchRest::Validation::ValidatesIsUnique
-      include CouchRest::Validation::AutoValidate
-      
-      # Return the set of contextual validators or create a new one
-      #
-      def validators
-        @validations ||= ContextualValidators.new
-      end
-      
-      # Clean up the argument list and return a opts hash, including the
-      # merging of any default opts. Set the context to default if none is
-      # provided. Also allow :context to be aliased to :on, :when & group
-      #
-      def opts_from_validator_args(args, defaults = nil)
-        opts = args.last.kind_of?(Hash) ? args.pop : {}
-        context = :default
-        context = opts[:context] if opts.has_key?(:context)
-        context = opts.delete(:on) if opts.has_key?(:on)
-        context = opts.delete(:when) if opts.has_key?(:when)
-        context = opts.delete(:group) if opts.has_key?(:group)
-        opts[:context] = context
-        opts.merge!(defaults) unless defaults.nil?
-        opts
-      end
-      
-      # Given a new context create an instance method of
-      # valid_for_<context>? which simply calls valid?(context)
-      # if it does not already exist
-      #
-      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__ + 1
-            def #{name}                               # def valid_for_signup?
-              valid?('#{context.to_s}'.to_sym)        #   valid?('signup'.to_sym)
-            end                                       # end
-          EOS
-        end
-      end
-
-      # Create a new validator of the given klazz and push it onto the
-      # requested context for each of the attributes in the fields list
-      #
-      def add_validator_to_context(opts, fields, klazz)
-        fields.each do |field|
-          validator = klazz.new(field.to_sym, opts)
-          if opts[:context].is_a?(Symbol)
-            unless validators.context(opts[:context]).include?(validator)
-              validators.context(opts[:context]) << validator
-              create_context_instance_methods(opts[:context])
-            end
-          elsif opts[:context].is_a?(Array)
-            opts[:context].each do |c|
-              unless validators.context(c).include?(validator)
-                validators.context(c) << validator
-                create_context_instance_methods(c)
-              end
-            end
-          end
-        end
-      end
-      
-    end # module ClassMethods
-  end # module Validation
-
-end # module CouchRest