with_model 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa91ae8171d006cf36ea0fe3f849f5087d5e2e42
-  data.tar.gz: 9b709891a0c2eed053f23ab153d54aa7af0929d7
+  metadata.gz: 8e51eac83567f4ff6d4024540c3cb5f19af36d64
+  data.tar.gz: fd75b1167e99cdd310195b67a72bd50b9160dbbf
 SHA512:
-  metadata.gz: 9c771d0886b9f2c57ba44c035c4fad21a6c83ac26af2234bbc07c22c267e433af91fbe8c30315422f433d5ff687adc62925a7e0c4e1c765b716203f5fac5501b
-  data.tar.gz: f09b067cdfd82d425bc9ca698be041e4f809841bee41b7843d3595dcfd283ea9468d7102addcde1aa752a5defd98259ea99076e6354b8f418e4bd5bdf52b733d
+  metadata.gz: cc55b658c3f4fc470c31d2326a9b3efafa0948a0206d098cba84f1d796e3157e39940e48f509574a6b72b27331b3e4d820481aa60558baefa3e36f8d44a4d889
+  data.tar.gz: b041ee9cfb97ab592330e4a0b3ea75ee06248188c7bca52332e9b8ca9c217e87dcd201d1fa72f1ec82975ad16f01c1e6c14966bc0baadd3f47abad91e326d2c4

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format documentation
+--order default

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
+sudo: false
 
 rvm:
-  - "1.9"
-  - "2.0"
-  - "2.1"
+  - "2.3.1"
+  - "2.2.5"
+  - "2.1.10"
+  - "2.0.0-p648"
+  - "1.9.3-p551"
   - jruby-19mode
   - rbx-2
 
@@ -12,20 +15,35 @@ install:
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
-  - ACTIVE_RECORD_VERSION="~> 4.2.0"
-  - ACTIVE_RECORD_VERSION="~> 4.1.0"
-  - ACTIVE_RECORD_VERSION="~> 4.0.0"
-  - ACTIVE_RECORD_VERSION="~> 3.2.0"
-  - ACTIVE_RECORD_VERSION="~> 3.1.0"
   - ACTIVE_RECORD_VERSION="~> 3.0.0"
+  - ACTIVE_RECORD_VERSION="~> 3.1.0"
+  - ACTIVE_RECORD_VERSION="~> 3.2.0"
+  - ACTIVE_RECORD_VERSION="~> 4.0.0"
+  - ACTIVE_RECORD_VERSION="~> 4.1.0"
+  - ACTIVE_RECORD_VERSION="~> 4.2.0"
+  - ACTIVE_RECORD_VERSION="~> 5.0.0"
 
 matrix:
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
   exclude:
     - env: ACTIVE_RECORD_BRANCH="master"
-      rvm: "1.9"
+      rvm: "1.9.3-p551"
     - env: ACTIVE_RECORD_BRANCH="master"
-      rvm: "2.0"
+      rvm: "2.0.0-p648"
+    - env: ACTIVE_RECORD_BRANCH="master"
+      rvm: "2.1.10"
+    - env: ACTIVE_RECORD_BRANCH="master"
+      rvm: jruby-19mode
     - env: ACTIVE_RECORD_BRANCH="master"
+      rvm: rbx-2
+    - env: ACTIVE_RECORD_VERSION="~> 5.0.0"
+      rvm: "1.9.3-p551"
+    - env: ACTIVE_RECORD_VERSION="~> 5.0.0"
+      rvm: "2.0.0-p648"
+    - env: ACTIVE_RECORD_VERSION="~> 5.0.0"
+      rvm: "2.1.10"
+    - env: ACTIVE_RECORD_VERSION="~> 5.0.0"
       rvm: jruby-19mode
+    - env: ACTIVE_RECORD_VERSION="~> 5.0.0"
+      rvm: rbx-2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 1.2.2
+
+- Fix ActiveRecord 5 deprecation warning
+- Options passed to `with_model` are validated to prevent accidental misuse of API
+- Improve thread-safety by making table names unique to process and thread ID, instead of just process ID
+
+### 1.2.1
+
+- Support ActiveRecord 4.2 (no code change, only dependency requirement bump)
+
 ### 1.2.0
 
 - Allow specifying scope for before/after blocks (Miks Miķelsons)
@@ -33,22 +43,20 @@
 
 ### 0.2.6
 
-- Active Record 3.2 compatible. (Steven Harman / Brent Wheeldon)
+- ActiveRecord 3.2 compatible. (Steven Harman / Brent Wheeldon)
 
 ### 0.2.5
 
-- Clear Active Record 3.x associations class cache between specs to clean up test
-- pollution.
+- Clear ActiveRecord 3.x associations class cache between specs to clean up test pollution.
 
 ### 0.2.4
 
 - Active Record 3.1 compatible.
-- Fix bug where column information was being cached incorrectly by Active
-- Record.
+- Fix bug where column information was being cached incorrectly by ActiveRecord.
 
 ### 0.2.3
 
-- Create a new class each run to prevent test pollution. (J. Andrew Marshall)
+- Create a new class each run to prevent test pollution. (Andrew Marshall)
 - Use :UpperCase in examples.
 
 ### 0.2.2
@@ -57,22 +65,19 @@
 
 ### 0.2.1
 
-- Fix a bug when the with_model name contains capital letters. Now you can
-- safely make calls like `with_model :BlogPost`
+- Fix a bug when the with_model name contains capital letters. Now you can safely make calls like `with_model :BlogPost`
 
 ### 0.2
 
-- Remove the buggy attr_accessor method for accessing with_model classes. Now
-- there is only the constant available in the example group.
+- Remove the buggy `attr_accessor` method for accessing with_model classes. Now there is only the constant available in the example group.
 
 ### 0.1.5
 
-- WithModel::Base is now marked as an abstract_class, which makes polymorphic
-- belongs_to work properly.
+- `WithModel::Base` is now marked as an `abstract_class,` which makes polymorphic `belongs_to` work properly.
 
 ### 0.1.4
 
-- Add ability to pass arguments to create_table.
+- Add ability to pass arguments to `create_table`.
 
 ### 0.1.2
 

data/Gemfile

@@ -2,8 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'activerecord', :git => 'https://github.com/rails/rails.git', :branch => ENV['ACTIVE_RECORD_BRANCH'] if ENV['ACTIVE_RECORD_BRANCH']
-gem 'activerecord', ENV['ACTIVE_RECORD_VERSION'] if ENV['ACTIVE_RECORD_VERSION']
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 gem 'coveralls', :require => false, :platforms => :mri_20
-gem 'sqlite3', '1.3.8', :platforms => :ruby
+gem 'test-unit', :require => 'test/unit'
+
+if ar_branch = ENV['ACTIVE_RECORD_BRANCH']
+  gem 'activerecord', :git => 'https://github.com/rails/rails.git', :branch => ENV['ACTIVE_RECORD_BRANCH']
+  gem 'arel', :git => 'https://github.com/rails/arel.git' if ar_branch == 'master'
+end
+
+if ENV['ACTIVE_RECORD_VERSION']
+  gem 'activerecord', ENV['ACTIVE_RECORD_VERSION']
+end
+
+case RUBY_ENGINE
+when 'ruby'
+  gem 'sqlite3', '>= 1.3.10', :platforms => :ruby
+when 'rbx'
+  gem 'sqlite3', '1.3.8', :platforms => :ruby
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Case Commons, LLC
+Copyright (c) 2010-2016 Case Commons, Inc. <http://casecommons.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,9 +1,9 @@
 # [with_model](https://github.com/Casecommons/with_model)
 
+[![Gem Version](https://img.shields.io/gem/v/with_model.svg?style=flat)](https://rubygems.org/gems/with_model)
 [![Build Status](https://secure.travis-ci.org/Casecommons/with_model.svg?branch=master)](https://travis-ci.org/Casecommons/with_model)
 [![Code Climate](https://img.shields.io/codeclimate/github/Casecommons/with_model.svg?style=flat)](https://codeclimate.com/github/Casecommons/with_model)
 [![Coverage Status](https://img.shields.io/coveralls/Casecommons/with_model/master.svg?style=flat)](https://coveralls.io/r/Casecommons/with_model)
-[![Gem Version](https://img.shields.io/gem/v/with_model.svg?style=flat)](https://rubygems.org/gems/with_model)
 
 `with_model` dynamically builds an ActiveRecord model (with table) before each test in a group and destroys it afterwards.
 
@@ -165,9 +165,9 @@ end
 
 ## Requirements
 
-- Ruby 1.9.3+
+- Ruby 1.9.3, 2.x
 - RSpec or minitest/spec
-- ActiveRecord 3.0.x–4.1.x (for ActiveRecord 2, use with_model 0.2.x)
+- ActiveRecord 3.x, 4.x (for ActiveRecord 2, use with_model 0.2.x)
 
 ## Versioning
 
@@ -175,5 +175,5 @@ As of version 1.0.0, with_model uses [Semantic Versioning 2.0.0](http://semver.o
 
 ## License
 
-Copyright © 2010–2014 Case Commons, LLC.
-Licensed under the MIT license, available in the “LICENSE” file.
+Copyright © 2010–2016 [Case Commons, Inc](http://casecommons.org).
+Licensed under the MIT license, see [LICENSE](/LICENSE) file.

data/lib/with_model/model.rb

@@ -6,29 +6,29 @@ require 'with_model/table'
 
 module WithModel
   class Model
+    OPTIONS = [:superclass].freeze
+    private_constant :OPTIONS
+
     attr_writer :model_block, :table_block, :table_options
 
     def initialize name, options = {}
+      validate_options!(options)
       @name = name.to_sym
-      @options = options
       @model_block = nil
       @table_block = nil
       @table_options = {}
+      @superclass = options.fetch(:superclass, ActiveRecord::Base)
     end
 
     def create
       table.create
-      @model = Class.new(superclass) do
+      @model = Class.new(@superclass) do
         extend WithModel::Methods
       end
       stubber.stub_const @model
       setup_model
     end
 
-    def superclass
-      @options.fetch(:superclass, ActiveRecord::Base)
-    end
-
     def destroy
       stubber.unstub_const
       remove_from_superclass_descendants
@@ -68,7 +68,15 @@ module WithModel
     end
 
     def table_name
-      "with_model_#{@name.to_s.tableize}_#{$$}".freeze
+      uid = "#$$_#{Thread.current.object_id}"
+      "with_model_#{@name.to_s.tableize}_#{uid}".freeze
+    end
+
+    def validate_options!(options)
+      unknown_options = options.keys - OPTIONS
+      unless unknown_options.empty?
+        raise ArgumentError, "unknown options: #{unknown_options.inspect}"
+      end
     end
   end
 end

data/lib/with_model/table.rb

@@ -9,13 +9,26 @@ module WithModel
     end
 
     def create
-      connection = ActiveRecord::Base.connection
-      connection.drop_table(@name) if connection.table_exists?(@name)
+      connection.drop_table(@name) if exists?
       connection.create_table(@name, @options, &@block)
     end
 
     def destroy
       ActiveRecord::Base.connection.drop_table(@name)
     end
+
+    private
+
+    def exists?
+      if connection.respond_to?(:data_source_exists?)
+        connection.data_source_exists?(@name)
+      else
+        connection.table_exists?(@name)
+      end
+    end
+
+    def connection
+      ActiveRecord::Base.connection
+    end
   end
 end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/spec/active_record_behaviors_spec.rb

@@ -56,7 +56,7 @@ describe "ActiveRecord behaviors" do
 
       with_model :TeaCup do
         table do |t|
-          t.belongs_to :pet, :polymorphic => true
+          t.belongs_to :pet, :polymorphic => true, :index => false
         end
         model do
           belongs_to :pet, :polymorphic => true

data/spec/with_model_spec.rb

@@ -86,26 +86,27 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
   end
 
-  ::MyConst = 1
+  describe "constant restoration" do
+    before { stub_const('MyConst', 1) }
+    shadowing_example_ran = false
 
-  shadowing_example_ran = false
+    context "with the with_model block" do
+      with_model :MyConst
 
-  describe "that shadows an existing constant" do
-    with_model :MyConst
+      after do
+        shadowing_example_ran = true
+      end
 
-    after do
-      shadowing_example_ran = true
+      it "shadows that constant" do
+        expect(MyConst).to be_a(Class)
+      end
     end
 
-    it "shadows that constant" do
-      expect(MyConst).to be_a(Class)
-    end
-  end
-
-  context "in later examples" do
-    it "returns the constant to its original value" do
-      expect(shadowing_example_ran).to eq true
-      expect(MyConst).to eq 1
+    context "without the with_model block" do
+      it "returns the constant to its original value" do
+        expect(shadowing_example_ran).to eq true
+        expect(MyConst).to eq 1
+      end
     end
   end
 
@@ -150,40 +151,41 @@ describe "a temporary ActiveRecord model created with with_model" do
     it "is available" do end
   end
 
-  module AMixin
-    def foo
+  context "with a mixin" do
+    let(:mixin) do
+      Module.new { def foo; end }
     end
-  end
+    before { stub_const('AMixin', mixin) }
 
-  context "with a mixin" do
     with_model :WithAMixin do
       model do
         include AMixin
       end
     end
 
-    before { ::ModelWithMixin = WithAMixin }
-
     it "has the mixin" do
-      expect(lambda { ::ModelWithMixin.new.foo }).to_not raise_error
-      expect(::ModelWithMixin.include?(AMixin)).to eq true
+      expect(lambda { ::WithAMixin.new.foo }).to_not raise_error
+      expect(::WithAMixin.include?(AMixin)).to eq true
     end
   end
 
   context "with a mixin that has a class_eval" do
-    subject { WithAClassEval.new }
-
-    module AMixinWithClassEval
-      def self.included(klass)
-        klass.class_eval do
-          after_save { |object| object.my_method }
+    let(:mixin) do
+      Module.new do
+        def self.included(klass)
+          klass.class_eval do
+            after_save { |object| object.my_method }
+          end
         end
       end
     end
+    before { stub_const('AMixin', mixin) }
+
+    subject { WithAClassEval.new }
 
     with_model :WithAClassEval do
       model do
-        include AMixinWithClassEval
+        include AMixin
         def my_method; end
       end
     end
@@ -329,6 +331,10 @@ describe "a temporary ActiveRecord model created with with_model" do
       self.abstract_class = true
     end
 
+    after(:all) do
+      Object.send(:remove_const, 'BlogPostParent')
+    end
+
     with_model :BlogPost, superclass: BlogPostParent do
       table do |t|
         t.string 'title'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,7 +83,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
+- Rakefile.rb
 - lib/with_model.rb
 - lib/with_model/constant_stubber.rb
 - lib/with_model/methods.rb
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Dynamically build a model within an RSpec context
@@ -125,4 +125,3 @@ test_files:
 - spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/with_model_spec.rb
-has_rdoc: