coupler 0.0.4-java → 0.0.6-java

data/lib/coupler/models/connection.rb

@@ -3,7 +3,16 @@ module Coupler
     class Connection < Sequel::Model
       include CommonModel
 
-      ADAPTERS = [%w{mysql MySQL h2 H2}]
+      ADAPTERS = [
+        {
+          :name => "mysql", :label => "MySQL",
+          :ignored_attributes => %w{path}
+        },
+        {
+          :name => "h2", :label => "H2",
+          :ignored_attributes => %w{host port username password database_name}
+        }
+      ]
 
       one_to_many :resources
 

data/lib/coupler/models/import.rb

@@ -209,14 +209,10 @@ module Coupler
         def validate
           super
 
-          validates_presence :project_id
-          if project_id
-            # don't allow import to have the same name as an already existing resource
-            if project.resources_dataset.filter(:name => name).count > 0
-              errors.add(:name, "is already taken")
-            end
+          validates_presence [:project_id, :name, :field_names, :primary_key_name]
+          if name && project_id
+            validates_unique [:project_id, :name]
           end
-          validates_presence [:field_names, :primary_key_name]
           if field_names.is_a?(Array)
             validates_includes field_names, [:primary_key_name]
 

data/lib/coupler/models/transformer.rb

@@ -3,7 +3,7 @@ module Coupler
     class Transformer < Sequel::Model
       include CommonModel
 
-      plugin :serialization, :marshal, :allowed_types
+      plugin :serialization, :marshal, :allowed_types, :code
 
       TYPES = %w{string integer datetime}
       EXAMPLES = {

data/lib/coupler/runner.rb

@@ -51,7 +51,7 @@ module Coupler
 
       if success
         Coupler::Base.set(:running, true)
-        say "Web server is up and running on http://#{settings.bind}:#{settings.port}"
+        puts "Web server is up and running on http://#{settings.bind}:#{settings.port}"
         if !options.has_key?(:trap) || options[:trap]
           trap("INT") do
             shutdown

data/lib/coupler/scheduler.rb

@@ -37,7 +37,7 @@ module Coupler
       if !is_started?
         @loop = Thread.new do
           loop do
-            sleep 30
+            sleep 10
             run_jobs
           end
         end

data/tasks/test.rake

@@ -19,6 +19,14 @@ namespace :test do
     test.ruby_opts = %w{--debug}
   end
   task :integration => ['environment:test', 'db:purge', 'db:migrate', 'db:fake']
+
+  Rake::TestTask.new(:functional) do |test|
+    test.libs << 'lib' << 'test'
+    test.pattern = 'test/functional/**/test_*.rb'
+    #test.verbose = true
+    test.ruby_opts = %w{--debug}
+  end
+  task :functional => ['environment:test', 'db:purge', 'db:migrate', 'db:fake']
 end
 
 begin

data/test/functional/test_base.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+module CouplerFunctionalTests
+  class TestBase < Coupler::Test::FunctionalTest
+    def test_index_when_no_projects
+      visit("/")
+      assert_equal 200, page.status_code
+      assert page.has_content?('Getting Started')
+    end
+
+    def test_redirect_when_projects_exist
+      project = Project.create(:name => 'foo')
+      visit("/")
+      assert_equal "/projects", current_path
+    end
+  end
+end

data/test/functional/test_connections.rb

@@ -0,0 +1,81 @@
+require 'helper'
+
+module CouplerFunctionalTests
+  class TestConnections < Coupler::Test::FunctionalTest
+    def setup
+      super
+      @connections = []
+      @configs = {}
+      each_adapter do |adapter, config|
+        conn = new_connection(adapter, :name => "#{adapter} connection").save!
+        @connections << conn
+        @configs[adapter] = config
+      end
+    end
+
+    test "index" do
+      visit "/connections"
+      assert page.has_selector?('a[href="/connections/new"]')
+    end
+
+    test "new" do
+      visit "/connections/new"
+      assert page.has_selector?("form[action='/connections']")
+      assert page.has_selector?("select[name='connection[adapter]']")
+      %w{name host port username password}.each do |name|
+        assert page.has_selector?("input[name='connection[#{name}]']")
+      end
+    end
+
+    each_adapter do |adapter, config|
+      attribute(:javascript, true)
+      test "successfully creating #{adapter} connection" do
+        attributes = config.merge(:name => 'foo')
+
+        visit "/connections/new"
+        find("#adapter").find("option[value='#{adapter}']").select_option
+        sleep 1 # wait for animations
+        attributes.each_pair do |name, value|
+          fill_in "connection[#{name}]", :with => value
+        end
+        click_button "Submit"
+
+        connection = Connection[:name => 'foo']
+        assert connection
+
+        assert_equal "/connections", page.current_path
+      end
+    end
+
+    test "failing to create connection" do
+      attributes = @configs['mysql'].merge(:name => nil)
+
+      visit "/connections/new"
+      select 'MySQL', :from => "connection[adapter]"
+      attributes.each_pair do |name, value|
+        fill_in "connection[#{name}]", :with => value
+      end
+      click_button "Submit"
+
+      assert page.has_content?("Name is not present")
+    end
+
+    test "show" do
+      @connections.each do |conn|
+        visit "/connections/#{conn.id}"
+        assert page.has_selector?("table.show")
+      end
+    end
+
+    attribute(:javascript, true)
+    test "destroy" do
+      visit "/connections"
+      find('span.ui-icon-trash').click
+      a = page.driver.browser.switch_to.alert
+      a.accept
+
+      assert_equal '/connections', page.current_path
+      assert_nil Models::Connection[@connections[0].id]
+    end
+  end
+end

data/test/functional/test_imports.rb

@@ -0,0 +1,76 @@
+require 'helper'
+
+module CouplerFunctionalTests
+  class TestImports < Coupler::Test::FunctionalTest
+    def setup
+      super
+      @project = Project.create(:name => 'foo')
+    end
+
+    attribute(:javascript, true)
+    test "upload" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('people.csv'))
+
+      assert_equal "/projects/#{@project.id}/imports/upload", page.current_path
+      assert page.has_selector?('input#name')
+    end
+
+    attribute(:javascript, true)
+    test "upload with no headers" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('no-headers.csv'))
+
+      assert_equal "/projects/#{@project.id}/imports/upload", page.current_path
+      assert page.has_selector?('input#name')
+    end
+
+    attribute(:javascript, true)
+    test "create with no issues" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('people.csv'))
+
+      click_button('Begin Importing')
+      assert_match %r{^/projects/#{@project[:id]}/resources/\d+$}, page.current_path
+    end
+
+    attribute(:javascript, true)
+    test "create with invalid import" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('people.csv'))
+
+      fill_in('name', :with => '')
+      click_button('Begin Importing')
+
+      assert page.has_selector?("div.errors")
+    end
+
+    attribute(:javascript, true)
+    test "create with duplicate keys redirects to edit" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('duplicate-keys.csv'))
+      click_button('Begin Importing')
+
+      assert find("h2").has_content?("Duplicate Keys")
+      assert_match %r{^/projects/#{@project.id}/imports/\d+/edit$}, page.current_path
+    end
+
+    attribute(:javascript, true)
+    test "update import with duplicate keys" do
+      visit "/projects/#{@project.id}/resources/new"
+      find('label[for="resource-type-csv"]').click
+      attach_file('data', fixture_path('duplicate-keys.csv'))
+      click_button('Begin Importing')
+
+      find('input[name="delete[2][]"][value="1"]').click
+      click_button('Submit')
+
+      assert_match %r{^/projects/#{@project[:id]}/resources/\d+$}, page.current_path
+    end
+  end
+end

data/test/{integration/extensions → functional}/test_jobs.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
-module TestExtensions
-  class TestJobs < Coupler::Test::IntegrationTest
+module CouplerFunctionalTests
+  class TestJobs < Coupler::Test::FunctionalTest
     def self.startup
       super
       conn = new_connection('h2', :name => 'foo')
@@ -27,25 +27,34 @@ module TestExtensions
       })
     end
 
+    attribute(:javascript, true)
     test "jobs" do
-      job = Job.create!(:name => 'transform', :status => 'scheduled', :resource => @resource)
-      get "/jobs"
-      assert last_response.ok?
+      visit "/projects/#{@project.id}/resources/#{@resource.id}"
+      click_button "Transform now"
+      a = page.driver.browser.switch_to.alert
+      a.accept
+
+      visit "/jobs"
+      assert page.has_selector?("table.list tbody tr")
     end
 
+    # Using Rack::Test directly here for JSON tests
     test "count" do
       scheduled_job = Job.create!(:name => 'transform', :status => 'scheduled', :resource => @resource)
       completed_job = Job.create!(:name => 'transform', :status => 'done', :resource => @resource, :completed_at => Time.now)
-      get "/jobs/count"
-      assert last_response.ok?
-      assert_equal "1", last_response.body
+      page.driver.get "/jobs/count"
+      assert_equal "1", page.driver.response.body
     end
 
     test "progress" do
-      job = Job.create!(:name => 'transform', :status => 'scheduled', :resource => @resource, :total => 200, :completed => 54)
-      get "/jobs/#{job.id}/progress"
-      assert last_response.ok?
-      result = JSON.parse(last_response.body)
+      visit "/projects/#{@project.id}/resources/#{@resource.id}"
+      click_button "Transform now"
+      assert_equal "/projects/#{@project.id}/resources/#{@resource.id}", page.current_path
+
+      job = @resource.scheduled_jobs.first
+      job.update(:total => 200, :completed => 54)
+      page.driver.get "/jobs/#{job.id}/progress"
+      result = JSON.parse(page.driver.response.body)
       assert_equal({'total' => 200, 'completed' => 54}, result)
     end
   end

data/test/functional/test_matchers.rb

@@ -0,0 +1,108 @@
+require 'helper'
+
+module CouplerFunctionalTests
+  class TestMatchers < Coupler::Test::FunctionalTest
+    def self.startup
+      super
+      conn = new_connection('h2', :name => 'foo')
+      conn.database do |db|
+        db.create_table!(:foo) do
+          primary_key :id
+          String :foo
+          String :bar
+        end
+        db[:foo].insert({:foo => 'foo', :bar => 'bar'})
+        db[:foo].insert({:foo => 'bar', :bar => 'foo'})
+      end
+    end
+
+    def setup
+      super
+      @connection = new_connection('h2', :name => 'foo').save!
+      @project = Project.create!(:name => 'foo')
+      @resource = Resource.create!(:name => 'foo', :project => @project, :table_name => 'foo', :connection => @connection)
+      @scenario = Scenario.create!(:name => 'foo', :project => @project, :resource_1 => @resource)
+    end
+
+    test "new" do
+      visit "/projects/#{@project.id}/scenarios/#{@scenario.id}/matchers/new"
+      assert_equal 200, page.status_code
+    end
+
+    test "new with non existant project" do
+      visit "/projects/8675309/scenarios/#{@scenario.id}/matchers/new"
+      assert_equal "/projects", page.current_path
+      assert page.has_content?("The project you were looking for doesn't exist")
+    end
+
+    test "new with non existant scenario" do
+      visit "/projects/#{@project.id}/scenarios/8675309/matchers/new"
+      assert_equal "/projects/#{@project.id}/scenarios", page.current_path
+      assert page.has_content?("The scenario you were looking for doesn't exist")
+    end
+
+    attribute(:javascript, true)
+    test "successfully creating matcher for self-linkage" do
+      visit "/projects/#{@project.id}/scenarios/#{@scenario.id}/matchers/new"
+      click_link("Add comparison")
+      select('foo', :from => "lhs_value_select")
+      find('span.ui-button-text', :text => 'Add').click
+      click_button('Submit')
+      assert_equal "/projects/#{@project.id}/scenarios/#{@scenario.id}", page.current_path
+
+      assert @scenario.matcher
+    end
+
+    attribute(:javascript, true)
+    test "edit" do
+      foo = @resource.fields_dataset[:name => 'foo']
+      bar = @resource.fields_dataset[:name => 'bar']
+      matcher = Matcher.create!({
+        :scenario => @scenario,
+        :comparisons_attributes => [{
+          'lhs_type' => 'field', 'raw_lhs_value' => foo.id, 'lhs_which' => 1,
+          'rhs_type' => 'field', 'raw_rhs_value' => bar.id, 'rhs_which' => 2,
+          'operator' => 'equals'
+        }]
+      })
+      visit "/projects/#{@project.id}/scenarios/#{@scenario.id}/matchers/#{matcher.id}/edit"
+      click_link("Delete")
+
+      click_link("Add comparison")
+      find("#lhs_value_select").select("bar")
+      find("#rhs_value_select").select("foo")
+      find('span.ui-button-text', :text => 'Add').click
+      click_button('Submit')
+      assert_equal "/projects/#{@project.id}/scenarios/#{@scenario.id}", page.current_path
+
+      assert_equal 1, @scenario.matcher.comparisons_dataset.count
+    end
+
+    test "edit with non existant matcher" do
+      visit "/projects/#{@project.id}/scenarios/#{@scenario.id}/matchers/8675309/edit"
+      assert_equal "/projects/#{@project.id}/scenarios/#{@scenario.id}", page.current_path
+      assert page.has_content?("The matcher you were looking for doesn't exist")
+    end
+
+    attribute(:javascript, true)
+    test "delete" do
+      pend "This fails and I don't know why"
+      field = @resource.fields_dataset[:name => 'foo']
+      matcher = Matcher.create!({
+        :scenario => @scenario,
+        :comparisons_attributes => [{
+          'lhs_type' => 'field', 'raw_lhs_value' => field.id, 'lhs_which' => 1,
+          'rhs_type' => 'field', 'raw_rhs_value' => field.id, 'rhs_which' => 2,
+          'operator' => 'equals'
+        }]
+      })
+      visit "/projects/#{@project.id}/scenarios/#{@scenario.id}"
+      link = page.driver.browser.find_element(:link_text, "Delete")
+      link.click
+      a = page.driver.browser.switch_to.alert
+      a.accept
+      assert_equal 0, Models::Matcher.filter(:id => matcher.id).count
+      assert_equal "/projects/#{@project.id}/scenarios/#{@scenario.id}", page.current_path
+    end
+  end
+end

data/test/functional/test_projects.rb

@@ -0,0 +1,67 @@
+require 'helper'
+
+module CouplerFunctionalTests
+  class TestProjects < Coupler::Test::FunctionalTest
+    test "projects" do
+      visit "/projects"
+      assert_equal 200, page.status_code
+    end
+
+    test "create project" do
+      visit "/projects/new"
+      assert_equal 200, page.status_code
+
+      within('form[action="/projects"]') do
+        fill_in("Name", :with => "foo")
+        fill_in("Description", :with => "foo bar")
+        click_button("Submit")
+      end
+
+      assert_match %r{/projects/\d+}, page.current_path
+      assert page.has_content?("Project successfully created")
+    end
+
+    test "showing invalid project when projects exist" do
+      visit "/projects/8675309"
+      assert_not_equal "/projects/8675309", page.current_path
+      assert page.has_content?("The project you were looking for doesn't exist")
+    end
+
+    test "edit project" do
+      project = Project.create(:name => 'foo')
+      visit "/projects/#{project.id}/edit"
+
+      within("form[action='/projects/#{project.id}']") do
+        fill_in("Name", :with => "bar")
+        fill_in("Description", :with => "bar foo")
+        click_button("Submit")
+      end
+
+      assert_match %r{/projects/\d+}, page.current_path
+    end
+
+    attribute(:javascript, true)
+    test "delete" do
+      project = Project.create(:name => 'foo')
+      visit "/projects"
+      find('button.delete-project').click
+      find('#yes-button').click
+      assert_equal "/projects", page.current_path
+      #assert_nil Project[:id => project.id]
+    end
+
+    attribute(:javascript, true)
+    test "delete with versions" do
+      project = Project.create(:name => 'foo')
+      visit "/projects"
+      find('button.delete-project').click
+      find('#nuke').click
+      yes = find('#yes-button')
+      yes.click
+      yes.click
+      assert_equal "/projects", page.current_path
+      assert_nil Project[:id => project.id]
+      assert_nil Database.instance[:projects_versions][:current_id => project.id]
+    end
+  end
+end