active_table 0.0.4 → 0.0.5

data/lib/active_table/base.rb

@@ -1,11 +1,10 @@
 module ActiveTable
   class Base < ActiveRecord::Base
-    @@tables = {}
+    @@insert_statements = []
     def self.active_table(&block)
+      @table = {}
       block.call
-      ActiveRecord::Base.connection_pool.connections.each do |connection|
-        create_tables(connection)
-      end
+      create_table!
       self.reset_column_information
       self.define_attribute_methods
     end
@@ -13,35 +12,38 @@ module ActiveTable
     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 => []}
+      @table = {:name => name, :options => options, :block => block, :rows => []}
     end
 
     def self.insert(params)
       class_name = self.name
-      @@tables[class_name][:rows] << params
+      @table[:rows] << params
     end
 
-    def self.create_tables(connection)
-      started_inside_a_transaction = !connection.outside_transaction?
-      begin
-        connection.execute("COMMIT") if started_inside_a_transaction
-      rescue ActiveRecord::StatementInvalid
-        started_inside_a_transaction = false
+    def self.create_table!
+      connection = ActiveRecord::Base.connection
+      connection.execute "DROP TABLE IF EXISTS #{connection.quote_table_name(@table[:name])}"
+
+      connection.create_table @table[:name], @table[:options] do |t|
+        @table[:block].call(t)
       end
 
-      @@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
+      @@insert_statements.reject!{|statement| statement[:table_name] == @table[:name]}
+      @table[:rows].each do |row|
+        insert_sql = generate_insert_sql_for_hash(connection, @table[:name], row)
+        connection.execute insert_sql
+        @@insert_statements << {:table_name => @table[:name], :sql => insert_sql}
+      end
+    end
 
-        table[:rows].each do |row|
-          connection.execute generate_insert_sql_for_hash(connection, table[:name], row)
+    def self.seed!
+      connection = ActiveRecord::Base.connection
+      @@insert_statements.each do |insert|
+        begin
+          connection.execute(insert[:sql])
+        rescue ActiveRecord::RecordNotUnique
         end
-        connection.mark_active_table_as_loaded(table[:name])
       end
-
-      connection.execute("BEGIN") if started_inside_a_transaction
     end
 
     def self.generate_insert_sql_for_hash(connection, table_name, params)
@@ -49,9 +51,5 @@ module ActiveTable
       values = params.values.map {|v| connection.quote(v.to_s)}.join(", ")
       "INSERT INTO #{connection.quote_table_name(table_name.to_s)} (#{keys}) VALUES (#{values})"
     end
-
-    def self.reset_table_information
-      @@tables = {}
-    end
   end
 end

data/lib/active_table/railtie.rb

@@ -0,0 +1,14 @@
+module ActiveTable
+  class Railtie < Rails::Railtie
+    initializer "active_table", :after => "casebook2_extensions" do
+      Dir.glob("#{Rails.root}/app/models/**/*.rb").each do |file|
+        File.open(file).readlines.each do |line|
+          if (line =~ /ActiveTable::Base/)
+            require file if Rails.env.dev?
+            next
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_table/version.rb

@@ -1,3 +1,3 @@
 module ActiveTable
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/active_table.rb

@@ -1,7 +1,4 @@
 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'
+require 'active_table/railtie' if defined?(Rails)

data/spec/active_table_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe "a model created with active_table" do
   before(:each) do
     @connection_pool = ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ":memory:")
+    @connection = @connection_pool.connection
   end
 
   after(:each) do
     @connection_pool.disconnect!
-    ActiveTable::Base.reset_table_information
   end
 
   it "should inherit from ActiveRecord::Base" do
@@ -15,9 +15,10 @@ describe "a model created with active_table" do
   end
 
   it "should behave like an ActiveRecord model" do
-    class TemporaryModel < ActiveTable::Base
+
+    class AwesomeModel < ActiveTable::Base
       active_table do
-        create_table :temporary_models do |t|
+        create_table :awesome_models do |t|
           t.string :name
         end
 
@@ -26,41 +27,16 @@ describe "a model created with active_table" do
       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
+    AwesomeModel.count.should == 2
   end
 
   context "#active_table" do
     it "should perform oprerations immediately and correctly reload attributes" do
-      connection = @connection_pool.checkout
-
       lambda {
-        class TemporaryModel < ActiveTable::Base
+        class AwesomeModel < ActiveTable::Base
           active_table do
-            self.table_name = "temporary_models"
-            create_table :temporary_models do |t|
+            self.table_name = "awesome_models"
+            create_table :awesome_models do |t|
               t.string :name
             end
           end
@@ -71,52 +47,69 @@ describe "a model created with active_table" do
     end
   end
 
+  context "#seed!" do
+    it "should attempt to re-insert all rows" do
+      class AwesomeModel < ActiveTable::Base
+        active_table do
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+
+          insert :id => 1, :name => "foo"
+          insert :id => 4, :name => "baz"
+        end
+      end
+
+      @connection.execute("SELECT * FROM awesome_models").size.should == 2
+      @connection.execute("DELETE FROM awesome_models")
+      @connection.execute("SELECT * FROM awesome_models").size.should == 0
+      ActiveTable::Base.seed!
+      @connection.execute("SELECT * FROM awesome_models").size.should == 2
+    end
+  end
+
   context "when a connection is opened" do
     it "should create a table from its model definition" do
-      class TemporaryModel < ActiveTable::Base
+      class AwesomeModel < ActiveTable::Base
         active_table do
-          create_table :temporary_models do |t|
+          create_table :awesome_models do |t|
             t.string :name
           end
         end
       end
 
-      connection = @connection_pool.connection
-
       lambda {
-        connection.execute("SELECT * FROM temporary_models")
+        @connection.execute("SELECT * FROM awesome_models")
       }.should_not raise_error
     end
 
     it "should create multiple tables at the same time" do
-      class TemporaryModel < ActiveTable::Base
+      class AwesomeModel < ActiveTable::Base
         active_table do
-          create_table :temporary_models do |t|
+          create_table :awesome_models do |t|
             t.string :name
           end
         end
       end
 
-      class TemporaryModelTwo < ActiveTable::Base
+      class AwesomeModelTwo < ActiveTable::Base
         active_table do
-          create_table :temporary_models_two do |t|
+          create_table :awesome_models_two do |t|
             t.string :name
           end
         end
       end
 
-      connection = @connection_pool.connection
-
       lambda {
-        connection.execute("SELECT * FROM temporary_models")
-        connection.execute("SELECT * FROM temporary_models_two")
+        @connection.execute("SELECT * FROM awesome_models")
+        @connection.execute("SELECT * FROM awesome_models_two")
       }.should_not raise_error
     end
 
     it "should insert rows of data specified within the model" do
-      class TemporaryModel < ActiveTable::Base
+      class AwesomeModel < ActiveTable::Base
         active_table do
-          create_table :temporary_models do |t|
+          create_table :awesome_models do |t|
             t.string :name
           end
 
@@ -125,19 +118,17 @@ describe "a model created with active_table" do
         end
       end
 
-      connection = @connection_pool.connection
-
-      connection.execute("SELECT * FROM temporary_models").size.should == 2
-      connection.execute("SELECT * FROM temporary_models WHERE id = 1").first["name"].should == "foo"
-      connection.execute("SELECT * FROM temporary_models WHERE name = 'baz'").first["id"].should == 4
+      @connection.execute("SELECT * FROM awesome_models").size.should == 2
+      @connection.execute("SELECT * FROM awesome_models WHERE id = 1").first["name"].should == "foo"
+      @connection.execute("SELECT * FROM awesome_models WHERE name = 'baz'").first["id"].should == 4
     end
   end
 
   context "when inserting data" do
     it "should handle apostrophes without blowing up" do
-      class TemporaryModel < ActiveTable::Base
+      class AwesomeModel < ActiveTable::Base
         active_table do
-          create_table :temporary_models do |t|
+          create_table :awesome_models do |t|
             t.string :name
           end
 
@@ -145,33 +136,7 @@ describe "a model created with active_table" do
         end
       end
 
-      connection = @connection_pool.connection
-
-      connection.execute("SELECT * FROM temporary_models WHERE id = 1").first["name"].should == "foo's the boss?"
-    end
-  end
-
-  context "with multiple connections" do
-    it "should create a temporary table for each connection" do
-      class TemporaryModel < ActiveTable::Base
-        active_table do
-          create_table :temporary_models do |t|
-            t.string :name
-          end
-        end
-      end
-
-      connections = []
-      3.times do
-        connections << @connection_pool.checkout
-      end
-
-      connections.first.should_not == connections.last
-      connections.each do |connection|
-        lambda {
-          connection.execute("SELECT * FROM temporary_models")
-        }.should_not raise_error
-      end
+      @connection.execute("SELECT * FROM awesome_models WHERE id = 1").first["name"].should == "foo's the boss?"
     end
   end
 end

metadata

@@ -1,42 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_table
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Case Commons LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 -04:00
+date: 2011-07-08 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152706580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2152706580
 description: Dynamically-populated ActiveRecord models based on static data
-email: 
+email:
 - casecommons-dev@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -45,42 +41,37 @@ files:
 - gemfiles/Gemfile.common
 - 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/railtie.rb
 - lib/active_table/version.rb
 - spec/active_table_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: https://github.com/Casecommons/active_table
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: active_table
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Dynamically-populated ActiveRecord models based on static data
-test_files: 
+test_files:
 - spec/active_table_spec.rb
 - spec/spec_helper.rb

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

@@ -1,11 +0,0 @@
-ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
-  attr_reader :connections
-
-  private
-  def new_connection
-    connection = ActiveRecord::Base.send(spec.adapter_method, spec.config)
-    ActiveTable::Base.create_tables(connection)
-    connection
-  end
-end
-

data/lib/active_record/connection_adapters/abstract_adapter_extensions.rb

@@ -1,12 +0,0 @@
-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

@@ -1,15 +0,0 @@
-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