ripple 0.9.5 → 1.0.0.beta

data/lib/ripple/document/link.rb

@@ -0,0 +1,30 @@
+require 'riak/link'
+
+module Ripple
+  module Document
+    # A Link that is tied to a particular document and tag.
+    # The key is fetched from the document lazily when needed.
+    class Link < Riak::Link
+      attr_reader :document
+      private :document
+
+      def initialize(document, tag)
+        @document = document
+        super(document.class.bucket_name, nil, tag)
+      end
+
+      def key
+        document.key
+      end
+
+      def hash
+        document.hash
+      end
+    end
+
+    def to_link(tag)
+      Link.new(self, tag)
+    end
+  end
+end
+

data/lib/ripple/document/persistence.rb

@@ -1,17 +1,3 @@
-# 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 'active_support/concern'
 
 module Ripple
@@ -29,7 +15,7 @@ module Ripple
         # Destroys all records one at a time.
         # Place holder while :delete to bucket is being developed.
         def destroy_all
-          all(&:destroy)
+          list(&:destroy)
         end
 
         attr_writer :quorums
@@ -74,8 +60,7 @@ module Ripple
         end
 
         def really_save(*args)
-          robject.key = key if robject.key != key
-          robject.data = attributes_for_persistence
+          update_robject
           robject.store(self.class.quorums.slice(:w,:dw))
           self.key = robject.key
           @new = false
@@ -86,8 +71,9 @@ module Ripple
         # @return self
         def reload
           return self if new?
-          robject.reload(:force => true)
-          self.__send__(:attributes=, @robject.data.except("_type"), false)
+          @robject = @robject.reload(:force => true)
+          self.__send__(:raw_attributes=, @robject.data.except("_type"))
+          reset_associations
           self
         end
 
@@ -113,9 +99,15 @@ module Ripple
           end
         end
 
+        def update_robject
+          robject.key = key if robject.key != key
+          robject.content_type = 'application/json'
+          robject.data = attributes_for_persistence
+        end
+
         private
         def attributes_for_persistence
-          attributes.merge("_type" => self.class.name)
+          raw_attributes.merge("_type" => self.class.name)
         end
       end
     end

data/lib/ripple/embedded_document.rb

@@ -1,20 +1,7 @@
-# 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 'active_support/concern'
 require 'active_support/core_ext/hash/except'
 require 'ripple/translation'
+require 'ripple/embedded_document/around_callbacks'
 require 'ripple/embedded_document/finders'
 require 'ripple/embedded_document/persistence'
 require 'ripple/properties'
@@ -45,6 +32,7 @@ module Ripple
       include Ripple::Validations
       include Ripple::Associations
       include Ripple::Callbacks
+      include Ripple::EmbeddedDocument::AroundCallbacks
       include Ripple::Conversion
       include Finders
       include Ripple::Inspection
@@ -62,7 +50,14 @@ module Ripple
       def ==(other)
         self.class == other.class &&
         _parent_document == other._parent_document &&
-        attributes.except('_type') == other.attributes.except('_type')
+        serializable_hash == other.serializable_hash
+      end
+      alias eql? ==
+
+      def hash
+        parent = [_parent_document.class]
+        parent << [_parent_document.key] if _parent_document.respond_to?(:key)
+        [ self.class, parent, serializable_hash ].hash
       end
     end
   end

data/lib/ripple/embedded_document/around_callbacks.rb

@@ -0,0 +1,18 @@
+require 'ripple/callbacks'
+
+module Ripple
+  module EmbeddedDocument
+    module AroundCallbacks
+      extend ActiveSupport::Concern
+      extend Translation
+
+      included do
+        Ripple::Callbacks::CALLBACK_TYPES.each do |type|
+          define_singleton_method "around_#{type}" do |*args|
+            raise NotImplementedError.new(t("around_callbacks_not_supported", :type => type))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ripple/embedded_document/finders.rb

@@ -1,17 +1,3 @@
-# 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 'active_support/concern'
 require 'active_support/inflector'
 
@@ -24,14 +10,17 @@ module Ripple
       module ClassMethods
         def instantiate(attrs)
           begin
-            klass = attrs['_type'].present? ? attrs['_type'].constantize : self
-            klass.new(attrs)
+            klass = attrs['_type'].present? ? attrs.delete('_type').constantize : self
           rescue NameError
-            new(attrs)
+            klass = self
+          end
+          klass.new.tap do |object|
+            object.raw_attributes = attrs
+            object.changed_attributes.clear
           end
         end
       end
-      
+
     end
   end
 end

data/lib/ripple/embedded_document/persistence.rb

@@ -1,17 +1,3 @@
-# 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 'active_support/concern'
 require 'ripple/translation'
 
@@ -32,7 +18,7 @@ module Ripple
       extend ActiveSupport::Concern
 
       module ClassMethods
-        # Creates a method that points to the parent document. 
+        # Creates a method that points to the parent document.
         def embedded_in(parent)
           define_method(parent) { @_parent_document }
         end
@@ -68,7 +54,9 @@ module Ripple
         # Saves this embedded document by delegating to the root document.
         def save(*args)
           if _root_document
-            _root_document.save(*args)
+            run_save_callbacks do
+              _root_document.save(*args)
+            end
           else
             raise NoRootDocument.new(self, :save)
           end
@@ -76,7 +64,7 @@ module Ripple
 
         # @private
         def attributes_for_persistence
-          attributes.merge("_type" => self.class.name)
+          raw_attributes.merge("_type" => self.class.name)
         end
 
         # The root {Ripple::Document} to which this embedded document belongs.

data/lib/ripple/i18n.rb

@@ -1,16 +1,2 @@
-# 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 'active_support/i18n'
 I18n.load_path << File.expand_path("../locale/en.yml", __FILE__)

data/lib/ripple/inspection.rb

@@ -1,26 +1,32 @@
-# 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
   # Makes IRB and other inspect output a bit friendlier
   module Inspection
+
     # A human-readable version of the {Ripple::Document} or {Ripple::EmbeddedDocument}
+    # plus attributes
     def inspect
       attribute_list = attributes_for_persistence.except("_type").map {|k,v| "#{k}=#{v.inspect}" }.join(' ')
-      identifier = self.class.embeddable? ? "" : ":#{key || '[new]'}"
-      "<#{self.class.name}#{identifier} #{attribute_list}>"
+      inspection_string(attribute_list)
+    end
+
+    # A string representation of the {Ripple::Document} or {Ripple::EmbeddedDocument}
+    def to_s
+      inspection_string
     end
+
+    private
+
+    def inspection_string(extra = nil)
+      body = self.class.name + persistance_identifier
+      body += " #{extra}" if extra
+      "<#{body}>"
+    end
+
+    def persistance_identifier
+      self.class.embeddable? ? "" : ":#{key || '[new]'}"
+    end
+
   end
 end

data/lib/ripple/locale/en.yml

@@ -1,26 +1,22 @@
-# 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.
 en:
   ripple:
+    around_callbacks_not_supported: "around_%{type} callbacks are not supported on embedded documents.  See https://github.com/seancribbs/ripple/issues/188 for more detail."
+    associated_document_error_summary: "for %{doc_type} %{doc_id}: %{errors}"
     attribute_hash: "value of attributes must be a Hash"
+    cluster_not_created: "The cluster for the current environment is not created yet. Run `rake riak:create` first."
+    conflict_handler_not_implemented: "No on_conflict handler has been implemented for %{document}"
     document_invalid: "Validation failed: %{errors}"
     document_not_found: 
       no_key: "Couldn't find document without a key"
       one_key: "Couldn't find document with key: %{key}"
       many_keys: "Couldn't find documents with keys: %{keys}"
     invalid_association_value: "Invalid value %{value} for association %{name} of type %{klass} on %{owner}"
+    many_association_validation_error: "are invalid (%{association_errors})"
+    many_key_association: "You cannot use a many association using :key"
     missing_configuration: "You are missing your ripple configuration file that should be at %{file}"
     no_root_document: "You cannot call %{method} on %{doc} without a root document"
+    one_association_validation_error: "is invalid (%{association_errors})"
     property_type_mismatch: "Cannot cast %{value} into a %{class}"
+    undefined_property: "Undefined property :%{prop} for class '%{class}'"
+    unexpected_conflicts: "Conflict cannot be resolved for %{conflicts} (for %{document})"
 

data/lib/ripple/nested_attributes.rb

@@ -1,17 +1,3 @@
-# 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 'active_support/concern'
 require 'active_support/core_ext/class/inheritable_attributes'
 
@@ -23,10 +9,14 @@ module Ripple
     TRUE_VALUES = [ true, "true", 1, "1", "yes", "ok", "y" ]
 
     included do
-      class_inheritable_accessor :nested_attributes_options, :instance_writer => false
+      if respond_to?(:class_attribute) # ActiveSupport 3.1
+        class_attribute :nested_attributes_options, :instance_writer => false
+      else
+        class_inheritable_accessor :nested_attributes_options, :instance_writer => false
+      end
       self.nested_attributes_options = {}
     end
-    
+
     # = Nested Attributes
     #
     # This is similar to the `accepts_nested_attributes` functionality
@@ -87,7 +77,7 @@ module Ripple
     #                                                        { :key => 'yyy', :reference => 'updated foo2' } ])
     #   manifest.shipments.first.reference # => updated foo1
     #   manifest.shipments.second.reference # => updated foo2
-    # 
+    #
     # NOTE: On many embedded, then entire collection of embedded documents is replaced, as there
     # is no key to specifically update.
     #
@@ -105,41 +95,45 @@ module Ripple
     #   end
     #
     # The assigning of attributes replaces existing:
-    #   
+    #
     #   manifest = Manifest.create(:signature_attributes => [ { :esig => 'a00001' }, { :esig => 'b00001' } ]
     #   manifest.signatures # => [<Signature esig="a00001">, <Signature esig="b00001">]
     #
     #   manifest.signature_attributes = [ { :esig => 'c00001' } ]
     #   manifest.signatures # => [<Signature esig="c00001">]
-    #     
+    #
     module ClassMethods
-    
+
       def accepts_nested_attributes_for(*attr_names)
         options = { :allow_destroy => false }
         options.update(attr_names.extract_options!)
-        
+
         attr_names.each do |association_name|
           if association = self.associations[association_name]
             nested_attributes_options[association_name.to_sym] = options
-         
-            class_eval %{
-              def #{association_name}_attributes=(attributes)
-                assign_nested_attributes_for_#{association.type}_association(:#{association_name}, attributes)
-              end
 
-              before_save :autosave_nested_attributes_for_#{association_name}
-              before_save :destroy_marked_for_destruction
+            define_method "#{association_name}_attributes=" do |attributes|
+              send("assign_nested_attributes_for_#{association.type}_association",
+                association_name, attributes
+              )
+            end
 
-              private
+            before_save :"autosave_nested_attributes_for_#{association_name}"
+            before_save :destroy_marked_for_destruction
 
-              def autosave_nested_attributes_for_#{association_name}
-                save_nested_attributes_for_#{association.type}_association(:#{association_name}) if self.autosave[:#{association_name}]
+            define_method "autosave_nested_attributes_for_#{association_name}" do
+              if self.autosave[association_name]
+                send("save_nested_attributes_for_#{association.type}_association",
+                  association_name
+                )
               end
-            }, __FILE__, __LINE__
+            end
+            private :"autosave_nested_attributes_for_#{association_name}"
+
           else
             raise ArgumentError, "Association #{association_name} not found!"
           end
-        end        
+        end
       end
     end
 
@@ -156,7 +150,7 @@ module Ripple
       end
 
       private
-      
+
       def save_nested_attributes_for_one_association(association_name)
         send(association_name).save
       end
@@ -178,14 +172,14 @@ module Ripple
 
       def assign_nested_attributes_for_one_association(association_name, attributes)
         association = self.class.associations[association_name]
-        if association.embeddable?
+        if association.embedded?
           assign_nested_attributes_for_one_embedded_association(association_name, attributes)
         else
           self.autosave[association_name] = true
           assign_nested_attributes_for_one_linked_association(association_name, attributes)
         end
       end
-      
+
       def assign_nested_attributes_for_one_embedded_association(association_name, attributes)
         send(association_name).build(attributes.except(*UNASSIGNABLE_KEYS))
       end
@@ -215,7 +209,7 @@ module Ripple
         end
 
         association = self.class.associations[association_name]
-        if association.embeddable?
+        if association.embedded?
           assign_nested_attributes_for_many_embedded_association(association_name, attributes_collection)
         else
           self.autosave[association_name] = true
@@ -255,7 +249,7 @@ module Ripple
         record.attributes = attributes.except(*UNASSIGNABLE_KEYS)
       end
     end
-    
+
     def has_destroy_flag?(hash)
       TRUE_VALUES.include?(hash.stringify_keys['_destroy'])
     end
@@ -275,5 +269,5 @@ module Ripple
     end
 
   end
-  
+
 end