Don't show db_type for imported resources

- Hopefully workaround const_missing error with Models, need to revisit
- Decrease Scheduler job time

lib/coupler/base.rb

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

lib/coupler/helpers.rb

@@ -117,5 +117,13 @@ def local_ip
     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

lib/coupler/models.rb

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

lib/coupler/runner.rb

@@ -51,7 +51,7 @@ def initialize(argv = ARGV, options = {}, &block)
 
       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

lib/coupler/scheduler.rb

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

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 -%>

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() {

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>