toystore 0.10.1 → 0.10.2

data/Changelog.md

@@ -1,5 +1,11 @@
 I will do my best to keep this up to date with significant changes here, starting in 0.8.3.
 
+* 0.10.2
+  * [Allow changing list attribute type](https://github.com/jnunemaker/toystore/commit/a5b1a944622509c32688d2e56088a7d7aa6fc0b3)
+  * [No longer include id in `persisted_attributes`](https://github.com/jnunemaker/toystore/commit/9f713311ebf174e314db700392e27af86ca00662)
+  * [Allow overriding `persist` safely](https://github.com/jnunemaker/toystore/commit/304e50c7e4ac11a365ae00f5d4caed722de31909)
+  * [Choose accessor over `write_attribute` for `attributes=`](https://github.com/jnunemaker/toystore/commit/65a8f81d933f0ebe1f13c9b1ff776f9e20333cb3)
+
 * 0.10.0
   * [Reference proxy api changes](https://github.com/jnunemaker/toystore/pull/5) thanks to jakehow
   * [Support for inheritance](https://github.com/jnunemaker/toystore/pull/4)

data/lib/toy.rb

@@ -83,7 +83,6 @@ module Toy
   autoload 'Timestamps',              'toy/timestamps'
   autoload 'Validations',             'toy/validations'
 
-  autoload 'Collection',              'toy/collection'
   autoload 'List',                    'toy/list'
   autoload 'Lists',                   'toy/lists'
   autoload 'Reference',               'toy/reference'

data/lib/toy/attributes.rb

@@ -27,7 +27,7 @@ module Toy
     end
 
     def initialize(attrs={})
-      initialize_attributes_with_defaults
+      initialize_attributes
       self.attributes = attrs
       write_attribute :id, self.class.next_key(self) unless id?
     end
@@ -42,7 +42,7 @@ module Toy
 
     def persisted_attributes
       {}.tap do |attrs|
-        self.class.attributes.each do |name, attribute|
+        self.class.attributes.except('id').each do |name, attribute|
           next if attribute.virtual?
           attrs[attribute.persisted_name] = attribute.to_store(read_attribute(attribute.name))
         end
@@ -52,10 +52,10 @@ module Toy
     def attributes=(attrs, *)
       return if attrs.nil?
       attrs.each do |key, value|
-        if attribute_method?(key)
-          write_attribute(key, value)
-        elsif respond_to?("#{key}=")
+        if respond_to?("#{key}=")
           send("#{key}=", value)
+        elsif attribute_method?(key)
+          write_attribute(key, value)
         end
       end
     end
@@ -71,16 +71,15 @@ module Toy
     private
 
     def read_attribute(key)
-      @attributes ||= {}
       @attributes[key.to_s]
     end
 
     def write_attribute(key, value)
-      @attributes[key.to_s] = attribute_definition(key).try(:from_store, value)
-    end
-
-    def attribute_definition(key)
-      self.class.attributes[key.to_s]
+      key = key.to_s
+      attribute = self.class.attributes.fetch(key) {
+        raise AttributeNotDefined, "#{self.class} does not have attribute #{key}"
+      }
+      @attributes[key.to_s] = attribute.from_store(value)
     end
 
     def attribute_method?(key)
@@ -99,11 +98,11 @@ module Toy
       read_attribute(key).present?
     end
 
-    def initialize_attributes_with_defaults
+    def initialize_attributes
       @attributes ||= {}
       self.class.defaulted_attributes.each do |attribute|
         @attributes[attribute.name.to_s] = attribute.default
       end
     end
   end
-end
+end

data/lib/toy/dirty.rb

@@ -19,10 +19,11 @@ module Toy
     end
 
     def write_attribute(name, value)
+      @attributes ||= {}
       name    = name.to_s
       current = read_attribute(name)
       attribute_will_change!(name) if current != value
       super
     end
   end
-end
+end

data/lib/toy/exceptions.rb

@@ -1,6 +1,8 @@
 module Toy
   class Error < StandardError; end
 
+  class AttributeNotDefined < Error; end
+
   class RecordInvalid < Error
     attr_reader :record
     def initialize(record)
@@ -26,4 +28,4 @@ module Toy
       super("Key may not be nil")
     end
   end
-end
+end

data/lib/toy/list.rb

@@ -2,19 +2,61 @@ require 'toy/proxies/list'
 
 module Toy
   class List
-    include Toy::Collection
+    attr_accessor :model, :name, :options
 
-    def after_initialize
-      model.attribute(key, Array)
+    def initialize(model, name, *args, &block)
+      @model   = model
+      @name    = name.to_sym
+      @options = args.extract_options!
+      @type    = args.shift
+
+      model.send(list_method)[name] = self
+
+      options[:extensions] = modularized_extensions(block, options[:extensions])
+
+      model.attribute(key, options.fetch(:attribute_type) { Array })
       create_accessors
     end
 
+    def type
+      @type ||= name.to_s.classify.constantize
+    end
+
     def key
       @key ||= :"#{name.to_s.singularize}_ids"
     end
 
+    def instance_variable
+      @instance_variable ||= :"@_#{name}"
+    end
+
+    def new_proxy(owner)
+      proxy_class.new(self, owner)
+    end
+
+    def extensions
+      options[:extensions]
+    end
+
+    def eql?(other)
+      self.class.eql?(other.class) &&
+        model == other.model &&
+        name  == other.name
+    end
+    alias :== :eql?
+
     private
 
+    def proxy_class
+      raise('Not Implemented')
+    end
+
+    def modularized_extensions(*extensions)
+      extensions.flatten.compact.map do |extension|
+        Proc === extension ? Module.new(&extension) : extension
+      end
+    end
+
     def proxy_class
       Toy::Proxies::List
     end
@@ -44,4 +86,4 @@ module Toy
       end
     end
   end
-end
+end

data/lib/toy/persistence.rb

@@ -43,7 +43,7 @@ module Toy
 
     def initialize_from_database(attrs={})
       @_new_record = false
-      initialize_attributes_with_defaults
+      initialize_attributes
       send("attributes=", attrs, false)
       self
     end
@@ -87,23 +87,18 @@ module Toy
     private
 
     def create
-      persist!
+      persist
+      @_new_record = false
+      true
     end
 
     def update
-      persist!
+      persist
+      true
     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
+      adapter.write(id, persisted_attributes)
     end
   end
-end
+end

data/lib/toy/reloadable.rb

@@ -4,7 +4,7 @@ module Toy
       if attrs = adapter.read(id)
         attrs['id'] = id
         instance_variables.each        { |ivar| instance_variable_set(ivar, nil) }
-        initialize_attributes_with_defaults
+        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}") }

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.10.1"
+  VERSION = "0.10.2"
 end

data/spec/toy/attributes_spec.rb

@@ -156,6 +156,28 @@ describe Toy::Attributes do
     it "ignores keys that are not attributes and do not have accessors defined" do
       lambda { User.new(:taco => 'bell') }.should_not raise_error
     end
+
+    it "uses accessor over writing attribute" do
+      User.attribute :age, Integer
+
+      User.class_eval do
+        def age=(value)
+          write_attribute :age, value + 10
+        end
+      end
+
+      record = User.new
+      record.attributes = {:age => 15}
+      record.age.should be(25)
+    end
+
+    it "uses write_attribute if accessor not present" do
+      User.attribute :age, Integer
+      record = User.new
+      record.should_receive(:respond_to?).with("age=") { false }
+      record.attributes = {:age => 10}
+      record.age.should be(10)
+    end
   end
 
   describe "reading an attribute" do
@@ -169,6 +191,42 @@ describe Toy::Attributes do
     end
   end
 
+  describe "writing an attribute" do
+    before do
+      User.attribute :name, String
+
+      User.class_eval do
+        def alternate_name=(value)
+          write_attribute :name, value
+        end
+      end
+    end
+
+    it "assigns attribute value" do
+      user = User.new
+      user.alternate_name = 'Joe'
+      user.name.should eq('Joe')
+    end
+
+    context "when attribute not defined" do
+      before do
+        User.class_eval do
+          def pirate=(value)
+            write_attribute :pirate, value
+          end
+        end
+
+        @user = User.new
+      end
+
+      it "raises error" do
+        expect {
+          @user.pirate = 'arrrrrr'
+        }.to raise_error(Toy::AttributeNotDefined, "User does not have attribute pirate")
+      end
+    end
+  end
+
   describe "declaring an attribute" do
     before do
       User.attribute :name, String
@@ -271,25 +329,4 @@ describe Toy::Attributes do
       User.new.skills.should == []
     end
   end
-
-  # https://github.com/newtoy/toystore/issues/13
-  describe "Overriding initialize and setting an attribute before calling super" do
-    before do
-      User.attribute(:name, String)
-      User.class_eval do
-        def initialize(*)
-          self.name = 'John'
-          super
-        end
-      end
-    end
-
-    it "does not throw error" do
-      lambda { User.new }.should_not raise_error
-    end
-
-    it "sets value" do
-      User.new.name.should == 'John'
-    end
-  end
-end
+end

data/spec/toy/dirty_spec.rb

@@ -64,4 +64,25 @@ describe Toy::Dirty do
       User.new.clone.should_not be_changed
     end
   end
-end
+
+  # https://github.com/newtoy/toystore/issues/13
+  describe "Overriding initialize and setting an attribute before calling super" do
+    before do
+      User.attribute(:name, String)
+      User.class_eval do
+        def initialize(*)
+          self.name = 'John'
+          super
+        end
+      end
+    end
+
+    it "does not throw error" do
+      lambda { User.new }.should_not raise_error
+    end
+
+    it "sets value" do
+      User.new.name.should == 'John'
+    end
+  end
+end

data/spec/toy/list_spec.rb

@@ -63,26 +63,6 @@ describe Toy::List do
     end
   end
 
-  describe "dependent" do
-    before do
-      User.list :games, :dependent => true
-      @game = Game.create
-      @user = User.create(:game_ids => [@game.id])
-    end
-
-    it "should create a method to destroy games" do
-      User.new.should respond_to(:destroy_games)
-    end
-
-    it "should remove the games" do
-      user_id = @user.id
-      game_id = @game.id
-      @user.destroy
-      User.get(user_id).should be_nil
-      Game.get(game_id).should be_nil
-    end
-  end
-
   describe "setting list type" do
     before do
       @list = User.list(:active_games, Game)
@@ -498,6 +478,37 @@ describe Toy::List do
     end
   end
 
+  describe "list with :dependent option" do
+    before do
+      User.list :games, :dependent => true
+      @game = Game.create
+      @user = User.create(:game_ids => [@game.id])
+    end
+
+    it "should create a method to destroy games" do
+      User.new.should respond_to(:destroy_games)
+    end
+
+    it "should remove the games" do
+      user_id = @user.id
+      game_id = @game.id
+      @user.destroy
+      User.get(user_id).should be_nil
+      Game.get(game_id).should be_nil
+    end
+  end
+
+  describe "list with :attribute_type option" do
+    before do
+      @type = stub
+      User.list :games, :attribute_type => @type
+    end
+
+    it "uses correct type" do
+      User.attributes['game_ids'].type.should eq(@type)
+    end
+  end
+
   describe "list extension with :extensions option" do
     before do
       old_module = Module.new do
@@ -572,4 +583,4 @@ describe Toy::List do
       @user.games.get!(@game.id).should == @game
     end
   end
-end
+end

data/spec/toy/persistence_spec.rb

@@ -199,16 +199,44 @@ describe Toy::Persistence do
     context "with new record" do
       before do
         @doc = User.new(:name => 'John', :age => 28, :accepted_terms => true)
-        @doc.save
       end
 
       it "saves to key" do
+        @doc.save
         User.key?(@doc.id)
       end
 
       it "does not persist virtual attributes" do
+        @doc.save
         @doc.adapter.read(@doc.id).should_not include('accepted_terms')
       end
+
+      it "is persisted" do
+        @doc.save
+        @doc.persisted?.should be_true
+      end
+
+      it "returns true" do
+        @doc.save.should be_true
+      end
+
+      context "with #persist overridden" do
+        before do
+          @doc.class_eval do
+            def persist
+            end
+          end
+        end
+
+        it "is persisted" do
+          @doc.save
+          @doc.persisted?.should be_true
+        end
+
+        it "returns true" do
+          @doc.save.should be_true
+        end
+      end
     end
 
     context "with existing record" do
@@ -218,25 +246,55 @@ describe Toy::Persistence do
         @value    = User.adapter.read(@doc.id)
         @doc.name = 'Bill'
         @doc.accepted_terms = false
-        @doc.save
       end
       let(:doc) { @doc }
 
       it "does not change primary key" do
+        @doc.save
         doc.id.should == @key
       end
 
       it "updates value in adapter" do
+        @doc.save
         User.adapter.read(doc.id).should_not == @value
       end
 
       it "does not persist virtual attributes" do
+        @doc.save
         @doc.adapter.read(@doc.id).should_not include('accepted_terms')
       end
 
       it "updates the attributes in the instance" do
+        @doc.save
         doc.name.should == 'Bill'
       end
+
+      it "is persisted" do
+        @doc.save
+        @doc.persisted?.should be_true
+      end
+
+      it "returns true" do
+        @doc.save.should be_true
+      end
+
+      context "with #persist overridden" do
+        before do
+          @doc.class_eval do
+            def persist
+            end
+          end
+        end
+
+        it "is persisted" do
+          @doc.save
+          doc.persisted?.should be_true
+        end
+
+        it "returns true" do
+          @doc.save.should be_true
+        end
+      end
     end
   end
 
@@ -296,4 +354,4 @@ describe Toy::Persistence do
       user.clone.should_not be_destroyed
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  version: 0.10.2
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-22 00:00:00 Z
+date: 2012-05-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -131,7 +131,6 @@ files:
 - lib/toy/caching.rb
 - lib/toy/callbacks.rb
 - lib/toy/cloneable.rb
-- lib/toy/collection.rb
 - lib/toy/dirty.rb
 - lib/toy/dirty_store.rb
 - lib/toy/equality.rb

data/lib/toy/collection.rb

@@ -1,56 +0,0 @@
-module Toy
-  module Collection
-    extend ActiveSupport::Concern
-
-    included do
-      attr_accessor :model, :name, :options
-    end
-
-    def initialize(model, name, *args, &block)
-      @model   = model
-      @name    = name.to_sym
-      @options = args.extract_options!
-      @type    = args.shift
-
-      model.send(list_method)[name] = self
-
-      options[:extensions] = modularized_extensions(block, options[:extensions])
-      after_initialize
-    end
-
-    def type
-      @type ||= name.to_s.classify.constantize
-    end
-
-    def instance_variable
-      @instance_variable ||= :"@_#{name}"
-    end
-
-    def new_proxy(owner)
-      proxy_class.new(self, owner)
-    end
-
-    def extensions
-      options[:extensions]
-    end
-
-    def eql?(other)
-      self.class.eql?(other.class) &&
-        model == other.model &&
-        name  == other.name
-    end
-    alias :== :eql?
-
-    private
-
-    def proxy_class
-      raise('Not Implemented')
-    end
-
-    def modularized_extensions(*extensions)
-      extensions.flatten.compact.map do |extension|
-        Proc === extension ? Module.new(&extension) : extension
-      end
-    end
-  end
-end