toystore 0.8.3 → 0.9.0

data/lib/toy/logger.rb

@@ -3,28 +3,13 @@ module Toy
     extend ActiveSupport::Concern
 
     module ClassMethods
-      OperationsToLogValueFor = [:get, :set, :del]
-
       def logger
         Toy.logger
       end
-
-      def log_operation(operation, model, adapter, key, value=nil)
-        if logger && logger.debug?
-          logger.debug("TOYSTORE #{operation.to_s.upcase} #{model} :#{adapter.name} #{key.inspect}")
-          logger.debug("  #{value.inspect}") if !value.nil? && OperationsToLogValueFor.include?(operation)
-        end
-      end
     end
 
-    module InstanceMethods
-      def logger
-        Toy.logger
-      end
-
-      def log_operation(*args)
-        self.class.log_operation(*args)
-      end
+    def logger
+      Toy.logger
     end
   end
 end

data/lib/toy/mass_assignment_security.rb

@@ -3,11 +3,9 @@ module Toy
     extend ActiveSupport::Concern
     include ActiveModel::MassAssignmentSecurity
 
-    module InstanceMethods
-      def attributes=(attrs, guard_protected_attributes=true)
-        attrs = sanitize_for_mass_assignment(attrs || {}) if guard_protected_attributes
-        super(attrs)
-      end
+    def attributes=(attrs, guard_protected_attributes=true)
+      attrs = sanitize_for_mass_assignment(attrs || {}) if guard_protected_attributes
+      super(attrs)
     end
   end
 end

data/lib/toy/middleware/identity_map.rb

@@ -1,15 +1,34 @@
 module Toy
   module Middleware
     class IdentityMap
+      class Body
+        def initialize(target, original)
+          @target   = target
+          @original = original
+        end
+
+        def each(&block)
+          @target.each(&block)
+        end
+
+        def close
+          @target.close if @target.respond_to?(:close)
+        ensure
+          Toy::IdentityMap.enabled = @original
+          Toy::IdentityMap.clear
+        end
+      end
+
       def initialize(app)
         @app = app
       end
 
       def call(env)
-        Toy.identity_map.clear
-        @app.call(env)
-      ensure
-        Toy.identity_map.clear
+        Toy::IdentityMap.clear
+        enabled = Toy::IdentityMap.enabled
+        Toy::IdentityMap.enabled = true
+        status, headers, body = @app.call(env)
+        [status, headers, Body.new(body, enabled)]
       end
     end
   end

data/lib/toy/object.rb

@@ -0,0 +1,16 @@
+module Toy
+  module Object
+    extend ActiveSupport::Concern
+
+    included do
+      extend  ActiveModel::Naming
+      include ActiveModel::Conversion
+      include Attributes
+      include Cloneable
+      include Dirty
+      include Equality
+      include Inspect
+      include Logger
+    end
+  end
+end

data/lib/toy/persistence.rb

@@ -3,15 +3,20 @@ module Toy
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def store(name=nil, client=nil, options={})
-        assert_client(name, client)
-        @store = Adapter[name].new(client, options) if !name.nil? && !client.nil?
-        assert_store(name, client)
-        @store
-      end
+      def adapter(name=nil, client=nil, options={})
+        missing_client = !name.nil? && client.nil?
+        raise(ArgumentError, 'Client is required') if missing_client
+
+        needs_default_adapter = name.nil? && client.nil?
+        assigning_adapter     = !name.nil? && !client.nil?
 
-      def has_store?
-        !@store.nil?
+        if needs_default_adapter
+          @adapter ||= Adapter[:memory].new({}, options)
+        elsif assigning_adapter
+          @adapter = Adapter[name].new(client, options)
+        end
+
+        @adapter
       end
 
       def create(attrs={})
@@ -25,75 +30,80 @@ module Toy
       def destroy(*ids)
         ids.each { |id| get(id).try(:destroy) }
       end
+    end
 
-      private
-        def assert_client(name, client)
-          raise(ArgumentError, 'Client is required') if !name.nil? && client.nil?
-        end
+    def adapter
+      self.class.adapter
+    end
 
-        def assert_store(name, client)
-          raise(StandardError, "No store has been set") if name.nil? && client.nil? && !has_store?
-        end
+    def initialize(attrs={})
+      @_new_record = true
+      super
     end
 
-    module InstanceMethods
-      def store
-        self.class.store
-      end
+    def initialize_from_database(attrs={})
+      @_new_record = false
+      initialize_attributes_with_defaults
+      send("attributes=", attrs, false)
+      self
+    end
 
-      def new_record?
-        @_new_record == true
-      end
+    def initialize_copy(other)
+      super
+      @_new_record = true
+      @_destroyed  = false
+    end
 
-      def destroyed?
-        @_destroyed == true
-      end
+    def new_record?
+      @_new_record == true
+    end
 
-      def persisted?
-        !new_record? && !destroyed?
-      end
+    def destroyed?
+      @_destroyed == true
+    end
 
-      def save(*)
-        new_record? ? create : update
-      end
+    def persisted?
+      !new_record? && !destroyed?
+    end
 
-      def update_attributes(attrs)
-        self.attributes = attrs
-        save
-      end
+    def save(*)
+      new_record? ? create : update
+    end
 
-      def destroy
-        delete
-      end
+    def update_attributes(attrs)
+      self.attributes = attrs
+      save
+    end
 
-      def delete
-        @_destroyed = true
-        log_operation(:del, self.class.name, store, id)
-        store.delete(id)
-      end
+    def destroy
+      delete
+    end
 
-      private
-        def create
-          persist!
-        end
+    def delete
+      @_destroyed = true
+      adapter.delete(id)
+    end
 
-        def update
-          persist!
-        end
+    private
 
-        def persist
-          @_new_record = false
-        end
+    def create
+      persist!
+    end
 
-        def persist!
-          attrs = persisted_attributes
-          attrs.delete('id') # no need to persist id as that is key
-          store.write(id, attrs)
-          log_operation(:set, self.class.name, store, id, attrs)
-          persist
-          each_embedded_object { |doc| doc.send(:persist) }
-          true
-        end
+    def update
+      persist!
+    end
+
+    def persist
+      @_new_record = false
+    end
+
+    def persist!
+      attrs = persisted_attributes
+      attrs.delete('id') # no need to persist id as that is key
+      adapter.write(id, attrs)
+      persist
+      true
     end
   end
 end

data/lib/toy/proxies/list.rb

@@ -70,28 +70,29 @@ module Toy
       end
 
       private
-        def find_target
-          return [] if target_ids.blank?
-          proxy_class.get_multi(target_ids)
-        end
 
-        def target_ids
-          proxy_owner.send(proxy_key)
-        end
+      def find_target
+        return [] if target_ids.blank?
+        proxy_class.get_multi(target_ids)
+      end
 
-        def target_ids=(value)
-          ids = value.map do |item|
-            if item.is_a?(proxy_class)
-              item.id
-            elsif item.is_a?(Hash)
-              item['id']
-            else
-              item
-            end
+      def target_ids
+        proxy_owner.send(proxy_key)
+      end
+
+      def target_ids=(value)
+        ids = value.map do |item|
+          if item.is_a?(proxy_class)
+            item.id
+          elsif item.is_a?(Hash)
+            item['id']
+          else
+            item
           end
-          proxy_owner.send(:"#{proxy_key}=", ids)
-          reset
         end
+        proxy_owner.send(:"#{proxy_key}=", ids)
+        reset
+      end
     end
   end
 end

data/lib/toy/proxies/proxy.rb

@@ -47,13 +47,14 @@ module Toy
       end
 
       private
-        def find_target
-          raise('Not Implemented')
-        end
 
-        def method_missing(method, *args, &block)
-          target.send(method, *args, &block)
-        end
+      def find_target
+        raise('Not Implemented')
+      end
+
+      def method_missing(method, *args, &block)
+        target.send(method, *args, &block)
+      end
     end
   end
 end

data/lib/toy/querying.rb

@@ -4,8 +4,7 @@ module Toy
 
     module ClassMethods
       def get(id)
-        log_operation(:get, self, store, id)
-        load(id, store.read(id))
+        load(id, adapter.read(id))
       end
 
       def get!(id)
@@ -25,8 +24,7 @@ module Toy
       end
 
       def key?(id)
-        log_operation(:key, self, store, id)
-        store.key?(id)
+        adapter.key?(id)
       end
       alias :has_key? :key?
 

data/lib/toy/reference.rb

@@ -95,40 +95,42 @@ module Toy
       end
 
       private
-        def assert_type(record)
-          unless record.instance_of?(proxy_class)
-            raise(ArgumentError, "#{proxy_class} expected, but was #{record.class}")
-          end
-        end
 
-        def target_id
-          proxy_owner.send(proxy_key)
+      def assert_type(record)
+        unless record.instance_of?(proxy_class)
+          raise(ArgumentError, "#{proxy_class} expected, but was #{record.class}")
         end
+      end
 
-        def target_id=(value)
-          proxy_owner.send("#{proxy_key}=", value)
-        end
+      def target_id
+        proxy_owner.send(proxy_key)
+      end
 
-        def method_missing(method, *args, &block)
-          target.send(method, *args, &block)
-        end
+      def target_id=(value)
+        proxy_owner.send("#{proxy_key}=", value)
+      end
+
+      def method_missing(method, *args, &block)
+        target.send(method, *args, &block)
+      end
     end
 
     private
-      def create_accessors
-        model.class_eval """
-          def #{name}
-            #{instance_variable} ||= self.class.references[:#{name}].new_proxy(self)
-          end
 
-          def #{name}=(record)
-            #{name}.replace(record)
-          end
+    def create_accessors
+      model.class_eval """
+        def #{name}
+          #{instance_variable} ||= self.class.references[:#{name}].new_proxy(self)
+        end
 
-          def #{name}?
-            #{name}.present?
-          end
-        """
-      end
+        def #{name}=(record)
+          #{name}.replace(record)
+        end
+
+        def #{name}?
+          #{name}.present?
+        end
+      """
+    end
   end
 end

data/lib/toy/reloadable.rb

@@ -0,0 +1,17 @@
+module Toy
+  module Reloadable
+    def reload
+      if attrs = adapter.read(id)
+        attrs['id'] = id
+        instance_variables.each        { |ivar| instance_variable_set(ivar, nil) }
+        initialize_attributes_with_defaults
+        send(:attributes=, attrs, new_record?)
+        self.class.lists.each_key      { |name| send(name).reset }
+        self.class.references.each_key { |name| send(name).reset }
+      else
+        raise NotFound.new(id)
+      end
+      self
+    end
+  end
+end