coupler 0.0.4-java → 0.0.6-java

data/webroot/views/connections/new.erb

@@ -1,6 +1,6 @@
 <% @breadcrumbs = [@connection] %>
 <%= error_messages_for @connection %>
-<form method="post" action="/connections">
+<form method="post" action="/connections" class="connection-form">
   <table class="form">
     <tr>
       <td class="left"><label for="name">Name</label></td>
@@ -12,8 +12,8 @@
       <td class="left"><label for="adapter">Type</label></td>
       <td>
         <select id="adapter" name="connection[adapter]">
-          <% Coupler::Models::Connection::ADAPTERS.each do |(value, label)| %>
-            <option value="<%= value %>"<%= ' selected="selected"' if @connection.adapter == value %>><%= label %></option>
+          <% Coupler::Models::Connection::ADAPTERS.each do |options| %>
+            <option value="<%= options[:name] %>"<%= ' selected="selected"' if @connection.adapter == options[:name] %>><%= options[:label] %></option>
           <% end %>
         </select>
       </td>
@@ -48,8 +48,46 @@
         <input id="database_name" name="connection[database_name]" type="text" value="<%= @connection.database_name %>" />
       </td>
     </tr>
+    <tr>
+      <td class="left"><label for="path">Path</label></td>
+      <td>
+        <input id="path" name="connection[path]" type="text" value="<%= @connection.path %>" />
+      </td>
+    </tr>
   </table>
   <p>
     <input type="submit" value="Submit" /> or <a href="/connections">Cancel</a>
   </p>
 </form>
+<script type="text/javascript">
+  var ignoredAttribs = <%= Coupler::Models::Connection::ADAPTERS.inject({}) { |m, o| m[o[:name]] = o[:ignored_attributes]; m }.to_json %>
+  function adapterSelected(fade) {
+    var ignored = ignoredAttribs[$(this).val()];
+    var enable = $([]);
+    var disable = $([]);
+    $("[name^=connection\\[]").each(function() {
+      var obj = $(this);
+      var row = obj.closest('tr');
+      if ($.inArray(obj.attr('id'), ignored) == -1) {
+        enable = enable.add(row);
+      } else {
+        disable = disable.add(row);
+      }
+    });
+    if (typeof(fade) == 'undefined' || fade) {
+      disable.fadeOut(function() {
+        disable.find('input, select, textarea').attr('disabled', true);
+        enable.find('input, select, textarea').attr('disabled', false);
+        enable.fadeIn();
+      });
+    } else {
+      disable.hide().find('input, select, textarea').attr('disabled', true);
+      enable.find('input, select, textarea').attr('disabled', false).show();
+    }
+  }
+
+  $(function() {
+    var a = $('#adapter').change(adapterSelected);
+    adapterSelected.call(a[0], false);
+  });
+</script>

data/webroot/views/imports/new.erb

@@ -2,6 +2,8 @@
 <%- add_javascript('jquery.dataTables.min.js') -%>
 <%- add_stylesheet('dataTables.css') -%>
 
+<%= error_messages_for @import %>
+<%= error_messages_for @resource %>
 <form action="/projects/<%= @project.id %>/imports" method="post">
   <input type="hidden" name="import[data_cache]" value="<%= @import.data_cache %>" />
   <p>

data/webroot/views/jobs/list.erb

@@ -1,24 +1,28 @@
 <table class="list">
-  <tr>
-    <th>Type</th>
-    <th>Status</th>
-    <% if show_target %><th>Target</th><% end %>
-    <th>Created</th>
-  </tr>
-  <% jobs.each_with_index do |job, i| %>
-  <tr<%= cycle("", " class='alt'") %>>
-    <td><%= job.name %></td>
-    <td><%= job.status %></td>
-    <%- if show_target -%>
-      <%- if job.resource -%>
-        <td><a href="/projects/<%= job.resource.project.id %>/resources/<%= job.resource.id %>"><%= job.resource.name %></a></td>
-      <%- elsif job.scenario -%>
-        <td><a href="/projects/<%= job.scenario.project.id %>/scenarios/<%= job.scenario.id %>"><%= job.scenario.name %></a></td>
-      <%- else -%>
-        <td>N/A</td>
+  <thead>
+    <tr>
+      <th>Type</th>
+      <th>Status</th>
+      <% if show_target %><th>Target</th><% end %>
+      <th>Created</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% jobs.each_with_index do |job, i| %>
+    <tr<%= cycle("", " class='alt'") %>>
+      <td><%= job.name %></td>
+      <td><%= job.status %></td>
+      <%- if show_target -%>
+        <%- if job.resource -%>
+          <td><a href="/projects/<%= job.resource.project.id %>/resources/<%= job.resource.id %>"><%= job.resource.name %></a></td>
+        <%- elsif job.scenario -%>
+          <td><a href="/projects/<%= job.scenario.project.id %>/scenarios/<%= job.scenario.id %>"><%= job.scenario.name %></a></td>
+        <%- else -%>
+          <td>N/A</td>
+        <%- end -%>
       <%- end -%>
-    <%- end -%>
-    <td><%= timeago(job.created_at) %></td>
-  </tr>
-  <% end %>
+      <td><%= timeago(job.created_at) %></td>
+    </tr>
+    <% end %>
+  </tbody>
 </table>

data/webroot/views/projects/index.erb

@@ -55,24 +55,32 @@
   $(function() {
     $('#delete-project-dialog').dialog({
       autoOpen: false,
-      buttons: {
-        "Yes": function() {
-          if ($('#confirm-1').is(':visible')) {
-            $('#nuke-choice').toggle($('#nuke').is(':checked'));
-            $('#confirm-1').hide();
-            $('#confirm-2').show();
-          }
-          else {
-            $('#delete-form').submit();
+      buttons: [
+        {
+          id: "yes-button",
+          text: "Yes",
+          click: function() {
+            if ($('#confirm-1').is(':visible')) {
+              $('#nuke-choice').toggle($('#nuke').is(':checked'));
+              $('#confirm-1').hide();
+              $('#confirm-2').show();
+            }
+            else {
+              $('#delete-form').submit();
+            }
           }
         },
-        "No": function() {
-          $('#delete-project-dialog').dialog('close');
-          $('#nuke').attr('checked', false)
-          $('#confirm-1').show();
-          $('#confirm-2').hide();
+        {
+          id: "no-button",
+          text: "No",
+          click: function() {
+            $('#delete-project-dialog').dialog('close');
+            $('#nuke').attr('checked', false)
+            $('#confirm-1').show();
+            $('#confirm-2').hide();
+          },
         }
-      },
+      ],
       modal: true
     });
     $('button.edit-project').button({icons: { primary: 'ui-icon-pencil' }});

data/webroot/views/resources/list.erb

@@ -6,14 +6,13 @@
     <tr>
       <th>Name</th>
       <% unless @hide_connection %><th>Connection</th><% end %>
-      <th>Database</th>
       <th>Table</th>
     </tr>
   </thead>
   <tbody>
   <% @resources.each_with_index do |resource, i| %>
     <tr<%= ' class="alt"' if i % 2 == 1 %>>
-      <td><a href="/projects/<%= @project.id %>/resources/<%= resource.id %>"><%= resource.name %></a></td>
+      <td><a href="/projects/<%= resource.project_id %>/resources/<%= resource.id %>"><%= resource.name %></a></td>
       <%- if resource.import_id -%>
         <td colspan="3" class='centered'>(imported)</td>
       <%- else -%>

data/webroot/views/resources/new.erb

@@ -23,8 +23,8 @@
         <td class="left"><label for="adapter" class="strong">Type</label></td>
         <td>
           <select id="adapter" name="resource[connection_attributes][adapter]">
-          <%- Coupler::Models::Connection::ADAPTERS.each do |(value, label)| -%>
-            <option value="<%= value %>"<%= ' selected="selected"' if @resource.connection.adapter == value %>><%= label %></option>
+          <%- Coupler::Models::Connection::ADAPTERS.each do |options| -%>
+            <option value="<%= options[:name] %>"<%= ' selected="selected"' if @resource.connection.adapter == options[:name] %>><%= options[:label] %></option>
           <%- end -%>
           </select>
         </td>

data/webroot/views/resources/show.erb

@@ -13,7 +13,7 @@
   <%- @fields.each do |field| -%>
     <tr>
       <td<%= ' class="altered-field"' if field.is_generated %>><%= field.name %></td>
-      <td<%= ' class="altered-field"' if field.local_db_type %>><%= field.final_db_type %></td>
+      <td<%= ' class="altered-field"' if field.local_type %>><%= field_type(@resource, field) %></td>
     </tr>
   <%- end -%>
   </tbody>
@@ -66,7 +66,10 @@
 <script type="text/javascript">
   var intervalId;
   $(function() {
-    $('#fields').dataTable({bJQueryUI: true, aaSorting: [], aoColumns: [null, null] });
+    $('#fields').dataTable({
+      bJQueryUI: true, aaSorting: [],
+      bAutoWidth: false, aoColumns: [{sWidth: "50%"}, {sWidth: "50%"}]
+    });
   <%- if @job && @job.status == 'running' -%>
     $('#progressbar').progressbar({value: <%= @job.percent_completed %>});
     setInterval(function() {

data/webroot/views/scenarios/new.erb

@@ -35,7 +35,7 @@
     <tr class="alt">
       <td class="left"><label for="description">Description</label></td>
       <td>
-        <input id="name" name="scenario[description]" type="text" value="<%= @scenario.description %>" />
+        <input id="description" name="scenario[description]" type="text" value="<%= @scenario.description %>" />
       </td>
     </tr>
   </table>

data/webroot/views/transformations/new.erb

@@ -27,7 +27,7 @@
       </tr>
       <tr id="field-info" class="hidden">
         <td class="col1">Current Type:</td>
-        <td><span id='field-type'></span> (<span id='field-db-type'></span>)</td>
+        <td><span id='field-type'></span><%= " (<span id='field-db-type'></span>)" if !@resource.import_id %></td>
       </tr>
     </table>
   </div>

metadata

@@ -2,7 +2,7 @@
 name: coupler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.6
 platform: java
 authors: 
   - Jeremy Stephens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -05:00
+date: 2011-07-12 00:00:00 -05:00
 default_executable: coupler
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -69,7 +69,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: carrierwave
+    name: carrierwave-sequel
     version_requirements: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -102,7 +102,7 @@ dependencies:
     prerelease: false
     type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: rake
+    name: jdbc-h2
     version_requirements: &id009 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -111,9 +111,9 @@ dependencies:
             version: "0"
     requirement: *id009
     prerelease: false
-    type: :development
+    type: :runtime
   - !ruby/object:Gem::Dependency 
-    name: jeweler
+    name: rake
     version_requirements: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -124,7 +124,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: forgery
+    name: jeweler
     version_requirements: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -135,29 +135,29 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: test-unit
+    name: forgery
     version_requirements: &id012 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 2.2.0
+            version: "0"
     requirement: *id012
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: mocha
+    name: test-unit
     version_requirements: &id013 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            version: "0"
+            version: 2.2.0
     requirement: *id013
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: rack-test
+    name: mocha
     version_requirements: &id014 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -190,7 +190,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: factory_girl
+    name: git
     version_requirements: &id017 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -201,7 +201,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: git
+    name: thor
     version_requirements: &id018 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -212,7 +212,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: thor
+    name: table_maker
     version_requirements: &id019 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -223,7 +223,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: rake
+    name: capybara
     version_requirements: &id020 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -234,7 +234,7 @@ dependencies:
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
-    name: table_maker
+    name: jruby-openssl
     version_requirements: &id021 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
@@ -244,17 +244,6 @@ dependencies:
     requirement: *id021
     prerelease: false
     type: :development
-  - !ruby/object:Gem::Dependency 
-    name: ruby-debug
-    version_requirements: &id022 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: "0"
-    requirement: *id022
-    prerelease: false
-    type: :development
 description: Coupler is a (JRuby) desktop application designed to link datasets together
 email: jeremy.f.stephens@vanderbilt.edu
 executables: 
@@ -323,7 +312,6 @@ files:
   - 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
@@ -375,23 +363,22 @@ files:
   - 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
@@ -421,7 +408,6 @@ files:
   - 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

data/lib/coupler/config.rb

@@ -1,128 +0,0 @@
-module Coupler
-  module Config
-    DEFAULT_CONFIG = {
-      :database => {
-        :port => 12345,
-        :user => 'coupler',
-        :password => 'cupla',
-        :max_connections => '100',
-        :max_allowed_packet => '1M',
-        :connection_string => 'jdbc:mysql://localhost:%d/%s?user=%s&password=%s',
-      }
-    }
-
-    VENDOR_LIBS = {
-      'jruby' => {
-        :type => 'java',
-        :filetype => 'jar',
-        :version => '1.6.0',
-        :url => "http://jruby.org.s3.amazonaws.com/downloads/%1$s/jruby-complete-%1$s.jar",
-        :uncompress => false,
-        :filename => "jruby-complete-%s.jar",
-        :symlink => "jruby-complete.jar"
-      },
-      'mysql-connector-mxj' => {
-        :type => 'java',
-        :filetype => "tarball",
-        :version => '5-0-11',
-        :dir => "mysql-connector-mxj-gpl-%s",
-        :url => "http://mysql.mirrors.hoobly.com/Downloads/Connector-MXJ/mysql-connector-mxj-gpl-%s.tar.gz",
-        :libs => [
-          "mysql-connector-mxj-gpl-%s.jar",
-          "mysql-connector-mxj-gpl-%s-db-files.jar"
-        ]
-      },
-      'mysql-connector-java' => {
-        :type => 'java',
-        :filetype => "tarball",
-        :version => '5.1.13',
-        :dir => "mysql-connector-java-%s",
-        :url => "http://mysql.mirrors.hoobly.com/Downloads/Connector-J/mysql-connector-java-%s.tar.gz",
-        :libs => [
-          "mysql-connector-java-%s-bin.jar",
-        ]
-      }
-    }
-
-    def self.each_vendor_lib
-      VENDOR_LIBS.each_key do |name|
-        yield(name, vendor_lib_info(name))
-      end
-    end
-
-    def self.vendor_lib_info(name)
-      info = VENDOR_LIBS[name]
-      info = info.merge({:url => info[:url] % info[:version]})
-      info[:dir]      %= info[:version]   if info[:dir]
-      info[:filename] %= info[:version]   if info[:filename]
-      info
-    end
-
-    def self.vendor_lib_paths(name)
-      info = VENDOR_LIBS[name]
-      version = info[:version]
-      path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'vendor', info[:type], info[:dir] % version))
-      info[:libs].collect { |lib| File.join(path, lib % version) }
-    end
-
-    def self.require_vendor_libs(name)
-      vendor_lib_paths(name).each { |path| require(path) }
-    end
-
-    @@config = nil
-    def self.get(*keys)
-      if @@config.nil?
-        @@config = DEFAULT_CONFIG
-      end
-
-      if keys == [:data_path]
-        if !@@config.has_key?(keys[0])
-          # FIXME: this is a little naive
-          dir = File.join(File.dirname(__FILE__), "..", "..")
-          if ENV['APPDATA']
-            # Windows
-            dir = File.join(ENV['APPDATA'], "coupler")
-          elsif !File.writable?(dir)
-            if ENV['HOME']
-              dir = File.join(ENV['HOME'], ".coupler")
-            else
-              raise "don't know where to put data!"
-            end
-          end
-          @@config[:data_path] = File.expand_path(dir)
-        end
-        Dir.mkdir(@@config[:data_path])   if !File.exist?(@@config[:data_path])
-      elsif keys == [:upload_path]
-        if !@@config.has_key?(keys[0])
-          @@config[:upload_path] = path = File.join(get(:data_path), "uploads")
-        end
-        Dir.mkdir(@@config[:upload_path]) if !File.exist?(@@config[:upload_path])
-      end
-
-      keys.inject(@@config) { |hash, key| hash[key] }
-    end
-
-    def self.set(*args)
-      if @@config.nil?
-        @@config = DEFAULT_CONFIG
-      end
-
-      value = args.pop
-      keys = args
-
-      hash = keys[0..-2].inject(@@config) { |h, k| h[k] }
-      hash[keys[-1]] = value
-    end
-
-    def self.connection_string(database, options = {})
-      retval = self.get(:database, :connection_string) % [self.get(:database, :port), database, self.get(:database, :user), self.get(:database, :password)]
-      retval += "&createDatabaseIfNotExist=true"  if options[:create_database]
-      case options[:zero_date_time_behavior]
-      when :convert_to_null
-        retval += "&zeroDateTimeBehavior=convertToNull"
-      end
-      retval += "&autoReconnect=true"  if options[:auto_reconnect]
-      retval
-    end
-  end
-end