with_model 0.3.1 → 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb1eb5e067e816d4644cde5fa9da460fd764ac36
+  data.tar.gz: 5de4c0d4f74cf020b4c6541b31fdcdb3ac4d053b
+SHA512:
+  metadata.gz: 809520bde82da03692043a5e3b23bce6ceaffcaba26db542e4dec5380658bc00551ea8c6504d04c2a702a5983397d7a047596558926d79c0616f9296332a8b8c
+  data.tar.gz: e64fcb0db081580c10cd54f0b15f4ccde04fdadc5dd92edef5cc3944d68c7a54bb965b4a811f99999042402ee0d4d6c733929b03c3a02d4152d166a5619ceeca

data/.travis.yml

@@ -1,8 +1,30 @@
+language: ruby
+
+script: "bundle exec rspec spec"
+
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - jruby-18mode
+  - jruby-19mode
   - rbx-18mode
   - rbx-19mode
   - ree
-script: "rake spec"
+
+env:
+  - ACTIVE_RECORD_VERSION="~> 4.0.0.rc1"
+  - ACTIVE_RECORD_VERSION="~> 3.2.0"
+  - ACTIVE_RECORD_VERSION="~> 3.1.0"
+  - ACTIVE_RECORD_VERSION="~> 3.0.0"
+
+matrix:
+  allow_failures:
+    - env: ACTIVE_RECORD_VERSION="~> 4.0.0.rc1"
+  exclude:
+    - rvm:
+      - 1.8.7
+      - jruby-18mode
+      - rbx-18mode
+      - ree
+      env: ACTIVE_RECORD_VERSION="~> 4.0.0.rc1"

data/CHANGELOG

@@ -1,3 +1,9 @@
+### 0.3.2
+
+Allow calling with_model without a block. (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)

data/Gemfile

@@ -1,7 +1,10 @@
-source :rubygems
+source "https://rubygems.org"
 
 gemspec
 
 gem "rake"
 gem "sqlite3", :platforms => :ruby
 gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
+gem "rdoc"
+gem 'coveralls', :require => false, :platform => :mri_20
+gem 'activerecord', ENV["ACTIVE_RECORD_VERSION"] if ENV["ACTIVE_RECORD_VERSION"]

data/README.rdoc

@@ -2,7 +2,10 @@
 
 * http://github.com/casecommons/with_model/
 
-{<img src="https://secure.travis-ci.org/Casecommons/with_model.png" />}[http://travis-ci.org/Casecommons/with_model] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/Casecommons/with_model]
+{<img src="https://secure.travis-ci.org/Casecommons/with_model.png" />}[http://travis-ci.org/Casecommons/with_model] 
+{<img src="https://gemnasium.com/Casecommons/with_model.png" alt="Dependency Status" />}[https://gemnasium.com/Casecommons/with_model]
+{<img src="https://codeclimate.com/github/Casecommons/with_model.png" />}[https://codeclimate.com/github/Casecommons/with_model]
+{<img src="https://coveralls.io/repos/Casecommons/with_model/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/Casecommons/with_model]
 
 == DESCRIPTION
 

data/lib/with_model.rb

@@ -4,7 +4,9 @@ module WithModel
   autoload :VERSION, "with_model/version"
 
   def with_model(name, &block)
-    Dsl.new(name, self).tap { |dsl| dsl.instance_eval(&block) }.execute
+    dsl = Dsl.new(name, self)
+    dsl.instance_eval(&block) if block
+    dsl.execute
   end
 
   def with_table(name, options = {}, &block)

data/lib/with_model/dsl.rb

@@ -41,6 +41,9 @@ module WithModel
       end
 
       @example_group.after do
+        if model.superclass.respond_to?(:direct_descendants)
+          model.superclass.direct_descendants.delete(model)
+        end
         if defined?(ActiveSupport::Dependencies::Reference)
           ActiveSupport::Dependencies::Reference.clear!
         end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/active_record_behaviors_spec.rb

@@ -2,17 +2,10 @@ require 'spec_helper'
 
 describe "ActiveRecord behaviors" do
   describe "a temporary ActiveRecord model created with with_model" do
-    context "that has a named_scope" do
+    context "that has a named scope" do
       before do
         class RegularModel < ActiveRecord::Base
-          scope_method =
-            if respond_to?(:scope) && !protected_methods.include?('scope')
-              :scope # ActiveRecord 3.x
-            else
-              :named_scope # ActiveRecord 2.x
-            end
-
-          send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
+          scope :title_is_foo, lambda { where(:title => 'foo') }
         end
         RegularModel.connection.drop_table(RegularModel.table_name) rescue nil
         RegularModel.connection.create_table(RegularModel.table_name) do |t|
@@ -34,14 +27,7 @@ describe "ActiveRecord behaviors" do
         end
 
         model do
-          scope_method =
-            if respond_to?(:scope) && !protected_methods.include?('scope')
-              :scope # ActiveRecord 3.x
-            else
-              :named_scope # ActiveRecord 2.x
-            end
-
-          send scope_method, :title_is_foo, :conditions => {:title => 'foo'}
+          scope :title_is_foo, lambda { where(:title => 'foo') }
         end
       end
 

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require "active_record"
 require "with_model"
 
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
+
 RSpec.configure do |config|
   config.extend WithModel
 end

data/spec/with_model_spec.rb

@@ -76,8 +76,7 @@ describe "a temporary ActiveRecord model created with with_model" do
   shadowing_example_ran = false
 
   describe "that shadows an existing constant" do
-    with_model :MyConst do
-    end
+    with_model :MyConst
 
     after do
       shadowing_example_ran = true
@@ -96,8 +95,7 @@ describe "a temporary ActiveRecord model created with with_model" do
   end
 
   describe "with a plural name" do
-    with_model :BlogPosts do
-    end
+    with_model :BlogPosts
 
     it "should not singularize the constant name" do
       BlogPosts.should be
@@ -106,8 +104,7 @@ describe "a temporary ActiveRecord model created with with_model" do
   end
 
   describe "with a name containing capital letters" do
-    with_model :BlogPost do
-    end
+    with_model :BlogPost
 
     it "should tableize the table name" do
       BlogPost.table_name.should match(/_blog_posts_/)
@@ -116,8 +113,7 @@ describe "a temporary ActiveRecord model created with with_model" do
   end
 
   describe "with a name with underscores" do
-    with_model :blog_post do
-    end
+    with_model :blog_post
 
     it "should constantize the name" do
       BlogPost.should be
@@ -200,6 +196,46 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
   end
 
+  context "without a block" do
+    with_model :BlogPost
+
+    it "should act like a normal ActiveRecord model" do
+      record = BlogPost.create!
+      record.reload
+      record.destroy
+      lambda {
+        record.reload
+      }.should raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    if defined?(ActiveModel)
+      describe "the class" do
+        subject { BlogPost.new }
+        it_should_behave_like "ActiveModel"
+      end
+    end
+  end
+
+  context "with an empty block" do
+    with_model(:BlogPost) {}
+
+    it "should act like a normal ActiveRecord model" do
+      record = BlogPost.create!
+      record.reload
+      record.destroy
+      lambda {
+        record.reload
+      }.should raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    if defined?(ActiveModel)
+      describe "the class" do
+        subject { BlogPost.new }
+        it_should_behave_like "ActiveModel"
+      end
+    end
+  end
+
   context "without a model block" do
     with_model :BlogPost do
       table do |t|
@@ -255,4 +291,20 @@ describe "a temporary ActiveRecord model created with with_model" do
       end
     end
   end
+
+  context "with ActiveSupport::DescendantsTracker" do
+    with_model :BlogPost
+
+    it "includes the correct model class in descendants on the first test run" do
+      ActiveRecord::Base.descendants.detect do |c|
+        c.table_name == BlogPost.table_name
+      end.should == BlogPost
+    end
+
+    it "includes the correct model class in descendants on the second test run" do
+      ActiveRecord::Base.descendants.detect do |c|
+        c.table_name == BlogPost.table_name
+      end.should == BlogPost
+    end
+  end
 end

data/with_model.gemspec

@@ -11,12 +11,13 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/Casecommons/with_model"
   s.summary     = %q{Dynamically build a model within an RSpec context}
   s.description = s.summary
+  s.licenses    = ["MIT"]
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activerecord', '>=2.3.5', '<4.0.0'
+  s.add_dependency 'activerecord', '>=2.3.5', '<5.0.0'
   s.add_dependency 'rspec', "~>2.11"
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.2
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -10,34 +9,31 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -45,7 +41,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,34 +72,28 @@ files:
 - spec/with_model_spec.rb
 - with_model.gemspec
 homepage: https://github.com/Casecommons/with_model
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4572723804950659860
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4572723804950659860
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Dynamically build a model within an RSpec context
 test_files:
 - spec/active_record_behaviors_spec.rb