unit_record 0.2.0 → 0.3.0

data/CHANGELOG

@@ -0,0 +1,12 @@
+*0.3.0* (August 22nd, 2007)
+
+* Works with models using non-conventional table names.
+
+*0.2.0* (August 16th, 2007)
+
+* Cache columns based on schema.rb
+
+*0.1.0* (August 15th, 2007)
+
+* Converted plugin into a gem.
+* No longer depend on Rake task to dump and cache columns.

data/README

@@ -23,7 +23,7 @@ One huge benefit to disconnecting unit tests from the database is having a faste
 
 === Restructuring the Rails Test Directory
 
-The Rails test directory typically places testing for models under <tt>test/unit</tt> and tests for controllers under <tt>test/functional</tt>.  However, we need to change the definition of unit and functional.  Controllers can be unit tested (mocking out models and not rendering the view).  Models can be functionally tested (hitting the database).  Also, each type of test needs its own test_helper.  You should restructure your test directory like this:
+The Rails test directory typically places testing for models under <tt>test/unit</tt> and tests for controllers under <tt>test/functional</tt>.  However, we need to change the definition of unit and functional.  Controllers can be unit tested (mocking out models and not rendering the view).  Models can be functionally tested (hitting the database).  Also, each type of test needs its own test_helper.  I recommend restructuring your test directory like this:
   test
     test_helper.rb
     unit
@@ -37,7 +37,7 @@ The Rails test directory typically places testing for models under <tt>test/unit
 
 You should move existing functional tests into functional/controllers.  You will also need to change the require line at the top of those tests to require the functional_test_helper.rb file instead of the test_helper.rb file.
 
-The <tt>functional_test_helper.rb</tt> file should require <tt>test_helper.rb</tt> for now:
+The <tt>functional_test_helper.rb</tt> file only needs to require <tt>test_helper.rb</tt>:
   require File.dirname(__FILE__) + "/../test_helper"
 
 For moving unit tests, you have a few options.  I recommend moving them to unit/models and then disconnecting your unit tests from the database.  Any tests that fail should then be modified to not hit the database or moved to functional/models.
@@ -49,11 +49,7 @@ In the <tt>test/unit/unit_test_helper.rb</tt> file you created when restructurin
   require "unit_record"
   ActiveRecord::Base.disconnect!
   
-The <tt>disconnect!</tt> method will do everything necessary to run your unit tests without hitting the database.  For now, it connects to the database and caches the columns in a file (db/columns.rb) before disconnecting.  A later version will not need to connect at all.
-
-== Limitations
-
-* UnitRecord currently only works when all models use convention for table names.
+The <tt>disconnect!</tt> method will do everything necessary to run your unit tests without hitting the database.
 
 == Thanks
 Thanks to Jay Fields for the original implementation:

data/Rakefile

@@ -27,7 +27,7 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = "doc"
   rdoc.title    = "UnitRecord"
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('README', 'CHANGELOG')
 end
 
 desc "Upload RDoc to RubyForge"
@@ -40,7 +40,7 @@ Gem::manage_gems
 specification = Gem::Specification.new do |s|
 	s.name   = "unit_record"
   s.summary = "UnitRecord enables unit testing without hitting the database."
-	s.version = "0.2.0"
+	s.version = "0.3.0"
 	s.author = "Dan Manges"
 	s.description = "UnitRecord enables unit testing without hitting the database."
 	s.email = "daniel.manges@gmail.com"
@@ -48,11 +48,11 @@ specification = Gem::Specification.new do |s|
   s.rubyforge_project = "unit-test-ar"
 
   s.has_rdoc = true
-  s.extra_rdoc_files = ['README']
+  s.extra_rdoc_files = ['README', 'CHANGELOG']
   s.rdoc_options << '--title' << "UnitRecord" << '--main' << 'README' << '--line-numbers'
 
   s.autorequire = "unit_record"
-  s.files = FileList['{lib,test}/**/*.rb', '^[A-Z]+$', 'Rakefile', 'init.rb'].to_a
+  s.files = FileList['{lib,test}/**/*.rb', 'CHANGELOG', 'README', 'Rakefile'].to_a
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/lib/unit_record/column_cacher.rb

@@ -2,13 +2,13 @@ module UnitRecord
   class ColumnCacher
     include ActiveRecord::ConnectionAdapters::SchemaStatements
 
-    def self.cache(file)
+    def self.cache(schema_file)
       (class << ActiveRecord::Schema; self; end).class_eval do
         def define(options={}, &block)
           UnitRecord::ColumnCacher.new.instance_eval(&block)
         end
       end
-      load file
+      load schema_file
     end
 
     def add_index(table_name, column_name, options = {})
@@ -18,15 +18,10 @@ module UnitRecord
       table_definition = ActiveRecord::ConnectionAdapters::TableDefinition.new(self)
       table_definition.primary_key(options[:primary_key] || "id") unless options[:id] == false
       yield table_definition
-      if model = model_for_table(table_name)
-        (class << model; self; end).class_eval do
-          define_method(:columns) do
-            table_definition.columns.map do |c|
-              ActiveRecord::ConnectionAdapters::Column.new(c.name.to_s, c.default, c.sql_type, c.null)
-            end
-          end
+      ActiveRecord::Base.cached_columns[table_name.to_s] =
+        table_definition.columns.map do |c|
+          ActiveRecord::ConnectionAdapters::Column.new(c.name.to_s, c.default, c.sql_type, c.null)
         end
-      end
     end
     
     def native_database_types
@@ -46,9 +41,5 @@ module UnitRecord
         :boolean     => { :name => "tinyint", :limit => 1 }
       }
     end
-
-    def model_for_table(table)
-      table.to_s.classify.constantize rescue nil
-    end
   end
 end

data/lib/unit_record/disconnected_active_record.rb

@@ -6,6 +6,13 @@ module UnitRecord
     def disconnect!
       return if disconnected?
       (class << self; self; end).class_eval do
+        def cached_columns
+          @@_cached_columns ||= {}
+        end
+        def columns
+          cached_columns[table_name] ||
+           raise("Columns are not cached for '#{table_name}' - check schema.rb")
+        end
         def connection
           raise "ActiveRecord is disconnected; database access is unavailable in unit tests."
         end
@@ -18,8 +25,6 @@ module UnitRecord
       end
       Fixtures.disconnect!
       Test::Unit::TestCase.disconnect!
-      old_columns_file = File.join(RAILS_ROOT, 'db', 'columns.rb')
-      File.delete old_columns_file if File.exists?(old_columns_file)
       ColumnCacher.cache(RAILS_ROOT + "/db/schema.rb")
     end
   end

data/test/db/schema.rb

@@ -9,5 +9,9 @@ ActiveRecord::Schema.define(:version => 0) do
     t.column :last_name,  :string
   end
   
+  create_table :foofoo, :force => true do |t|
+    t.column :bar, :string
+  end
+  
   add_index "people", ["first_name"]
 end

data/test/functional/column_test.rb

@@ -18,6 +18,23 @@ functional_tests do
     assert_equal 42, record.some_count
   end
   
-  test "" do
+  test "a model with a non-convential table name does not blow up" do
+    assert_nothing_raised { Foo.columns }
+  end
+  
+  test "using attribute on a model with a non-conventional table name" do
+    foo = Foo.new
+    foo.bar = "baz"
+    assert_equal "baz", foo.bar
+  end
+  
+  test "should get a descriptive error message if no cached columns" do
+    exception = nil
+    begin
+      DoesNotExist.columns
+    rescue => exception
+    end
+    assert_not_nil exception
+    assert_equal "Columns are not cached for 'table_does_not_exist' - check schema.rb", exception.message
   end
 end

data/test/test_helper.rb

@@ -23,3 +23,9 @@ class Preference < ActiveRecord::Base
 end
 class Person < ActiveRecord::Base
 end
+class Foo < ActiveRecord::Base
+  set_table_name :foofoo
+end
+class DoesNotExist < ActiveRecord::Base
+  set_table_name "table_does_not_exist"
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: unit_record
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-08-16 00:00:00 -04:00
+  version: 0.3.0
+date: 2007-08-22 00:00:00 -04:00
 summary: UnitRecord enables unit testing without hitting the database.
 require_paths: 
 - lib
@@ -44,9 +44,9 @@ files:
 - test/functional/disconnected_test_case_test.rb
 - test/functional/functional_test_helper.rb
 - test/unit/column_extension_test.rb
-- Rakefile
-- init.rb
+- CHANGELOG
 - README
+- Rakefile
 test_files: []
 
 rdoc_options: 
@@ -57,6 +57,7 @@ rdoc_options:
 - --line-numbers
 extra_rdoc_files: 
 - README
+- CHANGELOG
 executables: []
 
 extensions: []

data/init.rb

@@ -1 +0,0 @@
-require "unit_record"