tb_core 1.1.6 → 1.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWQwZjNkMTFiYmZhZGYxOTAzYjFjOGIxMmJmNzFjNjYxMzAyMzNhOA==
+    MmMxMjIyYjIwY2MyN2IyOWVmZTllNDU3Njk0ODE4MTU0OWQwZjIxMQ==
   data.tar.gz: !binary |-
-    YTY2NzhiNzI3YTI2ZDQ3OWMxMWU2ZDgyMmE3ZWVhZWU2NDgwOTU5Mg==
+    MTdiMDBmNWFmNDI1ZWNmODA0MGFjNDQwNTI0M2I5NmZlMjhkZDQ5OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDFkZjJhMWU2MzdlNzA4YzQyNDE0ZTljNzViZjI2ZDIwYzllNWM2YTA5NWM5
-    ZjE1NTEwOGYyNTMyMDg2NDZkYmYyMTAzODcxYTU4MDUzMjJjMjc5NDRjNDMw
-    ZDJmOWI3NmNjNzU5OGViNDViMjQ2MzY5ZDViN2I4YjE5OTk3NGE=
+    MTJiMzFlZTg3OWI5YzgzZTU0ZTQ4ZWExYTViOTM4MTM1ZGQ4YTExMmQxNzE2
+    OTU5MDBkNTRmNGQ4MjU3YTExZGIxMWU2ZDI3MmZiZDg1YWQzYzI5YmUzNmQx
+    ZDBlYTQ0OWE0MTM2YWY2MzhhOWQwZWI0ZGUyOWU0NGFjNDJjY2M=
   data.tar.gz: !binary |-
-    ZWFkNWFjYzY3ODM1N2E0YjM3NDhjNTNlMDlmMDE3MWQ3Mzc5YTA4NmVhMWQ2
-    NzM5NTJlMmYwZmE1MGFmMGQyMTYzZWVlMDU1OTkwNDY3ODEyZGU5ZWEwMmQ3
-    YjgyYjgwNWM0OTI2NWJmMTM3ZTY0ZGNjNjQwOWY2MjMwNWZjMjc=
+    MmZkOTUyNzFkNzk2MGVkZDE0ODEzNTBlYmVhMDM5OTkyZmU3ZGQ5ZjU2M2Y0
+    YzI4OTc0Njk4ZGIyYjk0N2E0MGQ2ODhhZDRkMjI5NTcxZTZmZjdkMTUyMGZl
+    MzhiNTM3OTkwZTYwZTc4NjVkZjEyMWQxYWEyYzAxZTRmZTJiOTE=

data/README.md

@@ -11,19 +11,31 @@ 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
+3. Run the setup generator to copy in the base templates and migrations
+
+        `rails g spud:setup`
 
 4. run a rails server instance and point your browser to /admin
 
 
+Setup Tasks
+-----------
+
+The `spud:setup` generator takes care of a few tasks for you. If you missed that step or would like to complete them manually, they are listed below:
+
+1. Your base `ApplicationController` should extend from `Spud::ApplicationController`.
+2. Your base `application.html.erb` should include a few special head tags.
+3. You should copy in the base migrations with `rake railties:install:migrations`.
+
 Adding Apps to the Dashboard
 ----------------------------
 
-Admin apps can be 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. 
+The fastest way to add an app to the dashboard is via the geneator. The generator will take care of creating a model as well as a set of controllers/views. 
+
+    rails g spud:module Cars make:string model:string year:integer classic:boolean notes:text
+
+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 += [{
       :name => "Clients",
@@ -82,7 +94,7 @@ When building your own apps you may raise a `Spud::NotFoundError` at any time to
       def get_record
         @car = Car.where(:id => params[:id]).first
         if @car.blank?
-          raise Spud::NotFoundError(:item => 'car')
+          raise Spud::NotFoundError.new(:item => 'car')
         end
       end
     end

data/app/controllers/spud/application_controller.rb

@@ -81,7 +81,11 @@ private
   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
+    if request.xhr?
+      render :nothing => true, :status => 404
+    else
+      render :template => Spud::Core.not_found_template, :layout => nil, :formats => [:html], :status => 404
+    end
   end
 
 end

data/app/helpers/spud/application_helper.rb

@@ -1,4 +1,16 @@
 module Spud::ApplicationHelper
+
+  def tb_page_title
+    if content_for?(:title)
+      title = content_for(:title) + ' : ' + Spud::Core.site_name
+    elsif @page_title
+      title = @page_title + ' : ' + Spud::Core.site_name
+    else
+      title = Spud::Core.site_name
+    end
+    return content_tag :title, title
+  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)

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

@@ -2,7 +2,7 @@
 <%= form_tag admin_password_resets_path do  %>
   <div class="login-form-row">
 	  <%= label_tag :email %>
-	  <%= text_field_tag :email %>
+	  <%= text_field_tag :email, params[:email], :placeholder => 'email', :autofocus => 'autofocus' %>
   </div>
   <div class="login-form-row">
   	<%= submit_tag "Send Reset Instructions", :class => 'btn' %> or <%= link_to 'Cancel', admin_login_path %>

data/app/views/admin/password_resets/show.html.erb

@@ -3,7 +3,7 @@
   <%= error_messages_for(f.object) %>
   <div class="field-group">
   	<%= f.label :password %>
-  	<%= f.password_field :password %>
+  	<%= f.password_field :password, :placeholder => 'password', :autofocus => 'autofocus' %>
   </div>
   <div class="field-group">
   	<%= f.label :password_confirmation %>

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

@@ -4,7 +4,7 @@
 
   <div class="login-form-row">
 	  <%= f.label :login %>
-	  <%= f.text_field :login %>
+	  <%= f.text_field :login, :autofocus => 'autofocus' %>
   </div>
   <div class="login-form-row">
   	<%= f.label :password %>

data/app/views/password_resets/index.html.erb

@@ -1,9 +1,11 @@
+<% @page_title = 'Password Reset' %>
+
 <h1>Password Reset</h1>
 
 <%= form_tag password_resets_path, :class => 'password-reset-form' do  %>
   <div class="form-row">
     <%= label_tag :email %>
-    <%= text_field_tag :email, params[:email], :placeholder => 'email' %>
+    <%= text_field_tag :email, params[:email], :placeholder => 'email', :autofocus => 'autofocus' %>
   </div>
   <div class="form-row form-row-actions">
     <%= submit_tag 'Submit', :class => 'btn btn-primary' %> or <%= link_to 'Cancel', login_path %>

data/app/views/password_resets/show.html.erb

@@ -1,10 +1,12 @@
+<% @page_title = 'Password Reset' %>
+
 <div class="login-form">
 	<h1>Password Reset</h1>
 	<%= form_for @user, :url => password_reset_path(:id => @user.perishable_token), :html => {:class => 'password-reset-form'} do |f| %>
     <%= tb_form_errors(@user) %>
 	  <div class="form-row">
 	  	<%= f.label :password %>
-	  	<%= f.password_field :password, :placeholder => 'password' %>
+	  	<%= f.password_field :password, :placeholder => 'password', :autofocus => 'autofocus' %>
 	  </div>
 	  <div class="form-row">
 	  	<%= f.label :password_confirmation, 'Confirm password' %>

data/app/views/user_sessions/new.html.erb

@@ -1,10 +1,12 @@
+<% @page_title = 'Login' %>
+
 <h1><%= Spud::Core.config.site_name %> Login</h1>
 
 <%= form_for @user_session, :url => login_path, :html => {:class => 'login-form'} do |f| %>
   <%= tb_form_errors(@user_session) %>
   <div class="form-row">
     <%= f.label :login %>
-    <%= f.text_field :login, :placeholder => 'username' %>
+    <%= f.text_field :login, :placeholder => 'username', :autofocus => 'autofocus' %>
   </div>
   <div class="form-row">
     <%= f.label :password %>

data/lib/generators/spud/module_generator.rb

@@ -16,7 +16,7 @@ class Spud::ModuleGenerator < ::Rails::Generators::Base
     template "views/admin/_form.html.erb", "app/views/admin/#{module_name_formatted}/_form.html.erb"
     template "views/frontend/index.html.erb", "app/views/#{module_name_formatted}/index.html.erb"
     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 => \"/assets/admin/portfolio.png\",:url => \"/admin/#{module_name_formatted}\"}]")
+    environment("Spud::Core.config.admin_applications += [{:name => '#{module_name_formatted.humanize.titlecase}', :thumbnail => \"/assets/admin/module_icon.png\",:url => \"/admin/#{module_name_formatted}\"}]")
     create_routes
     invoke "model", [module_name_formatted.singularize] + attributes
   end

data/lib/generators/spud/setup_generator.rb

@@ -0,0 +1,12 @@
+class Spud::SetupGenerator < ::Rails::Generators::Base
+  desc 'Base setup for a new TB application'
+  source_root File.expand_path('../templates', __FILE__)
+
+  def setup
+    template "views/layouts/application.html.erb", "app/views/layouts/application.html.erb"
+    template "application_controller.rb", "app/controllers/application_controller.rb"
+    rake('railties:install:migrations')
+    rake('db:migrate')
+  end
+
+end

data/lib/generators/spud/templates/application_controller.rb

@@ -0,0 +1,3 @@
+class ApplicationController < Spud::ApplicationController
+  protect_from_forgery
+end

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

@@ -17,7 +17,7 @@ private
   def load_<%=module_name_formatted.singularize%>
     @<%=module_name_formatted.singularize%> = <%=module_name_formatted.singularize.camelize%>.where(:id => params[:id]).first
     if @<%=module_name_formatted.singularize%>.blank?
-      raise Spud::NotFoundError
+      raise Spud::NotFoundError.new(:item => '<%= module_name_formatted.singularize %>')
       return false
     end
   end

data/lib/generators/spud/templates/views/layouts/application.html.erb

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <%%= tb_page_title() %>
+  <%%= stylesheet_link_tag "application", :media => "all" %>
+  <%%= javascript_include_tag "application" %>
+  <%%= csrf_meta_tags %>
+  <%%= yield :head %>
+</head>
+<body>
+
+  <%% if flash[:notice] %>
+    <p class="flash flash-notice"><%%= flash[:notice] %> <a href="#" class="flash-remove">X</a></p>
+  <%% elsif flash[:error] %>
+    <p class="flash flash-error"><%%= flash[:error] %> <a href="#" class="flash-remove">X</a></p>
+  <%% end %>
+
+  <%%= content_for?(:body) ? yield(:body) : yield %>
+
+</body>
+</html>

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.1.6"
+    VERSION = "1.1.7"
   end
 end