ripple 0.7.0 → 0.7.1

data/spec/ripple/timestamps_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Ripple::Document::Timestamps do
+describe Ripple::Timestamps do
   require 'support/models/clock'
   
   before :each do

data/spec/ripple/validations_spec.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 require File.expand_path("../../spec_helper", __FILE__)
 
-describe Ripple::Document::Validations do
+describe Ripple::Validations do
   require 'support/models/box'
 
   before :each do

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@
 #    limitations under the License.
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'riak','lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'riak-client','lib'))
 
 require 'rubygems' # Use the gems path only for the spec suite
 require 'ripple'

data/spec/support/associations/proxies.rb

@@ -1,16 +1,16 @@
 # yet another filch from mongo mapper
-class FakeNilProxy < Ripple::Document::Associations::Proxy
+class FakeNilProxy < Ripple::Associations::Proxy
   def find_target; nil end
 end
 
-class FakeBlankProxy < Ripple::Document::Associations::Proxy
+class FakeBlankProxy < Ripple::Associations::Proxy
   def find_target; '' end
 end
 
-class FakeNumberProxy < Ripple::Document::Associations::Proxy
+class FakeNumberProxy < Ripple::Associations::Proxy
   def find_target; 17 end
 end
 
-class FakeProxy < Ripple::Document::Associations::Proxy
+class FakeProxy < Ripple::Associations::Proxy
   def find_target; [1, 2] end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,8 +43,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 0
-        version: 0.7.0
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -86,39 +86,39 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- 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/one.rb
+- lib/ripple/associations/one_embedded_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/document/associations/embedded.rb
-- lib/ripple/document/associations/instantiators.rb
-- lib/ripple/document/associations/linked.rb
-- lib/ripple/document/associations/many.rb
-- lib/ripple/document/associations/many_embedded_proxy.rb
-- lib/ripple/document/associations/one.rb
-- lib/ripple/document/associations/one_embedded_proxy.rb
-- lib/ripple/document/associations/proxy.rb
-- lib/ripple/document/associations.rb
-- lib/ripple/document/attribute_methods/dirty.rb
-- lib/ripple/document/attribute_methods/query.rb
-- lib/ripple/document/attribute_methods/read.rb
-- lib/ripple/document/attribute_methods/write.rb
-- lib/ripple/document/attribute_methods.rb
 - lib/ripple/document/bucket_access.rb
-- lib/ripple/document/callbacks.rb
 - lib/ripple/document/finders.rb
 - lib/ripple/document/persistence.rb
-- lib/ripple/document/properties.rb
-- lib/ripple/document/timestamps.rb
-- lib/ripple/document/validations/associated_validator.rb
-- lib/ripple/document/validations.rb
 - lib/ripple/document.rb
-- lib/ripple/embedded_document/conversion.rb
 - lib/ripple/embedded_document/finders.rb
 - lib/ripple/embedded_document/persistence.rb
 - lib/ripple/embedded_document.rb
 - lib/ripple/i18n.rb
 - lib/ripple/locale/en.yml
+- 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
 - spec/fixtures/config.yml
@@ -131,9 +131,9 @@ files:
 - 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/conversion_spec.rb
 - spec/ripple/embedded_document/finders_spec.rb
 - spec/ripple/embedded_document/persistence_spec.rb
 - spec/ripple/embedded_document_spec.rb
@@ -145,7 +145,6 @@ files:
 - spec/ripple/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/associations/proxies.rb
-- spec/support/integration.rb
 - spec/support/mocks.rb
 - spec/support/models/address.rb
 - spec/support/models/box.rb
@@ -203,9 +202,9 @@ test_files:
 - 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/conversion_spec.rb
 - spec/ripple/embedded_document/finders_spec.rb
 - spec/ripple/embedded_document/persistence_spec.rb
 - spec/ripple/embedded_document_spec.rb
@@ -217,7 +216,6 @@ test_files:
 - spec/ripple/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/associations/proxies.rb
-- spec/support/integration.rb
 - spec/support/mocks.rb
 - spec/support/models/address.rb
 - spec/support/models/box.rb

data/lib/ripple/document/associations.rb

@@ -1,154 +0,0 @@
-# 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 Document
-    module Associations
-      extend ActiveSupport::Concern
-      extend ActiveSupport::Autoload
-
-      autoload :Proxy
-      autoload :One
-      autoload :Many
-      autoload :Embedded
-      autoload :Instantiators
-      autoload :OneEmbeddedProxy
-      autoload :ManyEmbeddedProxy
-
-      module ClassMethods
-        # @private
-        def inherited(subclass)
-          super
-          subclass.associations.merge!(associations)
-        end
-
-        # Associations defined on the document
-        def associations
-          @associations ||= {}.with_indifferent_access
-        end
-
-        # Creates a singular association
-        def one(name, options={})
-          create_association(:one, name, options)
-        end
-
-        # Creates a plural association
-        def many(name, options={})
-          create_association(:many, name, options)
-        end
-
-        private
-        def create_association(type, name, options={})
-          association = associations[name] = Association.new(type, name, options)
-
-          define_method(name) do
-            get_proxy(association)
-          end
-
-          define_method("#{name}=") do |value|
-            get_proxy(association).replace(value)
-            value
-          end
-
-          if association.one?
-            define_method("#{name}?") do
-              get_proxy(association).present?
-            end
-          end
-        end
-      end
-
-      module InstanceMethods
-        def associations
-          self.class.associations
-        end
-        
-        def embedded_associations
-          associations.map do |name, association|
-            association if association.embeddable?
-          end.compact
-        end
-        
-        # @private
-        def get_proxy(association)
-          unless proxy = instance_variable_get(association.ivar)
-            proxy = association.proxy_class.new(self, association)
-            instance_variable_set(association.ivar, proxy)
-          end
-          proxy
-        end
-      end
-    end
-
-    class Association
-      attr_reader :type, :name, :options
-      
-      # association options :using, :class_name, :class, :extend, 
-      # options that may be added :validate
-
-      def initialize(type, name, options={})
-        @type, @name, @options = type, name, options.to_options
-      end
-
-      def class_name
-        @class_name ||= case
-                        when @options[:class_name]
-                          @options[:class_name]
-                        when @options[:class]
-                          @options[:class].to_s
-                        when many?
-                          @name.to_s.classify
-                        else
-                          @name.to_s.camelize
-                        end
-      end
-
-      def klass
-        @klass ||= options[:class] || class_name.constantize
-      end
-
-      def many?
-        @type == :many
-      end
-
-      def one?
-        @type == :one
-      end
-      
-      def embeddable?
-        klass.embeddable?
-      end
-      
-      def polymorphic?
-        false
-      end
-
-      def ivar
-        "@_#{name}"
-      end
-      
-      def proxy_class
-        return @proxy_class if defined?(@proxy_class)
-        proxy_class_name.constantize
-      end
-
-      def proxy_class_name
-        @using   ||= options[:using] || (embeddable? ? :embedded : :link)
-        klass_name = (many? ? 'Many' : 'One') + @using.to_s.camelize + ('Polymorphic' if polymorphic?).to_s + 'Proxy'
-        "Ripple::Document::Associations::#{klass_name}"
-      end
-    end
-  end
-end

data/lib/ripple/document/associations/many.rb

@@ -1,52 +0,0 @@
-# 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 Document
-    module Associations
-      module Many
-        include Instantiators
-        
-        def to_ary
-          load_target
-          Array === target ? target.to_ary : Array(target)
-        end
-
-        def count
-          load_target
-          target.size
-        end
-        
-        def reset
-          super
-          @target = []
-        end
-        
-        def <<
-          raise NotImplementedError
-        end
-        alias_method :push, :<<
-        alias_method :concat, :<<
-        
-        protected        
-          def instantiate_target(instantiator, attrs={})
-            doc = klass.send(instantiator, attrs)
-            self << doc
-            doc
-          end
-      end
-    end
-  end
-end

data/lib/ripple/document/associations/many_embedded_proxy.rb

@@ -1,49 +0,0 @@
-# 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 Document
-    module Associations
-      class ManyEmbeddedProxy < Proxy
-        include Many
-        include Embedded
-        
-        def <<(docs)
-          load_target
-          assign_references(docs)
-          @target += Array(docs)
-          self
-        end
-        
-        def replace(docs)
-          @_docs = docs.map { |doc| attrs = doc.respond_to?(:attributes_for_persistence) ? doc.attributes_for_persistence : doc }
-          assign_references(docs)
-          reset
-          @_docs
-        end
-      
-        protected
-          def find_target
-            (@_docs || []).map do |attrs|
-              klass.instantiate(attrs).tap do |doc|
-                assign_references(doc)
-              end
-            end
-          end
-        
-      end
-    end
-  end
-end

data/lib/ripple/document/associations/proxy.rb

@@ -1,125 +0,0 @@
-# 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 Document
-    module Associations
-      class Proxy
-        alias :proxy_respond_to? :respond_to?
-        alias :proxy_extend :extend
-
-        instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
-
-        attr_reader :owner, :reflection, :target
-
-        alias :proxy_owner :owner
-        alias :proxy_target :target
-        alias :proxy_reflection :reflection
-
-        delegate :klass, :to => :proxy_reflection
-        delegate :options, :to => :proxy_reflection
-        delegate :collection, :to => :klass
-
-        def initialize(owner, reflection)
-          @owner, @reflection = owner, reflection
-          Array(reflection.options[:extend]).each { |ext| proxy_extend(ext) }
-          reset
-        end
-
-        def inspect
-          load_target
-          target.inspect
-        end
-
-        def loaded?
-          @loaded
-        end
-
-        def loaded
-          @loaded = true
-        end
-
-        def nil?
-          load_target
-          target.nil?
-        end
-
-        def blank?
-          load_target
-          target.blank?
-        end
-
-        def present?
-          load_target
-          target.present?
-        end
-
-        def reload
-          reset
-          load_target
-          self unless target.nil?
-        end
-
-        def replace(v)
-          raise NotImplementedError
-        end
-
-        def reset
-          @loaded = false
-          @target = nil
-        end
-
-        def respond_to?(*args)
-          proxy_respond_to?(*args) || (load_target && target.respond_to?(*args))
-        end
-
-        def send(method, *args, &block)
-          if proxy_respond_to?(method)
-            super
-          else
-            load_target
-            target.send(method, *args, &block)
-          end
-        end
-
-        def ===(other)
-          load_target
-          other === target
-        end
-
-        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
-          end
-        end
-
-        def load_target
-          @target = find_target unless loaded?
-          loaded
-          @target
-        end
-
-        def find_target
-          raise NotImplementedError
-        end
-      end
-    end
-  end
-end