ripple 0.8.1 → 0.8.2

data/Rakefile

@@ -11,10 +11,10 @@ gemspec = Gem::Specification.new do |gem|
   gem.email = "seancribbs@gmail.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
-  gem.add_development_dependency "rspec", "~>2.0.0.beta.18"
-  gem.add_dependency "riak-client", version
-  gem.add_dependency "activesupport", "3.0.0"
-  gem.add_dependency "activemodel", "3.0.0"
+  gem.add_development_dependency "rspec", "~>2.0.0"
+  gem.add_dependency "riak-client", "~>#{version}"
+  gem.add_dependency "activesupport", "~>3.0.0"
+  gem.add_dependency "activemodel", "~>3.0.0"
 
   files = FileList["**/*"]
   files.exclude /\.DS_Store/
@@ -27,6 +27,7 @@ gemspec = Gem::Specification.new do |gem|
   files.exclude /^pkg/
   files.exclude 'ripple.gemspec'
   files.exclude 'Gemfile'
+  files.exclude 'spec/support/test_server.yml'
 
   gem.files = files.to_a
 

data/lib/ripple/associations/embedded.rb

@@ -19,10 +19,15 @@ module Ripple
 
       def initialize(*args)
         super
-        owner.class.validates reflection.name, :associated => true
+        lazy_load_validates_associated
       end
 
       protected
+      
+      def lazy_load_validates_associated
+        return if @owner.class.validators_on(@reflection.name).any? {|v| Ripple::Validations::AssociatedValidator === v}
+        @owner.class.validates @reflection.name, :associated => true
+      end
 
       def assign_references(docs)
         Array(docs).each do |doc|

data/lib/ripple/core_ext/casting.rb

@@ -62,10 +62,8 @@ class String
   end
 end
 
-# Stand-in for true/false property types.
-module ::Boolean
-  extend self
-  def ripple_cast(value)
+boolean_cast = proc do
+  def self.ripple_cast(value)
     case value
     when NilClass
       nil
@@ -83,15 +81,14 @@ module ::Boolean
   end
 end
 
-# @private
-class TrueClass
-  extend Boolean
+unless defined?(::Boolean)
+  # Stand-in for true/false property types.
+  module ::Boolean; end
 end
 
-# @private
-class FalseClass
-  extend Boolean
-end
+::Boolean.module_eval(&boolean_cast)
+TrueClass.module_eval(&boolean_cast)
+FalseClass.module_eval(&boolean_cast)
 
 # @private
 class Time

data/lib/ripple/validations/associated_validator.rb

@@ -20,9 +20,8 @@ module Ripple
   module Validations
     class AssociatedValidator < ActiveModel::EachValidator
       def validate_each(record, attribute, value)
-        unless Array(value).map {|r| r.nil? || r.valid? }.all?
-          record.errors.add(attribute, :invalid, :default => options[:message], :value => value)
-        end
+        return if (value.is_a?(Array) ? value : [value]).collect{ |r| r.nil? || r.valid? }.all?
+        record.errors.add(attribute, :invalid, options.merge(:value => value))
       end
     end
 

data/spec/ripple/associations/many_embedded_proxy_spec.rb

@@ -127,4 +127,9 @@ describe Ripple::Associations::ManyEmbeddedProxy do
     lambda { @user.addresses = @address }.should raise_error
     lambda { @user.addresses = [@note] }.should raise_error
   end
+  
+  it "should not add the associated validator multiple times" do
+    #$stderr.puts User.validators.collect(&:inspect)
+    User.validators_on(:addresses).count.should eq(1)
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta
-        - 18
-        version: 2.0.0.beta.18
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,13 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 8
-        - 1
-        version: 0.8.1
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,7 +53,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -70,7 +68,7 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -186,7 +184,6 @@ files:
 - spec/support/models/wheel.rb
 - spec/support/models/widget.rb
 - spec/support/test_server.rb
-- spec/support/test_server.yml
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []

data/spec/support/test_server.yml

@@ -1,2 +0,0 @@
-bin_dir: /Users/sean/Development/riak/rel/riak/bin
-temp_dir: /Users/sean/Development/ripple/.riaktest