tb_core 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8475b9518168de94786cd9f214159943b6213c49
-  data.tar.gz: bd3edd0b803176eff49892130070b5f28e785d23
+  metadata.gz: 71c34ea80001648010e043bef02b72692915420f
+  data.tar.gz: 3883316c2ffaa12dd1dd898f3b96a018b58441fd
 SHA512:
-  metadata.gz: 71bb0da66f3555badb283e7fa90a3d1e68d2e41ad3f06ff62d2b07d3f5d3edda31ec93a3fa260e7afbd48379b28c4d6c22a83a6e39484237293a7d6ca5ca37de
-  data.tar.gz: 05a4129bc69e3b7679948c57dcbabd0c4b193b774bc1f4aae548a8960b484467ca6d059142ab09db62a10d46e8a72a67bf66fd0674a9b16a2915bf6fda7565ca
+  metadata.gz: ce061063bbbe493d0371ce8a1f3eba01091a2ee8c4d35a77d47afa5e8431f6c40c39f2f93b4a4c7f442cf317951696a5640f80b7f90565e1f039c04c0064398a
+  data.tar.gz: 378b935cdabc307ec286995fc2b7f77a1dc18fe482a9c1790685a0bc12bccb07e976f57728e3cf3131c256d05ec9c3881471e0ab13751d6179c4618721b1f388

data/README.md

@@ -47,7 +47,6 @@ The core engine provides various configuration options.
 - `admin_applications`: Array of custom admin modules. See section below for more info.
 - `site_name`: Controls the site name displayed in the dashboard and `tb_page_title` view helper.
 - `from_address`: Sender address used for password resets and other mailers.
-- `not_found_template`: ERB template used for 404 exceptions. Defaults to `layouts/not_found`.
 - `production_alert_domain`: When set, displays a prominent warning bar in the admin dashboard directing users to the production domain. You should only set this value in `config/environments/staging.rb`.
 
 Adding Apps to the Dashboard
@@ -60,12 +59,15 @@ The fastest way to add an app to the dashboard is via the geneator. The generato
 Admin apps are added via the `Spud::Core.config.admin_applications` array. We recommend you perform this action in either an initializer or within your `application.rb` file. 
 
     Spud::Core.config.admin_applications += [{
+      # Required:
       :name => "Clients",
       :thumbnail => "spud/admin/clients.png",
-      :url => "/admin/clients"
+      :url => "/admin/clients",
+      # Optional: 
+      :badge => ->(user){ Client.where(:is_pending => true).count() }
     }]
 
-Build out your RESTful controller and views like you normally would in any Rails app. Extend your controller from `Admin::ApplicationController` in order to inherit the default admin behaviors, and look at the core admin controllers for example implementations. 
+Build out your RESTful controller and views like you normally would in any Rails app. Extend your controller from `Admin::ApplicationController` in order to inherit the default admin behaviors, and look at the core admin controllers for example implementations.
 
 Roles & Permissions
 -------------------
@@ -145,12 +147,12 @@ Create a file in your app at `app/views/admin/users/_show_additions.html.erb`.
 404 Handling
 ------------
 
-The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` errors by rendering out the template specified in `Spud::Core.not_found_template`. The default tempalte is `layouts/not_found.html`. To customize this view, create a template by that name in your own project. 
+The base `Spud::ApplicationController` will automatically rescue from any `Spud::NotFoundError` errors by rendering out the `layouts/not_found.html` template. To customize this view, create a template by that name in your own project.
 
 When building your own apps you may raise a `Spud::NotFoundError` at any time to halt further execution and cause the 404 page to render. For example:
 
     class CarsController
-      before_filter :get_record
+      before_action :get_record
       # ... actions here
       def get_record
         @car = Car.where(:id => params[:id]).first

data/app/assets/javascripts/admin/application.js

@@ -2,3 +2,5 @@
   PLACEHOLDER
   You should create a javascript file in your application at app/assets/javascripts/admin/application.js
 */
+
+window.app = {admin: {}};

data/app/assets/javascripts/admin/core/application.js

@@ -6,6 +6,7 @@
 //= require bootstrap/js/bootstrap
 //= require datepicker/js/bootstrap-datepicker
 //= require jquery-ui/js/jquery-ui-1.9.1.custom
+//= require ../../tb_core
 //= require_self
 //= require_tree .
 //= require retina_tag
@@ -14,14 +15,6 @@ spud = {admin:{}};
 
 $(document).ready(function() {
 
-  if(typeof(window.console) == 'undefined'){
-    window.console = {
-      log:function(){},
-      warn:function(){},
-      error:function(){}
-    };
-  }
-
   spud.admin.editor.init();
 
     $("#modal_window .modal-footer .form-submit").bind('click', function() {

data/app/assets/javascripts/admin/core/dashboard.js

@@ -1,9 +1,40 @@
 (function(){
 
 spud.admin.dashboard = {
-	init:function(){
+  init:function(){
+    updateBadges();
+    setInterval(updateBadges, 30000);
+  }
+};
+
+var updateBadges = function updateBadges() {
+  var url = tb.util.urlFor('admin/badges');
+  $.ajax({
+    url: url
+  }).always(function(json) {
+    if(json && json.data) {
+      json.data.forEach(function(eachBadge) {
+        var id = "application_name_" + eachBadge.key;
+        updateBadge(id, eachBadge.badge_count);
+      });
+    }
+  });
+};
 
-	}
+var updateBadge = function updateBadge(badge_id, count) {
+  var badgeIcon = $('#' + badge_id).find('.dash_icon_badge');
+  if(badgeIcon.length === 0) {
+    return;
+  }
+  else if (count === 0) {
+    badgeIcon.toggle(false);
+  }
+  else if (count > 999) {
+    badgeIcon.text("999+").toggle(true);
+  }
+  else {
+    badgeIcon.text(count).toggle(true);
+  }
 };
 
-})();
+})();

data/app/assets/javascripts/admin/core/date_picker.js

@@ -12,10 +12,10 @@ spud.admin.date_picker = {};
       date = new Date(parseInt(dateComponents[0],10),parseInt(dateComponents[1],10) - 1,parseInt(dateComponents[2],10));
     }
     return date;
-  }
+  };
 
   picker.init = function(selector) {
-      selector = (typeof(selector) == 'undefined') ? '.spud_form_date_picker' : selector;
+      selector = (typeof(selector) == 'undefined') ? '.spud_form_date_picker, .tb-form-date-picker' : selector;
       $(selector).each(function() {
         var $this = $(this);
         var baseName = $this.attr('name');

data/app/assets/javascripts/tb_core/configuration.js.erb

@@ -0,0 +1,9 @@
+(function(){
+
+tb.config = {
+  env: '<%= Rails.env %>',
+  siteName: '<%= Spud::Core.config.site_name %>',
+  subUri: '<%= Rails.configuration.relative_url_root %>'
+};
+
+})();

data/app/assets/javascripts/tb_core/console.js

@@ -0,0 +1,12 @@
+(function(){
+
+if(typeof(console) == 'undefined'){
+  var noop = function(){};
+  window.console = {
+    log: noop,
+    warn: noop,
+    error: noop
+  };
+}
+
+})();

data/app/assets/javascripts/tb_core/utility.js

@@ -0,0 +1,32 @@
+(function(){
+
+tb.util = {
+  domainWithPort: function(){
+    if(window.location.origin){
+      return window.location.origin;
+    }
+    else{
+      return location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : '');
+    }
+  },
+
+  pathFor: function(){
+    var args = Array.prototype.slice.call(arguments, 0);
+    var parts = [''];
+    if(tb.config.subUri){
+      parts.push(tb.config.subUri);
+    }
+    return parts.concat(args).join('/');
+  },
+
+  urlFor: function(){
+    var args = Array.prototype.slice.call(arguments, 0);
+    var parts = [tb.util.domainWithPort()];
+    if(tb.config.subUri){
+      parts.push(tb.config.subUri);
+    }
+    return parts.concat(args).join('/');
+  }
+};
+
+})();

data/app/assets/javascripts/tb_core.js.erb

@@ -0,0 +1,6 @@
+//= require_self
+//= require_directory ./tb_core
+
+(function(){
+  window.tb = {};
+})();

data/app/assets/stylesheets/admin/core/application.css.scss

@@ -377,3 +377,23 @@ form input.full-width {
 #modal_window .form-actions-no-modal{
 	display: none;
 }
+
+/* Admin Dashboard */
+a .image_wrapper {
+	position: relative;
+	.dash_icon_badge {
+		display: none;
+		position: absolute;
+		right: -28px;
+		top: -28px;
+		width: 40px;
+		height: 40px;
+		background: #e55137;
+		-moz-border-radius: 70px;
+		-webkit-border-radius: 20px;
+		border-radius: 20px;
+		color: white;
+		line-height: 36px;
+		font-size: 15px;
+	}
+}

data/app/controllers/admin/application_controller.rb

@@ -1,7 +1,7 @@
 class Admin::ApplicationController < Spud::ApplicationController
 
-  before_filter :require_admin_user
-  before_filter :verify_site_mode
+  before_action :require_admin_user
+  before_action :verify_site_mode
   add_breadcrumb "Dashboard", :admin_root_path
   layout 'admin/detail'
   respond_to :html, :json, :xml, :js
@@ -24,6 +24,7 @@ private
   def require_admin_user
     if current_user.blank?
       flash[:notice] = "You must be logged in to access the requested page"
+      store_location
       redirect_to admin_login_path
       return false
     elsif !current_user.has_admin_rights?

data/app/controllers/admin/dashboard_controller.rb

@@ -8,6 +8,22 @@ class Admin::DashboardController < Admin::ApplicationController
     end
   end
 
+  def badges
+    data = []
+    @admin_applications = Spud::Core.admin_applications.select do |admin_application|
+      if current_user.can_view_app?(admin_application)
+        if admin_application[:badge]
+          begin
+            data << {:key => admin_application[:key], :badge_count => admin_application[:badge].call(current_user)}
+          rescue Exception => e
+            logger.error e
+          end
+        end
+      end
+    end
+    render :json => {:data => data}
+  end
+
   def switch
     if !params[:multisite_select].blank?
       if Spud::Core.multisite_config.select{|p| p[:site_id].to_i == params[:multisite_select].to_i}.blank? == false

data/app/controllers/admin/password_resets_controller.rb

@@ -1,7 +1,7 @@
 class Admin::PasswordResetsController < Admin::ApplicationController
 
-  before_filter :load_user_using_perishable_token, :only => [:show, :update]
-  skip_before_filter :require_user, :require_admin_user
+  before_action :load_user_using_perishable_token, :only => [:show, :update]
+  skip_before_action :require_user, :require_admin_user
   layout 'admin/login'
 
   def index
@@ -30,6 +30,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     @user.password = params[:spud_user][:password]
     @user.password_confirmation = params[:spud_user][:password_confirmation]
     if @user.save
+      SpudUserSession.create(:login => @user.login, :password => params[:spud_user][:password])
       flash[:notice] = "Password successfully updated"
       redirect_to admin_login_path
     else

data/app/controllers/admin/roles_controller.rb

@@ -1,6 +1,6 @@
 class Admin::RolesController < Admin::ApplicationController
 
-  before_filter :get_record, :only => [:show, :edit, :update, :destroy]
+  before_action :get_record, :only => [:show, :edit, :update, :destroy]
   respond_to :html, :json, :xml
   belongs_to_spud_app :users
   add_breadcrumb "Users", :admin_users_path

data/app/controllers/admin/settings_controller.rb

@@ -1,9 +1,9 @@
 class Admin::SettingsController < Admin::ApplicationController
 
-  before_filter :require_user
-  skip_before_filter :require_admin_user
+  before_action :require_user
+  skip_before_action :require_admin_user
 
-  before_filter do |c|
+  before_action do |c|
     if current_user && current_user.has_admin_rights?
       add_breadcrumb "Settings", :admin_settings_path
     end
@@ -15,6 +15,9 @@ class Admin::SettingsController < Admin::ApplicationController
 
   def update
     if @current_user.update_attributes(user_params)
+      if user_params.include?(:password)
+        SpudUserSession.create(:login => @current_user.login, :password => user_params[:password])
+      end
       flash[:notice] = "User settings saved successfully."
       respond_with @current_user, :location => admin_settings_path
     else

data/app/controllers/admin/setup_controller.rb

@@ -1,6 +1,6 @@
 class Admin::SetupController < Admin::ApplicationController
 
-  skip_before_filter :require_user, :require_admin_user
+  skip_before_action :require_user, :require_admin_user
 
   def new
     if SpudUser.count != 0
@@ -15,6 +15,7 @@ class Admin::SetupController < Admin::ApplicationController
     @spud_user = SpudUser.new(user_params)
     @spud_user.super_admin = true
     if @spud_user.save
+      SpudUserSession.create(:login => @spud_user.login, :password => user_params[:password])
       redirect_to admin_root_path
     else
       render 'new', :status => 422

data/app/controllers/admin/user_sessions_controller.rb

@@ -1,6 +1,6 @@
 class Admin::UserSessionsController < Admin::ApplicationController
 
-  skip_before_filter :require_admin_user
+  skip_before_action :require_admin_user
   layout 'admin/login'
 
   def new
@@ -17,7 +17,7 @@ class Admin::UserSessionsController < Admin::ApplicationController
     @user_session = SpudUserSession.new(params[:spud_user_session])
     if @user_session.save
       flash[:notice] = "Login successful!"
-      redirect_to admin_root_path
+      redirect_to redirect_path_for_admin
     else
       render :action => :new
     end
@@ -36,4 +36,15 @@ class Admin::UserSessionsController < Admin::ApplicationController
     redirect_to admin_login_path
   end
 
+private
+
+  def redirect_path_for_admin
+    back_or_default = back_or_default(admin_root_path)
+    if /\/admin\//.match(back_or_default)
+      return back_or_default
+    else
+      return admin_root_path
+    end
+  end
+
 end

data/app/controllers/admin/users_controller.rb

@@ -3,7 +3,7 @@ class Admin::UsersController < Admin::ApplicationController
   layout false
   belongs_to_spud_app :users
   add_breadcrumb "Users", :admin_users_path
-  before_filter :load_user, :only => [:edit, :update, :show, :destroy]
+  before_action :load_user, :only => [:edit, :update, :show, :destroy]
   respond_to :html
 
   def index

data/app/controllers/password_resets_controller.rb

@@ -1,7 +1,7 @@
 class PasswordResetsController < ApplicationController
 
-  before_filter :load_user_using_perishable_token, :only => [:show, :update]
-  skip_before_filter :require_user
+  before_action :load_user_using_perishable_token, :only => [:show, :update]
+  skip_before_action :require_user
   respond_to :html
 
   def index
@@ -32,6 +32,7 @@ class PasswordResetsController < ApplicationController
       @user.password = params[:spud_user][:password]
       @user.password_confirmation = params[:spud_user][:password_confirmation]
       if @user.save()
+        SpudUserSession.create(:login => @user.login, :password => params[:spud_user][:password])
         flash[:notice] = "Password successfully updated"
         redirect_back_or_default(root_path)
         return

data/app/controllers/spud/application_controller.rb

@@ -5,10 +5,10 @@ class Spud::ApplicationController < ActionController::Base
   around_filter :set_time_zone
 
   if Spud::Core.multisite_mode_enabled
-    before_filter :multisite_caching
+    before_action :multisite_caching
   end
   include Spud::ApplicationHelper
-  before_filter :set_mailer_default_url
+  before_action :set_mailer_default_url
 
   rescue_from Spud::NotFoundError, :with => :handle_not_found
 
@@ -51,7 +51,9 @@ private
   end
 
   def store_location
-    session[:return_to] = request.url
+    if request.format.html? && !request.xhr?
+      session[:return_to] = request.url
+    end
   end
 
   def redirect_back_or_default(default)

data/app/controllers/user_sessions_controller.rb

@@ -1,6 +1,6 @@
 class UserSessionsController < ApplicationController
 
-  skip_before_filter :require_user
+  skip_before_action :require_user
   respond_to :html
   
   def new

data/app/helpers/admin/application_helper.rb

@@ -50,5 +50,12 @@ module Admin::ApplicationHelper
 
   end
 
+  def url_for_admin_dashboard_application(url)
+    if Rails.configuration.relative_url_root.blank?
+      return url
+    else
+      return [Rails.configuration.relative_url_root, url].join('/').gsub(/(\/+)/, '/') 
+    end
+  end
 
 end

data/app/models/spud_user_session.rb

@@ -1,3 +1,4 @@
 class SpudUserSession < Authlogic::Session::Base
   generalize_credentials_error_messages true
+  self.last_request_at_threshold = 1.minutes
 end

data/app/views/admin/dashboard/index.html.erb

@@ -1,14 +1,15 @@
-
 <div class="sortable">
-<%@admin_applications.each do |admin_application|%>
-
-	<div class="admin_application" id="application_name_<%=admin_application[:name]%>"><a href="<%=admin_application[:url]%>">
-		<div class="image_wrapper"><%=image_tag(admin_application[:thumbnail])%></div>
-		<span class="application_name"><%=admin_application[:name]%></span>
-		</a>
-	</div>
-
-<%end%>
+  <% @admin_applications.each do |admin_application| %>
+    <div class="admin_application" id="application_name_<%= admin_application[:key] %>">
+      <%= link_to url_for_admin_dashboard_application(admin_application[:url]) do %>
+        <div class="image_wrapper">
+          <%= image_tag(admin_application[:thumbnail]) %>
+            <span class="dash_icon_badge" ></span>
+        </div>
+        <span class="application_name"><%= admin_application[:name] %></span>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 <script type="text/javascript">
   $(document).ready(spud.admin.dashboard.init);

data/config/routes.rb

@@ -4,8 +4,8 @@ Rails.application.routes.draw do
 
     get 'login' => 'user_sessions#new', :as => 'login'
     post 'login' => 'user_sessions#create'
+    get 'badges' => 'dashboard#badges'
     match 'logout' => 'user_sessions#destroy', :as => 'logout', :via => [:get, :post]
-
     resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
 
     get 'settings' => 'settings#edit', :as => 'settings'

data/lib/generators/spud/module_generator.rb

@@ -10,15 +10,12 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
   def create_module
     template "admin_controller.rb.erb", "app/controllers/admin/#{module_name_formatted}_controller.rb"
     template "controller.rb.erb", "app/controllers/#{module_name_formatted}_controller.rb"
-    
-    if defined?(CoffeeScript)
-      template "assets/module.coffee.erb", "app/assets/javascripts/admin/#{module_name_formatted}.js.coffee"
-    else
-      template "assets/module.js.erb", "app/assets/javascripts/admin/#{module_name_formatted}.js"
-    end
-
+  
+    template "assets/module.js.erb", "app/assets/javascripts/#{module_name_formatted}.js"
+    template "assets/admin/module.js.erb", "app/assets/javascripts/admin/#{module_name_formatted}.js"
     create_file "app/assets/stylesheets/admin/#{module_name_formatted}.css.scss", "// Place #{module_name} module styles here\n\n"
     template "views/admin/index.html.erb", "app/views/admin/#{module_name_formatted}/index.html.erb"
+    template "views/admin/show.html.erb", "app/views/admin/#{module_name_formatted}/show.html.erb"
     template "views/admin/new.html.erb", "app/views/admin/#{module_name_formatted}/new.html.erb"
     template "views/admin/edit.html.erb", "app/views/admin/#{module_name_formatted}/edit.html.erb"
     template "views/admin/_form.html.erb", "app/views/admin/#{module_name_formatted}/_form.html.erb"
@@ -32,7 +29,7 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
 private
 
   def module_name_formatted
-    module_name.pluralize.downcase.underscore
+    module_name.pluralize.underscore
   end
 
   def create_routes

data/lib/generators/spud/setup_generator.rb

@@ -8,18 +8,14 @@ class Spud::SetupGenerator < ::Rails::Generators::Base
     template 'assets/admin.css.scss', 'app/assets/stylesheets/admin/application.css.scss'
 
     update_base_stylesheet()
-    update_base_javascript()
 
-    if defined?(CoffeeScript)
-      template 'assets/admin.coffee.erb', 'app/assets/javascripts/admin/application.js.coffee'
-    else
-      template 'assets/admin.js.erb', 'app/assets/javascripts/admin/application.js'
-    end
+    template 'assets/application.js', 'app/assets/javascripts/application.js'
+    template 'assets/admin/application.js', 'app/assets/javascripts/admin/application.js'
 
     environment(spud_core_configs())
     rake('railties:install:migrations')
 
-    if ask("Migrate the database? [Yn] ") == 'Y'
+    if ask("Migrate the database? [Yn] ").downcase == 'y'
       rake('db:migrate')
     end
   end

data/lib/generators/spud/templates/admin_controller.rb.erb

@@ -1,6 +1,6 @@
 class Admin::<%= module_name_formatted.camelize%>Controller < Admin::ApplicationController
 
-  before_filter :load_<%= module_name_formatted.singularize %>, :only => [:show, :edit, :update, :destroy]
+  before_action :load_<%= module_name_formatted.singularize %>, :only => [:show, :edit, :update, :destroy]
   belongs_to_spud_app :<%= module_name_formatted %>
   add_breadcrumb "<%= module_name_formatted.humanize.titlecase %>", :admin_<%= module_name_formatted %>_path
 

data/lib/generators/spud/templates/assets/admin/application.js

@@ -0,0 +1,16 @@
+//= require_self
+//= require_tree
+
+(function(){
+
+window.app = {
+  admin: {
+    init: function(){
+
+    }
+  }
+};
+
+$(document).ready(app.admin.init);
+
+})();

data/lib/generators/spud/templates/assets/admin/module.js.erb

@@ -0,0 +1,19 @@
+// <%= module_name.titleize %>
+
+(function(){
+
+app.admin.<%= module_name_formatted %> = {
+  index: function(){
+
+  },
+
+  show: function(){
+
+  },
+
+  edit: function(){
+
+  }
+};
+
+})();

data/lib/generators/spud/templates/assets/application.js

@@ -0,0 +1,17 @@
+//= require jquery
+//= require jquery_ujs
+//= require tb_core
+//= require_self
+//= require_directory .
+
+(function(){
+
+window.app = {
+  init: function(){
+    // global initializer
+  }
+};
+
+$(document).ready(app.init);
+
+})();

data/lib/generators/spud/templates/assets/module.js.erb

@@ -1,9 +1,13 @@
-// Place module <%= module_name %> scripts here
+// <%= module_name.titleize %>
 
 (function(){
 
-<%= application_name() %>.<%= module_name_formatted %> = {
-  init: function(){
+app.<%= module_name_formatted %> = {
+  index: function(){
+
+  },
+
+  show: function(){
 
   }
 };

data/lib/generators/spud/templates/controller.rb.erb

@@ -1,7 +1,7 @@
 class <%=module_name_formatted.camelize%>Controller < ApplicationController
 
   respond_to :html, :json
-  before_filter :load_<%=module_name_formatted.singularize%>, :only => [:show]
+  before_action :load_<%=module_name_formatted.singularize%>, :only => [:show]
 
   def index
     @<%=module_name_formatted%> = <%=module_name_formatted.singularize.camelize%>.paginate(:page => params[:page])

data/lib/generators/spud/templates/views/admin/_form.html.erb

@@ -20,5 +20,5 @@
 <%% end %>
 
 <script>
-  $(document).ready(<%= application_name %>.<%= module_name_formatted %>.init);
+  $(document).ready(app.admin.<%= module_name_formatted %>.edit);
 </script>

data/lib/generators/spud/templates/views/admin/index.html.erb

@@ -17,6 +17,7 @@
           <td><%%= <%=module_name_formatted.singularize%>.<%=attribute%> %></td>
           <%-end-%>
           <td align="right" width="150">
+            <%%= link_to 'Details', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
             <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :class => 'btn btn-mini' %>
             <%%= link_to 'Delete', admin_<%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>), :method => :delete, :data => {:confirm => 'Are you sure you want to delete this <%=module_name_formatted.singularize.humanize%>?'}, :class => 'btn btn-danger btn-mini' %>
           </td>
@@ -25,4 +26,9 @@
     </tbody>
   </table>
   <%%= will_paginate @<%=module_name_formatted%> %>
+
+  <script>
+    $(document).ready(app.admin.<%= module_name_formatted %>.index);
+  </script>
+
 <%% end %>

data/lib/generators/spud/templates/views/admin/show.html.erb

@@ -0,0 +1,17 @@
+<%% content_for :data_controls do %>
+  <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(@<%=module_name_formatted.singularize%>), :class => 'btn' %>
+<%% end %>
+
+<ul>
+  <%- attribute_names.each do |attribute| -%>
+  <li><strong><%= attribute.humanize.titlecase %>:</strong> <%%= @<%= module_name_formatted.singularize %>.<%= attribute %> %></li>
+  <%- end -%>
+</ul>
+
+<div class="form-actions">
+  <%%= link_to "Back", admin_<%= module_name_formatted %>_path, :class => "btn" %>
+</div>
+
+<script>
+  $(document).ready(app.admin.<%= module_name_formatted %>.show);
+</script>

data/lib/generators/spud/templates/views/frontend/index.html.erb

@@ -19,4 +19,8 @@
     <%% end %>
   </tbody>
 </table>
-<%%=will_paginate @<%=module_name_formatted%>%>
+<%%= will_paginate @<%=module_name_formatted%> %>
+
+<script>
+  $(document).ready(app.<%= module_name_formatted %>.index);
+</script>

data/lib/generators/spud/templates/views/frontend/show.html.erb

@@ -5,4 +5,8 @@
 <p><strong><%=attribute_args[0].humanize.titlecase%></strong> <%%=@<%=module_name_formatted.singularize%>.<%=attribute_args[0]%> %></p>
 <%-end-%>
 
-<p><%%= link_to 'Back', <%=module_name_formatted.pluralize%>_path %></p>
+<p><%%= link_to 'Back', <%=module_name_formatted.pluralize%>_path %></p>
+
+<script>
+  $(document).ready(app.<%= module_name_formatted %>.show);
+</script>

data/lib/spud_core/belongs_to_app.rb

@@ -15,7 +15,7 @@ module Spud::BelongsToApp
         end
       end
       self.class_eval do
-        before_filter do |controller|
+        before_action do |controller|
           @page_thumbnail = self.class.page_application[:thumbnail]
           @application_name = self.class.page_application[:name]
           @page_name = self.class.page_title

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/spec/controllers/admin/dashboard_controller_spec.rb

@@ -6,6 +6,11 @@ describe Admin::DashboardController do
       :name => 'Test App',
       :url => '/test/app',
       :permissions => ["admin.test_app.full_access"]
+    },
+    {
+      :name => "dash app",
+      :key => 'dash_app',
+      :badge => ->(user) { return 1 }
     }]
   end
 
@@ -114,4 +119,44 @@ describe Admin::DashboardController do
       end
     end
   end
+
+  describe :badges do
+    before(:each) do
+      request.accept = "application/json"
+      Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = true
+      end
+      @user.super_admin = true
+      @user.save
+    end
+
+    it "should respond with a json content type" do
+      get :badges
+      response.content_type.should eq("application/json")
+    end
+
+    it "should contain data array in reponse" do
+      get :badges
+      json = JSON.parse(response.body)
+      assert json.has_key?("data")
+    end
+
+    it "should have badge count 1 for dash app" do
+      get :badges
+      json = JSON.parse(response.body)
+      data = json["data"]
+      assert data.size  == 1
+      app_found = false
+      badge_count = 0
+      data.each do |app|
+        if app["key"] == "dash_app"
+          app_found = true
+          badge_count = app["badge_count"]
+        end
+      end
+      assert app_found && badge_count == 1
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
@@ -328,6 +328,10 @@ files:
 - app/assets/javascripts/admin/core/roles.js
 - app/assets/javascripts/admin/core/split_pane.js
 - app/assets/javascripts/admin/core/users.js
+- app/assets/javascripts/tb_core.js.erb
+- app/assets/javascripts/tb_core/configuration.js.erb
+- app/assets/javascripts/tb_core/console.js
+- app/assets/javascripts/tb_core/utility.js
 - app/assets/libs/bootstrap/css/bootstrap-responsive.css
 - app/assets/libs/bootstrap/css/bootstrap.css.scss
 - app/assets/libs/bootstrap/img/glyphicons-halflings-white.png
@@ -430,16 +434,17 @@ files:
 - lib/generators/spud/setup_generator.rb
 - lib/generators/spud/templates/admin_controller.rb.erb
 - lib/generators/spud/templates/application_controller.rb
-- lib/generators/spud/templates/assets/admin.coffee.erb
 - lib/generators/spud/templates/assets/admin.css.scss
-- lib/generators/spud/templates/assets/admin.js.erb
-- lib/generators/spud/templates/assets/module.coffee.erb
+- lib/generators/spud/templates/assets/admin/application.js
+- lib/generators/spud/templates/assets/admin/module.js.erb
+- lib/generators/spud/templates/assets/application.js
 - lib/generators/spud/templates/assets/module.js.erb
 - lib/generators/spud/templates/controller.rb.erb
 - lib/generators/spud/templates/views/admin/_form.html.erb
 - lib/generators/spud/templates/views/admin/edit.html.erb
 - lib/generators/spud/templates/views/admin/index.html.erb
 - lib/generators/spud/templates/views/admin/new.html.erb
+- lib/generators/spud/templates/views/admin/show.html.erb
 - lib/generators/spud/templates/views/frontend/index.html.erb
 - lib/generators/spud/templates/views/frontend/show.html.erb
 - lib/generators/spud/templates/views/layouts/application.html.erb

data/lib/generators/spud/templates/assets/admin.coffee.erb

@@ -1,9 +0,0 @@
-#= require_self
-#= require_tree
-
-window.<%= application_name() %> = {
-  init: ()->
-
-}
-
-$(document).ready(<%= application_name() %>.init);

data/lib/generators/spud/templates/assets/admin.js.erb

@@ -1,14 +0,0 @@
-//= require_self
-//= require_tree
-
-(function(){
-
-window.<%= application_name() %> = {
-  init: function(){
-
-  }
-};
-
-$(document).ready(<%= application_name() %>.init);
-
-})();

data/lib/generators/spud/templates/assets/module.coffee.erb

@@ -1,6 +0,0 @@
-# Place module <%= module_name %> scripts here
-
-<%= application_name() %>.<%= module_name_formatted %> = {
-  init: ()->
-
-}