citrusbyte-schemer 0.0.4 → 0.0.5

data/lib/schemer.rb

@@ -1,3 +1,5 @@
+require 'activerecord'
+
 module Schemer
   def schema(*args)
     extend  ClassMethods
@@ -8,27 +10,39 @@ module Schemer
   end
 
   module ClassMethods
+    # Columns which we don't touch regardless of not being defined in schema
+    # (and are ignored if they are defined in schema)
     def protected_columns
       %w( id )
     end
+
+    # Create the underlying table for this class
+    def create_table
+      ActiveRecord::Migration.create_table(table_name) do |t|;end;
+    end
+    
+    # Update ActiveRecord's automatically generated methods so we don't have to
+    # reload for schema changes to take effect
+    def update_methods
+      generated_methods.each { |method| remove_method(method) }
+      @columns = @column_names = @columns_hash = @generated_methods = nil
+    end
+    
+    # Update the underlying schema as defined by schema call
+    def update_schema
+      create_table unless table_exists?
+      (schema_columns - column_names).each { |column| ActiveRecord::Migration.add_column(table_name, column, :string) }
+      (column_names - protected_columns - schema_columns).each { |column| ActiveRecord::Migration.remove_column(table_name, column) }
+    end    
   end
   
   module InstanceMethods
     def initialize(*args)
-      update_schema
+      self.class.update_schema
+      self.class.update_methods
       super
     end
-  
-    private
-  
-    def update_schema
-      ActiveRecord::Migration.create_table(self.class.table_name) do |t|;end; unless self.class.table_exists?
-      self.class.schema_columns.each do |column|
-        ActiveRecord::Migration.add_column(self.class.table_name, column, :string) unless respond_to?(column.to_sym)
-        (self.class.column_names - self.class.protected_columns).each do |column|
-          ActiveRecord::Migration.remove_column(self.class.table_name, column) unless self.class.schema_columns.include?(column.to_s)
-        end
-      end
-    end
   end
 end
+
+ActiveRecord::Base.extend(Schemer)

data/rails/init.rb

@@ -1,3 +1,2 @@
+raise "We highly suggest you only use Schemer in development mode!" unless Rails.env.to_s == 'development'
 require 'schemer'
-raise "We would highly suggest you only use Schemer in development mode!" unless Rails.env.to_s == 'development'
-ActiveRecord::Base.extend(Schemer)

data/test/schemer_test.rb

@@ -1,5 +1,43 @@
-require File.dirname(__FILE__) + "/../lib/contest"
+require 'rubygems'
+require 'contest'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'schemer')
 
-class FooTest < Contest::Unit::TestCase
-  # coming soon, tests!
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => 'test/schemer_test.db'
+ActiveRecord::Base.logger = Logger.new(File.join(File.dirname(__FILE__), "debug.log"))
+
+class Foo < ActiveRecord::Base;end;
+ActiveRecord::Migration.drop_table(Foo.table_name) if Foo.table_exists?
+
+class FooTest < Test::Unit::TestCase  
+  context "defining the schema" do
+    setup do
+      Foo.schema :foo, :bar
+      @foo = Foo.new
+    end
+    
+    should "create the foos table" do
+      assert Foo.table_exists?
+    end
+    
+    should "create the foo column" do
+      assert @foo.respond_to?(:foo)
+    end
+
+    should "create the bar column" do
+      assert @foo.respond_to?(:bar)
+    end
+  end
+  
+  context "updating the schema" do
+    setup do
+      Foo.schema :foo, :bar
+      @foo = Foo.new
+      Foo.schema :foo
+      @foo = Foo.new
+    end
+    
+    should "remove the bar column" do
+      assert !@foo.respond_to?(:bar)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-schemer
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ben Alavi