toystore 0.10.3 → 0.10.4

data/.gitignore

@@ -6,3 +6,5 @@ tmp
 pkg
 .bundle
 Gemfile.lock
+bin
+vendor

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -1,8 +1,11 @@
+gemfile:
+  - Gemfile
+  - gemfiles/rails_3_1.gemfile
+  - gemfiles/rails_3_0.gemfile
 language: ruby
 rvm:
   - 1.8.7
   - ree
-  - 1.9.2
   - 1.9.3
 notifications:
   email: false

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.4
+  * Support for ActiveSupport/ActiveModel 3.2.*
+
+* 0.10.3
+  * More liberal uuid gem dependency version
+
 * 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)

data/Gemfile

@@ -1,9 +1,11 @@
 source :rubygems
 gemspec
 
-gem 'rake',       '~> 0.9.0'
-gem 'oj',         '~> 1.0.0'
-gem 'multi_json', '~> 1.3.2'
+gem 'activesupport', '~> 3.2.0'
+gem 'activemodel',   '~> 3.2.0'
+gem 'rake',          '~> 0.9.0'
+gem 'oj',            '~> 1.0.0'
+gem 'multi_json',    '~> 1.3.2'
 
 group(:guard) do
   gem 'guard',          '~> 1.0.0'

data/Guardfile

@@ -1,6 +1,5 @@
 rspec_options = {
   :all_after_pass => false,
-  :all_on_start   => false,
 }
 
 guard 'rspec', rspec_options do

data/README.md

@@ -228,8 +228,8 @@ As of 0.8.3, I started keeping a [changelog](https://github.com/jnunemaker/toyst
 
 ## Compatibility
 
-* Rails 3, Sinatra, etc. No Rails 2 (because it uses Active Model).
-* Ruby 1.8.7, 1.9.2, 1.9.3 (specs are run against each before releases)
+* Rails 3.0.*, 3.1.*, 3.2.*, Sinatra, etc. No Rails 2 (because it uses Active Model).
+* Ruby 1.8.7, REE, and 1.9.3
 
 ## Mailing List
 

data/gemfiles/rails_3_0.gemfile

@@ -0,0 +1,21 @@
+source :rubygems
+gemspec :path => '../'
+
+gem 'activesupport', '~> 3.0.0'
+gem 'activemodel',   '~> 3.0.0'
+gem 'rake',          '~> 0.9.0'
+gem 'oj',            '~> 1.0.0'
+gem 'multi_json',    '~> 1.3.2'
+
+group(:guard) do
+  gem 'guard',          '~> 1.0.0'
+  gem 'guard-rspec',    '~> 0.6.0'
+  gem 'guard-bundler',  '~> 0.1.0'
+end
+
+group(:test) do
+  gem 'rspec',      '~> 2.8.0'
+  gem 'timecop',    '~> 0.3.0'
+  gem 'tzinfo',     '~> 0.3.0'
+  gem 'rack-test',  '~> 0.6.0'
+end

data/gemfiles/rails_3_1.gemfile

@@ -0,0 +1,21 @@
+source :rubygems
+gemspec :path => '../'
+
+gem 'activesupport', '~> 3.1.0'
+gem 'activemodel',   '~> 3.1.0'
+gem 'rake',          '~> 0.9.0'
+gem 'oj',            '~> 1.0.0'
+gem 'multi_json',    '~> 1.3.2'
+
+group(:guard) do
+  gem 'guard',          '~> 1.0.0'
+  gem 'guard-rspec',    '~> 0.6.0'
+  gem 'guard-bundler',  '~> 0.1.0'
+end
+
+group(:test) do
+  gem 'rspec',      '~> 2.8.0'
+  gem 'timecop',    '~> 0.3.0'
+  gem 'tzinfo',     '~> 0.3.0'
+  gem 'rack-test',  '~> 0.6.0'
+end

data/lib/toy/attributes.rb

@@ -5,7 +5,15 @@ module Toy
 
     included do
       include Identity
-      attribute_method_suffix('', '=', '?')
+
+      # blank suffix is no longer needed in 3.2+
+      # open to suggestions on how to do this better
+      if ActiveSupport::VERSION::MAJOR == 3 && ActiveSupport::VERSION::MINOR < 2
+        attribute_method_suffix('')
+      end
+
+      attribute_method_suffix('=')
+      attribute_method_suffix('?')
     end
 
     module ClassMethods
@@ -18,7 +26,9 @@ module Toy
       end
 
       def attribute(key, type, options = {})
-        Attribute.new(self, key, type, options)
+        attribute = Attribute.new(self, key, type, options)
+        define_attribute_methods [attribute.name]
+        attribute
       end
 
       def attribute?(key)

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.10.3"
+  VERSION = "0.10.4"
 end

data/spec/helper.rb

@@ -28,6 +28,11 @@ RSpec.configure do |c|
   c.include(Support::Objects)
   c.include(IdentityMapMatcher)
 
+  c.filter_run :focused => true
+  c.alias_example_to :fit, :focused => true
+  c.alias_example_to :xit, :pending => true
+  c.run_all_when_everything_filtered = true
+
   c.before(:each) do
     Toy::IdentityMap.enabled = false
     Toy.clear

data/spec/support/constants.rb

@@ -5,7 +5,6 @@ module Support
     module ClassMethods
       def uses_constants(*constants)
         before { create_constants *constants }
-        after  { remove_constants *constants }
       end
     end
 
@@ -17,8 +16,9 @@ module Support
       constants.each { |constant| remove_constant constant }
     end
 
-    def create_constant(constant, superclass=nil)
-      Object.const_set constant, Model(superclass)
+    def create_constant(constant)
+      remove_constant constant
+      Object.const_set constant, ToyStore(constant)
     end
 
     def remove_constant(constant)
@@ -27,11 +27,13 @@ module Support
       end
     end
 
-    def Model(superclass=nil)
-      if superclass.nil?
-        Class.new { include Toy::Store }
-      else
-        Class.new(superclass) { include Toy::Store }
+    def ToyStore(name = nil)
+      Class.new.tap do |object|
+        object.class_eval """
+          def self.name; '#{name}' end
+          def self.to_s; '#{name}' end
+        """ if name
+        object.send(:include, Toy::Store)
       end
     end
   end

data/spec/support/objects.rb

@@ -4,28 +4,30 @@ module Support
 
     module ClassMethods
       def uses_objects(*objects)
-        before { create_objects(*objects) }
+        before { create_objects *objects }
       end
     end
 
     def create_objects(*objects)
-      objects.each { |object| create_object(object) }
+      objects.each { |object| create_object object }
     end
 
     def remove_objects(*objects)
-      objects.each { |object| remove_object(object) }
+      objects.each { |object| remove_object object }
     end
 
     def create_object(object)
-      remove_object(object)
-      Kernel.const_set(object, Object(object))
+      remove_object object
+      Object.const_set object, ToyObject(object)
     end
 
     def remove_object(object)
-      Kernel.send(:remove_const, object) if Kernel.const_defined?(object)
+      if Object.const_defined?(object)
+        Object.send :remove_const, object
+      end
     end
 
-    def Object(name=nil)
+    def ToyObject(name = nil)
       Class.new.tap do |object|
         object.class_eval """
           def self.name; '#{name}' end
@@ -35,4 +37,4 @@ module Support
       end
     end
   end
-end
+end

data/spec/toy/attributes_spec.rb

@@ -119,7 +119,7 @@ describe Toy::Attributes do
 
   describe "#attributes" do
     it "defaults to hash with id" do
-      attrs = Model().new.attributes
+      attrs = ToyStore().new.attributes
       attrs.keys.should == ['id']
     end
 

data/spec/toy/dirty_spec.rb

@@ -42,15 +42,15 @@ describe Toy::Dirty do
   end
 
   it "has attribute was method" do
-    user = User.new(:name => 'John')
+    user = User.new
     user.name = 'Steve'
-    user.name_was.should == 'John'
+    user.name_was.should be_nil
   end
 
   it "has attribute change method" do
-    user = User.new(:name => 'John')
+    user = User.new
     user.name = 'Steve'
-    user.name_change.should == ['John', 'Steve']
+    user.name_change.should == [nil, 'Steve']
   end
 
   it "has attribute will change! method" do

data/spec/toy/plugins_spec.rb

@@ -9,12 +9,21 @@ describe Toy::Plugins do
 
   describe ".plugin" do
     before do
-      class_methods_mod    = Module.new { def foo; 'foo' end }
-      instance_methods_mod = Module.new { def bar; 'bar' end }
+      @mod = Module.new {
+        extend ActiveSupport::Concern
+
+        def bar
+          'bar'
+        end
+      }
+
+      class_methods_module = Module.new do
+        def foo
+          'foo'
+        end
+      end
 
-      @mod = Module.new { extend ActiveSupport::Concern }
-      @mod.const_set(:ClassMethods,    class_methods_mod)
-      @mod.const_set(:InstanceMethods, instance_methods_mod)
+      @mod.const_set :ClassMethods, class_methods_module
 
       Toy.plugin(@mod)
     end
@@ -31,7 +40,7 @@ describe Toy::Plugins do
     end
 
     it "adds plugins to classes declared after plugin was called" do
-      klass = Class.new { include Toy::Store }
+      klass = ToyStore()
       klass.foo.should     == 'foo'
       klass.new.bar.should == 'bar'
     end

data/toystore.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'adapter',       '~> 0.5.1'
-  s.add_dependency 'activemodel',   '~> 3.0', '< 3.2'
-  s.add_dependency 'activesupport', '~> 3.0', '< 3.2'
+  s.add_dependency 'activemodel',   '~> 3.0'
+  s.add_dependency 'activesupport', '~> 3.0'
   s.add_dependency 'simple_uuid',   '~> 0.2'
 end

metadata

@@ -1,102 +1,98 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: toystore
-version: !ruby/object:Gem::Version
-  version: 0.10.3
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 10
+  - 4
+  version: 0.10.4
 platform: ruby
-authors:
+authors: 
 - Geoffrey Dagley
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: adapter
-  requirement: !ruby/object:Gem::Requirement
+
+date: 2012-10-29 00:00:00 -04:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-  type: :runtime
+  version_requirements: *id001
+  name: adapter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  version_requirements: *id002
   name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  version_requirements: *id003
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
+  version_requirements: *id004
   name: simple_uuid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+  type: :runtime
 description: An object mapper for anything that can read, write and delete data
-email:
+email: 
 - gdagley@gmail.com
 - nunemaker@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .rspec
 - .travis.yml
 - Changelog.md
 - Gemfile
@@ -115,6 +111,8 @@ files:
 - examples/plain_old_object_on_roids.rb
 - examples/redis.rb
 - examples/riak.rb
+- gemfiles/rails_3_0.gemfile
+- gemfiles/rails_3_1.gemfile
 - lib/toy.rb
 - lib/toy/association_serialization.rb
 - lib/toy/attribute.rb
@@ -216,31 +214,41 @@ files:
 - spec/toy_spec.rb
 - test/lint_test.rb
 - toystore.gemspec
+has_rdoc: true
 homepage: http://jnunemaker.github.com/toystore/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An object mapper for anything that can read, write and delete data
-test_files:
+test_files: 
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb