with_model 2.0.0 → 2.1.0

data/spec/readme_spec.rb

@@ -1,12 +1,10 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
-describe "A blog post" do
-  before :all do
-    module SomeModule; end
-  end
+require 'spec_helper'
 
-  after :all do
-    Object.send :remove_const, :SomeModule
+describe 'A blog post' do
+  before do
+    stub_const('MyModule', Module.new)
   end
 
   with_model :BlogPost do
@@ -18,7 +16,7 @@ describe "A blog post" do
 
     # The model block works just like the class definition.
     model do
-      include SomeModule
+      include MyModule
       has_many :comments
       validates_presence_of :title
 
@@ -45,30 +43,30 @@ describe "A blog post" do
     end
   end
 
-  it "can be accessed as a constant" do
+  it 'can be accessed as a constant' do
     expect(BlogPost).to be
   end
 
-  it "has the module" do
-    expect(BlogPost.include?(SomeModule)).to eq true
+  it 'has the module' do
+    expect(BlogPost.include?(MyModule)).to eq true
   end
 
-  it "has the class method" do
+  it 'has the class method' do
     expect(BlogPost.some_class_method).to eq 'chunky'
   end
 
-  it "has the instance method" do
+  it 'has the instance method' do
     expect(BlogPost.new.some_instance_method).to eq 'bacon'
   end
 
-  it "can do all the things a regular model can" do
+  it 'can do all the things a regular model can' do
     record = BlogPost.new
     expect(record).to_not be_valid
-    record.title = "foo"
+    record.title = 'foo'
     expect(record).to be_valid
     expect(record.save).to eq true
     expect(record.reload).to eq record
-    record.comments.create!(:text => "Lorem ipsum")
+    record.comments.create!(text: 'Lorem ipsum')
     expect(record.comments.count).to eq 1
   end
 
@@ -80,12 +78,12 @@ describe "A blog post" do
   with_model :Ford, superclass: Car do
   end
 
-  it "has a specified superclass" do
+  it 'has a specified superclass' do
     expect(Ford < Car).to eq true
   end
 end
 
-describe "with_model can be run within RSpec :all hook" do
+describe 'with_model can be run within RSpec :all hook' do
   with_model :BlogPost, scope: :all do
     table do |t|
       t.string :title
@@ -96,26 +94,26 @@ describe "with_model can be run within RSpec :all hook" do
     BlogPost.create # without scope: :all these will fail
   end
 
-  it "has been initialized within before(:all)" do
+  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
+describe 'another example group' do
+  it 'does not have the constant anymore' do
     expect(defined?(BlogPost)).to be_falsy
   end
 end
 
-describe "with table options" do
+describe 'with table options' do
   with_model :WithOptions do
-    table :id => false do |t|
+    table id: false do |t|
       t.string 'foo'
       t.timestamps null: false
     end
   end
 
-  it "respects the additional options" do
-    expect(WithOptions.columns.map(&:name)).to_not include("id")
+  it 'respects the additional options' do
+    expect(WithOptions.columns.map(&:name)).to_not include('id')
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,8 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler.setup
 
-begin
-  require 'coveralls'
-  Coveralls.wear!
-rescue LoadError
-end
-
 require 'with_model'
 RSpec.configure do |config|
   config.extend WithModel
@@ -22,13 +18,13 @@ RSpec.configure do |config|
   end
 end
 
-is_jruby = RUBY_PLATFORM =~ /\bjava\b/
+is_jruby = RUBY_PLATFORM == 'java'
 adapter = is_jruby ? 'jdbcsqlite3' : 'sqlite3'
 
 # WithModel requires ActiveRecord::Base.connection to be established.
 # If ActiveRecord already has a connection, as in a Rails app, this is unnecessary.
 require 'active_record'
-ActiveRecord::Base.establish_connection(:adapter => adapter, :database => ':memory:')
+ActiveRecord::Base.establish_connection(adapter: adapter, database: ':memory:')
 
 if defined?(I18n) && I18n.respond_to?(:enforce_available_locales=)
   I18n.enforce_available_locales = true
@@ -41,14 +37,15 @@ end
 
 module SpecHelper
   module RailsTestCompatability
-    if ::ActiveRecord::VERSION::STRING >= '4.1.0'
-      require 'minitest'
-      include Minitest::Assertions
-      def assertions; @assertions ||= 0; end
-      def assertions= value; @assertions = value; end
-    else
-      require 'test/unit/assertions'
-      include Test::Unit::Assertions
+    require 'minitest'
+    include Minitest::Assertions
+
+    def assertions
+      @assertions ||= 0
+    end
+
+    def assertions=(value)
+      @assertions = value
     end
   end
 end

data/spec/with_model_spec.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'active_model'
 require 'spec_helper'
 
-shared_examples_for "ActiveModel" do
+shared_examples_for 'ActiveModel' do
   require 'active_model/lint'
   include SpecHelper::RailsTestCompatability
   include ActiveModel::Lint::Tests
@@ -10,7 +12,7 @@ shared_examples_for "ActiveModel" do
   active_model_lint_tests = active_model_methods.map(&:to_s).grep(/^test/)
 
   active_model_lint_tests.each do |method_name|
-    friendly_name = method_name.gsub('_', ' ')
+    friendly_name = method_name.tr('_', ' ')
     example friendly_name do
       public_send method_name.to_sym
     end
@@ -19,7 +21,7 @@ shared_examples_for "ActiveModel" do
   before { @model = subject }
 end
 
-describe "a temporary ActiveRecord model created with with_model" do
+describe 'a temporary ActiveRecord model created with with_model' do
   non_shadowing_example_ran = false
 
   describe "which doesn't shadow an existing class" do
@@ -41,8 +43,8 @@ describe "a temporary ActiveRecord model created with with_model" do
       non_shadowing_example_ran = true
     end
 
-    it "acts like a normal ActiveRecord model" do
-      record = BlogPost.create!(:title => 'New blog post', :content => 'Hello, world!')
+    it 'acts like a normal ActiveRecord model' do
+      record = BlogPost.create!(title: 'New blog post', content: 'Hello, world!')
 
       record.reload
 
@@ -55,103 +57,113 @@ describe "a temporary ActiveRecord model created with with_model" do
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
 
-    it "has the methods defined in its model block" do
-      expect(BlogPost.new(:title => 'New blog post').fancy_title).to eq 'Title: New blog post'
+    it 'has the methods defined in its model block' do
+      expect(BlogPost.new(title: 'New blog post').fancy_title).to eq 'Title: New blog post'
     end
 
-    it "defines a constant" do
+    it 'defines a constant' do
       expect(BlogPost).to be_a(Class)
     end
 
-    describe ".with_model?" do
-      it "returns true" do
+    describe '.with_model?' do
+      it 'returns true' do
         expect(BlogPost.with_model?).to eq true
       end
     end
 
-    it "is its own base_class" do
+    it 'is its own base_class' do
       expect(BlogPost.base_class).to eq BlogPost
     end
   end
 
-  context "after an example which uses with_model without shadowing an existing constant" do
-    it "returns the constant to its undefined state" 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 eq true
       expect(defined?(BlogPost)).to be_falsy
     end
   end
 
-  describe "constant restoration" do
+  describe 'constant restoration' do
     before { stub_const('MyConst', 1) }
     shadowing_example_ran = false
 
-    context "with the with_model block" do
+    context 'with the with_model block' do
       with_model :MyConst
 
       after do
         shadowing_example_ran = true
       end
 
-      it "shadows that constant" do
+      it 'shadows that constant' do
         expect(MyConst).to be_a(Class)
       end
     end
 
-    context "without the with_model block" do
-      it "returns the constant to its original value" do
+    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
 
-  describe "with a plural name" do
+  describe 'with a plural name' do
     with_model :BlogPosts
 
-    it "does not singularize the constant name" do
+    it 'does not singularize the constant name' do
       expect(BlogPosts).to be
-      expect(lambda { BlogPost }).to raise_error(NameError)
+      expect(-> { BlogPost }).to raise_error(NameError)
     end
   end
 
-  describe "with a name containing capital letters" do
+  describe 'with a name containing capital letters' do
     with_model :BlogPost
 
-    it "tableizes the table name" do
+    it 'tableizes the table name' do
       expect(BlogPost.table_name).to match(/_blog_posts_/)
       expect(BlogPost.table_name).to eq BlogPost.table_name.downcase
     end
   end
 
-  describe "with a name with underscores" do
+  describe 'with a name with underscores' do
     with_model :blog_post
 
-    it "constantizes the name" do
+    it 'constantizes the name' do
       expect(BlogPost).to be
     end
 
-    it "tableizes the table name" do
+    it 'tableizes the table name' do
       expect(BlogPost.table_name).to match(/_blog_posts_/)
       expect(BlogPost.table_name).to eq BlogPost.table_name.downcase
     end
   end
 
-  describe "using the constant in the model block" do
+  describe 'with a name which is namespaced' do
+    before { stub_const('Stuff', Module.new) }
+    with_model :'Stuff::BlogPost'
+
+    it 'creates the model in the namespace' do
+      expect(defined?(::BlogPost)).to be_falsey
+      expect(defined?(::Stuff::BlogPost)).to be_truthy
+    end
+  end
+
+  describe 'using the constant in the model block' do
     with_model :BlogPost do
       model do
         raise 'I am not myself!' unless self == BlogPost
       end
     end
 
-    it "is available" do end
+    it 'is available' do end
   end
 
-  context "with a mixin" do
+  context 'with a mixin' do
     let(:mixin) do
       Module.new { def foo; end }
     end
@@ -163,18 +175,18 @@ describe "a temporary ActiveRecord model created with with_model" do
       end
     end
 
-    it "has the mixin" do
-      expect(lambda { ::WithAMixin.new.foo }).to_not raise_error
+    it 'has the mixin' do
+      expect(-> { ::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
+  context 'with a mixin that has a class_eval' do
     let(:mixin) do
       Module.new do
         def self.included(klass)
           klass.class_eval do
-            after_save { |object| object.my_method }
+            after_save { |object| object.my_method } # rubocop:disable Style/SymbolProc
           end
         end
       end
@@ -190,63 +202,63 @@ describe "a temporary ActiveRecord model created with with_model" do
       end
     end
 
-    it "only has one after_save callback" do
+    it 'only has one after_save callback' do
       expect(subject).to receive(:my_method).once
       subject.save
     end
 
-    it "still only has one after_save callback in future tests" do
+    it 'still only has one after_save callback in future tests' do
       expect(subject).to receive(:my_method).once
       subject.save
     end
   end
 
-  context "with table options" do
+  context 'with table options' do
     with_model :WithOptions do
-      table :id => false do |t|
+      table id: false do |t|
         t.string 'foo'
         t.timestamps null: false
       end
     end
 
-    it "respects the additional options" do
+    it 'respects the additional options' do
       expect(WithOptions.columns.map(&:name)).to_not include('id')
     end
   end
 
-  context "without a block" do
+  context 'without a block' do
     with_model :BlogPost
 
-    it "acts like a normal ActiveRecord model" do
+    it 'acts like a normal ActiveRecord model' do
       record = BlogPost.create!
       record.reload
       record.destroy
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
   end
 
-  context "with an empty block" do
+  context 'with an empty block' do
     with_model(:BlogPost) {}
 
-    it "acts like a normal ActiveRecord model" do
+    it 'acts like a normal ActiveRecord model' do
       record = BlogPost.create!
       record.reload
       record.destroy
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
   end
 
-  context "without a model block" do
+  context 'without a model block' do
     with_model :BlogPost do
       table do |t|
         t.string 'title'
@@ -255,8 +267,8 @@ describe "a temporary ActiveRecord model created with with_model" do
       end
     end
 
-    it "acts like a normal ActiveRecord model" do
-      record = BlogPost.create!(:title => 'New blog post', :content => 'Hello, world!')
+    it 'acts like a normal ActiveRecord model' do
+      record = BlogPost.create!(title: 'New blog post', content: 'Hello, world!')
 
       record.reload
 
@@ -269,16 +281,16 @@ describe "a temporary ActiveRecord model created with with_model" do
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
   end
 
-  context "without a table or model block" do
+  context 'without a table or model block' do
     with_model :BlogPost
 
-    it "acts like a normal ActiveRecord model" do
+    it 'acts like a normal ActiveRecord model' do
       expect(BlogPost.columns.map(&:name)).to eq ['id']
       record = BlogPost.create!
       record.reload
@@ -286,23 +298,23 @@ describe "a temporary ActiveRecord model created with with_model" do
       expect { record.reload }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
   end
 
-  context "with ActiveSupport::DescendantsTracker" do
+  context 'with ActiveSupport::DescendantsTracker' do
     with_model :BlogPost
 
-    it "includes the correct model class in descendants on the first test run" do
+    it 'includes the correct model class in descendants on the first test run' do
       descendant = ActiveRecord::Base.descendants.detect do |c|
         c.table_name == BlogPost.table_name
       end
       expect(descendant).to eq BlogPost
     end
 
-    it "includes the correct model class in descendants on the second test run" do
+    it 'includes the correct model class in descendants on the second test run' do
       descendant = ActiveRecord::Base.descendants.detect do |c|
         c.table_name == BlogPost.table_name
       end
@@ -310,7 +322,7 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
   end
 
-  context "with_model can be run within RSpec :all hook" do
+  context 'with_model can be run within RSpec :all hook' do
     with_model :BlogPost, scope: :all do
       table do |t|
         t.string :title
@@ -321,7 +333,7 @@ describe "a temporary ActiveRecord model created with with_model" do
       BlogPost.create # without scope: :all these will fail
     end
 
-    it "has been initialized within before(:all)" do
+    it 'has been initialized within before(:all)' do
       expect(BlogPost.count).to eq 1
     end
   end
@@ -332,7 +344,7 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
 
     after(:all) do
-      Object.send(:remove_const, 'BlogPostParent')
+      Object.__send__(:remove_const, 'BlogPostParent')
     end
 
     with_model :BlogPost, superclass: BlogPostParent do
@@ -341,20 +353,20 @@ describe "a temporary ActiveRecord model created with with_model" do
       end
     end
 
-    describe "the class" do
+    describe 'the class' do
       subject { BlogPost.new }
-      it_should_behave_like "ActiveModel"
+      it_should_behave_like 'ActiveModel'
     end
 
-    it "is a subclass of the supplied superclass" do
+    it 'is a subclass of the supplied superclass' do
       expect(BlogPost < BlogPostParent).to eq true
     end
 
-    it "is its own base_class" do
+    it 'is its own base_class' do
       expect(BlogPost.base_class).to eq BlogPost
     end
 
-    it "responds to .with_model? with true" do
+    it 'responds to .with_model? with true' do
       expect(BlogPost.with_model?).to eq true
     end
   end