merb-admin 0.5.1 → 0.5.2

data/README.markdown

@@ -14,7 +14,7 @@ At the command prompt, type:
 
 In your app, add the following dependency to `config/dependencies.rb`:
 
-    dependency "merb-admin", "0.5.1"
+    dependency "merb-admin", "0.5.2"
 
 Add the following route to `config/router.rb`:
 

data/Rakefile

@@ -9,7 +9,7 @@ AUTHOR = "Erik Michaels-Ober"
 EMAIL = "sferik@gmail.com"
 HOMEPAGE = "http://github.com/sferik/merb-admin"
 SUMMARY = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-GEM_VERSION = "0.5.1"
+GEM_VERSION = "0.5.2"
 
 spec = Gem::Specification.new do |s|
   s.rubyforge_project = "merb"

data/app/controllers/application.rb

@@ -1,4 +1,4 @@
-class MerbAdmin::Application < Merb::Controller  
+class MerbAdmin::Application < Merb::Controller
   include Merb::MerbAdmin::MainHelper
 
   controller_for_slice

data/app/controllers/main.rb

@@ -80,7 +80,7 @@ class MerbAdmin::Main < MerbAdmin::Application
     end
     has_one_associations = @abstract_model.has_one_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
     has_many_associations = @abstract_model.has_many_associations.map{|association| [association, (params[:associations] || {}).delete(association[:name])]}
-    if @object.update_attributes(object) && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)} 
+    if @object.update_attributes(object) && has_one_associations.each{|association, id| update_has_one_association(association, id)} && has_many_associations.each{|association, ids| update_has_many_association(association, ids)}
       if params[:_continue]
         redirect(url(:merb_admin_edit, :model_name => @abstract_model.singular_name, :id => @object.id), :message => {:notice => "#{@abstract_model.pretty_name} was successfully updated"})
       elsif params[:_add_another]

data/app/helpers/application_helper.rb

@@ -4,7 +4,7 @@ module Merb
 
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def image_path(*segments)
         public_path_for(:image, *segments)
@@ -12,7 +12,7 @@ module Merb
 
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def javascript_path(*segments)
         public_path_for(:javascript, *segments)
@@ -20,40 +20,40 @@ module Merb
 
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def stylesheet_path(*segments)
         public_path_for(:stylesheet, *segments)
       end
 
       # Construct a path relative to the public directory
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path relative to the public directory, with added segments.
       def public_path_for(type, *segments)
         ::MerbAdmin.public_path_for(type, *segments)
       end
 
       # Construct an app-level path.
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path within the host application, with added segments.
       def app_path_for(type, *segments)
         ::MerbAdmin.app_path_for(type, *segments)
       end
 
       # Construct a slice-level path.
-      # 
+      #
       # @param <Symbol> The type of component.
       # @param *segments<Array[#to_s]> Path segments to append.
       #
-      # @return <String> 
+      # @return <String>
       #  A path within the slice source (Gem), with added segments.
       def slice_path_for(type, *segments)
         ::MerbAdmin.slice_path_for(type, *segments)

data/app/views/layout/dashboard.html.erb

@@ -21,7 +21,7 @@
           </h1>
         </div>
       </div>
-<%= partial('layout/message', :message => message) unless message.blank? -%>      
+<%= partial('layout/message', :message => message) unless message.blank? -%>
       <div id="content" class="colMS">
         <h1>
           <%= page_name %>

data/app/views/main/_has_many.html.erb

@@ -1,4 +1,4 @@
-<% 
+<%
   association_name = association[:name]
   collection = MerbAdmin::AbstractModel.new(association[:child_model]).all.map{|o| [o.id, object_title(o)]}.sort_by{|o| o[1]}
   selected = @object.send(association_name)

data/app/views/main/_properties.html.erb

@@ -16,4 +16,4 @@
 <%= partial(property_type.to_s, :property => property) -%>
               </div>
               <% end %>
-            </fieldset> 
+            </fieldset>

data/lib/merb-admin/merbtasks.rb

@@ -47,7 +47,7 @@ namespace :slices do
     task :migrate do # see slicetasks.rb
     end
 
-    desc "Freeze MerbAdmin into your app (only merb-admin/app)" 
+    desc "Freeze MerbAdmin into your app (only merb-admin/app)"
     task :freeze => [ "freeze:app" ]
 
     namespace :freeze do
@@ -67,7 +67,7 @@ namespace :slices do
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
 
-      desc "Freeze all views into your application for easy modification" 
+      desc "Freeze all views into your application for easy modification"
       task :views do
         puts "Copying all view templates to your application - resolves any collisions"
         copied, preserved = MerbAdmin.mirror_files_for :view
@@ -76,7 +76,7 @@ namespace :slices do
         preserved.each { |f| puts "! preserved override as #{f}" }
       end
 
-      desc "Freeze all models into your application for easy modification" 
+      desc "Freeze all models into your application for easy modification"
       task :models do
         puts "Copying all models to your application - resolves any collisions"
         copied, preserved = MerbAdmin.mirror_files_for :model

data/lib/merb-admin/slicetasks.rb

@@ -60,7 +60,7 @@ def load_data
       division = MerbAdmin::AbstractModel.new("Division").create(:name => mlb_team.division, :league => league)
     end
     unless team = MerbAdmin::AbstractModel.new("Team").first(:conditions => ["name = ?", mlb_team.name])
-      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :division => division, :league => league)
+      team = MerbAdmin::AbstractModel.new("Team").create(:name => mlb_team.name, :logo_image_url => mlb_team.logo_url, :manager => mlb_team.manager, :ballpark => mlb_team.ballpark, :mascot => mlb_team.mascot, :founded => mlb_team.founded, :wins => mlb_team.wins, :losses => mlb_team.losses, :win_percentage => ("%.3f" % (mlb_team.wins.to_f / mlb_team.wins + mlb_team.losses)).to_f, :division => division, :league => league)
     end
     mlb_team.players.each do |player|
       MerbAdmin::AbstractModel.new("Player").create(:name => player.name, :number => player.number, :position => player.position, :team => team)
@@ -128,4 +128,3 @@ def split_name(name)
   mres = /^([^\/\.]+)\.(.+)$/i.match(file_name)
   mres.nil? ? [file_name, ''] : [mres[1], mres[2]]
 end
-

data/lib/merb-admin/spectasks.rb

@@ -35,7 +35,7 @@ namespace :slices do
         t.spec_opts = ["--format", "specdoc", "--colour"]
         if(ENV['REQUEST'])
           t.spec_files = Dir["#{slice_root}/spec/requests/**/#{ENV['REQUEST']}_spec.rb"].sort
-        else    
+        else
           t.spec_files = Dir["#{slice_root}/spec/requests/**/*_spec.rb"].sort
         end
       end

data/lib/merb-admin.rb

@@ -9,7 +9,7 @@ if defined?(Merb::Plugins)
   Merb::Slices::register(__FILE__)
 
   # Slice configuration - set this in a before_app_loads callback.
-  # By default a Slice uses its own layout, so you can swicht to 
+  # By default a Slice uses its own layout, so you can swicht to
   # the main application layout or no layout at all if needed.
   #
   # Configuration options:
@@ -23,7 +23,7 @@ if defined?(Merb::Plugins)
 
     # Slice metadata
     self.description = "MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data."
-    self.version = "0.5.1"
+    self.version = "0.5.2"
     self.author = "Erik Michaels-Ober"
 
     # Stub classes loaded hook - runs before LoadClasses BootLoader

data/public/javascripts/DateTimeShortcuts.js

@@ -92,7 +92,7 @@ var DateTimeShortcuts = {
     openClock: function(num) {
         var clock_box = document.getElementById(DateTimeShortcuts.clockDivName+num)
         var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName+num)
-    
+
         // Recalculate the clockbox position
         // is it left-to-right or right-to-left layout ?
         if (getStyle(document.body,'direction')!='rtl') {
@@ -106,7 +106,7 @@ var DateTimeShortcuts = {
             clock_box.style.left = findPosX(clock_link) - 110 + 'px';
         }
         clock_box.style.top = findPosY(clock_link) - 30 + 'px';
-    
+
         // Show the clock box
         clock_box.style.display = 'block';
         addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissClock(num); return true; });
@@ -208,7 +208,7 @@ var DateTimeShortcuts = {
 	    }
 	}
 
-    
+
         // Recalculate the clockbox position
         // is it left-to-right or right-to-left layout ?
         if (getStyle(document.body,'direction')!='rtl') {
@@ -222,7 +222,7 @@ var DateTimeShortcuts = {
             cal_box.style.left = findPosX(cal_link) - 180 + 'px';
         }
         cal_box.style.top = findPosY(cal_link) - 75 + 'px';
-    
+
         cal_box.style.display = 'block';
         addEvent(window.document, 'click', function() { DateTimeShortcuts.dismissCalendar(num); return true; });
     },

data/public/javascripts/RelatedObjectLookups.js

@@ -13,7 +13,7 @@ function html_unescape(text) {
 
 // IE doesn't accept periods or dashes in the window name, but the element IDs
 // we use to generate popup window names may contain them, therefore we map them
-// to allowed characters in a reversible way so that we can locate the correct 
+// to allowed characters in a reversible way so that we can locate the correct
 // element when the popup window is dismissed.
 function id_to_windowname(text) {
     text = text.replace(/\./g, '__dot__');

data/public/javascripts/actions.js

@@ -25,7 +25,7 @@ var Actions = {
             tr.className += ' selected';
         } else if (!checked) {
             tr.className = tr.className.replace(' selected', '');
-        }  
+        }
     },
     checker: function(checked) {
         var actionCheckboxes = document.getElementsBySelector('tr input.action-select');

data/public/javascripts/core.js

@@ -78,7 +78,7 @@ function findPosX(obj) {
             curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft);
             obj = obj.offsetParent;
         }
-        // IE offsetParent does not include the top-level 
+        // IE offsetParent does not include the top-level
         if (isIE && obj.parentElement){
             curleft += obj.offsetLeft - obj.scrollLeft;
         }
@@ -95,7 +95,7 @@ function findPosY(obj) {
             curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop);
             obj = obj.offsetParent;
         }
-        // IE offsetParent does not include the top-level 
+        // IE offsetParent does not include the top-level
         if (isIE && obj.parentElement){
             curtop += obj.offsetTop - obj.scrollTop;
         }

data/public/javascripts/dateparse.js

@@ -36,7 +36,7 @@ var weekdayNames = gettext("Sunday Monday Tuesday Wednesday Thursday Friday Satu
    an error if 0 or more than 1 matches
 */
 function parseMonth(month) {
-    var matches = monthNames.filter(function(item) { 
+    var matches = monthNames.filter(function(item) {
         return new RegExp("^" + month, "i").test(item);
     });
     if (matches.length == 0) {
@@ -61,22 +61,22 @@ function parseWeekday(weekday) {
     return weekdayNames.indexOf(matches[0]);
 }
 
-/* Array of objects, each has 're', a regular expression and 'handler', a 
-   function for creating a date from something that matches the regular 
-   expression. Handlers may throw errors if string is unparseable. 
+/* Array of objects, each has 're', a regular expression and 'handler', a
+   function for creating a date from something that matches the regular
+   expression. Handlers may throw errors if string is unparseable.
 */
 var dateParsePatterns = [
     // Today
     {   re: /^tod/i,
-        handler: function() { 
+        handler: function() {
             return new Date();
-        } 
+        }
     },
     // Tomorrow
     {   re: /^tom/i,
         handler: function() {
-            var d = new Date(); 
-            d.setDate(d.getDate() + 1); 
+            var d = new Date();
+            d.setDate(d.getDate() + 1);
             return d;
         }
     },
@@ -89,7 +89,7 @@ var dateParsePatterns = [
         }
     },
     // 4th
-    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i, 
+    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[1], 10));
@@ -97,7 +97,7 @@ var dateParsePatterns = [
         }
     },
     // 4th Jan
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
+    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[1], 10));
@@ -116,7 +116,7 @@ var dateParsePatterns = [
         }
     },
     // Jan 4th
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
+    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i,
         handler: function(bits) {
             var d = new Date();
             d.setDate(parseInt(bits[2], 10));
@@ -209,7 +209,7 @@ function magicDate(input) {
     var messagespan = input.id + 'Msg';
     try {
         var d = parseDateString(input.value);
-        input.value = d.getFullYear() + '-' + (fmt00(d.getMonth() + 1)) + '-' + 
+        input.value = d.getFullYear() + '-' + (fmt00(d.getMonth() + 1)) + '-' +
             fmt00(d.getDate());
         input.className = '';
         // Human readable date

data/public/javascripts/getElementsBySelector.js

@@ -1,12 +1,12 @@
 /* document.getElementsBySelector(selector)
    - returns an array of element objects from the current document
-     matching the CSS selector. Selectors can contain element names, 
+     matching the CSS selector. Selectors can contain element names,
      class names and ids and can be nested. For example:
-     
+
        elements = document.getElementsBySelect('div#main p a.external')
-     
-     Will return an array of all 'a' elements with 'external' in their 
-     class attribute that are contained inside 'p' elements that are 
+
+     Will return an array of all 'a' elements with 'external' in their
+     class attribute that are contained inside 'p' elements that are
      contained inside the 'div' element which has id="main"
 
    New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
@@ -14,7 +14,7 @@
 
    Version 0.4 - Simon Willison, March 25th 2003
    -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
-   -- Opera 7 fails 
+   -- Opera 7 fails
 */
 
 function getAllChildren(e) {
@@ -112,7 +112,7 @@ document.getElementsBySelector = function(selector) {
         case '=': // Equality
           checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
           break;
-        case '~': // Match one of space seperated words 
+        case '~': // Match one of space seperated words
           checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
           break;
         case '|': // Match start with value followed by optional hyphen
@@ -156,12 +156,12 @@ document.getElementsBySelector = function(selector) {
   return currentContext;
 }
 
-/* That revolting regular expression explained 
+/* That revolting regular expression explained
 /^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
   \---/  \---/\-------------/    \-------/
     |      |         |               |
     |      |         |           The value
     |      |    ~,|,^,$,* or =
-    |   Attribute 
+    |   Attribute
    Tag
 */

data/public/stylesheets/global.css

@@ -57,10 +57,10 @@ p img, h1 img, h2 img, h3 img, h4 img, td img { vertical-align:middle; }
 table { border-collapse:collapse; border-color:#ccc; }
 td, th { font-size:11px; line-height:13px; border-bottom:1px solid #eee; vertical-align:top; padding:5px; font-family:"Lucida Grande", Verdana, Arial, sans-serif; }
 th { text-align:left; font-size:12px; font-weight:bold; }
-thead th, 
+thead th,
 tfoot td { color:#666; padding:2px 5px; font-size:11px; background:#e1e1e1 url(../images/nav-bg.gif) top left repeat-x; border-left:1px solid #ddd; border-bottom:1px solid #ddd; }
 tfoot td { border-bottom:none; border-top:1px solid #ddd; }
-thead th:first-child, 
+thead th:first-child,
 tfoot td:first-child { border-left:none !important; }
 thead th.optional { font-weight:normal !important; }
 fieldset table { border-right:1px solid #eee; }

data/spec/controllers/main_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe MerbAdmin::Main do 
+describe MerbAdmin::Main do
 
   before(:each) do
     mount_slice

data/spec/models/datamapper/draft.rb

@@ -1,6 +1,6 @@
 class Draft
   include DataMapper::Resource
-  
+
   property :id, Serial
   property :created_at, DateTime
   property :updated_at, DateTime

data/spec/models/datamapper/league.rb

@@ -1,11 +1,11 @@
 class League
   include DataMapper::Resource
-  
+
   property :id, Serial
   property :created_at, DateTime
   property :updated_at, DateTime
   property :name, String, :nullable => false, :index => true
-  
+
   has n, :divisions
   has n, :teams
 end

data/spec/requests/main_spec.rb

@@ -18,7 +18,7 @@ end
 given "three teams exist" do
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
@@ -31,7 +31,7 @@ given "a player exists and three teams exist" do
   @player = MerbAdmin::AbstractModel.new("Player").create(:team_id => rand(99999), :number => 1, :name => "Player 1")
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 
@@ -39,7 +39,7 @@ given "a league exists and three teams exist" do
   @league = League.create(:name => "League 1")
   @teams = []
   3.times do |i|
-    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => "%.3f" % (wins.to_f / 162))
+    @teams << MerbAdmin::AbstractModel.new("Team").create(:league_id => rand(99999), :division_id => rand(99999), :name => "Team #{i + 1}", :manager => "Manager #{i + 1}", :founded => 1869 + rand(130), :wins => (wins = rand(163)), :losses => 162 - wins, :win_percentage => ("%.3f" % (wins.to_f / 162)).to_f)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Erik Michaels-Ober