active_table 0.0.1 → 0.0.2

data/lib/active_record/connection_adapters/abstract/connection_pool_extensions.rb

@@ -1,4 +1,6 @@
 ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
+  attr_reader :connections
+
   private
   def new_connection
     connection = ActiveRecord::Base.send(spec.adapter_method, spec.config)

data/lib/active_record/connection_adapters/abstract_adapter_extensions.rb

@@ -0,0 +1,12 @@
+ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+  def mark_active_table_as_loaded(table_name)
+    @active_tables_loaded ||= []
+    @active_tables_loaded << table_name
+  end
+
+  def active_table_loaded_for?(table_name)
+    return false if @active_tables_loaded.blank?
+    @active_tables_loaded.include?(table_name)
+  end
+end
+

data/lib/active_record/connection_adapters/sqlite_adapter_extensions.rb

@@ -0,0 +1,15 @@
+ActiveRecord::ConnectionAdapters::SQLiteAdapter.class_eval do
+  def tables(name = nil) #:nodoc:
+    sql = <<-SQL
+      SELECT name FROM sqlite_master
+      WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+      UNION
+      SELECT name FROM sqlite_temp_master
+      WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+    SQL
+
+    execute(sql, name).map do |row|
+      row['name']
+    end
+  end
+end

data/lib/active_table/base.rb

@@ -1,8 +1,18 @@
 module ActiveTable
   class Base < ActiveRecord::Base
     @@tables = {}
+    def self.active_table(&block)
+      block.call
+      ActiveRecord::Base.connection_pool.connections.each do |connection|
+        create_tables(connection)
+      end
+      self.reset_column_information
+      self.define_attribute_methods
+    end
+
     def self.create_table(name, options = {}, &block)
       class_name = self.name
+      self.set_table_name name
       @@tables[class_name] = {:name => name, :options => options, :block => block, :rows => []}
     end
 
@@ -13,6 +23,7 @@ module ActiveTable
 
     def self.create_tables(connection)
       @@tables.each_value do |table|
+        next if connection.active_table_loaded_for?(table[:name])
         connection.create_table table[:name], table[:options].merge(:temporary => true) do |t|
           table[:block].call(t)
         end
@@ -20,6 +31,7 @@ module ActiveTable
         table[:rows].each do |row|
           connection.execute generate_insert_sql_for_hash(connection, table[:name], row)
         end
+        connection.mark_active_table_as_loaded(table[:name])
       end
     end
 
@@ -28,5 +40,9 @@ module ActiveTable
       values = params.values.map {|v| connection.quote(v.to_s)}.join(", ")
       "INSERT INTO #{connection.quote(table_name.to_s)} (#{keys}) VALUES (#{values})"
     end
+
+    def self.reset_table_information
+      @@tables = {}
+    end
   end
 end

data/lib/active_table/version.rb

@@ -1,3 +1,3 @@
 module ActiveTable
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/active_table.rb

@@ -1,4 +1,7 @@
 require 'active_record'
 require 'active_record/connection_adapters/abstract_adapter'
+require 'active_record/connection_adapters/abstract_adapter_extensions'
+require 'active_record/connection_adapters/sqlite_adapter'
+require 'active_record/connection_adapters/sqlite_adapter_extensions'
 require 'active_record/connection_adapters/abstract/connection_pool_extensions'
 require 'active_table/base'

data/spec/active_table_spec.rb

@@ -1,23 +1,83 @@
 require 'spec_helper'
 
-describe "a temporary ActiveRecord model created with with_model" do
+describe "a model created with active_table" do
   before(:each) do
     @connection_pool = ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
   end
 
   after(:each) do
     @connection_pool.disconnect!
+    ActiveTable::Base.reset_table_information
   end
 
   it "should inherit from ActiveRecord::Base" do
     ActiveTable::Base.superclass.should == ActiveRecord::Base
   end
 
+  it "should behave like an ActiveRecord model" do
+    class TemporaryModel < ActiveTable::Base
+      active_table do
+        create_table :temporary_models do |t|
+          t.string :name
+        end
+
+        insert :id => 1, :name => "foo"
+        insert :id => 4, :name => "baz"
+      end
+    end
+
+    connection = @connection_pool.connection
+
+    TemporaryModel.count.should == 2
+  end
+
+  it "should only create the table once for a given connection" do
+    connection = @connection_pool.checkout
+
+    connection.active_table_loaded_for?(:temporary_models).should be_false
+
+    class TemporaryModel < ActiveTable::Base
+      active_table do
+        create_table :temporary_models do |t|
+          t.string :name
+        end
+      end
+    end
+
+    ActiveTable::Base.create_tables(connection)
+    connection.active_table_loaded_for?(:temporary_models).should be_true
+
+    lambda {
+      ActiveTable::Base.create_tables(connection)
+    }.should_not raise_error
+  end
+
+  context "#active_table" do
+    it "should perform oprerations immediately and correctly reload attributes" do
+      connection = @connection_pool.checkout
+
+      lambda {
+        class TemporaryModel < ActiveTable::Base
+          active_table do
+            self.table_name = "temporary_models"
+            create_table :temporary_models do |t|
+              t.string :name
+            end
+          end
+
+          alias_method :foo, :name
+        end
+      }.should_not raise_error
+    end
+  end
+
   context "when a connection is opened" do
     it "should create a table from its model definition" do
       class TemporaryModel < ActiveTable::Base
-        create_table :temporary_models do |t|
-          t.string :name
+        active_table do
+          create_table :temporary_models do |t|
+            t.string :name
+          end
         end
       end
 
@@ -30,14 +90,18 @@ describe "a temporary ActiveRecord model created with with_model" do
 
     it "should create multiple tables at the same time" do
       class TemporaryModel < ActiveTable::Base
-        create_table :temporary_models do |t|
-          t.string :name
+        active_table do
+          create_table :temporary_models do |t|
+            t.string :name
+          end
         end
       end
 
       class TemporaryModelTwo < ActiveTable::Base
-        create_table :temporary_models_two do |t|
-          t.string :name
+        active_table do
+          create_table :temporary_models_two do |t|
+            t.string :name
+          end
         end
       end
 
@@ -51,12 +115,14 @@ describe "a temporary ActiveRecord model created with with_model" do
 
     it "should insert rows of data specified within the model" do
       class TemporaryModel < ActiveTable::Base
-        create_table :temporary_models do |t|
-          t.string :name
-        end
+        active_table do
+          create_table :temporary_models do |t|
+            t.string :name
+          end
 
-        insert :id => 1, :name => "foo"
-        insert :id => 4, :name => "baz"
+          insert :id => 1, :name => "foo"
+          insert :id => 4, :name => "baz"
+        end
       end
 
       connection = @connection_pool.connection
@@ -70,11 +136,13 @@ describe "a temporary ActiveRecord model created with with_model" do
   context "when inserting data" do
     it "should handle apostrophes without blowing up" do
       class TemporaryModel < ActiveTable::Base
-        create_table :temporary_models do |t|
-          t.string :name
-        end
+        active_table do
+          create_table :temporary_models do |t|
+            t.string :name
+          end
 
-        insert :id => 1, :name => "foo's the boss?"
+          insert :id => 1, :name => "foo's the boss?"
+        end
       end
 
       connection = @connection_pool.connection
@@ -86,8 +154,10 @@ describe "a temporary ActiveRecord model created with with_model" do
   context "with multiple connections" do
     it "should create a temporary table for each connection" do
       class TemporaryModel < ActiveTable::Base
-        create_table :temporary_models do |t|
-          t.string :name
+        active_table do
+          create_table :temporary_models do |t|
+            t.string :name
+          end
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_table
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Case Commons LLC
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -04:00
+date: 2011-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,8 @@ files:
 - gemfiles/rspec1/Gemfile
 - gemfiles/rspec2/Gemfile
 - lib/active_record/connection_adapters/abstract/connection_pool_extensions.rb
+- lib/active_record/connection_adapters/abstract_adapter_extensions.rb
+- lib/active_record/connection_adapters/sqlite_adapter_extensions.rb
 - lib/active_table.rb
 - lib/active_table/base.rb
 - lib/active_table/version.rb