active_table 0.1.2 → 0.1.3

data/lib/active_table/base.rb

@@ -4,84 +4,109 @@ module ActiveTable
     @@insert_statements = []
     @@table_list = []
 
-    def self.active_table(&block)
-      @table = {}
-      block.call
+    class << self
+      def active_table(&block)
+        @table = {}
+        block.call
+
+        unless model_loaded?
+          create_table!
+          model_loaded!
+        end
 
-      unless model_loaded?
-        create_table!
-        model_loaded!
+        self.reset_column_information
+        self.define_attribute_methods
       end
 
-      self.reset_column_information
-      self.define_attribute_methods
-    end
+      def model_loaded!
+        return unless defined?(Rails)
+        Rails.active_table_loaded_model_names << self.name
+      end
 
-    def self.model_loaded!
-      return unless defined?(Rails)
-      Rails.active_table_loaded_model_names << self.name
-    end
+      def model_loaded?
+        return false unless defined?(Rails)
+        Rails.active_table_loaded_model_names.include?(self.name)
+      end
 
-    def self.model_loaded?
-      return false unless defined?(Rails)
-      Rails.active_table_loaded_model_names.include?(self.name)
-    end
+      def create_table(name, options = {}, &block)
+        class_name = self.name
+        self.set_table_name name
+        @table = {:name => name, :options => options, :block => block, :rows => []}
+      end
 
-    def self.create_table(name, options = {}, &block)
-      class_name = self.name
-      self.set_table_name name
-      @table = {:name => name, :options => options, :block => block, :rows => []}
-    end
+      def insert(params)
+        class_name = self.name
+        @table[:rows] << params
+      end
 
-    def self.insert(params)
-      class_name = self.name
-      @table[:rows] << params
-    end
+      def table_list
+        @@table_list
+      end
 
-    def self.table_list
-      @@table_list
-    end
+      def add_detected_file(file)
+        @@detected_files << file
+      end
 
-    def self.add_detected_file(file)
-      @@detected_files << file
-    end
+      def detected_files
+        @@detected_files
+      end
 
-    def self.detected_files
-      @@detected_files
-    end
+      def create_table!
+        temp_table_name = "#{@table[:name]}__temp"
+
+        unless connection.table_exists?(temp_table_name)
+          db_drop_and_create_table(temp_table_name, @table[:options], @table[:block])
 
-    def self.create_table!
-      connection = ActiveRecord::Base.connection
-      connection.execute "DROP TABLE IF EXISTS #{connection.quote_table_name(@table[:name])}"
+          unless tables_match?(@table[:name], temp_table_name)
+            db_drop_table(@table[:name])
+            connection.rename_table(temp_table_name, @table[:name])
 
-      connection.create_table @table[:name], @table[:options] do |t|
-        @table[:block].call(t)
+            @@insert_statements.reject!{|statement| statement[:table_name] == @table[:name]}
+            @@table_list << @table[:name] unless @@table_list.include?(@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
+          else
+            db_drop_table(temp_table_name)
+          end
+        end
       end
 
-      @@insert_statements.reject!{|statement| statement[:table_name] == @table[:name]}
-      @@table_list << @table[:name] unless @@table_list.include?(@table[:name])
+      def tables_match?(table_1, table_2)
+        return false unless connection.table_exists?(table_1) and connection.table_exists?(table_2)
+        columns_1 = connection.columns(table_1)
+        columns_2 = connection.columns(table_2)
+        columns_1.to_json == columns_2.to_json
+      end
 
-      @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}
+      def db_drop_and_create_table(name, options, block)
+        db_drop_table(name)
+        connection.create_table name, options do |t|
+          block.call(t)
+        end
+      end
+
+      def db_drop_table(name)
+        connection.execute "DROP TABLE IF EXISTS #{connection.quote_table_name(name)}"
       end
-    end
 
-    def self.seed!
-      connection = ActiveRecord::Base.connection
-      @@insert_statements.each do |insert|
-        begin
-          connection.execute(insert[:sql])
-        rescue ActiveRecord::RecordNotUnique
+      def seed!
+        @@insert_statements.each do |insert|
+          begin
+            connection.execute(insert[:sql])
+          rescue ActiveRecord::RecordNotUnique
+          end
         end
       end
-    end
 
-    def self.generate_insert_sql_for_hash(connection, table_name, params)
-      keys = params.keys.map {|k| connection.quote_column_name(k.to_s)}.join(", ")
-      values = params.values.map {|v| connection.quote(v.to_s)}.join(", ")
-      "INSERT INTO #{connection.quote_table_name(table_name.to_s)} (#{keys}) VALUES (#{values})"
+      def generate_insert_sql_for_hash(connection, table_name, params)
+        keys = params.keys.map {|k| connection.quote_column_name(k.to_s)}.join(", ")
+        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
     end
   end
 end

data/lib/active_table/version.rb

@@ -1,3 +1,3 @@
 module ActiveTable
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/active_table_spec.rb

@@ -15,7 +15,6 @@ describe "a model created with active_table" do
   end
 
   it "should behave like an ActiveRecord model" do
-
     class AwesomeModel < ActiveTable::Base
       active_table do
         create_table :awesome_models do |t|
@@ -45,6 +44,56 @@ describe "a model created with active_table" do
         end
       }.should_not raise_error
     end
+
+    it "should not drop and recreate a table if the table definition is unchanged" do
+      class AwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+
+          insert :id => 1, :name => "foo"
+        end
+      end
+
+      class MoreAwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+        end
+      end
+
+      @connection.execute("SELECT * FROM awesome_models").size.should == 1
+    end
+
+    it "should drop and recreate a table if the table definition is changed" do
+      class AwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :name
+          end
+
+          insert :id => 1, :name => "foo"
+        end
+      end
+
+      class MoreAwesomeModel < ActiveTable::Base
+        active_table do
+          self.table_name = "awesome_models"
+          create_table :awesome_models do |t|
+            t.string :different_name
+          end
+        end
+      end
+
+      @connection.execute("SELECT * FROM awesome_models").size.should == 0
+      lambda { @connection.execute("SELECT name FROM awesome_models") }.should raise_error
+      lambda { @connection.execute("SELECT different_name FROM awesome_models") }.should_not raise_error
+    end
   end
 
   context "#table_list" do
@@ -101,7 +150,7 @@ describe "a model created with active_table" do
     end
   end
 
-  context "when a connection is opened" do
+  context "when an active_table block is encountered" do
     it "should create a table from its model definition" do
       class AwesomeModel < ActiveTable::Base
         active_table do

metadata

@@ -1,56 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_table
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Case Commons LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2165817320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2165817320
 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
@@ -68,37 +49,28 @@ files:
 - spec/spec_helper.rb
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: active_table
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 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