toystore 0.13.0 → 0.13.1

data/lib/toy/cloneable.rb

@@ -13,8 +13,6 @@ module Toy
         value = value.duplicable? ? value.clone : value
         send("#{key}=", value)
       end
-
-      write_attribute(:id, self.class.next_key(self))
     end
   end
-end
+end

data/lib/toy/dirty.rb

@@ -5,12 +5,6 @@ module Toy
     include Attributes
     include Cloneable
 
-    def initialize(*)
-      super
-      # never register initial id assignment as a change
-      @changed_attributes.delete('id') if @changed_attributes
-    end
-
     def initialize_copy(*)
       super.tap do
         @previously_changed = {}

data/lib/toy/equality.rb

@@ -3,23 +3,12 @@ module Toy
     extend ActiveSupport::Concern
 
     def eql?(other)
-      return true if self.class.eql?(other.class) && id == other.id
-      return true if other.respond_to?(:target) &&
-                     self.class.eql?(other.target.class) &&
-                     id == other.target.id
-      false
-    end
-    alias :== :eql?
-
-    def equal?(other)
-      if other.respond_to?(:proxy_respond_to?) && other.respond_to?(:target)
-        other = other.target
-      end
-      super other
+      self.class.eql?(other.class) && attributes == other.attributes
     end
+    alias_method :==, :eql?
 
     def hash
-      id.hash
+      attributes.hash
     end
   end
 end

data/lib/toy/extensions/symbol.rb

@@ -0,0 +1,17 @@
+module Toy
+  module Extensions
+    module Symbol
+      def to_store(value, *)
+        value.nil? ? nil : value.to_s
+      end
+
+      def from_store(value, *)
+        value.nil? ? nil : value.to_sym
+      end
+    end
+  end
+end
+
+class Symbol
+  extend Toy::Extensions::Symbol
+end

data/lib/toy/extensions/uuid.rb

@@ -2,11 +2,15 @@ module Toy
   module Extensions
     module UUID
       def to_store(value, *)
-        SimpleUUID::UUID.new(value)
+        return nil if value.nil?
+        return value if value.is_a?(self)
+        new(value)
       end
 
       def from_store(value, *)
-        SimpleUUID::UUID.new(value)
+        return nil if value.nil?
+        return value if value.is_a?(self)
+        new(value)
       end
     end
   end

data/lib/toy/identity.rb

@@ -7,7 +7,7 @@ module Toy
     end
 
     module ClassMethods
-      def key(name_or_factory = :uuid)
+      def key(name_or_factory = :uuid, options = {})
         @key_factory = if name_or_factory == :uuid
           UUIDKeyFactory.new
         elsif name_or_factory == :native_uuid
@@ -20,7 +20,7 @@ module Toy
           end
         end
 
-        attribute :id, @key_factory.key_type
+        attribute :id, @key_factory.key_type, :virtual => true
         @key_factory
       end
 
@@ -42,5 +42,42 @@ module Toy
     def key_factory
       self.class.key_factory
     end
+
+    def initialize(*args)
+      super
+      write_attribute :id, self.class.next_key(self) unless id?
+
+      # never register initial id assignment as a change
+      @changed_attributes.delete('id') if @changed_attributes
+    end
+
+    def initialize_copy(*args)
+      super
+      write_attribute :id, self.class.next_key(self)
+    end
+
+    def eql?(other)
+      return true if self.class.eql?(other.class) &&
+                      id == other.id
+
+      return true if other.respond_to?(:target) &&
+                       self.class.eql?(other.target.class) &&
+                       id == other.target.id
+
+      super
+    end
+
+    alias_method :==, :eql?
+
+    def equal?(other)
+      if other.respond_to?(:proxy_respond_to?) && other.respond_to?(:target)
+        other = other.target
+      end
+      super other
+    end
+
+    def to_key
+      key_factory.to_key(self)
+    end
   end
 end

data/lib/toy/inspect.rb

@@ -4,21 +4,20 @@ module Toy
 
     module ClassMethods
       def inspect
-        keys = attributes.keys - ['id']
+        keys = attributes.keys
         nice_string = keys.sort.map do |name|
           type = attributes[name].type
           "#{name}:#{type}"
         end.join(" ")
-        "#{name}(id:#{attributes['id'].type} #{nice_string})"
+        "#{name}(#{nice_string})"
       end
     end
 
     def inspect
-      keys = self.class.attributes.keys - ['id']
+      keys = self.class.attributes.keys
       attributes_as_nice_string = keys.map(&:to_s).sort.map do |name|
         "#{name}: #{read_attribute(name).inspect}"
       end
-      attributes_as_nice_string.unshift("id: #{read_attribute(:id).inspect}")
       "#<#{self.class}:#{object_id} #{attributes_as_nice_string.join(', ')}>"
     end
   end

data/lib/toy/object.rb

@@ -1,6 +1,6 @@
 module Toy
   module Object
-    extend ActiveSupport::Concern
+    extend  ActiveSupport::Concern
     extend  ActiveModel::Naming
     include ActiveModel::Conversion
     include ActiveModel::Validations
@@ -17,9 +17,5 @@ module Toy
     def persisted?
       false
     end
-
-    def to_key
-      key_factory.to_key(self)
-    end
   end
 end

data/lib/toy/persistence.rb

@@ -30,6 +30,15 @@ module Toy
       def destroy(*ids)
         ids.each { |id| get(id).try(:destroy) }
       end
+
+      def persisted_attributes
+        @persisted_attributes ||= attributes.values.select(&:persisted?)
+      end
+
+      def attribute(*args)
+        @persisted_attributes = nil
+        super
+      end
     end
 
     def adapter
@@ -81,7 +90,31 @@ module Toy
 
     def delete
       @_destroyed = true
-      adapter.delete(id)
+      adapter.delete(persisted_id)
+    end
+
+    # Public: Choke point for overriding what id is used to write and delete.
+    def persisted_id
+      attribute_name = 'id'
+      attribute = attribute_instance(attribute_name)
+      attribute_value = read_attribute(attribute_name)
+      attribute.to_store(attribute_value)
+    end
+
+    # Public: Choke point for overriding what attributes get stored.
+    def persisted_attributes
+      attributes = {}
+      self.class.persisted_attributes.each do |attribute|
+        if (value = attribute.to_store(read_attribute(attribute.name)))
+          attributes[attribute.persisted_name] = value
+        end
+      end
+      attributes
+    end
+
+    # Public: Choke point for overriding how data gets written.
+    def persist
+      adapter.write(persisted_id, persisted_attributes)
     end
 
     private
@@ -96,9 +129,5 @@ module Toy
       persist
       true
     end
-
-    def persist
-      adapter.write(id, persisted_attributes)
-    end
   end
 end

data/lib/toy/querying.rb

@@ -3,23 +3,23 @@ module Toy
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def get(id, options = nil)
+      def read(id, options = nil)
         if (attrs = adapter.read(id, options))
           load(id, attrs)
         end
       end
 
-      alias_method :read, :get
-      alias_method :find, :get
+      alias_method :get, :read
+      alias_method :find, :read
 
-      def get!(id, options = nil)
+      def read!(id, options = nil)
         get(id, options) || raise(Toy::NotFound.new(id))
       end
 
-      alias_method :read!, :get!
-      alias_method :find!, :get!
+      alias_method :get!, :read!
+      alias_method :find!, :read!
 
-      def get_multiple(ids, options = nil)
+      def read_multiple(ids, options = nil)
         result = adapter.read_multiple(ids, options)
         result.each do |id, attrs|
           result[id] = attrs.nil? ? nil : load(id, attrs)
@@ -27,8 +27,8 @@ module Toy
         result
       end
 
-      alias_method :read_multiple, :get_multiple
-      alias_method :find_multiple, :get_multiple
+      alias_method :get_multiple, :read_multiple
+      alias_method :find_multiple, :read_multiple
 
       def get_or_new(id)
         get(id) || new(:id => id)

data/lib/toy/reloadable.rb

@@ -3,15 +3,15 @@ module Toy
     extend ActiveSupport::Concern
 
     def reload
-      if attrs = adapter.read(id)
-        attrs['id'] = id
+      if attrs = adapter.read(persisted_id)
+        attrs['id'] = persisted_id
         instance_variables.each        { |ivar| instance_variable_set(ivar, nil) }
         initialize_attributes
         send(:attributes=, attrs, new_record?)
         self.class.lists.each_key      { |name| send(name).reset }
         self.class.references.each_key { |name| send("reset_#{name}") }
       else
-        raise NotFound.new(id)
+        raise NotFound.new(persisted_id)
       end
       self
     end

data/lib/toy/store.rb

@@ -3,6 +3,7 @@ module Toy
     extend ActiveSupport::Concern
 
     include Toy::Object
+    include Identity
     include Persistence
     include MassAssignmentSecurity
     include DirtyStore

data/lib/toy/types/json.rb

@@ -0,0 +1,20 @@
+module Toy
+  module Types
+    module JSON
+      def self.to_store(value, *)
+        return value if value.nil?
+        ActiveSupport::JSON.encode(value)
+      end
+
+      def self.from_store(value, *)
+        return value if value.nil?
+
+        if value.is_a?(String)
+          ActiveSupport::JSON.decode(value)
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/spec/helper.rb

@@ -29,6 +29,7 @@ RSpec.configure do |c|
   c.include(Support::Objects)
   c.include(IdentityMapMatcher)
 
+  c.fail_fast = true
   c.filter_run :focused => true
   c.alias_example_to :fit, :focused => true
   c.alias_example_to :xit, :pending => true

data/spec/toy/attributes_spec.rb

@@ -3,51 +3,9 @@ require 'helper'
 describe Toy::Attributes do
   uses_objects('User', 'Game')
 
-  describe "including" do
-    it "adds id attribute" do
-      User.attributes.keys.should == ['id']
-    end
-  end
-
   describe ".attributes" do
-    it "defaults to hash with id" do
-      User.attributes.keys.should == ['id']
-    end
-  end
-
-  describe "#persisted_attributes" do
-    before do
-      @over    = Game.attribute(:over, Boolean)
-      @score   = Game.attribute(:creator_score, Integer, :virtual => true)
-      @abbr    = Game.attribute(:super_secret_hash, String, :abbr => :ssh)
-      @rewards = Game.attribute(:rewards, Set)
-      @game    = Game.new({
-        :over          => true,
-        :creator_score => 20,
-        :rewards       => %w(twigs berries).to_set,
-        :ssh           => 'h4x',
-      })
-    end
-
-    it "includes persisted attributes" do
-      @game.persisted_attributes.should have_key('over')
-    end
-
-    it "includes abbreviated names for abbreviated attributes" do
-      @game.persisted_attributes.should have_key('ssh')
-    end
-
-    it "does not include full names for abbreviated attributes" do
-      @game.persisted_attributes.should_not have_key('super_secret_hash')
-    end
-
-    it "does not include virtual attributes" do
-      @game.persisted_attributes.should_not have_key(:creator_score)
-    end
-
-    it "includes to_store values for attributes" do
-      @game.persisted_attributes['rewards'].should be_instance_of(Array)
-      @game.persisted_attributes['rewards'].should == @rewards.to_store(@game.rewards)
+    it "defaults to empty hash" do
+      User.attributes.should eq({})
     end
   end
 
@@ -64,6 +22,22 @@ describe Toy::Attributes do
     it "excludes attributes without a default" do
       User.defaulted_attributes.should_not include(@name)
     end
+
+    it "memoizes after first call" do
+      User.should_receive(:attributes).once.and_return({
+        'name' => @name,
+        'age' => @age,
+      })
+      User.defaulted_attributes
+      User.defaulted_attributes
+      User.defaulted_attributes
+    end
+
+    it "is unmemoized when declaring a new attribute" do
+      User.defaulted_attributes
+      age = User.attribute :location, String, :default => 'IN'
+      User.defaulted_attributes.map(&:name).sort.should eq(%w[age location])
+    end
   end
 
   describe ".attribute?" do
@@ -90,17 +64,6 @@ describe Toy::Attributes do
       User.attribute :age,  Integer
     end
 
-    it "writes id" do
-      id = User.new.id
-      id.should_not be_nil
-      id.size.should == 36
-    end
-
-    it "does not attempt to set id if already set" do
-      user = User.new(:id => 'frank')
-      user.id.should == 'frank'
-    end
-
     it "sets attributes" do
       instance = User.new(:name => 'John', :age => 28)
       instance.name.should == 'John'
@@ -118,9 +81,9 @@ describe Toy::Attributes do
   end
 
   describe "#attributes" do
-    it "defaults to hash with id" do
-      attrs = ToyStore().new.attributes
-      attrs.keys.should == ['id']
+    it "defaults to empty hash" do
+      attrs = ToyObject().new.attributes
+      attrs.should eq({})
     end
 
     it "includes all attributes that are not nil" do
@@ -128,7 +91,6 @@ describe Toy::Attributes do
       User.attribute(:active, Boolean, :default => true)
       user = User.new
       user.attributes.should == {
-        'id'     => user.id,
         'active' => true,
       }
     end