toystore 0.6.5 → 0.6.6

data/lib/toy/identity.rb

@@ -9,23 +9,27 @@ module Toy
     module ClassMethods
       def key(name_or_factory = :uuid)
         @key_factory = case name_or_factory
-        when :uuid
-          UUIDKeyFactory.new
-        when :object_id
-          require 'toy/identity/object_id_key_factory'
-          ObjectIdKeyFactory.new
-        else
-          if name_or_factory.respond_to?(:next_key) &&
-             name_or_factory.respond_to?(:key_type)
-            name_or_factory
+          when :uuid
+            UUIDKeyFactory.new
+          when :object_id
+            require 'toy/identity/object_id_key_factory'
+            ObjectIdKeyFactory.new
           else
-            raise InvalidKeyFactory.new(name_or_factory)
+            if name_or_factory.respond_to?(:next_key) &&
+               name_or_factory.respond_to?(:key_type)
+              name_or_factory
+            else
+              raise InvalidKeyFactory.new(name_or_factory)
+            end
           end
-        end
         attribute :id, @key_factory.key_type
         @key_factory
       end
 
+      def key_factory
+        @key_factory || raise('Set your key_factory using key(...)')
+      end
+
       def key_type
         @key_factory.key_type
       end

data/lib/toy/plugins.rb

@@ -1,23 +1,32 @@
 module Toy
   def models
-    @models ||= Set.new
+    Toy::Store.direct_descendants
   end
 
   def plugins
-    @plugins ||= Set.new
+    Toy::Store.plugins
   end
 
   def plugin(mod)
-    Toy.models.each { |model| model.send(:include, mod) }
-    plugins << mod
+    Toy::Store.plugin(mod)
   end
 
   module Plugins
-    extend ActiveSupport::Concern
+    include ActiveSupport::DescendantsTracker
 
-    included do
-      Toy.models << self
-      Toy.plugins.each { |mod| include mod }
+    def plugins
+      @plugins ||= []
+    end
+
+    def plugin(mod)
+      include(mod)
+      direct_descendants.each {|model| model.send(:include, mod) }
+      plugins << mod
+    end
+
+    def included(base=nil, &block)
+      direct_descendants << base if base
+      super
     end
   end
-end
+end

data/lib/toy/store.rb

@@ -1,6 +1,7 @@
 module Toy
   module Store
     extend ActiveSupport::Concern
+    extend Plugins
 
     included do
       extend  ActiveModel::Naming
@@ -9,7 +10,6 @@ module Toy
       include Identity
       include Persistence
       include MassAssignmentSecurity
-      include Plugins
       include Dolly
       include Dirty
       include Equality

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.6.5"
+  VERSION = "0.6.6"
 end

data/spec/toy/identity_spec.rb

@@ -18,14 +18,11 @@ describe Toy::Identity do
     end
 
     it "should use Toy.key_factory by default" do
-      key_factory     = Toy::Identity::UUIDKeyFactory.new
+      key_factory     = Toy::Identity::ObjectIdKeyFactory.new
       Toy.key_factory = key_factory
-      klass           = Class.new { include Toy::Store }
-
-      key_factory.should_receive(:next_key).and_return('some_key')
-      klass.next_key
-
-      Toy.key_factory = nil
+      Class.new do
+        include Toy::Store
+      end.key_factory.should be_instance_of(Toy::Identity::ObjectIdKeyFactory)
     end
   end
 

data/spec/toy/plugins_spec.rb

@@ -4,7 +4,7 @@ describe Toy::Plugins do
   uses_constants('User', 'Game')
 
   it "keeps track of class that include toy store" do
-    Toy.models.should == [User, Game].to_set
+    Toy.models.should == [User, Game]
   end
 
   describe ".plugin" do
@@ -27,7 +27,7 @@ describe Toy::Plugins do
     end
 
     it "adds plugin to plugins" do
-      Toy.plugins.should == [@mod].to_set
+      Toy.plugins.should == [@mod]
     end
 
     it "adds plugins to classes declared after plugin was called" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -04:00
-default_executable: 
+date: 2011-05-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: adapter
@@ -216,7 +215,6 @@ files:
 - specs.watchr
 - test/lint_test.rb
 - toystore.gemspec
-has_rdoc: true
 homepage: http://github.com/newtoy/toystore
 licenses: []
 
@@ -246,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An object mapper for anything that can read, write and delete data
@@ -301,3 +299,4 @@ test_files:
 - spec/toy/validations_spec.rb
 - spec/toy_spec.rb
 - test/lint_test.rb
+has_rdoc: