with_model 0.2.3 → 0.2.4

data/.rspec

@@ -1 +1,2 @@
---colour
+--color
+--format documentation

data/CHANGELOG

@@ -1,3 +1,9 @@
+### 0.2.4
+
+Active Record 3.1 compatible.
+Fix bug where column information was being cached incorrectly by Active
+Record.
+
 ### 0.2.3
 
 Create a new class each run to prevent test pollution. (J. Andrew Marshall)

data/gemfiles/Gemfile.common

@@ -1,11 +1,9 @@
 source :rubygems
 
-# gemspec :path => File.join(File.dirname(__FILE__), '..')
-
 gem "mixico"
 gem "rake"
 
 group :test do
   gem "autotest"
-  gem "sqlite3-ruby"
+  gem "sqlite3"
 end

data/gemfiles/rspec1/Gemfile

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

data/gemfiles/rspec2/Gemfile

@@ -1,6 +1,4 @@
 filename = File.join(File.dirname(__FILE__), '..', 'Gemfile.common')
 eval(File.read(filename), binding, filename, 1)
 
-gem "rspec", "~>2.0"
-gem "activerecord", "~>3.0.0"
-
+gemspec :path => File.join(File.dirname(__FILE__), '..', '..')

data/lib/with_model.rb

@@ -13,7 +13,7 @@ module WithModel
     end
 
     after do
-      connection.drop_table(name) rescue nil
+      connection.drop_table(name)
     end
   end
 end

data/lib/with_model/dsl.rb

@@ -32,6 +32,8 @@ module WithModel
 
       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) }
@@ -39,6 +41,7 @@ module WithModel
           set_table_name table_name
           self.class_eval(&model_initialization)
         end
+        model.reset_column_information
       end
 
       @example_group.after do
@@ -46,8 +49,6 @@ module WithModel
         Object.send(:remove_const, const_name)
         Object.const_set(const_name, original_const_value) if original_const_defined
       end
-
-      @example_group.with_table(table_name, @table_options, &@table_block)
     end
   end
 end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/spec.opts

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

data/spec/spec_helper.rb

@@ -41,3 +41,8 @@ if defined?(ActiveModel)
     before { @model = subject }
   end
 end
+
+if ENV["LOGGER"]
+  require "logger"
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
+end

data/spec/with_model_spec.rb

@@ -239,6 +239,7 @@ describe "a temporary ActiveRecord model created with with_model" do
     end
 
     it "should act like a normal ActiveRecord model" do
+      BlogPost.columns.map(&:name).should == ["id"]
       record = BlogPost.create!
       record.reload
       record.destroy

data/with_model.gemspec

@@ -18,4 +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"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: with_model
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70182266155180 !ruby/object:Gem::Requirement
+  requirement: &2168918400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,7 +25,18 @@ dependencies:
         version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70182266155180
+  version_requirements: *2168918400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2168917640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2168917640
 description: Dynamically build a model within an Rspec context
 email:
 - casecommons-dev@googlegroups.com
@@ -51,6 +62,7 @@ files:
 - 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
@@ -81,5 +93,6 @@ 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