dm-cutie-ui 0.0.2 → 0.4.0

data/Rakefile

@@ -45,7 +45,7 @@ require ROOT + 'lib/dm-cutie-ui/version'
   s.add_dependency "dm-core",       ">=0.10.1"
   s.add_dependency "dm-aggregates", ">=0.10.1"
   s.add_dependency "data_objects",  '>=0.10.0'
-  s.add_dependency "dm-cutie",      '>=0.3.0'
+  s.add_dependency "dm-cutie",      '>=0.4.0'
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.2.0}
 end

data/lib/dm-cutie-ui.rb

@@ -5,7 +5,7 @@ require 'logger'
 gem 'extlib', ">=0.9.13"
 require 'extlib'
    
-gem 'dm-cutie', '>=0.3.0'
+gem 'dm-cutie', '>=0.4.0'
 require 'dm-cutie'
 
 gem 'dm-aggregates', '>=0.10.1'
@@ -17,7 +17,7 @@ require 'dm-core'
 gem "data_objects",  '>=0.10.0'
 require 'data_objects'
 
-# SEt up a faux adapter. DM requires a default repository
+# Set up a faux adapter. DM requires a default repository
 #   Repository names are hashes of the Normalized URI and are stored in CutieUI.
 DataMapper.setup :default, "abstract://null"
 

data/lib/dm-cutie-ui/server.rb

@@ -58,21 +58,22 @@ module DmCutieUI
       view_path  = DmCutieUI.view_root / 'views' / 'cutie_models' / "#{view_name}.erb"
       view_uri   = "/#{view_name}"
       if File.exist? view_path    
-        DmCutieUI.routes[view_uri] = {
+        DmCutieUI.routes[view_name] = {
           :model      => model,
           :file       => view_path,
-          :view_name  => view_name
+          :view_uri   => view_uri
         }
 
         # Create the 'controller'
         get view_uri do
           if !DmCutieUI.repos[session["current"]].blank?
             # The cutie model being viewed
+            
+            @view_name    = request.path_info.split('/')[1]
 
-            @view_name    = DmCutieUI.routes[ request.path_info ][:view_name]
-            @cutie_model  = DataMapper::Cutie.get_klass DmCutieUI.routes[ request.path_info ][:model]
+            @cutie_model  = DataMapper::Cutie.get_klass DmCutieUI.routes[ @view_name ][:model]
 
-            @title        = DmCutieUI.routes[ request.path_info ][:model]
+            @title        = Extlib::Inflection.classify( DmCutieUI.routes[ @view_name ][:model] )
 
             # Keep the response scoped to the users selected Cutie Repo
             user_current_repo { erb(:"cutie_models/#{@view_name}") }        
@@ -205,7 +206,7 @@ module DmCutieUI
 
         remote_model_name     = DataMapper::Cutie.get_human_name(remote_model).to_s.pluralize  
         total_remote_records  = remote_model.all( remote_model_key => filter_value ).count
-        link_to "View: #{total_remote_records}", "/#{remote_model_name}?#{remote_model_key}=#{filter_value}"
+        link_to "#{total_remote_records} records", "/#{remote_model_name}?#{remote_model_key}=#{filter_value}"
       end
 
       # Returns 'selected="selected"' to reselect filter drop downs

data/lib/dm-cutie-ui/server/public/application.css

@@ -47,9 +47,10 @@ table tr:hover td{
 }
 
 table.tablesorter thead tr .header {
+  padding-left: 20px;
 	background-image: url(bg.gif);
 	background-repeat: no-repeat;
-	background-position: center right;
+	background-position: center left;
 	cursor: pointer;
 }
 
@@ -116,6 +117,20 @@ a, a:visited{
 
 
 /* =========== BEGIN CLASSES =========== */
+.checkbox_label{
+  font-weight: 500;
+  font-size: 12px;
+}
+.left{
+  float: left;
+}
+.right{
+  float: right;
+}
+.clear{
+  float: clear;
+}
+
 .help_link{
   
 }

data/lib/dm-cutie-ui/server/views/cutie_models/executed_queries.erb

@@ -1,3 +1,4 @@
+<% help_link %>
 <% @columns = ExecutedQuery.properties %>
 <%= partial :menu, :locals => {:columns => @columns} %>
 
@@ -27,3 +28,29 @@
     :relationships  => ExecutedQuery.relationships
   }
 %>
+
+<a name="help">
+  <div class="help_container">
+    <p>
+      This is an archive off all queries that were actually executed while DM Cutie was running.
+    </p>
+    <p>
+      Columns:
+      <ul>
+        <li>id - DM Cutie ExecutedQuery ID</li>
+        <li>statement - Actual executed statement</li>
+        <li>elapsed_time - Query execution time</li>
+        <li>slow - was the query 'slow' based on the setting in DM Cutie</li>
+        <li>executed_at - Time the query was executed</li>
+        <li>caller_file - The file that created the query</li>
+        <li>caller_line - The line in the file that created the query</li>
+        <li>caller_method - The method that created the query</li>
+        <li>bind_values - An array of the bind values</li>
+        <li>repo_signature - The signature of the executed statement and repository.</li>
+        <li>signature - The signature of the query across all repositories</li>
+        <li>generalized_query_id - The Generalized Query that this execution is tied to.</li>
+      </ul>
+    </p>
+  
+  </div>
+</a>

data/lib/dm-cutie-ui/server/views/cutie_models/generalized_queries.erb

@@ -1,3 +1,4 @@
+<% help_link %>
 <% @columns = GeneralizedQuery.properties %>
 
 <%= partial :menu, :locals => {:columns => @columns } %>
@@ -36,3 +37,27 @@
     :relationships => GeneralizedQuery.relationships.except(:query_storage_links)
   }
 %>
+
+
+<a name="help">
+  <div class="help_container">
+    <p>
+      This is an archive of all 'generic' queries executed. A generic query is a unique query stripped of its bind values.
+    </p>
+    <p>
+      Example: Executing two statements that select one user by their id, would create one generalized query: select * from users where id = ?
+    </p>
+    <p>
+      Columns:
+      <ul>
+        <li>id - DM Cutie GeneralizedQuery ID</li>
+        <li>statement - Executed statement without its bind values.</li>
+        <li>operation - The SQL operation performed.</li>
+        <li>repo_signature - The signature of the executed statement and repository (globally unique).</li>
+        <li>signature - The signature of the query across all repositories (unique / query - will be duplicate across repositories).</li>
+        <li>has_links - Did the query have links to other tables (join)</li>
+      </ul>
+    </p>
+  
+  </div>
+</a>

data/lib/dm-cutie-ui/server/views/cutie_models/repository_storages.erb

@@ -1,3 +1,4 @@
+<% help_link %>
 <% @columns = RepositoryStorage.properties.to_a + [:total_selects, :total_inserts, :total_updates, :total_deletes, :read_to_write_ratio]%>
 <%= partial :menu, :locals => {:columns => @columns } %>
 
@@ -18,4 +19,30 @@
     :relationships => RepositoryStorage.relationships.except(:query_storage_links),
     :adhoc_columns => {}
   }
-%>
+%>
+
+<a name="help">
+  <div class="help_container">
+    <p>
+      An archive of all tables(storages) across repositories.
+    </p>
+    <p>
+      Columns:
+      <ul>
+        <li>id - DM Cutie RepositoryStorage ID</li>
+        <li>repo_name - The DataMapper repository name</li>
+        <li>storage_name - The name of the storage (table)</li>   
+        <li>adapter_name - The adapter storage was created with</li>      
+        <li>model_name - The name of the model</li>      
+        <li>record_count - The number of records in this adapters storage</li>      
+        <li>signature - The RepositoryStorage signature (unique)</li>     
+        <li>total_selects - Total number of selects (reads)</li>      
+        <li>total_inserts - Total number of inserts (creates)</li>      
+        <li>total_updates - Total number of updates</li>      
+        <li>total_deletes - Total number of deletes</li>      
+        <li>read_to_write_ratio - The read to write ratio of the storage</li>   
+      </ul>
+    </p>
+  
+  </div>
+</a>

data/lib/dm-cutie-ui/server/views/layout.erb

@@ -19,13 +19,26 @@
   <body>
     <div id="container">
       <div id="header">
-        <%= @title %>
-        <%= @help_link %>
+        <div class="left">
+          <%= @title %>
+          <%= @help_link %>
+        </div>
+        <div class="right">
+          <% if @record_count%>
+            Records: <%= @record_count %>
+          <% end %>
+        </div>
+        <div class="clear">&nbsp;</div>
       </div>
       <div id="content">
         <%= yield %>
       </div>
       <div id="footer">
+        <% if DmCutieUI.repos[session["current"]] %>
+          <div>
+            Connected to: <%= DmCutieUI.repos[session["current"]] %>
+          </div>
+        <% end %>
         <span>Powered by <a href="http://github.com/coryodaniel/dm-cutie">dm-cutie</a> (v. <%= DataMapper::Cutie::VERSION %>)</span>
         <br />
         <span><a href="http://github.com/coryodaniel/dm-cutie-ui">dm-cutie-ui </a>(v. <%= DmCutieUI::VERSION %>)</span>

data/lib/dm-cutie-ui/server/views/shared/_grid.erb

@@ -1,3 +1,4 @@
+<% @record_count = records.length %>
 <div id="grid">
   <table class="tablesorter">
     <thead>

data/lib/dm-cutie-ui/server/views/shared/_menu.erb

@@ -1,7 +1,4 @@
 <div id="menu">
-  <div>
-    Connected to: <%= DmCutieUI.repos[session["current"]] %>
-  </div>
   <div>
     <span>Filter By:</span>
     <select id="adapter_filter">
@@ -28,10 +25,10 @@
     <button id="filter_button">filter</button>
   </div>
   <div>    
-    <span>Columns:</span>
+    <div>Columns:</div>
     <% columns.each do |col| %>
     <input type="checkbox" checked="checked" id="<%=column_name col %>"/>
-    <span class=""><%= column_name col %></span>      
+    <span class="checkbox_label"><%= column_name col %></span>      
     <% end %>
   </div>
   <%= partial :navigation %>

data/lib/dm-cutie-ui/server/views/shared/_navigation.erb

@@ -1,7 +1,7 @@
-<div id="model_tabs">
-  <% DmCutieUI.routes.each do |uri, info| %>
-  <span class="model_tab <%= info[:view_name] == @view_name ? 'active' : 'inactive'%>">
-    <%= link_to info[:view_name].gsub('_',' '), uri %>
+<div id="model_tabs">  
+  <% DmCutieUI.routes.each do |view_name, info| %>
+  <span class="model_tab <%= view_name == @view_name ? 'active' : 'inactive'%>">
+    <%= link_to view_name.gsub('_',' '), info[:view_uri] %>
   </span>
   <% end %>
 </div>

data/lib/dm-cutie-ui/version.rb

@@ -1,3 +1,3 @@
 module DmCutieUI
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-cutie-ui
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Cory ODaniel
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -07:00
-default_executable: 
+date: 2009-10-15 00:00:00 +01:00
+default_executable: dm-cutie-ui
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: 0.4.0
     version: 
 description: An interface to DM Cutie repos.
 email: cutie@coryodaniel.com