tb_core 1.3.0.beta2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71d46dd97bbbbce461720a371f68625eb450dd6b
-  data.tar.gz: 1e7ee1ddf9176a6883a2b310d8c829b4fff33d8e
+  metadata.gz: 10dce243e38a7dda2ea1667da4ef47454d6c07c7
+  data.tar.gz: 21119a1481d42568af16b0afac0772b613b3eced
 SHA512:
-  metadata.gz: de1a06e5fb7ca79aa5d747f299da31ddff502b1626535552d7387e5a66c07012fa2ffac2d31fbd6a7f35d2160f1fd8d772e2749568f9b908206bd42f015328d4
-  data.tar.gz: 8b3656c0f2cc826005e5d33821b4954212efa72abac945092df36472bfccb344995593c23d92107e311ad4eed4069075272f87ba685e514556de244c83f2b293
+  metadata.gz: 52a4a4a753ce259fc37b70763755d83b886b366f77700f5ffbe479cb2ae91cba6b85ce02a77d3af4f4eec2dd45b1e25c037cc6c6161b5d486caffceb460b3ae6
+  data.tar.gz: 189b24c1e07af8ecd989bd9420e62d72976858ecb58274b5ff4db4f618a2bce452e1f5b34805df4f694613b35d15f269846c805ad884390d1c323c86565c2532

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

@@ -41,7 +41,4 @@ $(document).ready(function() {
 
   $('input[type=submit].btn').click(function() {$(this).button('loading');});
 
-  $('#multisite_switcher select').change(function() {
-    $(this).parent().submit();
-  });
 } );

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

@@ -66,9 +66,15 @@ body {
 		line-height: 36px;
 		font-size: 15px;
 	}
+	.application-name{
+		white-space: nowrap;
+	}
 }
 
 // Detail
+.admin-search-form{
+	display: inline;
+}
 .detail-wrapper {
 	background:#fff;
 	min-height:300px;

data/app/controllers/admin/application_controller.rb

@@ -1,19 +1,9 @@
 class Admin::ApplicationController < Spud::ApplicationController
 
   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
-  unloadable
-
-  def current_admin_site
-    if(session[:admin_site] == nil)
-      return 0
-    else
-      return session[:admin_site]
-    end
-  end
+  respond_to :html, :json
 
 private
 
@@ -30,25 +20,4 @@ private
     end
   end
 
-  def verify_site_mode
-    if(session[:admin_site] == nil)
-      session[:admin_site] = 0
-    end
-  end
-
-  def multisite_caching
-    if Spud::Core.multisite_mode_enabled
-      @old_cache_directory = Rails.application.config.action_controller.page_cache_directory
-      if(@old_cache_directory.blank?)
-        @old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
-      end
-      if session && session[:admin_site]
-        site_config = Spud::Core.site_config_for_id(session[:admin_site])
-      else
-        site_config = Spud::Core.site_config_for_host(request.host_with_port)
-      end
-      self.class.page_cache_directory = File.join(@old_cache_directory.to_s, site_config[:short_name].to_s.downcase)
-      logger.debug "Cache directory set to: #{Rails.application.config.action_controller.page_cache_directory}"
-    end
-  end
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -13,27 +13,11 @@ class Admin::DashboardController < Admin::ApplicationController
     @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
+          data << {:key => admin_application[:key], :badge_count => admin_application[:badge].call(current_user)}
         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
-        session[:admin_site] = params[:multisite_select].to_i
-      else
-        flash[:error] = "Site does not exist."
-      end
-    else
-      session[:admin_site] = 0
-    end
-    redirect_to(back_or_default(!request.referer.blank? ? request.referer : admin_root_path)) and return
-  end
 end

data/app/controllers/admin/password_resets_controller.rb

@@ -12,7 +12,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     @user = SpudUser.find_by_email(params[:email])
     if @user
       @user.reset_perishable_token!
-      CoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver
+      CoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver_later
       flash[:notice] = "Instructions to reset your password have been emailed to you. " +
       "Please check your email."
       redirect_to admin_login_path

data/app/controllers/password_resets_controller.rb

@@ -13,7 +13,7 @@ class PasswordResetsController < ApplicationController
     @user = SpudUser.find_by_email(params[:email])
     if @user
       @user.reset_perishable_token!
-      CoreMailer.forgot_password_notification(@user, password_reset_url(@user.perishable_token)).deliver
+      CoreMailer.forgot_password_notification(@user, password_reset_url(@user.perishable_token)).deliver_later
       flash[:notice] = "Password reset instructions have been sent to your email"
       redirect_to login_path
     else

data/app/controllers/spud/application_controller.rb

@@ -6,14 +6,11 @@ class Spud::ApplicationController < ActionController::Base
   helper_method :current_user_session, :current_user, :current_user_id
   around_filter :set_time_zone
 
-  if Spud::Core.multisite_mode_enabled
-    before_action :multisite_caching
-  end
   include Spud::ApplicationHelper
   before_action :set_mailer_default_url
 
   rescue_from Spud::RequestError, :with => :handle_request_error
-  rescue_from ActionController::UnknownFormat, ActionView::MissingTemplate, :with => :handle_unknown_format_error
+  rescue_from ActionController::UnknownFormat, :with => :handle_unknown_format_error
   
   def not_found
     raise Spud::NotFoundError
@@ -82,19 +79,6 @@ private
     Time.zone = old_time_zone
   end
 
-  def multisite_caching
-    if Spud::Core.multisite_mode_enabled
-      @old_cache_directory = Rails.application.config.action_controller.page_cache_directory
-      if(@old_cache_directory.blank?)
-        @old_cache_directory = Rails.application.config.action_controller.page_cache_directory = File.join(Rails.root,'public')
-      end
-      site_config = Spud::Core.site_config_for_host request.host_with_port
-
-      self.class.page_cache_directory = File.join(@old_cache_directory.to_s,site_config[:short_name].to_s.downcase)
-      logger.debug "Cache directory set to: #{Rails.application.config.action_controller.page_cache_directory}"
-    end
-  end
-
   def handle_request_error(error)
     error.request_url = request.original_url
     respond_to do |format|
@@ -108,10 +92,8 @@ private
   end
 
   def handle_unknown_format_error(error)
-    if Rails.env.production?
-      error = Spud::NotFoundError.new()
-      handle_request_error(error)
-    end
+    error = Spud::NotFoundError.new()
+    handle_request_error(error)
   end
 
 end

data/app/helpers/admin/application_helper.rb

@@ -5,24 +5,6 @@ module Admin::ApplicationHelper
     return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
   end
 
-  def current_admin_site_name
-    site_name = Spud::Core.site_name
-    if Spud::Core.multisite_mode_enabled && !session[:admin_site].blank?
-      config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
-      site_name = config[0][:site_name] if !config.blank?
-    end
-    return site_name
-  end
-
-  def header_style
-    style_str = ''
-    if Spud::Core.multisite_mode_enabled
-      config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
-      style_str = config[0][:header_style] if !config.blank? && config[0].has_key?(:header_style)
-    end
-    return style_str
-  end
-
   def url_for_admin_dashboard_application(url)
     if Rails.configuration.relative_url_root.blank?
       return url

data/app/helpers/spud/application_helper.rb

@@ -12,16 +12,7 @@ module Spud::ApplicationHelper
   end
 
   def current_site_name
-    return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
-    config = Spud::Core.site_config_for_host(request.host_with_port)
-    return Spud::Core.site_name if config.blank?
-
-    return config[:site_name]
-  end
-
-  def current_site_id
-    config = Spud::Core.site_config_for_host(request.host_with_port)
-    return config[:site_id] unless config.blank?
+    return Spud::Core.config.site_name
   end
 
   def cache_key_for_spud_collection(collection, key:'view', cache_params:[], for_user:false)
@@ -33,9 +24,6 @@ module Spud::ApplicationHelper
     if cache_params.any?
       cache_keys += cache_params.collect{ |cache_param| params[cache_param] || 'nil' }
     end
-    if Spud::Core.multisite_mode_enabled
-      cache_keys.unshift(current_site_id)
-    end
     cache_keys += collection.collect(&:id)
     cache_key = cache_keys.join('/')
     if cache_key.length > 250

data/app/models/spud_user_session.rb

@@ -1,4 +1,9 @@
 class SpudUserSession < Authlogic::Session::Base
+
+  # Rails 4.2 fix. Possibly temporary?
+  # https://github.com/binarylogic/authlogic/issues/432#issuecomment-62506755
+  extend ActiveModel::Naming
+
   generalize_credentials_error_messages true
 
   # Dont update last_request_at timestamp on every page request

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

@@ -4,7 +4,7 @@
       <%= link_to url_for_admin_dashboard_application(admin_application[:url]) do %>
           <%= image_tag(admin_application[:thumbnail]) %>
           <span class="dash-icon-badge" ></span>
-        <span class="application_name"><%= admin_application[:name] %></span>
+        <span class="application-name"><%= admin_application[:name] %></span>
       <% end %>
     </div>
   <% end %>

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

@@ -1,21 +1,7 @@
 <%= content_for :data_controls do %>
-  <%= form_tag admin_users_path, :method => :get, :class => 'form-inline' do %>
-    <div class="form-group">
-      <div class="input-group">
-        <div class="input-group-addon"><span class="glyphicon glyphicon-search"></span></div>
-        <%= search_field_tag :search, params[:search], :placeholder => 'Search', :class => 'form-control' %>
-        <% if params[:search] %>
-          <div class="input-group-addon">
-            <%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_users_path %>
-          </div>
-        <% end %>
-      </div>
-    </div>
-    <div class="form-group">
-      <%= link_to 'Roles', admin_roles_path, :class => 'btn btn-default admin-role-btn' %>
-      <%= link_to "New User", new_admin_user_path, :class => "btn btn-primary admin-user-add-btn", :title => "New User" %>
-    </div>
-  <% end %>
+  <%= render :partial => '/layouts/admin/search', :locals => {:search_path => admin_users_path} %>
+  <%= link_to 'Roles', admin_roles_path, :class => 'btn btn-default admin-role-btn' %>
+  <%= link_to "New User", new_admin_user_path, :class => "btn btn-primary admin-user-add-btn", :title => "New User" %>
 <% end %>
 
 <%= content_for :detail do %>

data/app/views/layouts/admin/_search.html.erb

@@ -0,0 +1,13 @@
+<%= form_tag search_path, :method => :get, :class => 'form-inline admin-search-form' do %>
+  <div class="form-group">
+    <div class="input-group">
+      <div class="input-group-addon"><span class="glyphicon glyphicon-search"></span></div>
+      <%= search_field_tag :search, params[:search], :placeholder => 'Search', :class => 'form-control' %>
+      <% if params[:search] %>
+        <div class="input-group-addon">
+          <%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), search_path %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+<% end %>

data/app/views/layouts/admin/application.html.erb

@@ -15,7 +15,7 @@
     <p><strong>Notice:</strong> This is a staging version of your website. To update your live website, please <%= link_to 'log in to production.', "http://#{Spud::Core.production_alert_domain}/admin" %></p>
   </div>
 <% end %>
-<div id="header" style="<%=header_style%>">
+<div id="header">
   <div class="container">
   	<%= link_to '/' do %>
       <h1><%= Spud::Core.config.site_name %></h1>

data/config/routes.rb

@@ -15,13 +15,9 @@ Rails.application.routes.draw do
     resources :users, :controller
     resources :roles
 
-    match 'switch' => "dashboard#switch", :via => [:get, :post]
-
     get 'setup' => 'setup#new'
     post 'setup' => 'setup#create'
   end
-
-  resource :sitemap, :only => [:show]
   
   # Non-admin login paths 
   get 'login' => 'user_sessions#new', :as => 'login'

data/lib/generators/spud/module_generator.rb

@@ -10,10 +10,10 @@ 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"
-  
     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"
+    create_file "app/assets/stylesheets/admin/#{module_name_formatted}.css.scss", "// Place #{module_name} admin styles here\n\n"
+    create_file "app/assets/stylesheets/#{module_name_formatted}.css.scss", "// Place #{module_name} 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"
@@ -23,8 +23,9 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
     template "views/frontend/show.html.erb", "app/views/#{module_name_formatted}/show.html.erb"
     environment("Spud::Core.config.admin_applications += [{:name => '#{module_name_formatted.humanize.titlecase}', :thumbnail => \"admin/module_icon.png\", :url => \"/admin/#{module_name_formatted}\"}]")
     create_routes
-    invoke "model", [module_name_formatted.singularize] + attributes
-    
+    Rails::Generators.invoke "model", [module_name_formatted.singularize] + attributes, :behavior => behavior
+    Rails::Generators.invoke 'helper', [module_name], :behavior => behavior
+    Rails::Generators.invoke 'helper', ["Admin/#{module_name}"], :behavior => behavior
     if self.behavior == :invoke
       create_model_scopes()
     end

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

@@ -1,20 +1,6 @@
 <%% content_for :data_controls do %>
-  <%%= form_tag admin_<%= module_name_formatted %>_path, :method => :get, :class => 'form-inline' do %>
-    <div class="form-group">
-      <div class="input-group">
-        <div class="input-group-addon"><span class="glyphicon glyphicon-search"></span></div>
-        <%%= text_field_tag 'search', params[:search], :placeholder => 'Search', :class => 'form-control' %>
-        <%% if params[:search] %>
-          <div class="input-group-addon">
-            <%%= link_to raw('<span class="glyphicon glyphicon-remove"></span>'), admin_<%= module_name_formatted %>_path %>
-          </div>
-        <%% end %>
-      </div>
-    </div>
-    <div class="form-group">
-      <%%= link_to "New <%=module_name_formatted.singularize.humanize.titlecase%>", new_admin_<%=module_name_formatted.singularize%>_path, :class => "btn btn-primary", :title => "New <%=module_name_formatted.singularize.humanize.titlecase%>" %>
-    </div>
-  <%% end %>
+  <%%= render :partial => '/layouts/admin/search', :locals => {:search_path => admin_<%= module_name_formatted %>_path } %>
+  <%%= link_to "New <%=module_name_formatted.singularize.humanize.titlecase%>", new_admin_<%=module_name_formatted.singularize%>_path, :class => "btn btn-primary", :title => "New <%=module_name_formatted.singularize.humanize.titlecase%>" %>
 <%% end %>
 
 <%% content_for :detail do %>

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

@@ -1,5 +1,6 @@
 <%% content_for :data_controls do %>
   <%%= link_to 'Edit', edit_admin_<%=module_name_formatted.singularize%>_path(@<%=module_name_formatted.singularize%>), :class => 'btn btn-default' %>
+  <%%= link_to "Back", admin_<%= module_name_formatted %>_path, :class => "btn btn-default" %>
 <%% end %>
 
 <dl class="dl-horizontal">
@@ -9,8 +10,6 @@
   <%- end -%>
 </dl>
 
-<%%= link_to "Back", admin_<%= module_name_formatted %>_path, :class => "btn btn-default" %>
-
 <script>
   $(document).ready(app.admin.<%= module_name_formatted %>.show);
 </script>

data/lib/spud_core/configuration.rb

@@ -1,18 +1,15 @@
 module Spud
   module Core
     include ActiveSupport::Configurable
-    config_accessor :site_name, :admin_applications, :sitemap_urls, :multisite_mode_enabled, :multisite_config,
-      :from_address, :site_id, :short_name, :javascripts, :stylesheets, :admin_javascripts, :admin_stylesheets, 
+    config_accessor :site_name, :admin_applications, :from_address, :site_id, :short_name,
+      :javascripts, :stylesheets, :admin_javascripts, :admin_stylesheets,
       :permissions, :production_alert_domain, :use_email_as_login
     self.admin_applications = []
     self.site_name = "Company Name"
     self.site_id = 0
     self.short_name = 'default'
-    self.sitemap_urls = []
     self.javascripts = []
     self.stylesheets = []
-    self.multisite_mode_enabled = false
-    self.multisite_config = []
     self.from_address = "no-reply@companyname.com"
     self.permissions = []
     self.admin_javascripts = ['admin/core/application', 'admin/application']
@@ -20,28 +17,6 @@ module Spud
     self.production_alert_domain = nil
     self.use_email_as_login = false
 
-    def self.site_config_for_host(host)
-      configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}
-      if configs.blank?
-        return default_site_config
-      else
-        return configs[0]
-      end
-    end
-
-    def self.site_config_for_id(id)
-      if(id == Spud::Core.config.site_id)
-        return self.default_site_config
-      else
-        matches = Spud::Core.config.multisite_config.select{ |site| site[:site_id] == id }
-        return matches[0] if matches.any?
-      end
-    end
-
-    def self.default_site_config
-      return {:site_id => Spud::Core.config.site_id, :site_name => Spud::Core.config.site_name, :short_name => Spud::Core.config.short_name}
-    end
-
     def self.append_admin_javascripts(*args)
       if args[0].class == Array
         Spud::Core.config.admin_javascripts += args[0]

data/lib/spud_core/engine.rb

@@ -1,3 +1,4 @@
+require 'responders'
 require 'jquery-rails'
 require 'authlogic'
 require 'bootstrap-sass'
@@ -21,7 +22,6 @@ module Spud
 
       engine_name :tb_core
       config.autoload_paths << "#{root}/lib"
-      #config.autoload_paths << File.expand_path("../lib", __FILE__)
 
       initializer 'tb_core.controller_overrides' do |config|
          ActionController::Base.class_eval do

data/lib/spud_core/errors.rb

@@ -14,7 +14,8 @@ class Spud::AccessDeniedError < Spud::RequestError
     @template = opts[:template]
     @code = 403
     @title = "Access Denied"
-    super("You are not authorized to view the requested #{item.downcase}.")
+    message = opts[:message] || "You are not authorized to view the requested #{item.downcase}."
+    super(message)
   end
 end
 
@@ -24,6 +25,7 @@ class Spud::NotFoundError < Spud::RequestError
     @template = opts[:template]
     @code = 404
     @title = "Not Found"
-    super("The #{item.downcase} you were looking for could not be found.")
+    message = opts[:message] || "The #{item.downcase} you were looking for could not be found."
+    super(message)
   end
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.3.0.beta2"
+    VERSION = "1.3.0"
   end
 end

data/lib/tb_core/form_builder.rb

@@ -31,10 +31,9 @@ class TbCore::FormBuilder < ActionView::Helpers::FormBuilder
       if block_given?
         concat(yield(attribute))
       else
-        concat send(input_type, attribute, objectify_options(
-          :placeholder => @object.class.human_attribute_name(attribute),
-          :class => 'form-control'
-        ))
+        options[:class] ||= 'form-control'
+        options[:placeholder] ||= @object.class.human_attribute_name(attribute)
+        concat send(input_type, attribute, objectify_options(options))
       end
       error_message = @object.errors[attribute].first
       if error_message

data/spec/controllers/admin/application_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Admin::ApplicationController do
+RSpec.describe Admin::ApplicationController, :type => :controller do
   
   before :each do
     activate_authlogic
@@ -9,7 +9,7 @@ describe Admin::ApplicationController do
     @session = SpudUserSession.create(@user)
   end
   
-  describe :require_user do
+  describe 'require_user' do
     controller(Admin::ApplicationController) do
       def index
         render :nothing => true
@@ -18,8 +18,7 @@ describe Admin::ApplicationController do
     it "should respond successfully if the current user is a super admin" do
       @user.update_attribute(:super_admin, true)
       get :index
-      
-      response.should be_success
+      expect(response).to be_success
     end
     
     it "should respond successfully if the current user has admin permissions" do
@@ -28,15 +27,13 @@ describe Admin::ApplicationController do
       @user.role = @role
       @user.save()
       get :index
-      
-      response.should be_success
+      expect(response).to be_success
     end
     
     it "should redirect to the login if the current user is not logged in" do
       @session.destroy
       get :index
-      
-      response.should redirect_to(admin_login_path)
+      expect(response).to redirect_to(admin_login_path(:return_to => '/admin/application'))
     end
     
     it "should redirect to the root for a user without administrative priviledges" do
@@ -44,9 +41,8 @@ describe Admin::ApplicationController do
       @user.role = nil
       @user.save
       get :index
-      
-      response.code.should eq("403")
-      response.should render_template('layouts/admin/error_page')
+      expect(response.code).to eq('403')
+      expect(response).to render_template('layouts/admin/error_page')
     end
     
   end