acts_as_fu 0.0.3 → 0.0.4

data/lib/acts_as_fu/base.rb

@@ -4,34 +4,37 @@ RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(RAILS_ROOT)
 RAILS_ENV = 'test' unless defined?(RAILS_ENV)
 
 module ActsAsFu
-  class << self
-    attr_reader :log
-  
-    def connect!(config={})
-      @log = ""
-      ActiveRecord::Base.logger = Logger.new(StringIO.new(log))
-      ActiveRecord::Base.connection.disconnect! rescue nil
-      ActiveRecord::Base.establish_connection(config)
+
+  class Connection < ActiveRecord::Base
+    cattr_accessor :connected
+    cattr_reader :log
+    self.abstract_class = true
+
+    def self.connect!(config={})
+      @@log = ""
+      self.logger = Logger.new(StringIO.new(log))
+      self.connection.disconnect! rescue nil
+      self.establish_connection(config)
     end
   end
-  
+
   def build_model(name, options={}, &block)
     connect! unless connected?
-    
+
     super_class = options[:superclass] || begin
-      ActiveRecord::Base.connection.create_table(name, :force => true) { }
-      ActiveRecord::Base
+      ActsAsFu::Connection.connection.create_table(name, :force => true) { }
+      ActsAsFu::Connection
     end
-    
+
     set_class!(name, super_class, &block)
   end
-  
+
   private
-  
+
   def set_class!(name, super_class, &block)
     klass_name = name.to_s.classify
     Object.send(:remove_const, klass_name) rescue nil
-    
+
     klass = Class.new(super_class)
     Object.const_set(klass_name, klass)
 
@@ -40,29 +43,30 @@ module ActsAsFu
   end
 
   def connect!
-    ActsAsFu.connect!({
+    ActsAsFu::Connection.connect!({
       :adapter => "sqlite3",
       :database => ":memory:"
     })
+    ActsAsFu::Connection.connected = true
   end
-  
+
   def connected?
-    ActiveRecord::Base.connected?
+    ActsAsFu::Connection.connected
   end
-  
+
   def model_eval(klass, &block)
     class << klass
       def method_missing_with_columns(sym, *args, &block)
-        ActiveRecord::Base.connection.change_table(name.tableize) do |t|
+        ActsAsFu::Connection.connection.change_table(name.tableize) do |t|
           t.send(sym, *args)
         end
       end
-      
+
       alias_method_chain :method_missing, :columns
     end
-    
+
     klass.class_eval(&block) if block_given?
-    
+
     class << klass
       alias_method :method_missing, :method_missing_without_columns
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_fu
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pat Nakajima