tb_core 1.1.10 → 1.2.0

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

@@ -41,6 +41,9 @@
 </div>
 
 </fieldset>
+
+<%= render :partial => 'form_additions', :locals => {:f => f} %>
+
 <fieldset>
   <legend>Credentials</legend>
 

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

@@ -0,0 +1 @@
+<!-- Copy me to your application to add custom fields to the New/Edit action -->

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

@@ -0,0 +1 @@
+<!-- Copy me to your application to add custom fields to the Show action -->

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

@@ -24,5 +24,6 @@
     <dd><%= @user.role.blank? ? 'None' : @user.role.name %></dd>
     <dt>Super Admin?<dt>
     <dd><%= @user.super_admin? ? 'Yes' : 'No' %></dd>
+    <%= render 'show_additions' %>
   </dl>
 </div>

data/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
 
     get 'login' => 'user_sessions#new', :as => 'login'
     post 'login' => 'user_sessions#create'
-    match 'logout' => 'user_sessions#destroy', :as => 'logout'
+    match 'logout' => 'user_sessions#destroy', :as => 'logout', :via => [:get, :post]
 
     resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
 
@@ -15,7 +15,7 @@ Rails.application.routes.draw do
     resources :users, :controller
     resources :roles
 
-    match 'switch' => "dashboard#switch"
+    match 'switch' => "dashboard#switch", :via => [:get, :post]
 
     get 'setup' => 'setup#new'
     post 'setup' => 'setup#create'
@@ -26,7 +26,7 @@ Rails.application.routes.draw do
   # Non-admin login paths 
   get 'login' => 'user_sessions#new', :as => 'login'
   post 'login' => 'user_sessions#create'
-  match 'logout' => 'user_sessions#destroy', :as => 'logout'
+  match 'logout' => 'user_sessions#destroy', :as => 'logout', :via => [:get, :post]
   resources :password_resets, :only => [:index, :create, :show, :update], :path => 'login/forgot'
 
   get 'spud/admin' => 'admin/user_sessions#legacy_redirect'

data/lib/generators/spud/module_generator.rb

@@ -24,7 +24,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/module_icon.png\", :url => \"/admin/#{module_name_formatted}\"}]")
+    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
   end
@@ -61,4 +61,8 @@ EOF
     Rails.application.class.name.split('::').first.underscore
   end
 
+  def attribute_names
+    attributes.collect{ |att| att.split(':')[0] }
+  end
+
 end

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

@@ -19,7 +19,7 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
   end
 
   def create
-    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.new(params[:<%= module_name_formatted.singularize %>])
+    @<%= module_name_formatted.singularize %> = <%= module_name_formatted.singularize.camelize %>.new(<%= module_name_formatted.singularize %>_params)
     flash[:notice] = '<%= module_name_formatted.singularize.camelize %> created successfully' if @<%= module_name_formatted.singularize %>.save
     respond_with @<%= module_name_formatted.singularize %>, :location => admin_<%= module_name_formatted %>_path
   end
@@ -29,7 +29,7 @@ class Admin::<%= module_name_formatted.camelize%>Controller < Admin::Application
   end
 
   def update
-    if @<%= module_name_formatted.singularize%>.update_attributes(params[:<%= module_name_formatted.singularize%>])
+    if @<%= module_name_formatted.singularize%>.update_attributes(<%= module_name_formatted.singularize %>_params)
       flash[:notice] = '<%= module_name_formatted.singularize.camelize %> updated successfully'
     end
     respond_with @<%= module_name_formatted.singularize %>, :location => admin_<%= module_name_formatted %>_path
@@ -51,4 +51,8 @@ private
     end
   end
 
+  def <%= module_name_formatted.singularize %>_params
+    params.require(:<%= module_name_formatted.singularize %>).permit(<%= attribute_names.collect{ |att| ":#{att}" }.join(', ') %>)
+  end
+
 end

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

@@ -5,22 +5,20 @@
 <%% content_for :detail do %>
   <table class="table table-striped">
     <thead>
-      <tr><%attributes.each do |attribute|%>
-        <%-attribute_args = attribute.split(":")-%>
-        <th><%=attribute_args[0].humanize.titlecase%></th><% end %>
+      <tr><%attribute_names.each do |attribute|%>
+        <th><%=attribute.humanize.titlecase%></th><% end %>
         <th>Actions</th>
       </tr>
     </thead>
     <tbody>
       <%% @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>| %>
         <tr>
-          <%-attributes.each do |attribute|-%>
-          <%-attribute_args = attribute.split(":")-%>
-          <td><%%= <%=module_name_formatted.singularize%>.<%=attribute_args[0]%> %></td>
+          <%-attribute_names.each do |attribute|-%>
+          <td><%%= <%=module_name_formatted.singularize%>.<%=attribute%> %></td>
           <%-end-%>
           <td align="right" width="150">
             <%%= 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, :confirm => 'Are you sure you want to delete this <%=module_name_formatted.singularize.humanize%>?', :class => 'btn btn-danger 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>
         </tr>
       <%% end %>

data/lib/spud_core/engine.rb

@@ -1,14 +1,10 @@
-# require 'spud_core'
-# require 'rails'
-# require 'action_controller'
-# require 'rubygems'
 require 'jquery-rails'
 require 'retina_tag'
 require 'authlogic'
-# require 'dynamic_form'
 require 'breadcrumbs_on_rails'
 require 'will_paginate'
 require 'codemirror-rails'
+require 'tinymce-rails'
 
 module Spud
   module Core
@@ -18,26 +14,8 @@ module Spud
       require "#{root}/lib/spud_core/searchable"
       require "#{root}/lib/responds_to_parent"
 
-      def self.require_model(model_name)
-        require "#{root}/app/models/#{model_name}"
-      end
-
-      def self.require_controller(controller_name)
-        require "#{root}/app/controllers/#{controller_name}"
-      end
-
       engine_name :tb_core
-
-      initializer 'tb_core.assets' do |config|
-        Rails.application.config.assets.precompile += [
-          "tiny_mce/plugins/**/*",
-          "tiny_mce/themes/**/*",
-          "tiny_mce/utils/*",
-          "tiny_mce/langs/*",
-          'tiny_mce/tiny_mce_popup.js',
-          "tiny_mce/tiny_mce.js"
-        ]
-      end
+      config.autoload_paths << "#{root}/lib"
 
       initializer 'tb_core.controller_overrides' do |config|
          ActionController::Base.class_eval do

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.1.10"
+    VERSION = "1.2.0"
   end
 end

data/spec/controllers/admin/settings_controller_spec.rb

@@ -16,9 +16,9 @@ describe Admin::SettingsController do
   end
   
   describe :update do
-    it "should redirect to the admin root with a successful update" do
+    it "should redirect to the settings page with a successful update" do
       put :update, :spud_user => {:first_name => "Mike"}
-      response.should render_template('edit')
+      response.should redirect_to(admin_settings_path)
     end
     
     it "should put a message in the flash notice" do

data/spec/controllers/sitemap_controllers_spec.rb

@@ -13,8 +13,9 @@ describe SitemapsController do
     end
     
     it "should only respond to an XML format" do
-      get :show
-      response.response_code.should == 406
+      expect {
+        get :show
+      }.to raise_exception(ActionController::UnknownFormat)
     end
   end
-end
+end

data/spec/dummy/config/application.rb

@@ -30,6 +30,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+    config.i18n.enforce_available_locales = true
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/spec/dummy/config/environments/test.rb

@@ -11,8 +11,14 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
+  # Deprecated
   # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # config.whiny_nils = true
+
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
@@ -29,8 +35,9 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Deprecated
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/spec/dummy/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_token = 'f89bbe176924c011473e15af21c4e8b72c3fd12f887f26014c24ea32e1e3d2bf0250a671a30232047d5c5431e67c7361aca07b10d847405b99fce4543589e117'
+Dummy::Application.config.secret_key_base = 'b43711419c807b9c9efe9365dd79f87ebe31e9f72e1aa6744c1ecac68aace664c0a3a4f791d92bd2fa324fce1d6d09701a54b88453f131b7c460eeb9c530bd72'