coupler 0.0.4-java → 0.0.6-java

data/Gemfile

@@ -1,26 +1,25 @@
 source "http://rubygems.org"
 gem 'sinatra'
 gem 'sequel'
-gem 'rack-flash'
+gem 'rack-flash', :require => 'rack/flash'
 gem 'json'
 gem 'fastercsv'
-gem 'carrierwave'
+gem 'carrierwave-sequel', :require => 'carrierwave/sequel'
 gem 'mongrel'
-gem 'jdbc-mysql'
+gem 'jdbc-mysql', :require => 'jdbc/mysql'
+gem 'jdbc-h2', :require => 'jdbc/h2'
 
 group :development do
   gem 'rake'
   gem 'jeweler'
   gem 'forgery', :require => false
   gem 'test-unit', '2.2.0', :require => 'test/unit'
-  gem 'mocha'
-  gem 'rack-test', :require => 'rack/test'
+  gem 'mocha', :require => false
   gem 'nokogiri'
   gem 'timecop'
-  gem 'factory_girl'
   gem 'git'
   gem 'thor'
-  gem 'rake'
   gem 'table_maker'
-  gem 'ruby-debug'
+  gem 'capybara'
+  gem 'jruby-openssl'
 end

data/Gemfile.lock

@@ -1,38 +1,56 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
-    carrierwave (0.5.3)
+    activesupport (3.0.9)
+    bouncy-castle-java (1.5.0146.1)
+    capybara (1.0.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    carrierwave (0.5.6)
       activesupport (~> 3.0)
-    columnize (0.3.2)
-    factory_girl (1.3.3)
+    carrierwave-sequel (0.1.0)
+      carrierwave
+      sequel
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
     fastercsv (1.5.4)
-    forgery (0.3.8)
+    ffi (1.0.9-java)
+    forgery (0.3.10)
       nokogiri (~> 1.4)
     gem_plugin (0.2.3)
     git (1.2.5)
+    jdbc-h2 (1.3.154)
     jdbc-mysql (5.1.13)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.5.1-java)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    json (1.5.3-java)
+    json_pure (1.5.3)
+    mime-types (1.16)
     mocha (0.9.12)
     mongrel (1.1.5-java)
       gem_plugin (>= 0.2.3)
-    nokogiri (1.4.4.2-java)
-      weakling (>= 0.0.3)
-    rack (1.2.2)
-    rack-flash (0.1.1)
+    nokogiri (1.5.0-java)
+    rack (1.3.0)
+    rack-flash (0.1.2)
       rack
     rack-test (0.6.0)
       rack (>= 1.0)
-    rake (0.8.7)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4-java)
-    sequel (3.23.0)
+    rake (0.9.2)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
+    sequel (3.25.0)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (>= 1.2.2, < 2.0)
@@ -40,29 +58,30 @@ GEM
       sequel
     test-unit (2.2.0)
     thor (0.14.6)
-    tilt (1.3)
+    tilt (1.3.2)
     timecop (0.3.5)
-    weakling (0.0.4-java)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   java
 
 DEPENDENCIES
-  carrierwave
-  factory_girl
+  capybara
+  carrierwave-sequel
   fastercsv
   forgery
   git
+  jdbc-h2
   jdbc-mysql
   jeweler
+  jruby-openssl
   json
   mocha
   mongrel
   nokogiri
   rack-flash
-  rack-test
   rake
-  ruby-debug
   sequel
   sinatra
   table_maker

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

data/coupler.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{coupler}
-  s.version = "0.0.3"
+  s.version = "0.0.5"
   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-05-13}
+  s.date = %q{2011-07-12}
   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}
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "db/migrate/020_rename_import_columns.rb",
     "db/migrate/021_add_fields_to_connections.rb",
     "db/migrate/022_remove_database_name_from_resources.rb",
+    "db/migrate/023_add_import_jobs.rb",
     "features/connections.feature",
     "features/matchers.feature",
     "features/projects.feature",
@@ -77,7 +78,6 @@ Gem::Specification.new do |s|
     "gfx/icon.svg",
     "lib/coupler.rb",
     "lib/coupler/base.rb",
-    "lib/coupler/config.rb",
     "lib/coupler/data_uploader.rb",
     "lib/coupler/database.rb",
     "lib/coupler/extensions.rb",
@@ -129,23 +129,22 @@ Gem::Specification.new do |s|
     "tasks/vendor.rake",
     "test/README.txt",
     "test/config.yml",
-    "test/coupler/models/test_import.rb",
-    "test/factories.rb",
     "test/fixtures/duplicate-keys.csv",
     "test/fixtures/no-headers.csv",
     "test/fixtures/people.csv",
     "test/fixtures/varying-row-size.csv",
+    "test/functional/test_base.rb",
+    "test/functional/test_connections.rb",
+    "test/functional/test_imports.rb",
+    "test/functional/test_jobs.rb",
+    "test/functional/test_matchers.rb",
+    "test/functional/test_projects.rb",
+    "test/functional/test_resources.rb",
+    "test/functional/test_results.rb",
+    "test/functional/test_scenarios.rb",
+    "test/functional/test_transformations.rb",
+    "test/functional/test_transformers.rb",
     "test/helper.rb",
-    "test/integration/extensions/test_connections.rb",
-    "test/integration/extensions/test_imports.rb",
-    "test/integration/extensions/test_jobs.rb",
-    "test/integration/extensions/test_matchers.rb",
-    "test/integration/extensions/test_projects.rb",
-    "test/integration/extensions/test_resources.rb",
-    "test/integration/extensions/test_results.rb",
-    "test/integration/extensions/test_scenarios.rb",
-    "test/integration/extensions/test_transformations.rb",
-    "test/integration/extensions/test_transformers.rb",
     "test/integration/test_field.rb",
     "test/integration/test_import.rb",
     "test/integration/test_running_scenarios.rb",
@@ -169,12 +168,12 @@ Gem::Specification.new do |s|
     "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",
-    "vendor/h2-1.3.154.jar",
     "webroot/public/css/960.css",
     "webroot/public/css/dataTables.css",
     "webroot/public/css/jquery-ui.css",
@@ -293,46 +292,44 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rack-flash>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
-      s.add_runtime_dependency(%q<carrierwave>, [">= 0"])
+      s.add_runtime_dependency(%q<carrierwave-sequel>, [">= 0"])
       s.add_runtime_dependency(%q<mongrel>, [">= 0"])
       s.add_runtime_dependency(%q<jdbc-mysql>, [">= 0"])
+      s.add_runtime_dependency(%q<jdbc-h2>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<forgery>, [">= 0"])
       s.add_development_dependency(%q<test-unit>, ["= 2.2.0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<factory_girl>, [">= 0"])
       s.add_development_dependency(%q<git>, [">= 0"])
       s.add_development_dependency(%q<thor>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<table_maker>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<capybara>, [">= 0"])
+      s.add_development_dependency(%q<jruby-openssl>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<sequel>, [">= 0"])
       s.add_dependency(%q<rack-flash>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
-      s.add_dependency(%q<carrierwave>, [">= 0"])
+      s.add_dependency(%q<carrierwave-sequel>, [">= 0"])
       s.add_dependency(%q<mongrel>, [">= 0"])
       s.add_dependency(%q<jdbc-mysql>, [">= 0"])
+      s.add_dependency(%q<jdbc-h2>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<forgery>, [">= 0"])
       s.add_dependency(%q<test-unit>, ["= 2.2.0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<factory_girl>, [">= 0"])
       s.add_dependency(%q<git>, [">= 0"])
       s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<table_maker>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<jruby-openssl>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
@@ -340,23 +337,22 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rack-flash>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
-    s.add_dependency(%q<carrierwave>, [">= 0"])
+    s.add_dependency(%q<carrierwave-sequel>, [">= 0"])
     s.add_dependency(%q<mongrel>, [">= 0"])
     s.add_dependency(%q<jdbc-mysql>, [">= 0"])
+    s.add_dependency(%q<jdbc-h2>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<forgery>, [">= 0"])
     s.add_dependency(%q<test-unit>, ["= 2.2.0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<factory_girl>, [">= 0"])
     s.add_dependency(%q<git>, [">= 0"])
     s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<table_maker>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<jruby-openssl>, [">= 0"])
   end
 end
 

data/features/wizard.feature

@@ -1,6 +1,6 @@
 Feature: running Coupler for the first time
 
-  Scenario: very first use
+  Scenario: with a database resource
     When I go to the front page
     And I click the "create a project" link
     And I fill in the form:
@@ -8,3 +8,4 @@ Feature: running Coupler for the first time
       | Description | This is my first project |
     And I click the "Submit" button
     And I click the "add a resource" link
+    And I click the 

data/lib/coupler.rb

@@ -18,10 +18,10 @@ require 'sequel'
 require 'sequel/extensions/migration'
 require 'json'
 require 'fastercsv'
-require 'carrierwave'
+require 'carrierwave/sequel'
 require 'mongrel'
 #require 'jdbc/mysql'  # Sequel should load this when it needs to.
-require File.dirname(__FILE__) + '/../vendor/h2-1.3.154.jar'
+#require 'jdbc/h2'     # Sequel should load this when it needs to.
 
 require File.dirname(__FILE__) + "/coupler/logger"
 require File.dirname(__FILE__) + "/coupler/database"

data/lib/coupler/base.rb

@@ -50,6 +50,10 @@ module Coupler
     })
     enable :sessions
 
+    configure do
+      Models.load_all
+    end
+
     use Rack::Flash
     register Extensions::Connections
     register Extensions::Projects

data/lib/coupler/extensions/connections.rb

@@ -24,18 +24,8 @@ module Coupler
           @connection = Connection.new(params[:connection])
 
           if @connection.save
-            if session[:first_use]
-              flash[:notice] = "Connection was successfully created.  The next step is creating a project."
-              redirect "/projects/new"
-              session[:first_use] = nil
-            elsif session[:return_to]
-              flash[:notice] = "Connection was successfully created.  You can now create a resource for that connection."
-              redirect session[:return_to]
-              session[:return_to] = nil
-            else
-              flash[:notice] = "Connection was successfully created."
-              redirect "/connections"
-            end
+            flash[:notice] = "Connection was successfully created."
+            redirect "/connections"
           else
             erb 'connections/new'.to_sym
           end

data/lib/coupler/extensions/jobs.rb

@@ -8,12 +8,14 @@ module Coupler
         end
 
         app.get "/jobs/count" do
-          Models::Job.filter(:completed_at => nil).count.to_s
+          content_type :json
+          [200, [Models::Job.filter(:completed_at => nil).count.to_json]]
         end
 
         app.get "/jobs/:id/progress" do
+          content_type :text
           @job = Models::Job[:id => params[:id]]
-          { :completed => @job.completed, :total => @job.total }.to_json
+          [200, [{ :completed => @job.completed, :total => @job.total }.to_json]]
         end
       end
     end

data/lib/coupler/extensions/projects.rb

@@ -45,7 +45,7 @@ module Coupler
           @project.set(params[:project])
           if @project.valid?
             @project.save
-            redirect '/projects'
+            redirect "/projects/#{@project.id}"
           else
             erb 'projects/form'.to_sym
           end

data/lib/coupler/helpers.rb

@@ -1,7 +1,7 @@
 module Coupler
   module Helpers
     def error_messages_for(object)
-      return ""   if object.errors.empty?
+      return ""   if object.nil? || object.errors.empty?
 
       retval = "<div class='errors'><h3>Errors detected:</h3><ul>"
       object.errors.each do |(attr, messages)|
@@ -117,5 +117,13 @@ module Coupler
     def cycle(even, odd)
       (@_cycle = !@_cycle) ? even : odd
     end
+
+    def field_type(resource, field)
+      result = field.final_type
+      if !resource.import_id
+        result += " (#{field.final_db_type})"
+      end
+      result
+    end
   end
 end

data/lib/coupler/models.rb

@@ -12,6 +12,14 @@ module Coupler
       :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)

data/lib/coupler/models/comparison.rb

@@ -31,9 +31,10 @@ module Coupler
           field = lhs_rhs_value(name)
           result = field.name
           resource_name = field.resource.name
-          if self[:"#{name}_which"]
-            resource_name += %{<span class="sup">#{self[:"#{name}_which"]}</span>}
-          end
+          # FIXME: revisit this!
+          #if self[:"#{name}_which"]
+            #resource_name += %{<span class="sup">#{self[:"#{name}_which"]}</span>}
+          #end
           result += " (#{resource_name})"
         else
           lhs_rhs_value(name).inspect
@@ -147,7 +148,7 @@ module Coupler
           validates_includes [1, 2], :rhs_which   if rhs_type == 'field'
 
           if lhs_type == 'field' && rhs_type == 'field' && (lhs_field = lhs_value) && (rhs_field = rhs_value)
-            if lhs_field[:type] != rhs_field[:type]
+            if lhs_field[:final_type] != rhs_field[:final_type]
               errors.add(:base, "Comparing fields of different types is currently disallowed.")
             end
             if lhs_which != rhs_which && operator != 'equals'