coupler 0.0.6-java → 0.0.7-java

data/.vimrc

@@ -4,11 +4,11 @@ function! s:AlternateFile()
   let tail = fnamemodify(fn, ':t')
 
   if match(head, '^lib/coupler/extensions') >= 0
-    return substitute(head, '^lib/coupler', 'test/integration', '').'/test_'.tail
+    return substitute(head, '^lib/coupler/extensions', 'test/functional', '').'/test_'.tail
   elseif match(head, '^lib') >= 0
     return substitute(head, '^lib/coupler', 'test/unit', '').'/test_'.tail
-  elseif match(head, '^test/integration/extensions') >= 0
-    return substitute(head, '^test/integration', 'lib/coupler', '').'/'.substitute(tail, '^test_', '', '')
+  elseif match(head, '^test/functional') >= 0
+    return substitute(head, '^test/functional', 'lib/coupler/extensions', '').'/'.substitute(tail, '^test_', '', '')
   elseif match(head, '^test') >= 0
     return substitute(head, '^test/unit', 'lib/coupler', '').'/'.substitute(tail, '^test_', '', '')
   endif

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/coupler.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coupler}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
   s.platform = %q{java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Stephens"]
-  s.date = %q{2011-07-12}
+  s.date = %q{2011-07-19}
   s.default_executable = %q{coupler}
   s.description = %q{Coupler is a (JRuby) desktop application designed to link datasets together}
   s.email = %q{jeremy.f.stephens@vanderbilt.edu}
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
     "db/migrate/015_add_run_number_to_results.rb",
     "db/migrate/016_fix_scenario_run_count.rb",
     "db/migrate/017_rename_comparison_columns.rb",
-    "db/migrate/018_fix_scenario_linkage_type.rb",
+    "db/migrate/018_stub.rb",
     "db/migrate/019_add_columns_to_imports.rb",
     "db/migrate/020_rename_import_columns.rb",
     "db/migrate/021_add_fields_to_connections.rb",
@@ -165,12 +165,12 @@ Gem::Specification.new do |s|
     "test/unit/models/test_transformation.rb",
     "test/unit/models/test_transformer.rb",
     "test/unit/test_base.rb",
+    "test/unit/test_coupler.rb",
     "test/unit/test_data_uploader.rb",
     "test/unit/test_database.rb",
     "test/unit/test_helpers.rb",
     "test/unit/test_import_buffer.rb",
     "test/unit/test_logger.rb",
-    "test/unit/test_models.rb",
     "test/unit/test_runner.rb",
     "test/unit/test_scheduler.rb",
     "uploads/.gitignore",

data/db/migrate/018_stub.rb

@@ -0,0 +1,4 @@
+Sequel.migration do
+  up { }
+  down { }
+end

data/lib/coupler.rb

@@ -1,3 +1,4 @@
+require 'pp'
 require 'java'
 require 'jruby/core_ext'
 
@@ -23,6 +24,64 @@ require 'mongrel'
 #require 'jdbc/mysql'  # Sequel should load this when it needs to.
 #require 'jdbc/h2'     # Sequel should load this when it needs to.
 
+module Coupler
+  def self.environment
+    @environment ||= ENV['COUPLER_ENV'] || :production
+  end
+
+  def self.db_path(dbname)
+    File.join(data_path, 'db', environment.to_s, dbname)
+  end
+
+  def self.connection_string(dbname)
+    "jdbc:h2:#{db_path(dbname)};IGNORECASE=TRUE"
+  end
+
+  def self.upload_path
+    @upload_path ||= File.join(data_path, 'uploads', environment.to_s)
+  end
+
+  def self.log_path
+    @log_path ||= File.join(data_path, 'log')
+  end
+
+  def self.data_path
+    # NOTE: Unfortunately, this code is in two places. Coupler can
+    # be run with or without the launcher, and the launcher needs
+    # to know about Coupler's data path before it runs Coupler.
+    if !defined? @data_path
+      dir =
+        if ENV['COUPLER_HOME']
+          ENV['COUPLER_HOME']
+        else
+          case Config::CONFIG['host_os']
+          when /mswin|windows/i
+            # Windows
+            File.join(ENV['APPDATA'], "coupler")
+          else
+            if ENV['HOME']
+              File.join(ENV['HOME'], ".coupler")
+            else
+              raise "Can't figure out where Coupler lives! Try setting the COUPLER_HOME environment variable"
+            end
+          end
+        end
+      if !File.exist?(dir)
+        begin
+          Dir.mkdir(dir)
+        rescue SystemCallError
+          raise "Can't create Coupler directory (#{dir})! Is the parent directory accessible?"
+        end
+      end
+      if !File.writable?(dir)
+        raise "Coupler directory (#{dir}) is not writable!"
+      end
+      @data_path = File.expand_path(dir)
+    end
+    @data_path
+  end
+end
+
 require File.dirname(__FILE__) + "/coupler/logger"
 require File.dirname(__FILE__) + "/coupler/database"
 require File.dirname(__FILE__) + "/coupler/scheduler"

data/lib/coupler/base.rb

@@ -2,7 +2,7 @@ module Coupler
   class Base < Sinatra::Base
 
     inst_dir = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
-    set :environment, ENV['COUPLER_ENV'] || :production
+    set :environment, Coupler.environment
     set :root, File.join(inst_dir, "webroot")
     set :static, true
     set :erb, :trim => '-'
@@ -12,48 +12,8 @@ module Coupler
     set :logging, Proc.new { !test? }
     set :methodoverride, true
     set :bind, '127.0.0.1'
-    set :db_path, lambda { |dbname| File.join(data_path, 'db', environment.to_s, dbname) }
-    set :connection_string, lambda { |dbname| "jdbc:h2:#{db_path(dbname)};IGNORECASE=TRUE" }
-    set :upload_path, lambda { File.join(data_path, 'uploads', environment.to_s) }
-    set :log_path, lambda { File.join(data_path, 'log') }
-    set(:data_path, lambda {
-      # NOTE: Unfortunately, this code is in two places. Coupler can
-      # be run with or without the launcher, and the launcher needs
-      # to know about Coupler's data path before it runs Coupler.
-      dir =
-        if ENV['COUPLER_HOME']
-          ENV['COUPLER_HOME']
-        else
-          case Config::CONFIG['host_os']
-          when /mswin|windows/i
-            # Windows
-            File.join(ENV['APPDATA'], "coupler")
-          else
-            if ENV['HOME']
-              File.join(ENV['HOME'], ".coupler")
-            else
-              raise "Can't figure out where Coupler lives! Try setting the COUPLER_HOME environment variable"
-            end
-          end
-        end
-      if !File.exist?(dir)
-        begin
-          Dir.mkdir(dir)
-        rescue SystemCallError
-          raise "Can't create Coupler directory (#{dir})! Is the parent directory accessible?"
-        end
-      end
-      if !File.writable?(dir)
-        raise "Coupler directory (#{dir}) is not writable!"
-      end
-      File.expand_path(dir)
-    })
     enable :sessions
 
-    configure do
-      Models.load_all
-    end
-
     use Rack::Flash
     register Extensions::Connections
     register Extensions::Projects

data/lib/coupler/data_uploader.rb

@@ -1,7 +1,7 @@
 module Coupler
   class DataUploader < CarrierWave::Uploader::Base
     def store_dir
-      Base.settings.upload_path
+      Coupler.upload_path
     end
 
     def cache_dir

data/lib/coupler/database.rb

@@ -1,31 +1,24 @@
 module Coupler
-  class Database < Delegator
-    include Singleton
-
-    def initialize
-      @env = ENV['COUPLER_ENV']
-      connection_string = Base.connection_string('coupler')
-      @database = Sequel.connect(connection_string, :loggers => [Coupler::Logger.instance], :max_connections => 20)
-      super(@database)
-    end
-
-    def __getobj__
-      @database
-    end
-
+  Database = Sequel.connect(Coupler.connection_string('coupler'), :loggers => [Coupler::Logger.instance], :max_connections => 20)
+  class << Database
     def rollback!
-      version = @database[:schema_info].first[:version]
+      version = self[:schema_info].first[:version]
       migrate!(version - 1)
     end
 
     def migrate!(to = nil, from = nil)
       dir = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'db', 'migrate'))
-      args = [@database, dir]
+      args = [self, dir]
       if to
         args << to
         args << from  if from
       end
       Sequel::Migrator.apply(*args)
     end
+
+    def instance
+      warn("DEPRECATION NOTICE: Database.instance")
+      self
+    end
   end
 end

data/lib/coupler/logger.rb

@@ -3,9 +3,9 @@ module Coupler
     include Singleton
 
     def initialize
-      log_path = Base.settings.log_path
+      log_path = Coupler.log_path
       Dir.mkdir(log_path)    if !File.exist?(log_path)
-      @logger = ::Logger.new(File.join(log_path, "#{Base.settings.environment}.log"))
+      @logger = ::Logger.new(File.join(log_path, "#{Coupler.environment}.log"))
       super(@logger)
     end
 

data/lib/coupler/models.rb

@@ -1,36 +1,21 @@
+if !defined?(Coupler::Database)
+  raise "Database isn't initialized yet!"
+end
+
 module Coupler
   module Models
-    # NOTE: using autoload here would undoubtedly be more efficient, but
-    # I need to make sure the database connection is instantiated before
-    # loading these classes because of how Sequel::Model works.
-    #%w{connection project resource field transformer transformation scenario matcher job result comparison}.each do |name|
-      #autoload(name.capitalize.to_sym, File.dirname(__FILE__) + "/models/#{name}")
-    #end
-
-    NAMES = [
-      :Connection, :Project, :Resource, :Field, :Transformer,
-      :Transformation, :Scenario, :Matcher, :Job, :Result, :Comparison,
-      :Import
-    ]
-
-    def self.load_all
-      Database.instance
-      NAMES.each do |name|
-        require File.dirname(__FILE__) + "/models/#{name.to_s.downcase}"
-      end
-    end
-
-    def self.const_missing(name)
-      name = name.to_sym
-      if NAMES.include?(name)
-        Database.instance
-        require File.dirname(__FILE__) + "/models/#{name.to_s.downcase}"
-        const_get(name)
-      else
-        puts "#{name.inspect} wasn't in #{NAMES.inspect}"
-        super
-      end
-    end
+    autoload :Comparison,     File.dirname(__FILE__) + "/models/comparison"
+    autoload :Connection,     File.dirname(__FILE__) + "/models/connection"
+    autoload :Field,          File.dirname(__FILE__) + "/models/field"
+    autoload :Import,         File.dirname(__FILE__) + "/models/import"
+    autoload :Job,            File.dirname(__FILE__) + "/models/job"
+    autoload :Matcher,        File.dirname(__FILE__) + "/models/matcher"
+    autoload :Project,        File.dirname(__FILE__) + "/models/project"
+    autoload :Resource,       File.dirname(__FILE__) + "/models/resource"
+    autoload :Result,         File.dirname(__FILE__) + "/models/result"
+    autoload :Scenario,       File.dirname(__FILE__) + "/models/scenario"
+    autoload :Transformation, File.dirname(__FILE__) + "/models/transformation"
+    autoload :Transformer,    File.dirname(__FILE__) + "/models/transformer"
   end
 end
 

data/lib/coupler/models/comparison.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Comparison < Sequel::Model

data/lib/coupler/models/connection.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Connection < Sequel::Model

data/lib/coupler/models/field.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Field < Sequel::Model

data/lib/coupler/models/import.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Import < Sequel::Model

data/lib/coupler/models/job.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Job < Sequel::Model

data/lib/coupler/models/matcher.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Matcher < Sequel::Model

data/lib/coupler/models/project.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Project < Sequel::Model
@@ -15,7 +16,7 @@ module Coupler
 
       private
         def local_connection_string
-          Base.connection_string("project_#{id}")
+          Coupler.connection_string("project_#{id}")
         end
 
         def before_validation
@@ -31,7 +32,7 @@ module Coupler
 
         def after_destroy
           super
-          FileUtils.rm(Dir[Base.db_path("project_#{id}")+".*"], :force => true)
+          FileUtils.rm(Dir[Coupler.db_path("project_#{id}")+".*"], :force => true)
           resources_dataset.each { |r| r.delete_versions_on_destroy = self.delete_versions_on_destroy; r.destroy }
           scenarios_dataset.each { |s| s.delete_versions_on_destroy = self.delete_versions_on_destroy; s.destroy }
         end

data/lib/coupler/models/resource.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Resource < Sequel::Model
@@ -166,7 +167,7 @@ module Coupler
         end
 
         def local_connection_string
-          Base.connection_string("project_#{project.id}")
+          Coupler.connection_string("project_#{project.id}")
         end
 
         def create_fields

data/lib/coupler/models/result.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Result < Sequel::Model

data/lib/coupler/models/scenario.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Scenario < Sequel::Model
@@ -75,7 +76,7 @@ module Coupler
       private
 
         def local_connection_string
-          Base.connection_string("scenario_#{id}")
+          Coupler.connection_string("scenario_#{id}")
         end
 
         def before_validation

data/lib/coupler/models/transformation.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Transformation < Sequel::Model

data/lib/coupler/models/transformer.rb

@@ -1,3 +1,4 @@
+pp caller
 module Coupler
   module Models
     class Transformer < Sequel::Model

data/lib/coupler/runner.rb

@@ -26,7 +26,7 @@ module Coupler
       say "Starting up Coupler..."
 
       say "Migrating database..."
-      Coupler::Database.instance.migrate!
+      Coupler::Database.migrate!
 
       say "Starting scheduler..."
       Coupler::Scheduler.instance.start

data/tasks/db.rake

@@ -1,16 +1,16 @@
 namespace :db do
   desc "Obliterate the local database"
-  task :nuke do
+  task :nuke => :environment do
     confirm("This will completely obliterate all of Coupler's databases.")
 
     require 'fileutils'
-    files = Dir.glob(File.join(Coupler::Base.settings.data_path, "db", "*"))
-    FileUtils.rm_rf(files.reject { |d| d =~ /migrate$/ }, :verbose => true)
+    files = Dir.glob(File.join(Coupler.data_path, "db", "**", "*.db"))
+    FileUtils.rm_rf(files, :verbose => true)
   end
 
   desc "Purge the database"
   task :purge => :environment do
-    FileUtils.rm(Dir[Coupler::Base.settings.db_path('coupler')+".*"])
+    FileUtils.rm(Dir[Coupler.db_path('coupler')+".*"])
   end
 
   desc "Run migrations"

data/tasks/test.rake

@@ -1,7 +1,17 @@
 require 'rake/testtask'
 
 desc "Run all tests"
-task :test => ['test:unit', 'test:integration']
+task :test do
+  errors = %w(test:unit test:functional test:integration).collect do |task|
+    begin
+      Rake::Task[task].invoke
+      nil
+    rescue => e
+      task
+    end
+  end.compact
+  abort "Errors running #{errors * ', '}!" if errors.any?
+end
 
 namespace :test do
   Rake::TestTask.new(:unit) do |test|

data/test/functional/test_projects.rb

@@ -61,7 +61,7 @@ module CouplerFunctionalTests
       yes.click
       assert_equal "/projects", page.current_path
       assert_nil Project[:id => project.id]
-      assert_nil Database.instance[:projects_versions][:current_id => project.id]
+      assert_nil Database[:projects_versions][:current_id => project.id]
     end
   end
 end

data/test/helper.rb

@@ -36,7 +36,7 @@ require 'coupler'
 
 Coupler::Base.set(:sessions, false) # workaround
 Coupler::Base.set(:environment, :test)
-Coupler::Database.instance.migrate!
+Coupler::Database.migrate!
 
 #Capybara.register_driver :selenium_chrome do |app|
   #Capybara::Driver::Selenium.new(app, :browser => :chrome)
@@ -53,7 +53,7 @@ module Coupler
 
       def setup
         #@_original_connection_count = connection_count
-        @_database = Coupler::Database.instance
+        @_database = Coupler::Database
         @_database.tables.each do |name|
           next  if name == :schema_info
           @_database[name].delete

data/test/unit/models/test_common_model.rb

@@ -5,7 +5,7 @@ module CouplerUnitTests
     class TestCommonModel < Coupler::Test::UnitTest
       def self.startup
         super
-        db = Coupler::Database.instance
+        db = Coupler::Database
         db.create_table!(:foos) do
           primary_key :id
           String :bar
@@ -26,7 +26,7 @@ module CouplerUnitTests
       end
 
       def self.teardown
-        db = Coupler::Database.instance
+        db = Coupler::Database
         db.drop_table(:foos)
         super
       end
@@ -59,7 +59,7 @@ module CouplerUnitTests
         foo = @klass.create(:bar => "bar")
         assert_equal 1, foo.version
 
-        versions = Database.instance[:foos_versions].filter(:current_id => foo.id)
+        versions = Database[:foos_versions].filter(:current_id => foo.id)
         assert_equal 1, versions.count
 
         data = versions.first
@@ -74,7 +74,7 @@ module CouplerUnitTests
         foo.update(:bar => "baz")
         assert_equal 2, foo.version
 
-        versions = Database.instance[:foos_versions].filter(:current_id => foo.id, :version => 2)
+        versions = Database[:foos_versions].filter(:current_id => foo.id, :version => 2)
         assert_equal 1, versions.count
 
         data = versions.first

data/test/unit/models/test_project.rb

@@ -57,7 +57,7 @@ module CouplerUnitTests
 
       test "local_database" do
         project = Project.create(:name => "foo")
-        FileUtils.rm(Dir[Base.db_path("project_#{project.id}")+".*"])
+        FileUtils.rm(Dir[Coupler.db_path("project_#{project.id}")+".*"])
 
         project.local_database do |db|
           assert_kind_of Sequel::JDBC::Database, db
@@ -77,7 +77,7 @@ module CouplerUnitTests
         project = Project.create(:name => "foo")
         project.local_database { |db| db.test_connection }  # force creation of database
         project.destroy
-        files = Dir[Base.db_path("project_#{project.id}")+".*"]
+        files = Dir[Coupler.db_path("project_#{project.id}")+".*"]
         assert files.empty?, files.inspect
       end
 
@@ -91,7 +91,7 @@ module CouplerUnitTests
           expects(:delete_versions_on_destroy=).with(true)
         }])
         project.destroy
-        assert_equal 0, Database.instance[:projects_versions].filter(:current_id => project.id).count
+        assert_equal 0, Database[:projects_versions].filter(:current_id => project.id).count
       end
 
       #def test_local_database_uses_connection_class

data/test/unit/models/test_scenario.rb

@@ -171,7 +171,7 @@ module CouplerUnitTests
 
       test "local database" do
         scenario = new_scenario.save!
-        Base.expects(:connection_string).with("scenario_#{scenario.id}").returns("foo")
+        Coupler.expects(:connection_string).with("scenario_#{scenario.id}").returns("foo")
         db = mock('scenario db')
         Sequel.expects(:connect).with('foo', instance_of(Hash)).returns(db)
         assert_equal db, scenario.local_database

data/test/unit/test_base.rb

@@ -5,43 +5,5 @@ module CouplerUnitTests
     def test_subclasses_sinatra_base
       assert_equal Sinatra::Base, Coupler::Base.superclass
     end
-
-    def test_db_path
-      env = Base.settings.environment
-      begin
-        Base.set :environment, :production
-        expected = File.join(Base.settings.data_path, 'db', 'production', 'ponies')
-        assert_equal expected, Base.db_path("ponies")
-      ensure
-        Base.set :environment, env
-      end
-    end
-
-    def test_connection_string
-      env = Base.settings.environment
-      begin
-        Base.set :environment, :production
-        expected = "jdbc:h2:#{File.join(Base.settings.data_path, 'db', 'production', 'ponies')};IGNORECASE=TRUE"
-        assert_equal expected, Base.connection_string("ponies")
-      ensure
-        Base.set :environment, env
-      end
-    end
-
-    def test_upload_path
-      env = Base.settings.environment
-      begin
-        Base.set :environment, :production
-        expected = File.join(Base.settings.data_path, 'uploads', 'production')
-        assert_equal expected, Base.upload_path
-      ensure
-        Base.set :environment, env
-      end
-    end
-
-    def test_log_path
-      expected = File.join(Base.settings.data_path, 'log')
-      assert_equal expected, Base.log_path
-    end
   end
 end

data/test/unit/test_coupler.rb

@@ -0,0 +1,28 @@
+require 'helper'
+
+module CouplerUnitTests
+  class TestCoupler < Coupler::Test::UnitTest
+    def test_db_path
+      env = Coupler.environment
+      expected = File.join(Coupler.data_path, 'db', env, 'ponies')
+      assert_equal expected, Coupler.db_path("ponies")
+    end
+
+    def test_connection_string
+      env = Coupler.environment
+      expected = "jdbc:h2:#{File.join(Coupler.data_path, 'db', env, 'ponies')};IGNORECASE=TRUE"
+      assert_equal expected, Coupler.connection_string("ponies")
+    end
+
+    def test_upload_path
+      env = Coupler.environment
+      expected = File.join(Coupler.data_path, 'uploads', env)
+      assert_equal expected, Coupler.upload_path
+    end
+
+    def test_log_path
+      expected = File.join(Coupler.data_path, 'log')
+      assert_equal expected, Coupler.log_path
+    end
+  end
+end

data/test/unit/test_data_uploader.rb

@@ -7,13 +7,13 @@ module CouplerUnitTests
     end
 
     def test_store_dir_same_as_upload_path
-      Base.expects(:upload_path).returns("/path/to/uploads")
+      Coupler.expects(:upload_path).returns("/path/to/uploads")
       uploader = DataUploader.new
       assert_equal "/path/to/uploads", uploader.store_dir
     end
 
     def test_cache_dir_uses_upload_path
-      Base.expects(:upload_path).returns("/path/to/uploads")
+      Coupler.expects(:upload_path).returns("/path/to/uploads")
       uploader = DataUploader.new
       assert_equal "/path/to/uploads/tmp", uploader.cache_dir
     end

data/test/unit/test_database.rb

@@ -4,19 +4,19 @@ module CouplerUnitTests
   class TestDatabase < Coupler::Test::UnitTest
     def setup
       super
-      @database = Coupler::Database.instance
+      @database = Coupler::Database
     end
 
     def test_connection
-      assert_kind_of Sequel::JDBC::Database, @database.__getobj__
+      assert_kind_of Sequel::JDBC::Database, @database
 
-      expected = Base.connection_string('coupler')
+      expected = Coupler.connection_string('coupler')
       assert_equal expected, @database.uri
     end
 
     def test_migrate
       dir = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "db", "migrate"))
-      Sequel::Migrator.expects(:apply).with(@database.__getobj__, dir)
+      Sequel::Migrator.expects(:apply).with(@database, dir)
       @database.migrate!
     end
   end

data/test/unit/test_runner.rb

@@ -6,8 +6,7 @@ module CouplerUnitTests
       super
       @scheduler = stub("scheduler", :is_started? => true, :start => nil)
       Scheduler.stubs(:instance).returns(@scheduler)
-      @database = stub("database", :migrate! => nil)
-      Database.stubs(:instance).returns(@database)
+      Database.stubs(:migrate!)
       @app = stub('rack app')
       @handler = stub('rack handler', :new => @app)
       Rack::Handler.stubs(:get).returns(@handler)
@@ -51,7 +50,7 @@ module CouplerUnitTests
     end
 
     test "migrates the database" do
-      @database.expects(:migrate!)
+      Database.expects(:migrate!)
       capture_stdout { Runner.new([]) }
     end
 

metadata

@@ -2,7 +2,7 @@
 name: coupler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: java
 authors: 
   - Jeremy Stephens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-12 00:00:00 -05:00
+date: 2011-07-19 00:00:00 -05:00
 default_executable: coupler
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -287,7 +287,7 @@ files:
   - db/migrate/015_add_run_number_to_results.rb
   - db/migrate/016_fix_scenario_run_count.rb
   - db/migrate/017_rename_comparison_columns.rb
-  - db/migrate/018_fix_scenario_linkage_type.rb
+  - db/migrate/018_stub.rb
   - db/migrate/019_add_columns_to_imports.rb
   - db/migrate/020_rename_import_columns.rb
   - db/migrate/021_add_fields_to_connections.rb
@@ -399,12 +399,12 @@ files:
   - test/unit/models/test_transformation.rb
   - test/unit/models/test_transformer.rb
   - test/unit/test_base.rb
+  - test/unit/test_coupler.rb
   - test/unit/test_data_uploader.rb
   - test/unit/test_database.rb
   - test/unit/test_helpers.rb
   - test/unit/test_import_buffer.rb
   - test/unit/test_logger.rb
-  - test/unit/test_models.rb
   - test/unit/test_runner.rb
   - test/unit/test_scheduler.rb
   - uploads/.gitignore

data/db/migrate/018_fix_scenario_linkage_type.rb

@@ -1,8 +0,0 @@
-Sequel.migration do
-  up do
-    Coupler::Models::Scenario.each do |scenario|
-      scenario.set_linkage_type
-      scenario.save
-    end
-  end
-end

data/test/unit/test_models.rb

@@ -1,12 +0,0 @@
-require 'helper'
-
-module CouplerUnitTests
-  class TestModels < Coupler::Test::UnitTest
-    def test_lazy_loading_accepts_strings
-      assert_nothing_raised do
-        # This happens because Forgery calls const_missing directly with a string
-        Models.const_missing("Resource")
-      end
-    end
-  end
-end