tb_core 1.1.4 → 1.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTVkMDA5M2UwNGE0Mjc5Y2QyZjFkYWU3MjA4MGEzMzBhYWVmMmI0OA==
+    YzM4ZjU3ZmRjOGE0N2M1MDAzYzdmNjI0MmRkM2FmMWQ3NjQ5YTAzMQ==
   data.tar.gz: !binary |-
-    N2E2MTRhMmIxNzVmZTkzMTg5MTBmOTBmNTc2ZTdhNTg1MzMzNzMwZg==
+    Yzc5M2QwYmMzNDM1ZWU1YWI5NDljNjg4MGE3NzNlZTNiM2M3MzQ5NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2UzYjI1NGUxZWNlNTcyNGM2MjkzYzBmZTZmNjBlNWM2Mzc0NzUyOTU4OGY4
-    YjU1YjMwYjQzN2FiOGMwMmM1OGEyZDc4ZGYxMjJmOGRhOWFiMWU4NDliY2Qx
-    YzNlMTY0ZThmMzMyYWFkZTQzY2YyODM1MWQwZDk1ODFjOWFmNWU=
+    NDMxMzMwZmVlMzg1OTBjMDdiYjNlNGQ2OGYxOWVjYWY1Mzc2ZTRlMjFjN2Y4
+    MTA5MDkyMDFlYjU2ZGZjNWJhNzBlMDc0OTJlYTA5YmY5MzhjZDliMjQxOGM4
+    Njk2Y2JjNDEwNWNmYjgzNTg5MjViMDJiNmU3ZjBhN2NiZTViYzk=
   data.tar.gz: !binary |-
-    MTMwMTc3NzYzZDI5YmJhMDMyNWQ2ZTM2MTExMzg4Y2YxNzMwZmZkMWQ1OTE1
-    MjNkNTc5MDBkODBlNWMyZjY5M2IyNGRmMGU5ODExNDZkNTlhODhkODlkN2M2
-    NGRmNGQyMjc4MGQ4NDQzZDczZDYxMWY5NjlhYjdiYzgzMDc1Njc=
+    MmVjNmY5Yjk0NDZhMzFlNDI2MTMyZWYxYjkzZGQ0MDM5ODMzODM3ZmQ2MTI4
+    NzRkYjY1NWFhYzdkMGI4ZmYzYzk5YWYzNGUyMzZhZjRhZjdiNWI4N2Q4ZTIy
+    MGY3MDdjM2Y1ZjdhZDY1YzZkZWRhZjcxYjk0YmYyNzZmYzliMTk=

data/README.md

@@ -11,10 +11,11 @@ Installation/Usage
         gem 'tb_core'
 
 2. Run bundle install
+ 
 3. Copy in database migrations to your new rails project
 
-    bundle exec rake tb_core:install:migrations
-    rake db:migrate
+        bundle exec rake tb_core:install:migrations
+        rake db:migrate
 
 4. run a rails server instance and point your browser to /admin
 
@@ -68,10 +69,28 @@ Finally, custom permissions may optionally be tied to one or more dashboard apps
       :apps => [:clients, :projects]
     }]  
 
+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. 
+
+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
+      # ... actions here
+      def get_record
+        @car = Car.where(:id => params[:id]).first
+        if @car.blank?
+          raise Spud::NotFoundError(:item => 'car')
+        end
+      end
+    end
+
 Testing
 -----------------
 
-Twice Baked uses RSpec for testing. Get the tests running with a few short commands:
+Twice Baked uses RSpec, Capybara and Jasmine for testing. Get the tests running with a few short commands:
 
 1. Create and migrate the databases:
    
@@ -87,3 +106,10 @@ Twice Baked uses RSpec for testing. Get the tests running with a few short comma
         rspec spec
 
 After the tests have completed the current code coverage stats is available by opening `/coverage/index.html` in a browser.
+
+### Jasmine
+
+For running the javascript unit tets:
+
+        rake jasmine:ci
+

data/Rakefile

@@ -26,3 +26,12 @@ load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
 
 require 'rake'
+
+begin
+  require 'jasmine'
+  load 'jasmine/tasks/jasmine.rake'
+rescue LoadError
+  task :jasmine do
+    abort "Jasmine is not available. In order to run jasmine, you must: (sudo) gem install jasmine"
+  end
+end

data/app/controllers/spud/application_controller.rb

@@ -11,6 +11,12 @@ class Spud::ApplicationController < ActionController::Base
   include Spud::ApplicationHelper
   before_filter :set_mailer_default_url
 
+  rescue_from Spud::NotFoundError, :with => :handle_not_found
+
+  def not_found
+    raise Spud::NotFoundError
+  end
+
 private
 
   def set_mailer_default_url
@@ -72,4 +78,10 @@ private
     end
   end
 
+  def handle_not_found(exception)
+    @exception = exception
+    @exception.request_url = request.original_url
+    render :template => Spud::Core.not_found_template, :layout => nil, :formats => [:html], :status => 404
+  end
+
 end

data/app/views/admin/setup/new.html.erb

@@ -1,5 +1,5 @@
 <%
-@page_thumbnail = "spud/admin/users_thumb.png"
+@page_thumbnail = "admin/users_thumb.png"
 @page_name = "First Time Setup"
 %>
 

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

@@ -9,7 +9,7 @@
 </head>
 <body>
 <div id="header" style="<%=header_style%>">
-	<%= link_to root_path do %>
+	<%= link_to '/' do %>
     <h1><%= Spud::Core.config.site_name %></h1>
   <% end %>
   <% if current_user %>

data/app/views/layouts/not_found.html.erb

@@ -0,0 +1,6 @@
+<%= content_for :body do %>
+  <h1>404: Not Found!</h1>
+  <p>The <%= @exception.item %> you requested could not be found.</p>
+  <p>Requested URL: <%= @exception.request_url %></p>
+<% end %>
+<%= render :template => 'layouts/application' %>

data/config/routes.rb

@@ -30,5 +30,6 @@ Rails.application.routes.draw do
   resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
 
   get 'spud/admin' => 'admin/user_sessions#legacy_redirect'
+  get 'spud/not_found' => 'spud/application#not_found', :as => 'not_found'
 
 end

data/lib/spud_core/configuration.rb

@@ -1,7 +1,7 @@
 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, :permissions
+    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, :permissions, :not_found_template
     self.admin_applications = []
     self.site_name = "Company Name"
     self.site_id = 0
@@ -15,6 +15,7 @@ module Spud
     self.permissions = []
     self.admin_javascripts = ['admin/application']
     self.admin_stylesheets = ['admin/application']
+    self.not_found_template = 'layouts/not_found'
 
     def self.site_config_for_host(host)
       configs = Spud::Core.multisite_config.select{|p| p[:hosts].include?(host)}

data/lib/spud_core/exceptions.rb

@@ -3,5 +3,12 @@ class Spud::AccessDeniedError < StandardError
 end
 
 class Spud::NotFoundError < StandardError
+  
+  attr_accessor :request_url, :item
+
+  def initialize(opts={})
+    @item = opts[:item] || 'page'
+    super("The #{item.downcase} you were looking for could not be found.")
+  end
 
 end

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.1.4"
+    VERSION = "1.1.5"
   end
 end

data/spec/controllers/admin/application_controller_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Admin::ApplicationController do
   
-  
   before :each do
     activate_authlogic
     @user = FactoryGirl.create(:spud_user)

data/spec/controllers/spud/application_controller_spec.rb

@@ -1,6 +1,15 @@
 require 'spec_helper'
+require 'rspec/mocks'
+require 'rspec/mocks/standalone'
 
 describe Spud::ApplicationController do
 
+  describe :not_found do
+    it 'throws a 404 error' do
+      get :not_found
+      response.code.should eq("404")
+      response.should render_template(Spud::Core.not_found_template)
+    end
+  end
 
 end