with_model 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8cca5256377f4b9344225ea73072ed1da4f9021
-  data.tar.gz: 88f4236aac8bcfc99d18bc6b2d607b7f6d9e29ba
+  metadata.gz: e58c6b921cca191793c25a9d245ed3783b5438dd
+  data.tar.gz: 51c4bdcdde34e76a3f807b8feb92f7752479a35d
 SHA512:
-  metadata.gz: 9d4dec931009a42eb33bdbfb9c2a0220a427689f0b5fabe1f2ea694d7e82d10974814a6034f870d320db3a56b12db56490b73f4a96834bf418831c18fd55462a
-  data.tar.gz: 685d7c90874dc1abcc831a4ae76b67d4324792e856854cafa06c6ea9d9af9bf50fc6d76ab05a78196c0e55d009a2a7501456f0284e0218907bb8c7027060bb9f
+  metadata.gz: 33c20fcfd6aaa8efc10ffd72b41dba4d115e4ed146dacf42b7b980df368475001a6e72b47a2e99725a46a35836e92571c343d9693527685d5e1b3361ad0933ec
+  data.tar.gz: 6914dc77114c8b787b210b6a4618857bac68dc51823d5d80d46b97ab6ee733d338689246551c231d78907105aeb1c9856b8a7abf00ede6619769cb6052391c79

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.2.0
+
+- Allow specifying scope for before/after blocks (Miks Miķelsons)
+
 ### 1.1.0
 - Support Ruby 2.1
 - Support Rails 4.1
@@ -14,16 +18,16 @@
 ### 0.3.2
 
 - Allow calling with_model without a block. (Andrew Marshall)
-- Ensure that ActiveSupport's descendants works correctly between tests. (Andrew Marshall)
+- Ensure that ActiveSupport’s descendants works correctly between tests. (Andrew Marshall)
 - Allow Active Record 4 in gemspec.
 
 ### 0.3.1
 
-- Don't cache connection between tests. (Ryan Ong & Richard Nuno)
+- Don’t cache connection between tests. (Ryan Ong & Richard Nuno)
 
 ### 0.3
 
-- Use RSpec 2.11's built-in constant stubbing.
+- Use RSpec 2.11’s built-in constant stubbing.
 - Remove RSpec 1.x and Active Record 2.x support.
 - Remove Mixico support.
 

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 gem 'activerecord', :github => 'rails', :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, :platform => :mri_20
-gem 'sqlite3', :platforms => :ruby
+gem 'coveralls', :require => false, :platforms => :mri_20
+gem 'sqlite3', '1.3.8', :platforms => :ruby

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Case Commons, LLC
+Copyright (c) 2010-2014 Case Commons, LLC
 
 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,10 +1,10 @@
 # [with_model](https://github.com/Casecommons/with_model)
 
-[![Build Status](https://secure.travis-ci.org/Casecommons/with_model.png?branch=master)](https://travis-ci.org/Casecommons/with_model)
-[![Code Climate](https://codeclimate.com/github/Casecommons/with_model.png)](https://codeclimate.com/github/Casecommons/with_model)
-[![Coverage Status](https://coveralls.io/repos/Casecommons/with_model/badge.png?branch=master)](https://coveralls.io/r/Casecommons/with_model)
-[![Gem Version](https://badge.fury.io/rb/with_model.png)](https://rubygems.org/gems/with_model)
-[![Dependency Status](https://gemnasium.com/Casecommons/with_model.png)](https://gemnasium.com/Casecommons/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)](https://codeclimate.com/github/Casecommons/with_model)
+[![Coverage Status](https://img.shields.io/coveralls/Casecommons/with_model/master.svg)](https://coveralls.io/r/Casecommons/with_model)
+[![Gem Version](https://badge.fury.io/rb/with_model.svg)](https://rubygems.org/gems/with_model)
+[![Dependency Status](https://gemnasium.com/Casecommons/with_model.svg)](https://gemnasium.com/Casecommons/with_model)
 
 `with_model` dynamically builds an ActiveRecord model (with table) before each test in a group and destroys it afterwards.
 
@@ -12,7 +12,7 @@
 
 Install as usual: `gem install with_model` or add `gem 'with_model'` to your Gemfile. See `.travis.yml` for supported (tested) Ruby versions.
 
-## RSpec
+### RSpec
 
 Extend `WithModel` into RSpec:
 
@@ -24,7 +24,7 @@ RSpec.configure do |config|
 end
 ```
 
-## minitest/spec
+### minitest/spec
 
 Extend `WithModel` into minitest/spec:
 
@@ -93,7 +93,7 @@ describe "A blog post" do
   end
 
   it "has the module" do
-    expect(BlogPost.include?(SomeModule)).to be_true
+    expect(BlogPost.include?(SomeModule)).to eq true
   end
 
   it "has the class method" do
@@ -109,7 +109,7 @@ describe "A blog post" do
     expect(record).to_not be_valid
     record.title = "foo"
     expect(record).to be_valid
-    expect(record.save).to be_true
+    expect(record.save).to eq true
     expect(record.reload).to eq record
     record.comments.create!(:text => "Lorem ipsum")
     expect(record.comments.count).to eq 1
@@ -124,13 +124,29 @@ describe "A blog post" do
   end
 
   it "has a specified superclass" do
-    expect(Ford < Car).to be_true
+    expect(Ford < Car).to eq true
+  end
+end
+
+describe "with_model can be run within RSpec :all hook" do
+  with_model :BlogPost, scope: :all do
+    table do |t|
+      t.string :title
+    end
+  end
+
+  before :all do
+    BlogPost.create # without scope: :all these will fail
+  end
+
+  it "has been initialized within before(:all)" do
+    expect(BlogPost.count).to eq 1
   end
 end
 
 describe "another example group" do
   it "does not have the constant anymore" do
-    expect(defined?(BlogPost)).to be_false
+    expect(defined?(BlogPost)).to be_falsy
   end
 end
 

data/lib/with_model/model.rb

@@ -40,7 +40,7 @@ module WithModel
     private
 
     def const_name
-      @name.to_s.camelize.freeze
+      @name.to_s.camelize.to_sym
     end
 
     def setup_model

data/lib/with_model/version.rb

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

data/lib/with_model.rb

@@ -5,18 +5,34 @@ require 'with_model/version'
 
 module WithModel
   def with_model(name, options = {}, &block)
+    options = options.dup
+    scope = options.delete(:scope)
+
     model = Model.new name, options
     dsl = Model::DSL.new model
     dsl.instance_exec(&block) if block
 
-    before { model.create }
-    after { model.destroy }
+    before(*scope) do
+      model.create
+    end
+
+    after(*scope) do
+      model.destroy
+    end
   end
 
   def with_table(name, options = {}, &block)
+    options = options.dup
+    scope = options.delete(:scope)
+
     table = Table.new name, options, &block
 
-    before { table.create }
-    after { table.destroy }
+    before(*scope) do
+      table.create
+    end
+
+    after(*scope) do
+      table.destroy
+    end
   end
 end

data/spec/readme_spec.rb

@@ -50,7 +50,7 @@ describe "A blog post" do
   end
 
   it "has the module" do
-    expect(BlogPost.include?(SomeModule)).to be_true
+    expect(BlogPost.include?(SomeModule)).to eq true
   end
 
   it "has the class method" do
@@ -66,7 +66,7 @@ describe "A blog post" do
     expect(record).to_not be_valid
     record.title = "foo"
     expect(record).to be_valid
-    expect(record.save).to be_true
+    expect(record.save).to eq true
     expect(record.reload).to eq record
     record.comments.create!(:text => "Lorem ipsum")
     expect(record.comments.count).to eq 1
@@ -81,13 +81,29 @@ describe "A blog post" do
   end
 
   it "has a specified superclass" do
-    expect(Ford < Car).to be_true
+    expect(Ford < Car).to eq true
+  end
+end
+
+describe "with_model can be run within RSpec :all hook" do
+  with_model :BlogPost, scope: :all do
+    table do |t|
+      t.string :title
+    end
+  end
+
+  before :all do
+    BlogPost.create # without scope: :all these will fail
+  end
+
+  it "has been initialized within before(:all)" do
+    expect(BlogPost.count).to eq 1
   end
 end
 
 describe "another example group" do
   it "does not have the constant anymore" do
-    expect(defined?(BlogPost)).to be_false
+    expect(defined?(BlogPost)).to be_falsy
   end
 end
 

data/spec/spec_helper.rb

@@ -44,7 +44,7 @@ module SpecHelper
     if ::ActiveRecord::VERSION::STRING >= '4.1.0'
       require 'minitest'
       include Minitest::Assertions
-      def assertions; @assertions || 0; end
+      def assertions; @assertions ||= 0; end
       def assertions= value; @assertions = value; end
     else
       require 'test/unit/assertions'

data/spec/with_model_spec.rb

@@ -70,7 +70,7 @@ describe "a temporary ActiveRecord model created with with_model" do
 
     describe ".with_model?" do
       it "returns true" do
-        expect(BlogPost.with_model?).to be_true
+        expect(BlogPost.with_model?).to eq true
       end
     end
 
@@ -81,8 +81,8 @@ describe "a temporary ActiveRecord model created with with_model" do
 
   context "after an example which uses with_model without shadowing an existing constant" do
     it "returns the constant to its undefined state" do
-      expect(non_shadowing_example_ran).to be_true
-      expect(defined?(BlogPost)).to be_false
+      expect(non_shadowing_example_ran).to eq true
+      expect(defined?(BlogPost)).to be_falsy
     end
   end
 
@@ -104,7 +104,7 @@ describe "a temporary ActiveRecord model created with with_model" do
 
   context "in later examples" do
     it "returns the constant to its original value" do
-      expect(shadowing_example_ran).to be_true
+      expect(shadowing_example_ran).to eq true
       expect(MyConst).to eq 1
     end
   end
@@ -166,7 +166,7 @@ describe "a temporary ActiveRecord model created with with_model" do
 
     it "has the mixin" do
       expect(lambda { ::ModelWithMixin.new.foo }).to_not raise_error
-      expect(::ModelWithMixin.include?(AMixin)).to be_true
+      expect(::ModelWithMixin.include?(AMixin)).to eq true
     end
   end
 
@@ -308,6 +308,22 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
   end
 
+  context "with_model can be run within RSpec :all hook" do
+    with_model :BlogPost, scope: :all do
+      table do |t|
+        t.string :title
+      end
+    end
+
+    before :all do
+      BlogPost.create # without scope: :all these will fail
+    end
+
+    it "has been initialized within before(:all)" do
+      expect(BlogPost.count).to eq 1
+    end
+  end
+
   context "with 'superclass' option" do
     class BlogPostParent < ActiveRecord::Base
       self.abstract_class = true
@@ -325,7 +341,7 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
 
     it "is a subclass of the supplied superclass" do
-      expect(BlogPost < BlogPostParent).to be_true
+      expect(BlogPost < BlogPostParent).to eq true
     end
 
     it "is its own base_class" do
@@ -333,7 +349,7 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
 
     it "responds to .with_model? with true" do
-      expect(BlogPost.with_model?).to be_true
+      expect(BlogPost.with_model?).to eq true
     end
   end
 end

data/with_model.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.14'
+  spec.add_development_dependency 'rspec', '>= 2.14', '< 4'
   spec.add_development_dependency 'rubysl' if RUBY_ENGINE == 'rbx'
   spec.add_development_dependency 'rubysl-test-unit' if RUBY_ENGINE == 'rbx'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -63,16 +63,22 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: Dynamically build a model within an RSpec context
 email:
 - casecommons-dev@googlegroups.com
@@ -122,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Dynamically build a model within an RSpec context
@@ -131,3 +137,4 @@ test_files:
 - spec/readme_spec.rb
 - spec/spec_helper.rb
 - spec/with_model_spec.rb
+has_rdoc: