Update to Rails 4 and Refinery 3

app/controllers/refinery/snippets/admin/snippets_controller.rb

@@ -0,0 +1,46 @@
+module Refinery
+  module Snippets
+    module Admin
+      class SnippetsController < ::Refinery::AdminController
+
+        crudify :snippet, :xhr_paging => true
+
+        def create
+          if (@snippet = Snippet.create(snippet_params)).valid?
+            (request.xhr? ? flash.now : flash).notice = t(
+              'refinery.crudify.created',
+              :what => "#{@snippet.title}"
+            )
+
+            unless request.xhr?
+              redirect_to (params[:continue_editing] =~ /1/ ? edit_snippets_admin_snippet_path(@snippet) : snippets_admin_snippets_url)
+            else
+              response = Hash.new
+              response['redirect'] = edit_snippets_admin_snippet_path(@snippet) if params[:continue_editing]
+              render :json => response
+            end
+
+          else
+            unless request.xhr?
+              render :action => 'new'
+            else
+              html_snippets = Hash.new
+              html_snippets['flash_container'] = render_to_string(:partial => "/refinery/admin/error_messages",
+                                                                  :locals => {
+                                                                    :object => @snippet,
+                                                                    :include_object_name => true
+                                                                  })
+              render :json => {'snippets' => html_snippets}
+            end
+          end
+        end
+
+        private
+
+        def snippet_params
+          params.require(:snippet).permit(:title, :body)
+        end
+      end
+    end
+  end
+end

app/controllers/refinery/snippets/admin/snippets_page_parts_controller.rb

@@ -0,0 +1,40 @@
+module Refinery
+  module Snippets
+    module Admin
+      class SnippetsPagePartsController < Admin::BaseController
+
+        def add
+          @page = Page.find(params[:id])
+          @part = PagePart.find(params[:part_id])
+          @snippet = Snippet.find(params[:snippet_id])
+          before_body = params[:before_body] == 'true' ? true : false
+
+          sp = SnippetPagePart.new(:page_part => @part, :snippet => @snippet, :before_body => before_body)
+
+          if sp.save
+             flash[:notice] = "Snippet #{@snippet.title} was successfully added."
+          end
+
+          render :layout => false if request.xhr?
+        end
+
+        def remove
+          @page = Page.find(params[:id])
+          @part = PagePart.find(params[:part_id])
+          @snippet = Snippet.find(params[:snippet_id])
+          before_body = params[:before_body] == 'true' ? true : false
+
+          sp = SnippetPagePart.where(:page_part_id => @part, :snippet_id => @snippet, :before_body => before_body)
+
+          removed = sp.first.destroy() unless sp.empty?
+
+          if removed
+             flash[:notice] = "Snippet #{@snippet.title} was successfully removed."
+          end
+
+          render :layout => false if request.xhr?
+        end
+      end
+    end
+  end
+end

app/models/snippet.rb

@@ -9,14 +9,14 @@ class Snippet < ActiveRecord::Base
   has_many :snippet_page_parts, :dependent => :destroy
   has_many :page_parts, :through => :snippet_page_parts
 
-  named_scope :for_page, lambda{ |page|
+  scope :for_page, lambda { |page|
     raise RuntimeError.new("Couldn't find Snippet for a nil Page") if page.blank?
     joins(:page_parts => :page).where(:pages => {:id => page.id})
 
   }
 
-  scope :before, where(:snippets_page_parts => {:before_body => true})
-  scope :after, where(:snippets_page_parts => {:before_body => false}) 
+  scope :before, -> { where(:snippets_page_parts => {:before_body => true}) }
+  scope :after, -> { where(:snippets_page_parts => {:before_body => false}) }
 
   # rejects any page that has not been translated to the current locale.
   scope :translated, lambda {

app/models/snippet_page.rb

@@ -1,6 +1,6 @@
 class SnippetPage < ActiveRecord::Base
 
-  set_table_name 'snippet_page'
+  self.table_name = 'snippet_page'
 
   belongs_to :snippet, :foreign_key => :snippet_id
   belongs_to :page, :foreign_key => :page_id

app/models/snippet_page_part.rb

@@ -1,6 +1,6 @@
 class SnippetPagePart < ActiveRecord::Base
 
-  set_table_name 'snippets_page_parts'
+  self.table_name = 'snippets_page_parts'
 
   belongs_to :snippet, :foreign_key => :snippet_id
   belongs_to :page_part, :foreign_key => :page_part_id

app/views/refinery/snippets/admin/pages/tabs/_snippets.html.erb

@@ -0,0 +1,3 @@
+<div class="wym_skin_refinery page_part" id="page_snippet_picker">
+  <%= render :partial => '/refinery/snippets/admin/pages/tabs/snippets_content', :locals => {:f => f} %>
+</div>

app/views/admin/pages/tabs/_snippets_content.html.erb → app/views/refinery/snippets/admin/pages/tabs/_snippets_content.html.erb

@@ -8,7 +8,7 @@
     <% end %>
     </ul>
   </div>
-  <%= render :partial => '/admin/pages/tabs/snippets_field', :collection => @page.parts, :as => :part %>
+  <%= render :partial => '/refinery/snippets/admin/pages/tabs/snippets_field', :collection => @page.parts, :as => :part %>
 <% end %>
 
 <% content_for :stylesheets do %>

app/views/admin/pages/tabs/_snippets_field.html.erb → app/views/refinery/snippets/admin/pages/tabs/_snippets_field.html.erb

@@ -3,13 +3,13 @@
     <% if part.snippets.before.any? %>
       <h3><%= t('.before_body') %></h3>
       <ul>
-        <%= render :partial => '/admin/pages/tabs/snippets_list_item', :collection => part.snippets.before, :as => :snippet, :locals => {:part => part, :before_body => true} %>
+        <%= render :partial => '/refinery/snippets/admin/pages/tabs/snippets_list_item', :collection => part.snippets.before, :as => :snippet, :locals => {:part => part, :before_body => true} %>
       </ul>
     <% end %>
     <% if part.snippets.after.any? %>
       <h3><%= t('.after_body') %></h3>
       <ul>
-        <%= render :partial => '/admin/pages/tabs/snippets_list_item', :collection => part.snippets.after, :as => :snippet, :locals => {:part => part, :before_body => false} %>
+        <%= render :partial => '/refinery/snippets/admin/pages/tabs/snippets_list_item', :collection => part.snippets.after, :as => :snippet, :locals => {:part => part, :before_body => false} %>
       </ul>
     <% end %>
   </div>
@@ -23,12 +23,12 @@
             <span class="title"><%= snippet.title %></span>
             <div class="actions">
               <% unless snippet.after?(part) %>
-                <%= link_to t('.add_after_body'), {:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}, :class => 'add_icon add-snippet' %>
+                <%= link_to t('.add_after_body'), {:controller => 'refinery/snippets/admin/snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id}, :class => 'add_icon add-snippet' %>
               <% else %>
                 <span class="add_icon add-snippet"><%= t('.add_after_body') %></span>
               <% end %>
               <% unless snippet.before?(part) %>
-                <%= link_to t('.add_before_body'), {:controller => 'snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => 'true'}, :class => 'add_icon add-snippet' %>
+                <%= link_to t('.add_before_body'), {:controller => 'refinery/snippets/admin/snippets_page_parts', :action => 'add', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => 'true'}, :class => 'add_icon add-snippet' %>
               <% else %>
                 <span class="add_icon add-snippet"><%= t('.add_before_body') %></span>
               <% end %>

app/views/admin/pages/tabs/_snippets_list_item.html.erb → app/views/refinery/snippets/admin/pages/tabs/_snippets_list_item.html.erb

@@ -2,7 +2,7 @@
   <span class='title'>
     <%= snippet.title %>
     <% if defined?(::Refinery::I18n) and ::Refinery::I18n.frontend_locales.many? and
-        (locales = snippet.translations.collect{|t| t.locale}).present? %>
+           (locales = snippet.translations.collect{|t| t.locale}).present? %>
       <span class='preview'>
         <% locales.each do |locale| %>
           <%= refinery_icon_tag "flags/#{locale}.png", :size => '16x11' %>
@@ -11,10 +11,10 @@
     <% end %>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_snippet_path(snippet),
-      :title => t('.edit') %>
-    <%= link_to refinery_icon_tag('delete.png'), url_for({:controller => 'snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => before_body}),
-      :title => t('.remove'),
-      :class => 'remove-snippet' %>
+    <%= link_to refinery_icon_tag('application_edit.png'), edit_snippets_admin_snippet_path(snippet),
+        :title => t('.edit') %>
+    <%= link_to refinery_icon_tag('delete.png'), url_for({:controller => 'refinery/snippets/admin/snippets_page_parts', :action => 'remove', :id => @page.id, :snippet_id => snippet.id, :part_id => part.id, :before_body => before_body}),
+        :title => t('.remove'),
+        :class => 'remove-snippet' %>
   </span>
 </li>

app/views/admin/snippets/_actions.html.erb → app/views/refinery/snippets/admin/snippets/_actions.html.erb

@@ -1,25 +1,25 @@
 <ul>
-  <% if Admin::SnippetsController.searchable? %>
+  <% if Refinery::Snippets::Admin::SnippetsController.searchable? %>
     <li>
-      <%= render :partial => "/shared/admin/search",
+      <%= render :partial => "/refinery/admin/search",
                   :locals => {
-                    :url => admin_snippets_url
+                    :url => snippets_admin_snippets_url
                   } %>
     </li>
   <% end %>
   <li>
-    <%= link_to t('.create_new'), new_admin_snippet_url,
+    <%= link_to t('.create_new'), new_snippets_admin_snippet_url,
                  :class => "add_icon" %>
   </li>
-<% if !searching? and Admin::SnippetsController.sortable? and Snippet.count > 1 %>
+<% if !searching? and Refinery::Snippets::Admin::SnippetsController.sortable? and Snippet.count > 1 %>
   <li>
     <%= link_to t('.reorder', :what => "Snippets"),
-                 admin_snippets_url,
+                 snippets_admin_snippets_url,
                  :id => "reorder_action",
                  :class => "reorder_icon" %>
 
     <%= link_to t('.reorder_done', :what => "Snippets"),
-                 admin_snippets_url,
+                 snippets_admin_snippets_url,
                  :id => "reorder_action_done",
                  :style => "display: none;",
                  :class => "reorder_icon" %>

app/views/admin/snippets/_form.html.erb → app/views/refinery/snippets/admin/snippets/_form.html.erb

@@ -1,15 +1,13 @@
-<%= form_for [:admin, @snippet] do |f| -%>
-  <%= render :partial => "/shared/admin/error_messages", :locals => {
+<%= form_for [:snippets, :admin, @snippet] do |f| -%>
+  <%= render :partial => "/refinery/admin/error_messages", :locals => {
           :object => @snippet,
           :include_object_name => true
         } %>
 
 
-  <%= render :partial => "locale_picker",
-             :locals => {
-               :current_locale => Thread.current[:globalize_locale]
-             } if defined?(::Refinery::I18n) %>
-
+  <%= render '/refinery/admin/locale_picker', 
+               :current_locale => Globalize.locale if defined?(::Refinery::I18n) %>
+
   <div class='field'>
     <%= f.label :title -%>
     <%= f.text_field :title, :class => 'larger widest' -%>
@@ -31,7 +29,7 @@
                 :f => f,
                 :continue_editing => true,
                 :delete_title => t('delete', :scope => 'admin.snippets.snippet'),
-                :delete_confirmation => t('message', :scope => 'shared.admin.delete', :title => @snippet.title)
+                :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @snippet.title)
               } %>
 <% end -%>
 <% content_for :javascripts do %>

app/views/admin/snippets/_form_actions.html.erb → app/views/refinery/snippets/admin/snippets/_form_actions.html.erb

@@ -2,11 +2,11 @@
   <div class="form-actions-left">
     <%= hidden_field_tag :continue_editing, 1 %>
 
-    <%= submit_tag t('save', :scope => 'shared.admin.form_actions'),
+    <%= submit_tag t('save', :scope => 'refinery.admin.form_actions'),
       :id => 'save-button',
       :class => 'wymupdate button no-js-hide' %>
 
-    <%= submit_tag t('save_and_continue_editing', :scope => 'shared.admin.continue_editing'),
+    <%= submit_tag t('save_and_continue_editing', :scope => 'refinery.admin.continue_editing'),
       :id => 'save-continue-button',
       :class => "wymupdate button" %>
 

app/views/admin/snippets/_locale_picker.html.erb → app/views/refinery/snippets/admin/snippets/_locale_picker.html.erb

@@ -5,7 +5,7 @@
     <% locales.each do |locale| %>
       <li<%= " class='selected'" if locale.to_s == local_assigns[:current_locale].to_s %>>
         <%= link_to refinery_icon_tag("flags/#{locale}.png", :size => '48x33'),
-          url_for(:switch_locale => locale) %>
+                    url_for(:switch_locale => locale) %>
       </li>
     <% end %>
   </ul>

app/views/admin/snippets/_records.html.erb → app/views/refinery/snippets/admin/snippets/_records.html.erb

@@ -1,5 +1,5 @@
 <% if searching? %>
-  <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
+  <h2><%= t('results_for_html', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
 <% end %>
 <% if @snippets.any? %>
   <div class='pagination_container'>
@@ -12,7 +12,7 @@
         <%= t('.no_items_yet') %>
       </strong>
     <% else %>
-      <%= t('no_results', :scope => 'shared.admin.search') %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% end %>
   </p>
 <% end %>

app/views/admin/snippets/_snippet.html.erb → app/views/refinery/snippets/admin/snippets/_snippet.html.erb

@@ -11,12 +11,12 @@
     <% end %>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_edit.png"), edit_admin_snippet_path(snippet),
+    <%= link_to refinery_icon_tag("application_edit.png"), edit_snippets_admin_snippet_path(snippet),
          :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), admin_snippet_path(snippet),
+    <%= link_to refinery_icon_tag("delete.png"), snippets_admin_snippet_path(snippet),
         :class => "cancel confirm-delete",
         :title => t('.delete'),
-        :confirm => t('message', :scope => 'shared.admin.delete', :title => snippet.title),
+        :confirm => t('message', :scope => 'refinery.admin.delete', :title => snippet.title),
         :method => :delete %>
   </span>
 </li>