with_model 0.2.6 → 0.3

data/.gitignore

@@ -4,5 +4,5 @@ pkg/*
 .bundle
 .rvmrc
 doc
-gemfiles/**/Gemfile.lock
-*.rbc
+Gemfile.lock
+*.rbc

data/CHANGELOG

@@ -1,3 +1,13 @@
+### 0.3
+
+Use RSpec 2.11's built-in constant stubbing.
+Remove RSpec 1.x and Active Record 2.x support.
+Remove Mixico support.
+
+### 0.2.6
+
+Active Record 3.2 compatible. (Steven Harman / Brent Wheeldon)
+
 ### 0.2.5
 
 Clear Active Record 3.x associations class cache between specs to clean up test

data/Gemfile

@@ -1,4 +1,7 @@
-puts <<-MESSAGE
-This project uses multiple Gemfiles in subdirectories of ./gemfiles.
-The rake tasks automatically install these bundles as necessary. See rake -T.
-MESSAGE
+source :rubygems
+
+gemspec
+
+gem "rake"
+gem "sqlite3", :platforms => :ruby
+gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby

data/README.rdoc

@@ -2,7 +2,7 @@
 
 * 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://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]
 
 == DESCRIPTION
 
@@ -12,22 +12,12 @@
 
  gem install with_model
 
-=== RSpec 2
-
 In spec_helper.rb:
 
   RSpec.configure do |config|
     config.extend WithModel
   end
 
-=== Rspec 1
-
-In spec_helper.rb:
-
-  Spec::Runner.configure do |config|
-    config.extend WithModel
-  end
-
 == USAGE
 
 In an RSpec example group, call +with_model+ and inside its block pass it a +table+ block and a +model+ block.
@@ -119,16 +109,10 @@ In an RSpec example group, call +with_model+ and inside its block pass it a +tab
     end
   end
 
-=== Mixico
-
-If you have the +mixico+ gem installed, WithModel will automatically unmix any modules that were mixed into your model class. Without +mixico+, each module will hold a reference to the class for the remainder of your test suite.
-
-Usually unmixing isn't necessary, but it can be helpful if you use something like Module#included_in_classes (from Active Support 2.3) in a later test to ask a module which classes it has been mixed into.
-
 == REQUIREMENTS
 
-* RSpec
-* ActiveRecord 2 or 3
+* RSpec 2.11 or higher (for earlier RSpec versions, use 0.2.x)
+* ActiveRecord 3 (for ActiveRecord 2, use 0.2.x)
 
 == LICENSE:
 

data/Rakefile

@@ -1,38 +1,15 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-environments = %w[rspec1 rspec2]
-major, minor, revision = RUBY_VERSION.split(".").map{|str| str.to_i }
-
-in_environment = lambda do |environment, command|
-  sh %Q{export BUNDLE_GEMFILE="gemfiles/#{environment}/Gemfile"; bundle update && bundle exec #{command}}
-end
+task :default => :spec
 
-in_all_environments = lambda do |command|
-  environments.each do |environment|
-    puts "\n---#{environment}---\n"
-    in_environment.call(environment, command)
-  end
+def bundle_exec(command)
+  sh %Q{bundle update && bundle exec #{command}}
 end
 
-autotest_styles = {
-  :rspec1 => 'rspec',
-  :rspec2 => 'rspec2'
-}
-
-desc "Run all specs against Rspec 1 and 2"
+desc "Run all specs"
 task "spec" do
-  in_environment.call('rspec1', 'spec spec') if major == 1 && minor < 9
-  in_environment.call('rspec2', 'rspec spec')
-end
-
-namespace "autotest" do
-  environments.each do |environment|
-    desc "Run autotest in #{environment}"
-    task environment do
-      in_environment.call(environment, "autotest -s #{autotest_styles[environment.to_sym]}")
-    end
-  end
+  bundle_exec("rspec spec")
 end
 
 namespace "doc" do

data/lib/with_model.rb

@@ -1,12 +1,15 @@
-require "with_model/dsl"
-
 module WithModel
+  autoload :Base, "with_model/base"
+  autoload :Dsl, "with_model/dsl"
+  autoload :VERSION, "with_model/version"
+
   def with_model(name, &block)
     Dsl.new(name, self).tap { |dsl| dsl.instance_eval(&block) }.execute
   end
 
   def with_table(name, options = {}, &block)
     connection = ActiveRecord::Base.connection
+
     before do
       connection.drop_table(name) if connection.table_exists?(name)
       connection.create_table(name, options, &block)

data/lib/with_model/base.rb

@@ -1,8 +1,3 @@
-begin
-  require 'mixico'
-rescue LoadError
-end
-
 module WithModel
   class Base < ActiveRecord::Base
     self.abstract_class = true
@@ -10,24 +5,6 @@ module WithModel
       def with_model?
         true
       end
-
-      if defined?(Mixico)
-        def include(*args)
-          @modules_to_unmix ||= []
-          args.each do |mod|
-            unless @modules_to_unmix.include?(mod)
-              @modules_to_unmix << mod
-            end
-          end
-          super
-        end
-
-        def _with_model_deconstructor
-          @modules_to_unmix.each do |mod|
-            disable_mixin mod
-          end if defined?(@modules_to_unmix)
-        end
-      end
     end
   end
 end

data/lib/with_model/dsl.rb

@@ -1,4 +1,3 @@
-require 'with_model/base'
 require 'active_support/inflector'
 
 module WithModel
@@ -24,20 +23,17 @@ module WithModel
 
     def execute
       model_initialization = @model_initialization
-      const_name = @name.to_s.camelize.to_sym
+      const_name = @name.to_s.camelize
       table_name = "with_model_#{@name.to_s.tableize}_#{$$}"
 
-      original_const_defined = Object.const_defined?(const_name)
-      original_const_value = Object.const_get(const_name) if original_const_defined
-
       model = nil
 
       @example_group.with_table(table_name, @table_options, &@table_block)
 
       @example_group.before do
         model = Class.new(WithModel::Base)
-        silence_warnings { Object.const_set(const_name, model) }
-        Object.const_get(const_name).class_eval do
+        stub_const(const_name, model)
+        model.class_eval do
           self.table_name = table_name
           self.class_eval(&model_initialization)
         end
@@ -45,9 +41,6 @@ module WithModel
       end
 
       @example_group.after do
-        model._with_model_deconstructor if model.respond_to?(:_with_model_deconstructor)
-        Object.send(:remove_const, const_name)
-        Object.const_set(const_name, original_const_value) if original_const_defined
         if defined?(ActiveSupport::Dependencies::Reference)
           ActiveSupport::Dependencies::Reference.clear!
         end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.2.6"
+  VERSION = "0.3"
 end

data/spec/active_record_behaviors_spec.rb

@@ -79,7 +79,6 @@ describe "ActiveRecord behaviors" do
       with_table :animals
 
       with_model :StuffedAnimal do
-        table
         model do
           has_many :tea_cups, :as => :pet
         end

data/spec/spec_helper.rb

@@ -1,16 +1,8 @@
 require "active_record"
 require "with_model"
 
-if defined?(RSpec)
-  # For RSpec 2 users.
-  RSpec.configure do |config|
-    config.extend WithModel
-  end
-else
-  # For RSpec 1 users.
-  Spec::Runner.configure do |config|
-    config.extend WithModel
-  end
+RSpec.configure do |config|
+  config.extend WithModel
 end
 
 jruby = RUBY_PLATFORM =~ /\bjava\b/

data/with_model.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Case Commons, LLC", "Grant Hutchins"]
   s.email       = ["casecommons-dev@googlegroups.com", "gems@nertzy.com"]
   s.homepage    = "https://github.com/Casecommons/with_model"
-  s.summary     = %q{Dynamically build a model within an Rspec context}
+  s.summary     = %q{Dynamically build a model within an RSpec context}
   s.description = s.summary
 
   s.files         = `git ls-files`.split("\n")
@@ -18,5 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activerecord', '>=2.3.5', '<4.0.0'
-  s.add_dependency 'rspec', "<3"
+  s.add_dependency 'rspec', "~>2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70199881019880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,19 +25,32 @@ dependencies:
         version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70199881019880
+  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
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70199881019120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70199881019120
-description: Dynamically build a model within an Rspec context
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+description: Dynamically build a model within an RSpec context
 email:
 - casecommons-dev@googlegroups.com
 - gems@nertzy.com
@@ -54,16 +67,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/Gemfile.common
-- gemfiles/rspec1/Gemfile
-- gemfiles/rspec2/Gemfile
 - lib/with_model.rb
 - lib/with_model/base.rb
 - lib/with_model/dsl.rb
 - lib/with_model/version.rb
 - spec/active_record_behaviors_spec.rb
 - spec/readme_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/with_model_spec.rb
 - with_model.gemspec
@@ -87,13 +96,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Dynamically build a model within an Rspec context
+summary: Dynamically build a model within an RSpec context
 test_files:
 - spec/active_record_behaviors_spec.rb
 - spec/readme_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/with_model_spec.rb

data/gemfiles/Gemfile.common

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem "rake"
-gem "ZenTest" unless ENV["TRAVIS"]
-gem "mixico", :platforms => :mri unless RUBY_VERSION >= "1.9.3"
-gem "sqlite3", :platforms => :ruby
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby

data/gemfiles/rspec1/Gemfile

@@ -1,5 +0,0 @@
-filename = File.join(File.dirname(__FILE__), '..', 'Gemfile.common')
-eval(File.read(filename), binding, filename, 1)
-
-gem "rspec", "~>1.0"
-gem "activerecord", "~>2.3"

data/gemfiles/rspec2/Gemfile

@@ -1,4 +0,0 @@
-filename = File.join(File.dirname(__FILE__), '..', 'Gemfile.common')
-eval(File.read(filename), binding, filename, 1)
-
-gemspec :path => File.join(File.dirname(__FILE__), '..', '..')

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format nested