acts_as_fu 0.0.2 → 0.0.3

data/lib/acts_as_fu.rb

@@ -1,7 +1,5 @@
-$LOAD_PATH << File.dirname(__FILE__) + '/acts_as_fu'
+$LOAD_PATH << File.dirname(__FILE__)
 
-module ActsAsFu
-  VERSION = '0.0.2'
-end
+require 'acts_as_fu/base'
 
-%w(rubygems activerecord constants helper).each { |lib| require lib }
+include ActsAsFu

data/lib/acts_as_fu/{helper.rb → base.rb}

@@ -1,3 +1,8 @@
+%w(rubygems activerecord).each { |lib| require lib }
+
+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
@@ -5,12 +10,13 @@ module ActsAsFu
     def connect!(config={})
       @log = ""
       ActiveRecord::Base.logger = Logger.new(StringIO.new(log))
+      ActiveRecord::Base.connection.disconnect! rescue nil
       ActiveRecord::Base.establish_connection(config)
     end
   end
   
   def build_model(name, options={}, &block)
-    connect!
+    connect! unless connected?
     
     super_class = options[:superclass] || begin
       ActiveRecord::Base.connection.create_table(name, :force => true) { }
@@ -30,18 +36,18 @@ module ActsAsFu
     Object.const_set(klass_name, klass)
 
     model_eval(klass, &block)
+    klass
   end
 
   def connect!
-    begin
-      # This blows up if there's no connection
-      ActiveRecord::Base.connection
-    rescue
-      ActsAsFu.connect!({
-        :adapter => "sqlite3",
-        :database => ":memory:"
-      })
-    end
+    ActsAsFu.connect!({
+      :adapter => "sqlite3",
+      :database => ":memory:"
+    })
+  end
+  
+  def connected?
+    ActiveRecord::Base.connected?
   end
   
   def model_eval(klass, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_fu
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -33,8 +33,7 @@ extra_rdoc_files: []
 files: 
 - lib/acts_as_fu
 - lib/acts-as-fu.rb
-- lib/acts_as_fu/constants.rb
-- lib/acts_as_fu/helper.rb
+- lib/acts_as_fu/base.rb
 - lib/acts_as_fu.rb
 has_rdoc: true
 homepage: 
@@ -58,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Generate ActiveRecord models on the fly for your tests

data/lib/acts_as_fu/constants.rb

@@ -1,2 +0,0 @@
-RAILS_ROOT = File.join(File.dirname(__FILE__), '..') unless defined?(RAILS_ROOT)
-RAILS_ENV = 'test' unless defined?(RAILS_ENV)