ripple 0.9.0.beta → 0.9.0.beta2

data/Gemfile

@@ -1,16 +1,17 @@
-source :gemcutter
+source :rubygems
 
 gem 'bundler'
 gem 'riak-client', :path => "../riak-client"
 gem 'activemodel', '~>3.0.0'
-gem 'rspec', '~>2.0.0'
+gem 'rspec', '~>2.4.0'
 gem 'tzinfo'
 gem 'rake'
 
-if defined? JRUBY_VERSION
+platforms :mri do
+  gem 'yajl-ruby'
+end
+
+platforms :jruby do
   gem 'json'
   gem 'jruby-openssl'
-else
-  gem 'yajl-ruby'
-  gem 'curb', '>0.6'
 end

data/Rakefile

@@ -11,7 +11,7 @@ gemspec = Gem::Specification.new do |gem|
   gem.email = "sean@basho.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
-  gem.add_development_dependency "rspec", "~>2.0.0"
+  gem.add_development_dependency "rspec", "~>2.4.0"
   gem.add_dependency "riak-client", "~>#{version}"
   gem.add_dependency "activesupport", "~>3.0.0"
   gem.add_dependency "activemodel", "~>3.0.0"
@@ -23,10 +23,12 @@ gemspec = Gem::Specification.new do |gem|
       lib/rails/generators/ripple/configuration/templates/ripple.yml
       lib/rails/generators/ripple/js/js_generator.rb
       lib/rails/generators/ripple/js/templates/js/contrib.js
+      lib/rails/generators/ripple/js/templates/js/iso8601.js
       lib/rails/generators/ripple/js/templates/js/ripple.js
       lib/rails/generators/ripple/model/model_generator.rb
-      lib/rails/generators/ripple/model/templates
       lib/rails/generators/ripple/model/templates/model.rb
+      lib/rails/generators/ripple/observer/observer_generator.rb
+      lib/rails/generators/ripple/observer/templates/observer.rb
       lib/rails/generators/ripple/test/templates/test_server.rb
       lib/rails/generators/ripple/test/test_generator.rb
       lib/rails/generators/ripple_generator.rb
@@ -60,9 +62,9 @@ gemspec = Gem::Specification.new do |gem|
       lib/ripple/embedded_document.rb
       lib/ripple/i18n.rb
       lib/ripple/inspection.rb
-      lib/ripple/locale
       lib/ripple/locale/en.yml
       lib/ripple/nested_attributes.rb
+      lib/ripple/observable.rb
       lib/ripple/properties.rb
       lib/ripple/property_type_mismatch.rb
       lib/ripple/railtie.rb
@@ -95,6 +97,7 @@ gemspec = Gem::Specification.new do |gem|
       spec/ripple/finders_spec.rb
       spec/ripple/inspection_spec.rb
       spec/ripple/key_spec.rb
+      spec/ripple/observable_spec.rb
       spec/ripple/persistence_spec.rb
       spec/ripple/properties_spec.rb
       spec/ripple/ripple_spec.rb

data/lib/rails/generators/ripple/js/templates/js/iso8601.js

@@ -0,0 +1,76 @@
+// Written by Paul Sowden, 2005
+// http://delete.me.uk/2005/03/iso8601.html
+// Released under the Academic Free License
+
+Date.prototype.setISO8601 = function (string) {
+    var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})" +
+        "(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?" +
+        "(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?";
+    var d = string.match(new RegExp(regexp));
+
+    var offset = 0;
+    var date = new Date(d[1], 0, 1);
+
+    if (d[3]) { date.setMonth(d[3] - 1); }
+    if (d[5]) { date.setDate(d[5]); }
+    if (d[7]) { date.setHours(d[7]); }
+    if (d[8]) { date.setMinutes(d[8]); }
+    if (d[10]) { date.setSeconds(d[10]); }
+    if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }
+    if (d[14]) {
+        offset = (Number(d[16]) * 60) + Number(d[17]);
+        offset *= ((d[15] == '-') ? 1 : -1);
+    }
+
+    offset -= date.getTimezoneOffset();
+    time = (Number(date) + (offset * 60 * 1000));
+    this.setTime(Number(time));
+}
+
+Date.prototype.iso8601 = function (format, offset) {
+    /* accepted values for the format [1-6]:
+     1 Year:
+       YYYY (eg 1997)
+     2 Year and month:
+       YYYY-MM (eg 1997-07)
+     3 Complete date:
+       YYYY-MM-DD (eg 1997-07-16)
+     4 Complete date plus hours and minutes:
+       YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
+     5 Complete date plus hours, minutes and seconds:
+       YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
+     6 Complete date plus hours, minutes, seconds and a decimal
+       fraction of a second
+       YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
+    */
+    if (!format) { var format = 6; }
+    if (!offset) {
+        var offset = 'Z';
+        var date = this;
+    } else {
+        var d = offset.match(/([-+])([0-9]{2}):([0-9]{2})/);
+        var offsetnum = (Number(d[2]) * 60) + Number(d[3]);
+        offsetnum *= ((d[1] == '-') ? -1 : 1);
+        var date = new Date(Number(Number(this) + (offsetnum * 60000)));
+    }
+
+    var zeropad = function (num) { return ((num < 10) ? '0' : '') + num; }
+
+    var str = "";
+    str += date.getUTCFullYear();
+    if (format > 1) { str += "-" + zeropad(date.getUTCMonth() + 1); }
+    if (format > 2) { str += "-" + zeropad(date.getUTCDate()); }
+    if (format > 3) {
+        str += "T" + zeropad(date.getUTCHours()) +
+               ":" + zeropad(date.getUTCMinutes());
+    }
+    if (format > 5) {
+        var secs = Number(date.getUTCSeconds() + "." +
+                   ((date.getUTCMilliseconds() < 100) ? '0' : '') +
+                   zeropad(date.getUTCMilliseconds()));
+        str += ":" + zeropad(secs);
+    } else if (format > 4) { str += ":" + zeropad(date.getUTCSeconds()); }
+
+    if (format > 3) { str += offset; }
+    return str;
+}

data/lib/rails/generators/ripple/observer/observer_generator.rb

@@ -0,0 +1,30 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+require 'rails/generators/ripple_generator'
+
+module Ripple
+  module Generators
+    class ObserverGenerator < NamedBase
+      desc 'Creates an observer for Ripple documents'
+      check_class_collision :suffix => "Observer"
+
+      def create_observer_file
+        template 'observer.rb', File.join("app/models", class_path, "#{file_name}_observer.rb")
+      end
+
+      hook_for :test_framework
+    end
+  end
+end

data/lib/rails/generators/ripple/observer/templates/observer.rb

@@ -0,0 +1,4 @@
+<% module_namespacing do -%>
+class <%= class_name %>Observer < ActiveModel::Observer
+end
+<% end -%>

data/lib/rails/generators/ripple/test/templates/test_server.rb

@@ -8,7 +8,11 @@ module Ripple
     def test_server_config
       {
         :app_config => {
-          :riak_kv => { :js_source_dir => Ripple.config.delete(:js_source_dir) },
+          :riak_kv => {
+            :js_source_dir => Ripple.config.delete(:js_source_dir),
+            :map_cache_size => 0, # 0.14
+            :vnode_cache_entries => 0 # 0.13
+          },
           :riak_core => { :web_port => Ripple.config[:port] || 8098 }
         },
         :bin_dir => Ripple.config.delete(:bin_dir),

data/lib/ripple/attribute_methods.rb

@@ -33,6 +33,8 @@ module Ripple
       include Query
       include Dirty
       include ActiveModel::MassAssignmentSecurity
+      
+      attr_protected :key
     end
 
     module ClassMethods
@@ -55,17 +57,17 @@ module Ripple
       # nor embedded documents.
       # @return [Hash] all document attributes, by key
       def attributes
-        self.class.properties.values.inject({}) do |hash, prop|
+        self.class.properties.values.inject(@attributes.with_indifferent_access) do |hash, prop|
           hash[prop.key] = attribute(prop.key)
           hash
-        end.with_indifferent_access
+        end
       end
 
       # Mass assign the document's attributes.
       # @param [Hash] attrs the attributes to assign
-      def attributes=(attrs)
+      def attributes=(attrs, guard_protected_attrs = true)
         raise ArgumentError, t('attribute_hash') unless Hash === attrs
-        sanitize_for_mass_assignment(attrs).each do |k,v|
+        (guard_protected_attrs ? sanitize_for_mass_assignment(attrs) : attrs).each do |k,v|
           next if k.to_sym == :key
           if respond_to?("#{k}=")
             __send__("#{k}=",v)

data/lib/ripple/callbacks.rb

@@ -50,7 +50,7 @@ module Ripple
     # @private
     module InstanceMethods
       # @private
-      def save(*args, &block)
+      def really_save(*args, &block)
         state = new? ? :create : :update
         run_callbacks(:save) do
           run_callbacks(state) do

data/lib/ripple/core_ext/casting.rb

@@ -97,7 +97,7 @@ FalseClass.module_eval(&boolean_cast)
 # @private
 class Time
   def as_json(options={})
-    self.utc.rfc822
+    self.utc.send(Ripple.date_format)
   end
 
   def self.ripple_cast(value)
@@ -109,7 +109,7 @@ end
 # @private
 class Date
   def as_json(options={})
-    self.to_s(:rfc822)
+    self.to_s(Ripple.date_format)
   end
 
   def self.ripple_cast(value)
@@ -121,7 +121,7 @@ end
 # @private
 class DateTime
   def as_json(options={})
-    self.utc.to_s(:rfc822)
+    self.utc.to_s(Ripple.date_format)
   end
 
   def self.ripple_cast(value)
@@ -134,7 +134,7 @@ end
 module ActiveSupport
   class TimeWithZone
     def as_json(options={})
-      self.utc.rfc822
+      self.utc.send(Ripple.date_format)
     end
   end
 end

data/lib/ripple/document/finders.rb

@@ -14,7 +14,7 @@
 require 'ripple'
 
 module Ripple
-  
+
   # Raised by <tt>find!</tt> when a document cannot be found with the given key.
   #   begin
   #     Example.find!('badkey')
@@ -34,7 +34,7 @@ module Ripple
       end
     end
   end
-  
+
   module Document
     module Finders
       extend ActiveSupport::Concern
@@ -60,7 +60,7 @@ module Ripple
           return find_one(args.first) if args.size == 1
           args.map {|key| find_one(key) }
         end
-        
+
         # Retrieve single or multiple documents from Riak
         # but raise Ripple::DocumentNotFound if a key can
         # not be found in the bucket.
@@ -69,15 +69,15 @@ module Ripple
           raise DocumentNotFound.new(args, found) if !found || Array(found).include?(nil)
           found
         end
-        
+
         # Find the first object using the first key in the
-        # bucket's keys using find. You should not expect to 
+        # bucket's keys using find. You should not expect to
         # actually get the first object you added to the bucket.
         # This is just a convenience method.
         def first
           find(bucket.keys.first)
         end
-        
+
         # Find the first object using the first key in the
         # bucket's keys using find!
         def first!
@@ -112,15 +112,14 @@ module Ripple
         def find_one(key)
           instantiate(bucket.get(key, quorums.slice(:r)))
         rescue Riak::FailedRequest => fr
-          return nil if fr.code.to_i == 404
-          raise fr
+          raise fr unless fr.not_found?
         end
 
         def instantiate(robject)
           klass = robject.data['_type'].constantize rescue self
           klass.new.tap do |doc|
             doc.key = robject.key
-            robject.data.except("_type").each {|k,v| doc.send("#{k}=", v) } if robject.data
+            doc.__send__(:attributes=, robject.data.except("_type"), false) if robject.data
             doc.instance_variable_set(:@new, false)
             doc.instance_variable_set(:@robject, robject)
           end

data/lib/ripple/document/persistence.rb

@@ -70,14 +70,16 @@ module Ripple
         # Saves the document in Riak.
         # @return [true,false] whether the document succeeded in saving
         def save(*args)
+          really_save(*args)
+        end
+
+        def really_save(*args)
           robject.key = key if robject.key != key
           robject.data = attributes_for_persistence
           robject.store(self.class.quorums.slice(:w,:dw))
           self.key = robject.key
           @new = false
           true
-        rescue Riak::FailedRequest
-          false
         end
 
         # Reloads the document from Riak
@@ -85,7 +87,7 @@ module Ripple
         def reload
           return self if new?
           robject.reload(:force => true)
-          @robject.data.except("_type").each { |key, value| send("#{key}=", value) }
+          self.__send__(:attributes=, @robject.data.except("_type"), false)
           self
         end
 

data/lib/ripple/observable.rb

@@ -0,0 +1,39 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require 'ripple'
+
+module Ripple
+  module Observable
+    extend ActiveSupport::Concern
+    include ActiveModel::Observing
+
+    included do
+      set_callback(:create, :before)     { notify_observers :before_create }
+      set_callback(:create, :after)      { notify_observers :after_create }
+
+      set_callback(:update, :before)     { notify_observers :before_update }
+      set_callback(:update, :after)      { notify_observers :after_update }
+
+      set_callback(:save, :before)       { notify_observers :before_save }
+      set_callback(:save, :after)        { notify_observers :after_save }
+
+      set_callback(:destroy, :before)    { notify_observers :before_destroy }
+      set_callback(:destroy, :after)     { notify_observers :after_destroy }
+
+      set_callback(:validation, :before) { notify_observers :before_validation }
+      set_callback(:validation, :after)  { notify_observers :after_validation }
+    end
+
+  end
+end

data/lib/ripple/translation.rb

@@ -12,6 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 require 'ripple'
+require 'riak/util/translation'
 
 module Ripple
   # Adds i18n translation/string-lookup capabilities.

data/lib/ripple.rb

@@ -18,6 +18,7 @@ require 'active_support/json'
 require 'active_model'
 require 'ripple/i18n'
 require 'ripple/core_ext'
+require 'ripple/translation'
 
 # Contains the classes and modules related to the ODM built on top of
 # the basic Riak client.
@@ -46,12 +47,11 @@ module Ripple
 
   # Utilities
   autoload :Inspection
-  autoload :Translation
 
   class << self
     # @return [Riak::Client] The client for the current thread.
     def client
-      Thread.current[:ripple_client] ||= Riak::Client.new(config)
+      Thread.current[:ripple_client] ||= Riak::Client.new(client_config)
     end
 
     # Sets the client for the current thread.
@@ -71,6 +71,21 @@ module Ripple
       @config ||= {}
     end
 
+    # The format in which date/time objects will be serialized to
+    # strings in JSON.  Defaults to :iso8601, and can be set in
+    # Ripple.config.
+    # @return [Symbol] the date format
+    def date_format
+      (config[:date_format] ||= :iso8601).to_sym
+    end
+
+    # Sets the format for date/time objects that are serialized to
+    # JSON.
+    # @param [Symbol] format the date format
+    def date_format=(format)
+      config[:date_format] = format.to_sym
+    end
+
     # Loads the Ripple configuration from a given YAML file.
     # Evaluates the configuration with ERB before loading.
     def load_configuration(config_file, config_keys = [:ripple])
@@ -82,6 +97,11 @@ module Ripple
       raise Ripple::MissingConfiguration.new(config_file)
     end
     alias_method :load_config, :load_configuration
+
+    private
+    def client_config
+      config.slice(:host, :port, :prefix, :mapred, :client_id, :http_backend, :solr)
+    end
   end
 
   # Exception raised when the path passed to

data/ripple.gemspec

@@ -2,38 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripple}
-  s.version = "0.9.0.beta"
+  s.version = "0.9.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-12-29}
+  s.date = %q{2011-03-28}
   s.description = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.  It uses ActiveModel to provide an experience that integrates well with Rails 3 applications.}
   s.email = %q{sean@basho.com}
-  s.files = ["Gemfile", "lib/rails/generators/ripple/configuration/configuration_generator.rb", "lib/rails/generators/ripple/configuration/templates/ripple.yml", "lib/rails/generators/ripple/js/js_generator.rb", "lib/rails/generators/ripple/js/templates/js/contrib.js", "lib/rails/generators/ripple/js/templates/js/ripple.js", "lib/rails/generators/ripple/model/model_generator.rb", "lib/rails/generators/ripple/model/templates/model.rb", "lib/rails/generators/ripple/test/templates/test_server.rb", "lib/rails/generators/ripple/test/test_generator.rb", "lib/rails/generators/ripple_generator.rb", "lib/ripple/associations/embedded.rb", "lib/ripple/associations/instantiators.rb", "lib/ripple/associations/linked.rb", "lib/ripple/associations/many.rb", "lib/ripple/associations/many_embedded_proxy.rb", "lib/ripple/associations/many_linked_proxy.rb", "lib/ripple/associations/one.rb", "lib/ripple/associations/one_embedded_proxy.rb", "lib/ripple/associations/one_linked_proxy.rb", "lib/ripple/associations/proxy.rb", "lib/ripple/associations.rb", "lib/ripple/attribute_methods/dirty.rb", "lib/ripple/attribute_methods/query.rb", "lib/ripple/attribute_methods/read.rb", "lib/ripple/attribute_methods/write.rb", "lib/ripple/attribute_methods.rb", "lib/ripple/callbacks.rb", "lib/ripple/conversion.rb", "lib/ripple/core_ext/casting.rb", "lib/ripple/core_ext.rb", "lib/ripple/document/bucket_access.rb", "lib/ripple/document/finders.rb", "lib/ripple/document/key.rb", "lib/ripple/document/persistence.rb", "lib/ripple/document.rb", "lib/ripple/embedded_document/finders.rb", "lib/ripple/embedded_document/persistence.rb", "lib/ripple/embedded_document.rb", "lib/ripple/i18n.rb", "lib/ripple/inspection.rb", "lib/ripple/locale/en.yml", "lib/ripple/nested_attributes.rb", "lib/ripple/properties.rb", "lib/ripple/property_type_mismatch.rb", "lib/ripple/railtie.rb", "lib/ripple/timestamps.rb", "lib/ripple/translation.rb", "lib/ripple/validations/associated_validator.rb", "lib/ripple/validations.rb", "lib/ripple.rb", "Rakefile", "ripple.gemspec", "spec/fixtures/config.yml", "spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb", "spec/spec_helper.rb", "spec/support/associations/proxies.rb", "spec/support/mocks.rb", "spec/support/models/address.rb", "spec/support/models/box.rb", "spec/support/models/car.rb", "spec/support/models/cardboard_box.rb", "spec/support/models/clock.rb", "spec/support/models/customer.rb", "spec/support/models/driver.rb", "spec/support/models/email.rb", "spec/support/models/engine.rb", "spec/support/models/family.rb", "spec/support/models/favorite.rb", "spec/support/models/invoice.rb", "spec/support/models/late_invoice.rb", "spec/support/models/note.rb", "spec/support/models/page.rb", "spec/support/models/paid_invoice.rb", "spec/support/models/passenger.rb", "spec/support/models/seat.rb", "spec/support/models/tasks.rb", "spec/support/models/tree.rb", "spec/support/models/user.rb", "spec/support/models/wheel.rb", "spec/support/models/widget.rb", "spec/support/test_server.rb", "spec/support/test_server.yml.example"]
+  s.files = ["Gemfile", "lib/rails/generators/ripple/configuration/configuration_generator.rb", "lib/rails/generators/ripple/configuration/templates/ripple.yml", "lib/rails/generators/ripple/js/js_generator.rb", "lib/rails/generators/ripple/js/templates/js/contrib.js", "lib/rails/generators/ripple/js/templates/js/iso8601.js", "lib/rails/generators/ripple/js/templates/js/ripple.js", "lib/rails/generators/ripple/model/model_generator.rb", "lib/rails/generators/ripple/model/templates/model.rb", "lib/rails/generators/ripple/observer/observer_generator.rb", "lib/rails/generators/ripple/observer/templates/observer.rb", "lib/rails/generators/ripple/test/templates/test_server.rb", "lib/rails/generators/ripple/test/test_generator.rb", "lib/rails/generators/ripple_generator.rb", "lib/ripple/associations/embedded.rb", "lib/ripple/associations/instantiators.rb", "lib/ripple/associations/linked.rb", "lib/ripple/associations/many.rb", "lib/ripple/associations/many_embedded_proxy.rb", "lib/ripple/associations/many_linked_proxy.rb", "lib/ripple/associations/one.rb", "lib/ripple/associations/one_embedded_proxy.rb", "lib/ripple/associations/one_linked_proxy.rb", "lib/ripple/associations/proxy.rb", "lib/ripple/associations.rb", "lib/ripple/attribute_methods/dirty.rb", "lib/ripple/attribute_methods/query.rb", "lib/ripple/attribute_methods/read.rb", "lib/ripple/attribute_methods/write.rb", "lib/ripple/attribute_methods.rb", "lib/ripple/callbacks.rb", "lib/ripple/conversion.rb", "lib/ripple/core_ext/casting.rb", "lib/ripple/core_ext.rb", "lib/ripple/document/bucket_access.rb", "lib/ripple/document/finders.rb", "lib/ripple/document/key.rb", "lib/ripple/document/persistence.rb", "lib/ripple/document.rb", "lib/ripple/embedded_document/finders.rb", "lib/ripple/embedded_document/persistence.rb", "lib/ripple/embedded_document.rb", "lib/ripple/i18n.rb", "lib/ripple/inspection.rb", "lib/ripple/locale/en.yml", "lib/ripple/nested_attributes.rb", "lib/ripple/observable.rb", "lib/ripple/properties.rb", "lib/ripple/property_type_mismatch.rb", "lib/ripple/railtie.rb", "lib/ripple/timestamps.rb", "lib/ripple/translation.rb", "lib/ripple/validations/associated_validator.rb", "lib/ripple/validations.rb", "lib/ripple.rb", "Rakefile", "ripple.gemspec", "spec/fixtures/config.yml", "spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/observable_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb", "spec/spec_helper.rb", "spec/support/associations/proxies.rb", "spec/support/mocks.rb", "spec/support/models/address.rb", "spec/support/models/box.rb", "spec/support/models/car.rb", "spec/support/models/cardboard_box.rb", "spec/support/models/clock.rb", "spec/support/models/customer.rb", "spec/support/models/driver.rb", "spec/support/models/email.rb", "spec/support/models/engine.rb", "spec/support/models/family.rb", "spec/support/models/favorite.rb", "spec/support/models/invoice.rb", "spec/support/models/late_invoice.rb", "spec/support/models/note.rb", "spec/support/models/page.rb", "spec/support/models/paid_invoice.rb", "spec/support/models/passenger.rb", "spec/support/models/seat.rb", "spec/support/models/tasks.rb", "spec/support/models/tree.rb", "spec/support/models/user.rb", "spec/support/models/wheel.rb", "spec/support/models/widget.rb", "spec/support/test_server.rb", "spec/support/test_server.yml.example"]
   s.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{ripple is an object-mapper library for Riak, the distributed database by Basho.}
-  s.test_files = ["spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb"]
+  s.test_files = ["spec/integration/ripple/associations_spec.rb", "spec/integration/ripple/nested_attributes_spec.rb", "spec/integration/ripple/persistence_spec.rb", "spec/ripple/associations/many_embedded_proxy_spec.rb", "spec/ripple/associations/many_linked_proxy_spec.rb", "spec/ripple/associations/one_embedded_proxy_spec.rb", "spec/ripple/associations/one_linked_proxy_spec.rb", "spec/ripple/associations/proxy_spec.rb", "spec/ripple/associations_spec.rb", "spec/ripple/attribute_methods_spec.rb", "spec/ripple/bucket_access_spec.rb", "spec/ripple/callbacks_spec.rb", "spec/ripple/conversion_spec.rb", "spec/ripple/core_ext_spec.rb", "spec/ripple/document_spec.rb", "spec/ripple/embedded_document/finders_spec.rb", "spec/ripple/embedded_document/persistence_spec.rb", "spec/ripple/embedded_document_spec.rb", "spec/ripple/finders_spec.rb", "spec/ripple/inspection_spec.rb", "spec/ripple/key_spec.rb", "spec/ripple/observable_spec.rb", "spec/ripple/persistence_spec.rb", "spec/ripple/properties_spec.rb", "spec/ripple/ripple_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations_spec.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<activemodel>, ["~> 3.0.0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
   end

data/spec/ripple/associations/proxy_spec.rb

@@ -75,4 +75,4 @@ describe Ripple::Associations::Proxy do
     it { should be_blank }
     it { should_not be_present }
   end
-end
+end

data/spec/ripple/attribute_methods_spec.rb

@@ -185,8 +185,20 @@ describe Ripple::AttributeMethods do
     lambda { @widget.attributes = nil }.should raise_error(ArgumentError)
   end
 
-  it "should protect attributes from mass assignment" do
+  it "should protect attributes from mass assignment when initialized" do
     @widget = Widget.new(:manufactured => true)
     @widget.manufactured.should be_false
   end
+
+  it "should protect attributes from mass assignment by default" do
+    @widget = Widget.new
+    @widget.attributes = { :manufactured => true }
+    @widget.manufactured.should be_false
+  end
+
+  it "should allow protected attributes to be mass assigned" do
+    @widget = Widget.new
+    @widget.send(:attributes=, { :manufactured => true }, false)
+    @widget.manufactured.should be_true
+  end
 end

data/spec/ripple/callbacks_spec.rb

@@ -77,6 +77,15 @@ describe Ripple::Callbacks do
       @box.destroy
     end
 
+    it "should call save and validate callbacks in the correct order" do
+      Box.before_validation { $pinger.ping(:v) }
+      Box.before_save { $pinger.ping(:s) }
+      $pinger.should_receive(:ping).with(:v).ordered
+      $pinger.should_receive(:ping).with(:s).ordered
+      @box = Box.new
+      @box.save
+    end
+
     describe "validation callbacks" do
       it "should call validation callbacks" do
         Box.before_validation { $pinger.ping }

data/spec/ripple/core_ext_spec.rb

@@ -14,35 +14,86 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Time do
-  it "serializes to JSON in UTC, RFC 822 format" do
+  before { @date_format = Ripple.date_format }
+  after  { Ripple.date_format = @date_format }
+
+  it "serializes to JSON in UTC, ISO 8601 format by default" do
+    Time.utc(2010,3,16,12).as_json.should == "2010-03-16T12:00:00Z"
+  end
+
+  it "serializes to JSON in UTC, RFC822 format when specified" do
+    Ripple.date_format = :rfc822
     Time.utc(2010,3,16,12).as_json.should == "Tue, 16 Mar 2010 12:00:00 -0000"
   end
 end
 
 describe Date do
-  it "serializes to JSON RFC 822 format" do
+  before { @date_format = Ripple.date_format }
+  after  { Ripple.date_format = @date_format }
+
+  it "serializes to JSON ISO 8601 format by default" do
+    Date.civil(2010,3,16).as_json.should == "2010-03-16"
+  end
+
+  it "serializes to JSON in UTC, RFC822 format when specified" do
+    Ripple.date_format = :rfc822
     Date.civil(2010,3,16).as_json.should == "16 Mar 2010"
   end
 end
 
 describe DateTime do
+  before { @date_format = Ripple.date_format }
+  after  { Ripple.date_format = @date_format }
+
   before :each do
     Time.zone = :utc
   end
 
-  it "serializes to JSON in UTC, RFC 822 format" do
+  it "serializes to JSON in UTC, ISO 8601 format by default" do
+    DateTime.civil(2010,3,16,12).as_json.should == "2010-03-16T12:00:00+00:00"
+  end
+
+  it "serializes to JSON in UTC, RFC822 format when specified" do
+    Ripple.date_format = :rfc822
     DateTime.civil(2010,3,16,12).as_json.should == "Tue, 16 Mar 2010 12:00:00 +0000"
   end
 end
 
 describe ActiveSupport::TimeWithZone do
-  it "serializes to JSON in UTC, RFC 822 format" do
+  before { @date_format = Ripple.date_format }
+  after  { Ripple.date_format = @date_format }
+
+  it "serializes to JSON in UTC, ISO 8601 format by default" do
+    time = Time.utc(2010,3,16,12)
+    zone = ActiveSupport::TimeZone['Alaska']
+    ActiveSupport::TimeWithZone.new(time, zone).as_json.should == "2010-03-16T12:00:00Z"
+  end
+
+  it "serializes to JSON in UTC, RFC822 format when specified" do
+    Ripple.date_format = :rfc822
     time = Time.utc(2010,3,16,12)
     zone = ActiveSupport::TimeZone['Alaska']
     ActiveSupport::TimeWithZone.new(time, zone).as_json.should == "Tue, 16 Mar 2010 12:00:00 -0000"
   end
 end
 
+describe String do
+  it "can parse RFC 822 and ISO 8601 times" do
+    'Tue, 16 Mar 2010 12:00:00 -0000'.to_time.should == Time.utc(2010,3,16,12)
+    '2010-03-16T12:00:00Z'.to_time.should == Time.utc(2010,3,16,12)
+  end
+
+  it "can parse RFC 822 and ISO 8601 dates" do
+    '16 Mar 2010'.to_date.should == Date.civil(2010,3,16)
+    '2010-3-16'.to_date.should == Date.civil(2010,3,16)
+  end
+
+  it "can parse RFC 822 and ISO 8601 datetimes" do
+    'Tue, 16 Mar 2010 12:00:00 +0000'.to_datetime.should == DateTime.civil(2010,3,16,12)
+    '2010-03-16T12:00:00+00:00'.to_datetime.should == DateTime.civil(2010,3,16,12)
+  end
+end
+
 describe "Boolean" do
   it "should be available to properties on documents" do
     lambda {

data/spec/ripple/finders_spec.rb

@@ -75,9 +75,11 @@ describe Ripple::Document::Finders do
       lambda { Box.find!("square") }.should_not raise_error(Ripple::DocumentNotFound)
     end
 
-    it "should raise an exception when finding an existing document that has properties we don't know about" do
-      @plain.raw_data = '{"non_existent_property":"whatever"}'
-      lambda { Box.find("square") }.should raise_error
+    it "should put properties we don't know about into the attributes" do
+      @plain.raw_data = '{"non_existent_property":"some_value"}'
+      box = Box.find("square")
+      box[:non_existent_property].should == "some_value"
+      box.should_not respond_to(:non_existent_property)
     end
 
     it "should return the document when calling find!" do
@@ -86,18 +88,18 @@ describe Ripple::Document::Finders do
     end
 
     it "should return nil when no object exists at that key" do
-      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "404 not found"))
       box = Box.find("square")
       box.should be_nil
     end
 
     it "should raise DocumentNotFound when using find! if no object exists at that key" do
-      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "404 not found"))
       lambda { Box.find!("square") }.should raise_error(Ripple::DocumentNotFound, "Couldn't find document with key: square")
     end
 
     it "should re-raise the failed request exception if not a 404" do
-      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::FailedRequest.new(:get, 200, 500, {}, "500 internal server error"))
+      @bucket.should_receive(:get).with("square", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 500, {}, "500 internal server error"))
       lambda { Box.find("square") }.should raise_error(Riak::FailedRequest)
     end
 
@@ -123,7 +125,7 @@ describe Ripple::Document::Finders do
     describe "when using find with missing keys" do
       before :each do
         @bucket.should_receive(:get).with("square", {}).and_return(@plain)
-        @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+        @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "404 not found"))
       end
 
       it "should return nil for documents that no longer exist" do
@@ -153,7 +155,7 @@ describe Ripple::Document::Finders do
     it "should exclude objects that are not found" do
       @bucket.should_receive(:keys).and_return(["square", "rectangle"])
       @bucket.should_receive(:get).with("square", {}).and_return(@plain)
-      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "404 not found"))
       boxes = Box.all
       boxes.should have(1).item
       boxes.first.shape.should == "square"
@@ -162,7 +164,7 @@ describe Ripple::Document::Finders do
     it "should yield found objects to the passed block, excluding missing objects, and return an empty array" do
       @bucket.should_receive(:keys).and_yield(["square"]).and_yield(["rectangle"])
       @bucket.should_receive(:get).with("square", {}).and_return(@plain)
-      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "404 not found"))
+      @bucket.should_receive(:get).with("rectangle", {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "404 not found"))
       @block = mock()
       @block.should_receive(:ping).once
       Box.all do |box|

data/spec/ripple/observable_spec.rb

@@ -0,0 +1,134 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Ripple::Observable do
+  require 'support/models/clock'
+  require 'support/models/clock_observer'
+
+  before :each do
+    @client   = Ripple.client
+    @backend = mock("Backend", :store_object => true)
+    @client.stub!(:backend).and_return(@backend)
+    @clock    = Clock.new
+    @observer = ClockObserver.instance
+  end
+
+  context "given a document is created" do
+    it "should notify all observers twice" do
+      Clock.should_receive(:notify_observers).exactly(6).times
+      @clock.save
+    end
+
+    context "before creating the document" do
+      it "should call Observer#before_create" do
+        @observer.should_receive(:before_create)
+        @clock.save
+      end
+
+      it "should call Observer#before_save" do
+        @observer.should_receive(:before_save)
+        @clock.save
+      end
+
+      it "should call Observer#before_validation" do
+        @observer.should_receive(:before_validation)
+        @clock.save
+      end
+    end
+
+    context "after creating the document" do
+      it "should call Observer#after_create" do
+        @observer.should_receive(:after_create)
+        @clock.save
+      end
+
+      it "should call Observer#after_save" do
+        @observer.should_receive(:after_save)
+        @clock.save
+      end
+
+      it "should call Observer#after_validation" do
+        @observer.should_receive(:after_validation)
+        @clock.save
+      end
+    end
+  end
+
+  context "given a document is updated" do
+    before(:each) do
+      @clock.stub!(:new?).and_return(false)
+    end
+
+    it "should notify all observers twice" do
+      Clock.should_receive(:notify_observers).exactly(6).times
+      @clock.save
+    end
+
+    context "before updating the document" do
+      it "should call Observer#before_update" do
+        @observer.should_receive(:before_update)
+        @clock.save
+      end
+
+      it "should call Observer#before_save" do
+        @observer.should_receive(:before_save)
+        @clock.save
+      end
+
+      it "should call Observer#before_validation" do
+        @observer.should_receive(:before_validation)
+        @clock.save
+      end
+    end
+
+    context "after updating the document" do
+      it "should call Observer#after_update" do
+        @observer.should_receive(:after_update)
+        @clock.save
+      end
+
+      it "should call Observer#after_save" do
+        @observer.should_receive(:after_save)
+        @clock.save
+      end
+
+      it "should call Observer#after_validation" do
+        @observer.should_receive(:after_validation)
+        @clock.save
+      end
+    end
+  end
+
+  context "given a document is destroyed" do
+    it "should notify all observers twice" do
+      Clock.should_receive(:notify_observers).twice
+      @clock.destroy
+    end
+
+    context "before destroying the document" do
+      it "should call Observer#before_destroy" do
+        @observer.should_receive(:before_destroy)
+        @clock.destroy
+      end
+    end
+
+    context "after destroy the document" do
+      it "should call Observer#after_destroy" do
+        @observer.should_receive(:after_destroy)
+        @clock.destroy
+      end
+    end
+  end
+end

data/spec/ripple/persistence_spec.rb

@@ -68,7 +68,7 @@ describe Ripple::Document::Persistence do
   end
 
   it "should instantiate and save a new object to riak" do
-    json = @widget.attributes.merge(:size => 10, :shipped_at => "Sat, 01 Jan 2000 20:15:01 -0000", :_type => 'Widget').to_json
+    json = @widget.attributes.merge(:size => 10, :shipped_at => "2000-01-01T20:15:01Z", :_type => 'Widget').to_json
     @backend.should_receive(:store_object) do |obj, _, _, _|
       obj.raw_data.should == json
       obj.key.should be_nil
@@ -96,6 +96,28 @@ describe Ripple::Document::Persistence do
     @widget.should_not be_a_new_record
   end
 
+  it "should save the attributes not having a corresponding property" do
+    attrs = @widget.attributes.merge("_type" => "Widget", "unknown_property" => "a_value")
+    @backend.should_receive(:store_object) do |obj, _, _, _|
+      obj.data.should == attrs
+      obj.key.should be_nil
+      # Simulate loading the response with the key
+      obj.key = "new_widget"
+    end
+    @widget["unknown_property"] = "a_value"
+    @widget.save
+    @widget.key.should == "new_widget"
+    @widget.should_not be_a_new_record
+    @widget.changes.should be_blank
+  end
+
+  it "should allow unexpected exceptions to be raised" do
+    robject = mock("robject", :key => @widget.key, "data=" => true)
+    robject.should_receive(:store).and_raise(Riak::HTTPFailedRequest.new(:post, 200, 404, {}, "404 not found"))
+    @widget.stub!(:robject).and_return(robject)
+    lambda { @widget.save }.should raise_error(Riak::FailedRequest)
+  end
+
   it "should reload a saved object" do
     json = @widget.attributes.merge(:_type => "Widget").to_json
     @backend.should_receive(:store_object) do |obj, _, _, _|

data/spec/ripple/ripple_spec.rb

@@ -34,32 +34,51 @@ describe Ripple do
     Ripple.client = client
     Ripple.client.should == client
   end
-  
+
   it "should reset the client when the configuration changes" do
     c = Ripple.client
     Ripple.config = {:port => 9000}
     Ripple.client.should_not == c
     Ripple.client.port.should == 9000
   end
-  
+
   it "should raise No Such File or Directory when given a bad configuration file" do
     lambda { Ripple.load_config('not-here') }.should raise_error(Ripple::MissingConfiguration)
   end
-  
+
   it "should pass an empty hash into configure if the configuration file is missing the key" do
     Ripple.should_receive(:config=).with({})
     Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'), [:ripple, 'not-here'])
   end
-  
+
   it "should select the configuration hash from the config keys provided" do
     Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'), ['ripple_rails', 'development'])
     Ripple.client.port.should == 9001
     Ripple.client.host.should == '127.0.0.1'
   end
-  
+
   it "should apply the configuration under the ripple key" do
     Ripple.load_config(File.join(File.dirname(__FILE__), '..', 'fixtures', 'config.yml'))
     Ripple.client.port.should == 9000
     Ripple.client.host.should == 'localhost'
   end
+
+  describe "date format" do
+    before { @date_format = Ripple.date_format }
+    after  { Ripple.date_format = @date_format }
+
+    it "should default to :iso8601" do
+      Ripple.date_format.should == :iso8601
+    end
+
+    it "should allow setting via the config" do
+      Ripple.config = {"date_format" => "rfc822"}
+      Ripple.date_format.should == :rfc822
+    end
+
+    it "should allow setting manually" do
+      Ripple.date_format = "rfc822"
+      Ripple.date_format.should == :rfc822
+    end
+  end
 end

data/spec/ripple/validations_spec.rb

@@ -41,20 +41,20 @@ describe Ripple::Validations do
     @box.should_receive(:valid?).and_return(false)
     @box.save.should be_false
   end
-  
+
   it "should allow skipping validations by passing save :validate => false" do
     Ripple.client.http.stub!(:perform).and_return(mock_response)
     @box.should_not_receive(:valid?)
     @box.save(:validate => false).should be_true
   end
-  
+
   describe "when using save! on an invalid record" do
     before(:each) { @box.stub!(:valid?).and_return(false) }
-    
+
     it "should raise DocumentInvalid" do
       lambda { @box.save! }.should raise_error(Ripple::DocumentInvalid)
     end
-  
+
     it "should raise an exception that has the invalid document" do
       begin
         @box.save!
@@ -63,26 +63,34 @@ describe Ripple::Validations do
       end
     end
   end
-  
+
   it "should not raise an error when save! is called and the document is valid" do
     @box.stub!(:save).and_return(true)
     @box.stub!(:valid?).and_return(true)
     lambda { @box.save! }.should_not raise_error(Ripple::DocumentInvalid)
   end
-  
+
   it "should return true from save! when no exception is raised" do
     @box.stub!(:save).and_return(true)
     @box.stub!(:valid?).and_return(true)
     @box.save!.should be_true
   end
-  
+
+  it "should allow unexpected exceptions to be raised" do
+    robject = mock("robject", :key => @box.key, "data=" => true)
+    robject.should_receive(:store).and_raise(Riak::HTTPFailedRequest.new(:post, 200, 404, {}, "404 not found"))
+    @box.stub!(:robject).and_return(robject)
+    @box.stub!(:valid?).and_return(true)
+    lambda { @box.save! }.should raise_error(Riak::FailedRequest)
+  end
+
   it "should not raise an error when creating a box with create! succeeds" do
     @box.stub!(:new?).and_return(false)
     Box.stub(:create).and_return(@box)
     lambda { @new_box = Box.create! }.should_not raise_error(Ripple::DocumentInvalid)
     @new_box.should == @box
   end
-  
+
   it "should raise an error when creating a box with create! fails" do
     @box.stub!(:new?).and_return(true)
     Box.stub(:create).and_return(@box)
@@ -102,8 +110,8 @@ describe Ripple::Validations do
     @box.should be_valid
     Box.properties.delete :size
   end
-  
+
   after :each do
     Box.reset_callbacks(:validate)
-  end  
+  end
 end

metadata

@@ -1,14 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  hash: 31098121
-  prerelease: true
-  segments: 
-  - 0
-  - 9
-  - 0
-  - beta
-  version: 0.9.0.beta
+  prerelease: 6
+  version: 0.9.0.beta2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -16,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-29 00:00:00 -06:00
+date: 2011-03-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,13 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31098121
-        segments: 
-        - 0
-        - 9
-        - 0
-        - beta
-        version: 0.9.0.beta
+        version: 0.9.0.beta2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -60,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id003
@@ -76,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id004
@@ -98,9 +71,12 @@ files:
 - lib/rails/generators/ripple/configuration/templates/ripple.yml
 - lib/rails/generators/ripple/js/js_generator.rb
 - lib/rails/generators/ripple/js/templates/js/contrib.js
+- lib/rails/generators/ripple/js/templates/js/iso8601.js
 - lib/rails/generators/ripple/js/templates/js/ripple.js
 - lib/rails/generators/ripple/model/model_generator.rb
 - lib/rails/generators/ripple/model/templates/model.rb
+- lib/rails/generators/ripple/observer/observer_generator.rb
+- lib/rails/generators/ripple/observer/templates/observer.rb
 - lib/rails/generators/ripple/test/templates/test_server.rb
 - lib/rails/generators/ripple/test/test_generator.rb
 - lib/rails/generators/ripple_generator.rb
@@ -136,6 +112,7 @@ files:
 - lib/ripple/inspection.rb
 - lib/ripple/locale/en.yml
 - lib/ripple/nested_attributes.rb
+- lib/ripple/observable.rb
 - lib/ripple/properties.rb
 - lib/ripple/property_type_mismatch.rb
 - lib/ripple/railtie.rb
@@ -168,6 +145,7 @@ files:
 - spec/ripple/finders_spec.rb
 - spec/ripple/inspection_spec.rb
 - spec/ripple/key_spec.rb
+- spec/ripple/observable_spec.rb
 - spec/ripple/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb
@@ -215,25 +193,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
       version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: ripple is an object-mapper library for Riak, the distributed database by Basho.
@@ -259,6 +229,7 @@ test_files:
 - spec/ripple/finders_spec.rb
 - spec/ripple/inspection_spec.rb
 - spec/ripple/key_spec.rb
+- spec/ripple/observable_spec.rb
 - spec/ripple/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb