ripple 0.9.0.beta2 → 0.9.0

data/Gemfile

@@ -11,6 +11,14 @@ platforms :mri do
   gem 'yajl-ruby'
 end
 
+platforms :mri_18, :jruby do
+  gem 'ruby-debug'
+end
+
+platforms :mri_19 do
+  gem 'ruby-debug19'
+end
+
 platforms :jruby do
   gem 'json'
   gem 'jruby-openssl'

data/Rakefile

@@ -16,122 +16,17 @@ gemspec = Gem::Specification.new do |gem|
   gem.add_dependency "activesupport", "~>3.0.0"
   gem.add_dependency "activemodel", "~>3.0.0"
 
-  gem.files =  %W{
-      Gemfile
-      lib/rails/generators/ripple/configuration/configuration_generator.rb
-      lib/rails/generators/ripple/configuration/templates
-      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
-     }
+  files = FileList["**/*"]
+  # Editor and O/S files
+  files.exclude ".DS_Store", "*~", "\#*", ".\#*", "*.swp", "*.tmproj", "tmtags"
+  # Generated artifacts
+  files.exclude "coverage", "rdoc", "pkg", ".bundle", "*.rbc", ".rvmrc", ".watchr", ".rspec"
+  # Project-specific
+  files.exclude "Gemfile.lock", %r{spec/support/test_server.yml$}, "bin"
+  # Remove directories
+  files.exclude {|d| File.directory?(d) }
+
+  gem.files = files.to_a
 
   gem.test_files = gem.files.grep(/_spec\.rb$/)
 end

data/lib/rails/generators/ripple/configuration/templates/ripple.yml

@@ -1,6 +1,7 @@
 # Configure Riak connections for the Ripple library.
 development:
-  port: 8098
+  http_port: 8098
+  pb_port: 8087
   host: localhost
 
 # The test environment has additional keys for configuring the
@@ -11,11 +12,13 @@ development:
 # * js_source_dir specifies where your custom Javascript functions for
 #           MapReduce should be loaded from. Usually app/mapreduce.
 test:
-  port: 9000
+  http_port: 9000
+  pb_port: 9002
   host: localhost
   bin_dir: /usr/local/bin   # Default for Homebrew.
   js_source_dir: <%%= Rails.root + "app/mapreduce" %>
 
 production:
-  port: 8098
+  http_port: 8098
+  pb_port: 8087
   host: localhost

data/lib/ripple.rb

@@ -41,6 +41,7 @@ module Ripple
   autoload :Validations
   autoload :NestedAttributes
   autoload :Observable
+  autoload :Serialization
 
   # Exceptions
   autoload :PropertyTypeMismatch
@@ -100,7 +101,7 @@ module Ripple
 
     private
     def client_config
-      config.slice(:host, :port, :prefix, :mapred, :client_id, :http_backend, :solr)
+      config.slice(*Riak::Client::VALID_OPTIONS)
     end
   end
 

data/lib/ripple/associations.rb

@@ -123,7 +123,13 @@ module Ripple
       # @private
       def attributes_for_persistence
         self.class.embedded_associations.inject(super) do |attrs, association|
-          if documents = instance_variable_get(association.ivar)
+          documents = instance_variable_get(association.ivar)
+          # We must explicitly check #nil? (rather than just saying `if documents`)
+          # because documents can be an association proxy that is proxying nil.
+          # In this case ruby treats documents as true because it is not _really_ nil,
+          # but #nil? will tell us if it is proxying nil.
+
+          unless documents.nil?
             attrs[association.name] = documents.is_a?(Array) ? documents.map(&:attributes_for_persistence) : documents.attributes_for_persistence
           end
           attrs

data/lib/ripple/associations/many_linked_proxy.rb

@@ -26,6 +26,13 @@ module Ripple
         self
       end
 
+      def delete(value)
+        load_target
+        @target.delete(value)
+        replace @target
+        self
+      end
+
       protected
       def find_target
         robjects.map {|robj| klass.send(:instantiate, robj) }

data/lib/ripple/associations/one_embedded_proxy.rb

@@ -23,7 +23,14 @@ module Ripple
         @reflection.verify_type!(doc, @owner)
         @_doc = doc.respond_to?(:attributes_for_persistence) ? doc.attributes_for_persistence : doc
         assign_references(doc)
-        reset
+
+        if doc.is_a?(@reflection.klass)
+          loaded
+          @target = doc
+        else
+          reset
+        end
+
         @_doc
       end
 

data/lib/ripple/associations/one_linked_proxy.rb

@@ -22,7 +22,11 @@ module Ripple
       protected
       def find_target
         return nil if links.blank?
-        klass.send(:instantiate,robjects.first)
+
+        robjs = robjects
+        return nil if robjs.blank?
+
+        klass.send(:instantiate, robjs.first)
       end
     end
   end

data/lib/ripple/associations/proxy.rb

@@ -100,12 +100,12 @@ module Ripple
 
       protected
       def method_missing(method, *args, &block)
-        if load_target
-          if block_given?
-            target.send(method, *args)  { |*block_args| block.call(*block_args) }
-          else
-            target.send(method, *args)
-          end
+        load_target
+
+        if block_given?
+          target.send(method, *args)  { |*block_args| block.call(*block_args) }
+        else
+          target.send(method, *args)
         end
       end
 

data/lib/ripple/document.rb

@@ -63,6 +63,7 @@ module Ripple
       include Ripple::Document::Finders
       include Ripple::Inspection
       include Ripple::NestedAttributes
+      include Ripple::Serialization
     end
 
     module ClassMethods

data/lib/ripple/embedded_document.rb

@@ -38,6 +38,7 @@ module Ripple
       include Finders
       include Ripple::Inspection
       include Ripple::NestedAttributes
+      include Ripple::Serialization
     end
 
     module ClassMethods
@@ -45,5 +46,13 @@ module Ripple
         true
       end
     end
+
+    module InstanceMethods
+      def ==(other)
+        self.class == other.class &&
+        _parent_document == other._parent_document &&
+        attributes.except('_type') == other.attributes.except('_type')
+      end
+    end
   end
 end

data/lib/ripple/serialization.rb

@@ -0,0 +1,84 @@
+# 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'
+require 'active_model/serialization'
+require 'active_model/serializers/json'
+require 'active_model/serializers/xml'
+
+module Ripple
+  # Provides methods for serializing Ripple documents to external
+  # formats (e.g. JSON).  By default, embedded documents will be
+  # included in the resulting format.
+  module Serialization
+    extend ActiveSupport::Concern
+    include ::ActiveModel::Serializers::JSON
+
+    module InstanceMethods
+      # Creates a Hash suitable for conversion to an external format.
+      # @param [Hash] options (nil) serialization options
+      # @option options [Array<Symbol>] :only emit only the specified attributes
+      # @option options [Array<Symbol>] :except omit the specified attributes
+      # @option options [Array<Symbol>, Hash] :include include the
+      #      specified associations (with or without extra
+      #      options). This defaults to all embedded associations.
+      # @return [Hash] a hash of attributes and embedded documents
+      def serializable_hash(options=nil)
+        options = options.try(:clone) || {}
+
+        unless options.has_key?(:include)
+          options[:include] = self.class.embedded_associations.map(&:name)
+        end
+
+        hash = super(options)
+
+        hash['key'] = key if respond_to?(:key) and key.present?
+
+        serializable_add_includes(options) do |association, records, opts|
+          hash[association.to_s] = records.is_a?(Enumerable) ? records.map {|r| r.serializable_hash(opts) } : records.serializable_hash(opts)
+        end
+        hash
+      end
+
+      private
+      def serializable_add_includes(options={})
+        return unless include_associations = options.delete(:include)
+
+        base_only_or_except = {
+          :except => options[:except],
+          :only => options[:only]
+        }
+
+        include_has_options = include_associations.is_a?(Hash)
+        associations = include_has_options ? include_associations.keys : Array.wrap(include_associations)
+
+        for association in associations
+          records = case self.class.associations[association.to_sym].type
+                    when :many
+                      send(association).to_a
+                    when :one
+                      send(association)
+                    end
+
+          unless records.nil?
+            association_options = include_has_options ? include_associations[association] : base_only_or_except
+            opts = options.merge(association_options)
+            yield(association, records, opts)
+          end
+        end
+
+        options[:include] = include_associations
+      end
+    end
+  end
+end

data/lib/ripple/validations.rb

@@ -53,6 +53,10 @@ module Ripple
         obj = create(attrs, &block)
         (raise Ripple::DocumentInvalid.new(obj) if obj.new?) || obj
       end
+
+      def validates_associated(*attr_names)
+        validates_with AssociatedValidator, _merge_attributes(attr_names)
+      end
     end
 
     module InstanceMethods

data/lib/ripple/validations/associated_validator.rb

@@ -24,11 +24,5 @@ module Ripple
         record.errors.add(attribute, :invalid, options.merge(:value => value))
       end
     end
-
-    module ClassMethods
-      def validates_associated(*attr_names)
-        validates_with AssociatedValidator, _merge_attributes(attr_names)
-      end
-    end
   end
 end

data/ripple.gemspec

@@ -2,37 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripple}
-  s.version = "0.9.0.beta2"
+  s.version = "0.9.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-03}
   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/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.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/serialization.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/serialization_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations/associated_validator_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/clock_observer.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.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/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"]
+  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/serialization_spec.rb", "spec/ripple/timestamps_spec.rb", "spec/ripple/validations/associated_validator_spec.rb", "spec/ripple/validations_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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<riak-client>, ["~> 0.9.0"])
       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.4.0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     s.add_dependency(%q<activemodel>, ["~> 3.0.0"])
   end

data/spec/fixtures/config.yml

@@ -1,8 +1,8 @@
 ripple:
-  port: 9000
+  http_port: 9000
   host: localhost
   
 ripple_rails:
   development:
-    port: 9001
-    host: 127.0.0.1
+    http_port: 9001
+    host: 127.0.0.1

data/spec/integration/ripple/associations_spec.rb

@@ -58,6 +58,36 @@ describe "Ripple Associations" do
     @found.profile.user.should == @found
   end
 
+  it "should not raise an error when a one linked associated record has been deleted" do
+    @user.emergency_contact = @friend1
+    @user.save
+
+    @friend1.destroy
+    @found = User.find(@user.key)
+    @found.emergency_contact.should be_nil
+  end
+
+  it "should allow a many linked record to be deleted from the association but kept in the datastore" do
+    @user.friends << @friend1
+    @user.save!
+
+    @user.friends.delete(@friend1)
+    @user.save!
+
+    found_user = User.find(@user.key)
+    found_user.friends.should be_empty
+    User.find(@friend1.key).should be
+  end
+
+  it "should allow a many embedded record to be deleted from the association" do
+    @user.addresses << @billing << @shipping
+    @user.save!
+
+    @user.addresses.delete(@billing)
+    @user.save!
+    User.find(@user.key).addresses.should == [@shipping]
+  end
+
   it "should save many embedded associations" do
     @user.addresses << @billing << @shipping
     @user.save

data/spec/ripple/associations/one_embedded_proxy_spec.rb

@@ -27,11 +27,14 @@ describe Ripple::Associations::OneEmbeddedProxy do
   it "should not have a child before one is set" do
     @parent.child.should be_nil
   end
+
+  it "should raise NoMethodError when an undefined method is called on the unset child" do
+    expect { @parent.child.some_undefined_method }.to raise_error(NoMethodError)
+  end
   
   it "should be able to set and get its child" do
-    Child.stub!(:instantiate).and_return(@child)
     @parent.child = @child
-    @parent.child.should == @child
+    @parent.child.should equal(@child)
   end
   
   it "should set the parent document on the child when assigning" do

data/spec/ripple/associations_spec.rb

@@ -49,6 +49,13 @@ describe Ripple::Associations do
       Invoice.instance_methods.map(&:to_sym).should include(:payee?)
     end
   end
+
+  after do
+    Invoice.associations.delete(:foo)
+    Invoice.associations.delete(:items)
+    SubInvoice.associations.delete(:foo) if defined?(SubInvoice)
+    Invoice.associations.delete(:payee)
+  end
 end
 
 describe Ripple::Association do

data/spec/ripple/embedded_document_spec.rb

@@ -15,6 +15,7 @@ require File.expand_path("../../spec_helper", __FILE__)
 
 describe Ripple::EmbeddedDocument do
   require 'support/models/address'
+  require 'support/models/user'
 
   it "should have a model name when included" do
     Address.should respond_to(:model_name)
@@ -24,4 +25,50 @@ describe Ripple::EmbeddedDocument do
   it "should be embeddable" do
     Address.should be_embeddable
   end
+
+  describe "#==" do
+    let(:user_1) { User.create! }
+    let(:user_2) { User.create! }
+    let(:street_1) { '123 Somewhere St' }
+    let(:street_2) { '123 Somewhere Ave' }
+    let(:address_1) { Address.new(:street => street_1) }
+    let(:address_2) { Address.new(:street => street_1) }
+
+    before(:each) do
+      address_1._parent_document = user_1
+      address_2._parent_document = user_1
+    end
+
+    it "returns true when the documents have the same classes, parents and attributes" do
+      (address_1 == address_2).should be_true
+      (address_2 == address_1).should be_true
+    end
+
+    it "returns true when the documents match and only one of them includes the _type attribute" do
+      attrs = address_1.attributes
+      address_1.stub(:attributes => attrs.merge('_type' => 'Address'))
+
+      (address_1 == address_2).should be_true
+      (address_2 == address_1).should be_true
+    end
+
+    it "returns false when the parents are different (even if the attributes and classes are the same)" do
+      address_2._parent_document = user_2
+      (address_1 == address_2).should be_false
+      (address_2 == address_1).should be_false
+    end
+
+    it "returns false when the attributes are different (even if the parents and classes are the same)" do
+      address_2.street = street_2
+      (address_1 == address_2).should be_false
+      (address_2 == address_1).should be_false
+    end
+
+    it "returns false then the classes are different (even if the parents and attributes are the same)" do
+      special_address = SpecialAddress.new(address_1.attributes)
+      special_address._parent_document = address_1._parent_document
+      (address_1 == special_address).should be_false
+      (special_address == address_1).should be_false
+    end
+  end
 end

data/spec/ripple/ripple_spec.rb

@@ -30,16 +30,16 @@ describe Ripple do
 
   it "should allow setting the client manually" do
     Ripple.should respond_to(:client=)
-    client = Riak::Client.new(:port => 9000)
+    client = Riak::Client.new(:http_port => 9000)
     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.config = {:http_port => 9000}
     Ripple.client.should_not == c
-    Ripple.client.port.should == 9000
+    Ripple.client.http_port.should == 9000
   end
 
   it "should raise No Such File or Directory when given a bad configuration file" do
@@ -53,13 +53,13 @@ describe Ripple do
 
   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.http_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.http_port.should == 9000
     Ripple.client.host.should == 'localhost'
   end
 

data/spec/ripple/serialization_spec.rb

@@ -0,0 +1,52 @@
+# 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::Serialization do
+  require 'support/models/invoice'
+  require 'support/models/note'
+  require 'support/models/customer'
+
+  it "should provide JSON serialization" do
+    Invoice.new.should respond_to(:to_json)
+  end
+
+  context "when serializing" do
+    it "should include attributes" do
+      Note.new(:text => "Dear Jane,...").serializable_hash.should include('text')
+    end
+
+    it "should include the document key" do
+      doc = Invoice.new
+      doc.key = "1"
+      doc.serializable_hash['key'].should == "1"
+    end
+
+    it "should include embedded documents by default" do
+      doc = Invoice.new(:note => {:text => "Dear customer,..."}).serializable_hash
+      doc['note'].should eql({'text' => "Dear customer,..."})
+    end
+
+    it "should exclude specified attributes" do
+      hash = Invoice.new.serializable_hash(:except => [:created_at])
+      hash.should_not include('created_at')
+    end
+
+    it "should limit to specified attributes" do
+      hash = Invoice.new.serializable_hash(:only => [:created_at])
+      hash.should include('created_at')
+      hash.should_not include('updated_at')
+    end
+  end
+end

data/spec/ripple/validations/associated_validator_spec.rb

@@ -0,0 +1,33 @@
+# 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::Validations::AssociatedValidator do
+  require 'support/models/family'
+
+  let(:child)  { Child.new  }
+  let(:parent) { Parent.new }
+  before(:each) { parent.child = child }
+
+  it "is invalid when the associated record is invalid" do
+    child.should_not be_valid
+    parent.should_not be_valid
+  end
+
+  it "is valid when the associated record is valid" do
+    child.name = 'Coen'
+    child.should be_valid
+    parent.should be_valid
+  end
+end

data/spec/spec_helper.rb

@@ -26,4 +26,8 @@ RSpec.configure do |config|
   config.after(:each) do
     $test_server.recycle if $test_server
   end
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.debug = true
 end

data/spec/support/models/address.rb

@@ -20,3 +20,6 @@ class Address
   many :notes
   embedded_in :user
 end
+
+class SpecialAddress < Address
+end

data/spec/support/models/clock_observer.rb

@@ -0,0 +1,16 @@
+# 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.
+
+class ClockObserver < ActiveModel::Observer
+end

data/spec/support/models/family.rb

@@ -14,6 +14,7 @@
 class Parent
   include Ripple::Document
   one :child
+  validates_associated :child
 end
 
 class Child

data/spec/support/models/invoice.rb

@@ -16,4 +16,5 @@ class Invoice
   include Ripple::Document
   one :customer
   one :note
+  timestamps!
 end

data/spec/support/models/note.rb

@@ -14,4 +14,5 @@
 
 class Note
   include Ripple::EmbeddedDocument
+  property :text, String
 end

data/spec/support/test_server.rb

@@ -7,7 +7,7 @@ unless $test_server
     $test_server = Riak::TestServer.new(config.symbolize_keys)
     $test_server.prepare!
     $test_server.start
-    Ripple.config = {:port => 9000 }
+    Ripple.config = {:http_port => 9000 }
     at_exit { $test_server.cleanup }
   rescue => e
     warn "Can't run Riak::TestServer specs. Specify the location of your Riak installation in spec/support/test_server.yml. See Riak::TestServer docs for more info."

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.9.0.beta2
+  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.0.beta2
+        version: 0.9.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
 - lib/ripple/properties.rb
 - lib/ripple/property_type_mismatch.rb
 - lib/ripple/railtie.rb
+- lib/ripple/serialization.rb
 - lib/ripple/timestamps.rb
 - lib/ripple/translation.rb
 - lib/ripple/validations/associated_validator.rb
@@ -149,7 +150,9 @@ files:
 - spec/ripple/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb
+- spec/ripple/serialization_spec.rb
 - spec/ripple/timestamps_spec.rb
+- spec/ripple/validations/associated_validator_spec.rb
 - spec/ripple/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/associations/proxies.rb
@@ -159,6 +162,7 @@ files:
 - spec/support/models/car.rb
 - spec/support/models/cardboard_box.rb
 - spec/support/models/clock.rb
+- spec/support/models/clock_observer.rb
 - spec/support/models/customer.rb
 - spec/support/models/driver.rb
 - spec/support/models/email.rb
@@ -197,9 +201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -233,5 +237,7 @@ test_files:
 - spec/ripple/persistence_spec.rb
 - spec/ripple/properties_spec.rb
 - spec/ripple/ripple_spec.rb
+- spec/ripple/serialization_spec.rb
 - spec/ripple/timestamps_spec.rb
+- spec/ripple/validations/associated_validator_spec.rb
 - spec/ripple/validations_spec.rb