coupler 0.0.7-java → 0.0.8-java

data/test/unit/models/test_transformation.rb

@@ -41,7 +41,7 @@ module CouplerUnitTests
 
       def setup
         super
-        @resource = stub('resource', :pk => 3, :id => 3, :associations => {}, :refresh_fields! => nil)
+        @resource = stub('resource', :pk => 3, :id => 3, :associations => {}, :transformations_updated! => nil)
         @transformer = stub('transformer', {
           :pk => 1, :id => 1, :associations => {},
           :allowed_types => %w{string}, :name => "foobar"
@@ -137,7 +137,7 @@ module CouplerUnitTests
 
       test "updates resource fields on save" do
         transformation = new_transformation
-        @resource.expects(:refresh_fields!)
+        @resource.expects(:transformations_updated!)
         transformation.save!
       end
 
@@ -178,8 +178,8 @@ module CouplerUnitTests
       end
 
       test "sets position by resource" do
-        resource_1 = stub('resource', :pk => 1, :id => 1, :associations => {}, :refresh_fields! => nil)
-        resource_2 = stub('resource', :pk => 2, :id => 2, :associations => {}, :refresh_fields! => nil)
+        resource_1 = stub('resource', :pk => 1, :id => 1, :associations => {}, :transformations_updated! => nil)
+        resource_2 = stub('resource', :pk => 2, :id => 2, :associations => {}, :transformations_updated! => nil)
 
         xformation_1 = new_transformation(:resource => resource_1).save!
         xformation_2 = new_transformation(:resource => resource_1).save!

data/test/unit/test_base.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 module CouplerUnitTests
   class TestBase < Coupler::Test::UnitTest
-    def test_subclasses_sinatra_base
+    test "subclasses sinatra base" do
       assert_equal Sinatra::Base, Coupler::Base.superclass
     end
   end

data/test/unit/test_scheduler.rb

@@ -24,6 +24,17 @@ module CouplerUnitTests
       Scheduler.instance.schedule_run_scenario_job(scenario)
     end
 
+    test "schedule import job" do
+      import = mock('import')
+      Models::Job.expects(:create).with({
+        :name => "import",
+        :import => import,
+        :status => "scheduled"
+      })
+
+      Scheduler.instance.schedule_import_job(import)
+    end
+
     test "run_jobs executes first scheduled job" do
       running_dataset = mock('dataset')
       scheduled_dataset = mock('dataset')

data/webroot/public/css/style.css

@@ -24,6 +24,7 @@ body {
 #sidebar .accordion h3 {
   margin-top: 3px;
   font-family: verdana, arial, helvetica, sans-serif;
+  position: relative;
 }
 #sidebar .accordion h3.ui-state-active a {
   text-shadow: 1px 1px 1px black;
@@ -504,3 +505,25 @@ table.summary tr {
 .result-group-left .record-navigation {
   border-right: 2px solid #333;
 }
+
+#notifications {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+#notifications ul {
+  background-color: lightyellow;
+  -moz-border-radius-bottomright: 10px;
+  -webkit-border-bottom-right-radius: 10px;
+  border-bottom-right-radius: 10px;
+  -moz-border-radius-bottomleft: 10px;
+  -webkit-border-bottom-left-radius: 10px;
+  border-bottom-left-radius: 10px;
+  list-style-type: none;
+  text-align: center;
+}
+#notifications ul li {
+  margin: 0;
+  display: inline;
+}

data/webroot/public/js/application.js

@@ -1,12 +1,32 @@
-//function updateJobCount() {
-  //$.get("/jobs/count", function(data) {
-    //if (data == "0") {
-      //$('#job-count').html("")
-    //} else {
-      //$('#job-count').html("("+data+")")
-    //}
-  //});
-//}
+/*
+function updateJobCount() {
+  $.get("/jobs/count", function(data) {
+    if (data == "0") {
+      $('#job-count').html("")
+    } else {
+      $('#job-count').html("("+data+")")
+    }
+  });
+}
+*/
+function updateNotifications() {
+  $.get("/notifications/unseen.json", function(data, textStatus, jqXHR) {
+    var n = $('#notifications');
+    if (data.length == 0) {
+      n.find('ul').html('');
+      n.hide();
+    } else {
+      var ids = [];
+      $.each(data, function() {
+        var id = 'notification-'+this.id;
+        ids.push(id);
+        n.find('ul:not(:has(#'+id+'))').append('<li id="'+id+'"><a href="'+this.url+'">'+this.message+'</a></li>');
+      });
+      n.find('ul li:not(#'+ids.join(',#')+')').remove();
+      $('#notifications').show();
+    }
+  }, 'json');
+}
 $(function() {
   $('.timeago').timeago();
   var accordion = $('#sidebar .accordion').accordion({
@@ -36,5 +56,6 @@ $(function() {
       window.location.href = href;
     });
   });
-  //setInterval(updateJobCount, 30000);
+  setInterval(updateNotifications, 10000);
+  updateNotifications();
 });

data/webroot/views/jobs/list.erb

@@ -17,6 +17,8 @@
           <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>
+        <%- elsif job.import -%>
+          <td><%= job.import.name %> (Project: <a href="/projects/<%= job.import.project_id %>"><%= job.import.project.name %></a>)</td>
         <%- else -%>
           <td>N/A</td>
         <%- end -%>

data/webroot/views/layout.erb

@@ -3,12 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <title>Coupler</title>
-  <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <%= stylesheet_links %>
   <%= javascript_includes %>
 </head>
 <body>
+
+<div id="notifications"><ul></ul></div>
 <div id="main" class="container_16">
 
 <div id="sidebar" class="grid_3">

data/webroot/views/notifications/index.erb

@@ -0,0 +1,16 @@
+<%- @breadcrumbs = ["Notifications"] -%>
+<%- if @notifications.empty? -%>
+<p>There are currently no notifications.</p>
+<%- else -%>
+<ul class="notifications">
+  <%- @notifications.each do |notification| -%>
+    <li class="notification">
+      <% if notification.url %>
+        <a href="<%= notification.url %>"><%= notification.message %></a>
+      <% else %>
+        <%= notification.message %>
+      <% end %>
+    </li>
+  <%- end -%>
+</ul>
+<%- end -%>

data/webroot/views/resources/list.erb

@@ -12,13 +12,18 @@
   <tbody>
   <% @resources.each_with_index do |resource, i| %>
     <tr<%= ' class="alt"' if i % 2 == 1 %>>
-      <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 -%>
-        <% unless @hide_connection %><td><%= resource.connection.name %></td><% end %>
-        <td><%= resource.table_name %></td>
-      <%- end -%>
+      <% if resource.status == 'pending' %>
+        <td><%= resource.name %></td>
+        <td colspan="2" class='centered'>(pending)</td>
+      <% else %>
+        <td><a href="/projects/<%= resource.project_id %>/resources/<%= resource.id %>"><%= resource.name %></a></td>
+        <%- if resource.import_id -%>
+          <td colspan="2" class='centered'>(imported)</td>
+        <%- else -%>
+          <% unless @hide_connection %><td><%= resource.connection.name %></td><% end %>
+          <td><%= resource.table_name %></td>
+        <%- end -%>
+      <% end %>
     </tr>
   <% end %>
   </tbody>

data/webroot/views/sidebar.erb

@@ -97,6 +97,8 @@
             <a href="/jobs">Transform: <%= job.resource.name %></a>
           <%- elsif job.scenario -%>
             <a href="/jobs">Run: <%= job.scenario.name %></a>
+          <%- elsif job.import -%>
+            <a href="/jobs">Import: <%= job.import.name %></a>
           <%- end -%>
         </li>
       <%- end -%>

metadata

@@ -2,7 +2,7 @@
 name: coupler
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: java
 authors: 
   - Jeremy Stephens
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -05:00
+date: 2011-08-16 00:00:00 -05:00
 default_executable: coupler
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -293,6 +293,10 @@ files:
   - db/migrate/021_add_fields_to_connections.rb
   - db/migrate/022_remove_database_name_from_resources.rb
   - db/migrate/023_add_import_jobs.rb
+  - db/migrate/024_add_error_msg_to_jobs.rb
+  - db/migrate/025_add_notifications.rb
+  - db/migrate/026_add_status_to_resources.rb
+  - db/migrate/027_add_notification_id_to_jobs.rb
   - features/connections.feature
   - features/matchers.feature
   - features/projects.feature
@@ -320,6 +324,7 @@ files:
   - lib/coupler/extensions/imports.rb
   - lib/coupler/extensions/jobs.rb
   - lib/coupler/extensions/matchers.rb
+  - lib/coupler/extensions/notifications.rb
   - lib/coupler/extensions/projects.rb
   - lib/coupler/extensions/resources.rb
   - lib/coupler/extensions/results.rb
@@ -338,6 +343,7 @@ files:
   - lib/coupler/models/job.rb
   - lib/coupler/models/jobify.rb
   - lib/coupler/models/matcher.rb
+  - lib/coupler/models/notification.rb
   - lib/coupler/models/project.rb
   - lib/coupler/models/resource.rb
   - lib/coupler/models/result.rb
@@ -372,6 +378,7 @@ files:
   - test/functional/test_imports.rb
   - test/functional/test_jobs.rb
   - test/functional/test_matchers.rb
+  - test/functional/test_notifications.rb
   - test/functional/test_projects.rb
   - test/functional/test_resources.rb
   - test/functional/test_results.rb
@@ -392,6 +399,7 @@ files:
   - test/unit/models/test_import.rb
   - test/unit/models/test_job.rb
   - test/unit/models/test_matcher.rb
+  - test/unit/models/test_notification.rb
   - test/unit/models/test_project.rb
   - test/unit/models/test_resource.rb
   - test/unit/models/test_result.rb
@@ -476,6 +484,7 @@ files:
   - webroot/views/layout.erb
   - webroot/views/matchers/form.erb
   - webroot/views/matchers/list.erb
+  - webroot/views/notifications/index.erb
   - webroot/views/projects/form.erb
   - webroot/views/projects/index.erb
   - webroot/views/projects/show.erb