with_model 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88698902a3eed64e0fc34a173d4758e4f108dc5
-  data.tar.gz: 49b3e03abeccfc847d9f5751e5107ff3c486233e
+  metadata.gz: a8cca5256377f4b9344225ea73072ed1da4f9021
+  data.tar.gz: 88f4236aac8bcfc99d18bc6b2d607b7f6d9e29ba
 SHA512:
-  metadata.gz: e021cf0aa7032ea90c7572f28172d2158062682f382fbe8036489b88120607e986638c3b059cf3be30605f93465c90e3c417ff616f8b385a2eff0f097a4d1814
-  data.tar.gz: efd6470ae68ea7ae8861f8b0067c8fddb67062553e68eb88ec6c6afa53fc8f7160f8e05490fb1521da135e6c2fde76ec473dab85f0e48e3caa13a9781e12ca67
+  metadata.gz: 9d4dec931009a42eb33bdbfb9c2a0220a427689f0b5fabe1f2ea694d7e82d10974814a6034f870d320db3a56b12db56490b73f4a96834bf418831c18fd55462a
+  data.tar.gz: 685d7c90874dc1abcc831a4ae76b67d4324792e856854cafa06c6ea9d9af9bf50fc6d76ab05a78196c0e55d009a2a7501456f0284e0218907bb8c7027060bb9f

data/.travis.yml

@@ -3,12 +3,15 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
   - jruby-19mode
   - rbx-2.2
 
 env:
   - ACTIVE_RECORD_BRANCH="master"
+  - ACTIVE_RECORD_BRANCH="4-1-stable"
   - ACTIVE_RECORD_BRANCH="4-0-stable"
+  - ACTIVE_RECORD_VERSION="~> 4.1.0"
   - ACTIVE_RECORD_VERSION="~> 4.0.0"
   - ACTIVE_RECORD_VERSION="~> 3.2.0"
   - ACTIVE_RECORD_VERSION="~> 3.1.0"
@@ -17,4 +20,5 @@ env:
 matrix:
   allow_failures:
     - env: ACTIVE_RECORD_BRANCH="master"
+    - env: ACTIVE_RECORD_BRANCH="4-1-stable"
     - env: ACTIVE_RECORD_BRANCH="4-0-stable"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.1.0
+- Support Ruby 2.1
+- Support Rails 4.1
+- Refactor some internals
+
 ### 1.0.0
 - Start using [Semantic Versioning 2.0.0](http://semver.org/spec/v2.0.0.html)
 - Complete refactor of internals (Andrew Marshall)

data/README.md

@@ -152,7 +152,7 @@ end
 
 - Ruby 1.9.3+
 - RSpec or minitest/spec
-- ActiveRecord 3+ (for ActiveRecord 2, use with_model 0.2.x)
+- ActiveRecord 3.0.x–4.1.x (for ActiveRecord 2, use with_model 0.2.x)
 
 ## Versioning
 
@@ -160,5 +160,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.
+Copyright © 2010–2014 Case Commons, LLC.
 Licensed under the MIT license, available in the “LICENSE” file.

data/lib/with_model/model.rb

@@ -1,3 +1,4 @@
+require 'active_record'
 require 'active_support/core_ext/string/inflections'
 require 'with_model/constant_stubber'
 require 'with_model/methods'
@@ -10,25 +11,22 @@ module WithModel
     def initialize name, options = {}
       @name = name.to_sym
       @options = options
-      @model_block = proc {}
-      @table_block = proc {}
+      @model_block = nil
+      @table_block = nil
       @table_options = {}
     end
 
     def create
       table.create
-      @model = Class.new(superclass)
-
-      class << @model
-        include WithModel::Methods
+      @model = Class.new(superclass) do
+        extend WithModel::Methods
       end
-
       stubber.stub_const @model
       setup_model
     end
 
     def superclass
-      @options.fetch(:superclass) { ActiveRecord::Base }
+      @options.fetch(:superclass, ActiveRecord::Base)
     end
 
     def destroy
@@ -47,7 +45,7 @@ module WithModel
 
     def setup_model
       @model.table_name = table_name
-      @model.class_eval(&@model_block)
+      @model.class_eval(&@model_block) if @model_block
       @model.reset_column_information
     end
 

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/active_record_behaviors_spec.rb

@@ -4,13 +4,11 @@ describe "ActiveRecord behaviors" do
   describe "a temporary ActiveRecord model created with with_model" do
     context "that has a named scope" do
       before do
-        regular_model = Class.new ActiveRecord::Base do
+        @regular_model = Class.new ActiveRecord::Base do
           scope :title_is_foo, lambda { where(:title => 'foo') }
         end
-        stub_const 'RegularModel', regular_model
 
-        RegularModel.connection.drop_table(RegularModel.table_name) rescue nil
-        RegularModel.connection.create_table(RegularModel.table_name) do |t|
+        @regular_model.connection.create_table(@regular_model.table_name, force: true) do |t|
           t.string 'title'
           t.text 'content'
           t.timestamps
@@ -18,7 +16,7 @@ describe "ActiveRecord behaviors" do
       end
 
       after do
-        RegularModel.connection.drop_table(@model.table_name) rescue nil
+        @regular_model.connection.drop_table(@regular_model.table_name)
       end
 
       with_model :BlogPost do
@@ -35,10 +33,10 @@ describe "ActiveRecord behaviors" do
 
       describe "the named scope" do
         it "works like a regular named scope" do
-          included = RegularModel.create!(:title => 'foo', :content => 'Include me!')
-          excluded = RegularModel.create!(:title => 'bar', :content => 'Include me!')
+          included = @regular_model.create!(:title => 'foo', :content => 'Include me!')
+          excluded = @regular_model.create!(:title => 'bar', :content => 'Include me!')
 
-          expect(RegularModel.title_is_foo).to eq [included]
+          expect(@regular_model.title_is_foo).to eq [included]
 
           included = BlogPost.create!(:title => 'foo', :content => 'Include me!')
           excluded = BlogPost.create!(:title => 'bar', :content => 'Include me!')

data/with_model.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'activerecord', '>= 3.0', '< 4.1'
+  spec.add_dependency 'activerecord', '>= 3.0', '< 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -9,68 +9,68 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 description: Dynamically build a model within an RSpec context
@@ -82,9 +82,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dynamically build a model within an RSpec context