cadmus 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec60a64ad92c23d2f945ebf3e954c3dc8b30920
-  data.tar.gz: 213c4003f0c49f6d573de4d3158549af76aef486
+  metadata.gz: 25c8b4e53cfd255b409c868f3b8d713ee9ba529f
+  data.tar.gz: 0d63afd6ffe03f07c80b2e9a6ff6acfd8285c429
 SHA512:
-  metadata.gz: d1d497d73e198e2c052b6f10e2e334d0028f7449a108de8135547d365102c715fb4ccf48a73d073891a2235aeaec7498cf3abb70b367f7ff2057d5c146128333
-  data.tar.gz: f62c0c64feab4552bc33597fe890d2bc6a34e31d9ea54ebe8d681172af3a4c3a383b571bf289a04ab1f85b23c9c7c3dbb729d5d0c55b69d8e556d0383a3e80c3
+  metadata.gz: fa374b8cf36fd744d00c382eb62b64f013b53b5ea9a2ce30df22f640b4bcd56e85e3f3d98da8c9b8393d26738c2c6dff32c610ed0f6cbd16b7fafcd741850b1f
+  data.tar.gz: 6343c1b8a254081c5e2613665534af3cfda9a44837067b02c374916a87dc143a7ed975c1b4ac4c9a1ee7be35d249f13c03928033b93620c0b7d0ccbf32ec80ed

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## cadmus 0.5.2 (11-10-2016)
+
+* Rails 5 compatibility fixes
+
 ## cadmus 0.5.1 (05-03-2015)
 
 * Support the sanitizer changes in Rails 4.2

data/lib/cadmus/controller_extensions.rb

@@ -1,5 +1,5 @@
 module Cadmus
-  
+
   # A controller mixin that includes all the RESTful resource actions for viewing and administering Cadmus
   # pages.  This mixin provides a great deal of flexibility for customizing the behavior of the resulting
   # controller.
@@ -38,7 +38,7 @@ module Cadmus
   #      end
   #    end
   #
-  # A controller for pages inside a Book object.  This controller uses URLs of the form 
+  # A controller for pages inside a Book object.  This controller uses URLs of the form
   # +/books/:book_id/pages/...+  The book_id parameter is a slug, not an ID.  First, here's
   # the Book model:
   #
@@ -46,13 +46,13 @@ module Cadmus
   #      # This association has to be called "pages" because that's what BookPagesController
   #      # will expect to use to find them.
   #      has_many :pages, :class_name => "BookPage"
-  #      
+  #
   #      validates_uniqueness_of :slug
   #    end
   #
   #    class BookPagesController < ApplicationController
   #      include Cadmus::PagesController
-  #      
+  #
   #      self.page_parent_class = Book   # pages must have a Book as their parent
   #      self.page_parent_name = "book"  # use params[:book_id] for finding Books
   #      self.find_parent_by = "slug"    # use the Book's slug field for finding Books
@@ -65,26 +65,26 @@ module Cadmus
   module PagesController
     extend ActiveSupport::Concern
     include Cadmus::Renderable
-    
+
     included do
       class << self
         attr_accessor :page_parent_name, :page_parent_class, :find_parent_by
       end
-      
-      before_filter :load_parent_and_page
+
+      before_action :load_parent_and_page
       helper_method :cadmus_renderer
     end
-  
+
     def index
       @pages = page_scope.order(:name).all
-      
+
       respond_to do |format|
         format.html { render 'cadmus/pages/index' }
         format.xml  { render :xml => @pages }
         format.json { render :json => @pages }
       end
     end
-    
+
     def show
       respond_to do |format|
         format.html { render 'cadmus/pages/show' }
@@ -92,24 +92,24 @@ module Cadmus
         format.json { render :json => @page }
       end
     end
-    
+
     def new
       @page = page_scope.new
-      
+
       respond_to do |format|
         format.html { render 'cadmus/pages/new' }
         format.xml  { render :xml => @page }
         format.json { render :json => @page }
       end
     end
-    
-    def edit      
+
+    def edit
       render 'cadmus/pages/edit'
     end
-    
+
     def create
       @page = page_scope.new(page_params)
-      
+
       respond_to do |format|
         if @page.save
           dest = { :action => 'show', :page_glob => @page.slug }
@@ -123,7 +123,7 @@ module Cadmus
         end
       end
     end
-    
+
     def update
       respond_to do |format|
         if @page.update_attributes(page_params)
@@ -138,19 +138,19 @@ module Cadmus
         end
       end
     end
-    
+
     def destroy
       @page.destroy
-    
+
       respond_to do |format|
         format.html { redirect_to(:action => :index) }
         format.xml  { head :ok }
         format.json { head :ok }
       end
     end
-      
+
     protected
-      
+
     # This gets kind of meta.
     #
     # If page_parent_name and page_parent_class are both defined for this class, this method uses it to find
@@ -163,27 +163,27 @@ module Cadmus
     # what you want to use.
     def page_parent
       return @page_parent if @page_parent
-      
+
       if page_parent_name && page_parent_class
         parent_id_param = "#{page_parent_name}_id"
-        if params[parent_id_param]  
+        if params[parent_id_param]
           @page_parent = page_parent_class.where(find_parent_by => params[parent_id_param]).first
         end
       end
-        
+
       @page_parent
     end
-    
+
     # Returns the name of the page parent object.  This will be used for determining the parameter name for
     # finding the parent object.  For example, if the page parent name is "wiki", the finder will look in
     # params["wiki_id"] to determine the object ID.
     #
-    # By default, this will return the value of page_parent_name set at the controller class level, but can 
+    # By default, this will return the value of page_parent_name set at the controller class level, but can
     # be overridden for cases where the page parent name must be determined on a per-request basis.
     def page_parent_name
       self.class.page_parent_name
     end
-    
+
     # Returns the class of the page parent object.  For example, if the pages used by this controller are
     # children of a Section object, this method should return the Section class.
     #
@@ -192,7 +192,7 @@ module Cadmus
     def page_parent_class
       self.class.page_parent_class
     end
-    
+
     # Returns the field used to find the page parent object.  By default this is :id, but if you need to
     # find the page parent object using a different parameter (for example, if you use a "slug" field for
     # part of the URL), this can be changed.
@@ -203,18 +203,18 @@ module Cadmus
     def find_parent_by
       self.class.find_parent_by || :id
     end
-    
+
     # Returns the ActiveRecord::Relation that will be used for finding pages.  If there is a page parent
     # for this request, this will be the "pages" scope defined by the parent object.  If there isn't,
     # this will be the "global" scope of the page class (i.e. pages with no parent object).
     def page_scope
       @page_scope ||= page_parent ? page_parent.pages : page_class.global
     end
-    
+
     def page_params
       params.require(:page).permit(:name, :slug, :content)
     end
-    
+
     def load_parent_and_page
       if params[:page_glob]
         @page = page_scope.find_by_slug(params[:page_glob])

data/lib/cadmus/routing.rb

@@ -10,12 +10,12 @@ module Cadmus
     #   is +test+, because +assert_recognizes+ doesn't always pass the full params hash
     #   including globbed parameters.
     def matches?(request)
-      page_glob = request.symbolized_path_parameters[:page_glob]
-      
+      page_glob = request.path_parameters.symbolize_keys[:page_glob]
+
       # assert_recognizes doesn't pass the full params hash as we would in a real Rails
       # application.  So we have to always pass this constraint if we're testing.
       return true if page_glob.nil? && Rails.env.test?
-      
+
       page_glob.sub(/\A\//, '').split(/\//).all? do |part|
         part =~ /\A[a-z][a-z0-9\-]*\z/
       end
@@ -40,25 +40,25 @@ ActionDispatch::Routing::Mapper.class_eval do
   # * :controller - changes which controller it maps to.  By default, it is "pages" (meaning PagesController).
   # * :shallow - if set to "true", the edit, show, update and destroy routes won't include the "/pages" prefix.  Useful if you're
   #   already inside a unique prefix.
-  def cadmus_pages(options = nil) 
+  def cadmus_pages(options = nil)
     options ||= {}
     options = options.with_indifferent_access
-    
+
     controller = options[:controller] || 'pages'
-    
+
     get "pages" => "#{controller}#index", :as => 'pages'
     get "pages/new" => "#{controller}#new", :as => 'new_page'
     post "pages" => "#{controller}#create"
 
     slug_constraint = Cadmus::SlugConstraint.new
-    
+
     page_actions = Proc.new do
       get "*page_glob/edit" => "#{controller}#edit", :as => 'edit_page', :constraints => slug_constraint
       get "*page_glob" => "#{controller}#show", :as => 'page', :constraints => slug_constraint
       match "*page_glob" => "#{controller}#update", :constraints => slug_constraint, :via => [:put, :patch]
       delete "*page_glob" => "#{controller}#destroy", :constraints => slug_constraint
     end
-    
+
     if options[:shallow]
       instance_eval(&page_actions)
     else

data/lib/cadmus/version.rb

@@ -1,3 +1,3 @@
 module Cadmus
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cadmus
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Nat Budin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Embeddable CMS for Rails 3 apps