ripple 0.9.5 → 1.0.0.beta

data/lib/ripple/associations/one_key_proxy.rb

@@ -0,0 +1,58 @@
+require 'ripple/associations/proxy'
+require 'ripple/associations/one'
+
+module Ripple
+  module Associations
+    class OneKeyProxy < Proxy
+      include One
+
+      def replace(doc)
+        @reflection.verify_type!(doc, owner)
+
+        reset_previous_target_key_delegate
+        assign_new_target_key_delegate(doc)
+
+        loaded
+        @target = doc
+      end
+
+      def find_target
+        klass.find(owner.key)
+      end
+
+      protected
+      def instantiate_target(instantiator, attrs={})
+        @target = super
+        @target.key = owner.key
+        @target
+      end
+
+      private
+      def reset_previous_target_key_delegate
+        @target.key_delegate = @target if @target
+      end
+
+      def assign_new_target_key_delegate(doc)
+        doc.class.send(:include, Ripple::Associations::KeyDelegator) unless doc.class.include?(Ripple::Associations::KeyDelegator)
+        owner.key_delegate = doc.key_delegate = owner
+      end
+
+    end
+
+    module KeyDelegator
+      attr_accessor :key_delegate
+
+      def key_delegate
+        @key_delegate || self
+      end
+
+      def key
+        self === key_delegate ? super : key_delegate.key
+      end
+
+      def key=(value)
+        self === key_delegate ? super(value) : key_delegate.key = value
+      end
+    end
+  end
+end

data/lib/ripple/associations/one_linked_proxy.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 'ripple/associations/proxy'
 require 'ripple/associations/one'
 require 'ripple/associations/linked'
@@ -22,6 +8,10 @@ module Ripple
       include One
       include Linked
 
+      def key
+        keys.first
+      end
+
       protected
       def find_target
         return nil if links.blank?

data/lib/ripple/associations/one_stored_key_proxy.rb

@@ -0,0 +1,43 @@
+require 'ripple/associations/proxy'
+require 'ripple/associations/one'
+
+module Ripple
+  module Associations
+    class OneStoredKeyProxy < Proxy
+      include One
+
+      def replace(value)
+        @reflection.verify_type!(value, owner)
+
+        if value
+          assign_key(value.key)
+        else
+          assign_key(nil)
+        end
+
+        @target = value
+        loaded
+      end
+
+      protected
+
+      def key
+        @owner.send(key_name)
+      end
+
+      def assign_key(value)
+        @owner.send("#{key_name}=", value)
+      end
+
+      def key_name
+        "#{@reflection.name}_key"
+      end
+
+      def find_target
+        return nil if key.blank?
+
+        klass.find(key)
+      end
+    end
+  end
+end

data/lib/ripple/associations/proxy.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 'ripple/associations'
 
 module Ripple
@@ -99,6 +85,14 @@ module Ripple
         other === target
       end
 
+      def loaded_documents
+        loaded? ? Array(target) : []
+      end
+
+      def has_changed_documents?
+        loaded_documents.any? { |doc| doc.changed? }
+      end
+
       protected
       def method_missing(method, *args, &block)
         load_target

data/lib/ripple/attribute_methods.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 'ripple/translation'
 require 'active_support/concern'
 require 'active_model/attribute_methods'
@@ -35,7 +21,7 @@ module Ripple
       include Query
       include Dirty
       include ActiveModel::MassAssignmentSecurity
-      
+
       attr_protected :key
     end
 
@@ -59,6 +45,10 @@ module Ripple
       # nor embedded documents.
       # @return [Hash] all document attributes, by key
       def attributes
+        raw_attributes.reject { |k, v| !respond_to?(k) }
+      end
+
+      def raw_attributes
         self.class.properties.values.inject(@attributes.with_indifferent_access) do |hash, prop|
           hash[prop.key] = attribute(prop.key)
           hash
@@ -67,9 +57,21 @@ module Ripple
 
       # Mass assign the document's attributes.
       # @param [Hash] attrs the attributes to assign
-      def attributes=(attrs, guard_protected_attrs = true)
+      def attributes=(attrs)
+        raise ArgumentError, t('attribute_hash') unless Hash === attrs
+        sanitize_for_mass_assignment(attrs).each do |k,v|
+          if respond_to?("#{k}=")
+            __send__("#{k}=",v)
+          else
+            raise ArgumentError, t('undefined_property', :prop => k, :class => self.class.name)
+          end
+        end
+      end
+
+      # @private
+      def raw_attributes=(attrs)
         raise ArgumentError, t('attribute_hash') unless Hash === attrs
-        (guard_protected_attrs ? sanitize_for_mass_assignment(attrs) : attrs).each do |k,v|
+        attrs.each do |k,v|
           next if k.to_sym == :key
           if respond_to?("#{k}=")
             __send__("#{k}=",v)

data/lib/ripple/attribute_methods/dirty.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_model/dirty'
 
@@ -21,6 +7,15 @@ module Ripple
       extend ActiveSupport::Concern
       include ActiveModel::Dirty
 
+      module ClassMethods
+        # @private
+        def instantiate(robject)
+          super(robject).tap do |o|
+            o.changed_attributes.clear
+          end
+        end
+      end
+
       # @private
       def really_save(*args)
         if result = super
@@ -43,9 +38,18 @@ module Ripple
         changed_attributes.clear
       end
 
+      # Determines if the document has any chnages.
+      # @return [Boolean] true if this document, or any of its embedded
+      # documents at any level, have changed.
+      def changed?
+        super || self.class.embedded_associations.any? do |association|
+          send(association.name).has_changed_documents?
+        end
+      end
+
       private
       def attribute=(attr_name, value)
-        if self.class.properties.include?(attr_name.intern) && @attributes[attr_name] != value
+        if self.class.properties.include?(attr_name.to_sym) && @attributes[attr_name] != value
           attribute_will_change!(attr_name)
         end
         super

data/lib/ripple/attribute_methods/query.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

data/lib/ripple/attribute_methods/read.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

data/lib/ripple/attribute_methods/write.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

data/lib/ripple/callbacks.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_model/callbacks'
 
@@ -21,9 +7,11 @@ module Ripple
   module Callbacks
     extend ActiveSupport::Concern
 
+    CALLBACK_TYPES = [:create, :update, :save, :destroy, :validation]
+
     included do
       extend ActiveModel::Callbacks
-      define_model_callbacks :create, :update, :save, :destroy
+      define_model_callbacks *(CALLBACK_TYPES - [:validation])
       define_callbacks :validation, :terminator => "result == false", :scope => [:kind, :name]
     end
 
@@ -53,10 +41,16 @@ module Ripple
     module InstanceMethods
       # @private
       def really_save(*args, &block)
+        run_save_callbacks do
+          super
+        end
+      end
+
+      def run_save_callbacks
         state = new? ? :create : :update
         run_callbacks(:save) do
           run_callbacks(state) do
-            super
+            yield
           end
         end
       end

data/lib/ripple/conflict/basic_resolver.rb

@@ -0,0 +1,82 @@
+module Ripple
+  module Conflict
+    class BasicResolver
+      delegate :model_class, :document, :siblings, :to => :@main_resolver
+
+      def initialize(main_resolver)
+        @main_resolver = main_resolver
+      end
+
+      def remaining_conflicts
+        @remaining_conflicts ||= []
+      end
+
+      def unexpected_conflicts
+        # if the user didn't specify the conflict they expect,
+        # then don't consider any conflicts unexpected
+        return [] if model_class.expected_conflicts.blank?
+
+        remaining_conflicts - model_class.expected_conflicts
+      end
+
+      def perform
+        process_properties
+        process_embedded_associations
+        process_linked_associations
+        process_stored_key_associations
+      end
+
+      private
+
+      def process_properties
+        model_class.properties.each do |name, property|
+          document.send(:"#{name}=", resolved_property_value_for(property))
+        end
+      end
+
+      def process_embedded_associations
+        model_class.embedded_associations.each do |assoc|
+          document.send(:"#{assoc.name}=", resolved_association_value_for(assoc, :load_target))
+        end
+      end
+
+      def process_linked_associations
+        model_class.linked_associations.each do |assoc|
+          document.send(assoc.name).replace_links(resolved_association_value_for(assoc, :links))
+        end
+      end
+
+      def process_stored_key_associations
+        model_class.stored_key_associations.each do |assoc|
+          document.send(assoc.name).reset_owner_keys if (assoc.type == :many)
+        end
+      end
+
+      def resolved_property_value_for(property)
+        uniq_values = siblings.map(&property.key).uniq
+
+        value = if uniq_values.size == 1
+          uniq_values.first
+        elsif property.key == :updated_at
+          uniq_values.compact.max
+        elsif property.key == :created_at
+          uniq_values.compact.min
+        else
+          remaining_conflicts << property.key
+          property.default
+        end
+      end
+
+      def resolved_association_value_for(association, proxy_value_method)
+        # the association proxy doesn't uniquify well, so we have to use the target or links directly
+        uniq_values = siblings.map { |s| s.send(association.name).__send__(proxy_value_method) }.uniq
+
+        return uniq_values.first if uniq_values.size == 1
+        remaining_conflicts << association.name
+
+        association.many? ? [] : nil # default value
+      end
+    end
+  end
+end
+