outpost-cms 0.0.3 → 0.0.4

data/lib/outpost.rb

@@ -9,8 +9,11 @@ require 'outpost/config'
 
 module Outpost
   extend ActiveSupport::Autoload
-  
-  OBJ_KEY_REGEX = %r{([^:]+):(\d+)}
+
+  OBJ_KEY_REGEX = %r{([^-]+)-(\d+)}
+
+  DESCENDING  = "DESC"
+  ASCENDING   = "ASC"
 
   autoload :Controller
   autoload :Model
@@ -55,16 +58,16 @@ module Outpost
     end
 
     #--------------------
-    
+
     def model_classes
       @model_classes ||= begin
         klasses = {}
-        
+
         Outpost.config.registered_models.each do |name|
           klass = name.constantize
           klasses.merge!(klass.content_key => klass)
         end
-        
+
         klasses
       end
     end

data/lib/outpost/breadcrumbs.rb

@@ -3,7 +3,7 @@
 #
 # Super-simple breadcrumbs for you and me.
 # Include it into a controller
-# 
+#
 # Arguments:
 # Pairs of strings. Title of breadcrumb, Path
 #
@@ -28,9 +28,11 @@
 # You can also define multiple breadcrumbs at once.
 # Every 2 arguments is a new breadcrumb:
 #
-#   breadcrumb "Edit", outpost_edit_post_path(@post.id), @post.title, outpost_post_path(@post)
+#   breadcrumb "Edit",
+#     outpost_edit_post_path(@post.id),
+#     @post.title, outpost_post_path(@post)
 #
-# Don't want the crumb to be linked? Just leave the 
+# Don't want the crumb to be linked? Just leave the
 # second argument off, or +nil+ if you're defining
 # multiple breadcrumbs:
 #
@@ -40,32 +42,32 @@ module Outpost
   class Breadcrumb
     attr_accessor :title, :link
   end
-  
+
   #---------------
-  
+
   module Breadcrumbs
     extend ActiveSupport::Concern
-    
+
     included do
       attr_reader :breadcrumbs
-    
+
       if self < ActionController::Base
         helper_method :breadcrumbs
       end
     end
-    
+
     #--------------
     # Use this method to add breadcrumbs.
-    # See Outpost::Breadcrumbs 
+    # See Outpost::Breadcrumbs
     # for usage.
     def breadcrumb(*args)
       @breadcrumbs ||= []
-      
+
       args.each_slice(2).map do |pair|
         crumb       = Outpost::Breadcrumb.new
         crumb.title = pair[0]
         crumb.link  = pair[1]
-        
+
         @breadcrumbs.push crumb
       end
     end

data/lib/outpost/config.rb

@@ -10,22 +10,22 @@ module Outpost
       :excluded_list_columns      => [],
       :user_class                 => "User",
       :authentication_attribute   => :email,
-      :preferences                => [:order, :sort_mode]
+      :preferences                => [:order_attribute, :order_direction]
     }
-    
+
     # Pass a block to this method to define the configuration
     # If no block is passed, config will be defaults
     def self.configure
       yield Outpost.config if block_given?
       Outpost.config
     end
-    
+
     # An array of models that should show up
     attr_writer :registered_models
     def registered_models
       @registered_models || []
     end
-    
+
     attr_writer :preferences
     def preferences
       @preferences || DEFAULTS[:preferences]
@@ -47,13 +47,13 @@ module Outpost
     def title_attributes
       (@title_attributes ||= DEFAULTS[:title_attributes]) | [:simple_title]
     end
-    
+
     # Ignore these attributes when building a basic form
     attr_writer :excluded_form_fields
     def excluded_form_fields
       (@excluded_form_fields ||= []) | DEFAULTS[:excluded_form_fields]
     end
-    
+
     # Ignore these attributes when building a basic list
     attr_writer :excluded_list_columns
     def excluded_list_columns

data/lib/outpost/controller.rb

@@ -14,7 +14,7 @@ module Outpost
     autoload :Authentication
     autoload :Authorization
     autoload :CustomErrors
-    
+
     included do
       helper_method :list, :model, :fields
     end
@@ -116,7 +116,13 @@ module Outpost
       end
 
       def find_model
-        self.name.demodulize.underscore.split("_")[0...-1].join("_").classify.constantize
+        self.name
+          .demodulize
+          .underscore
+          .split("_")[0...-1]
+          .join("_")
+          .classify
+          .constantize
       end
     end # ClassMethods
   end # Controller

data/lib/outpost/controller/actions.rb

@@ -28,7 +28,7 @@ module Outpost
 
       def create
         @record = model.new(form_params)
-        
+
         if @record.save
           notice "Saved #{@record.simple_title}"
           respond_with :outpost, @record, location: requested_location
@@ -53,9 +53,9 @@ module Outpost
         notice "Deleted #{@record.simple_title}"
         respond_with :outpost, @record
       end
-      
+
       private
-      
+
       def form_params
         params[model.singular_route_key]
       end

data/lib/outpost/controller/authentication.rb

@@ -13,7 +13,8 @@ module Outpost
       # Returns Outpost.user_class instance.
       def current_user
         begin
-          @current_user ||= Outpost.user_class.where(can_login: true).find(session[:user_id])
+          @current_user ||= Outpost.user_class
+            .where(can_login: true).find(session[:user_id])
         rescue ActiveRecord::RecordNotFound
           session[:user_id]   = nil
           @current_user       = nil

data/lib/outpost/controller/authorization.rb

@@ -19,8 +19,9 @@ module Outpost
 
       # What to do when a user doesn't have proper permissions
       def handle_unauthorized(resource)
-        redirect_to outpost_root_path, 
-          alert: "You don't have permission to manage #{resource.to_title.pluralize}"
+        redirect_to outpost_root_path,
+          alert: "You don't have permission to manage " \
+                 "#{resource.to_title.pluralize}"
         return false
       end
     end # Authorization

data/lib/outpost/controller/callbacks.rb

@@ -6,7 +6,8 @@ module Outpost
       end
 
       def get_records
-        @records = model.order("#{model.table_name}.#{order} #{sort_mode}")
+        @records = model.order(
+          "#{model.table_name}.#{order_attribute} #{order_direction}")
           .page(params[:page]).per(self.list.per_page)
       end
     end # Callbacks

data/lib/outpost/controller/custom_errors.rb

@@ -2,11 +2,11 @@ module Outpost
   module Controller
     module CustomErrors
       extend ActiveSupport::Concern
-      
+
       NOT_FOUND_ERROR_CLASSES = [
-        ActionController::RoutingError, 
+        ActionController::RoutingError,
         ActionController::UnknownController,
-        AbstractController::ActionNotFound, 
+        AbstractController::ActionNotFound,
         ActiveRecord::RecordNotFound
       ]
 
@@ -15,12 +15,15 @@ module Outpost
       end
 
       included do
-        rescue_from StandardError, with: ->(e) { render_error(500, e) and return false }
-        rescue_from *NOT_FOUND_ERROR_CLASSES, with: ->(e) { render_error(404, e) and return false }
+        rescue_from StandardError,
+          with: ->(e) { render_error(500, e) and return false }
+
+        rescue_from *NOT_FOUND_ERROR_CLASSES,
+          with: ->(e) { render_error(404, e) and return false }
       end
-      
+
       #----------------------
-      
+
       def render_error(status, e=StandardError)
         response.status = status
 
@@ -28,14 +31,42 @@ module Outpost
           raise e
         else
           respond_to do |format|
-            format.html { render template: "/errors/error_#{status}", layout: "application", status: status, locals: { error: e } }
-            format.xml { render xml: { error: response.message, code: status }, status: status }
-            format.json { render json: { error: response.message, code: status }, status: status }
-            format.text { render text: "#{status} - #{response.message}", status: status}
-            format.any { head status }
+            format.html do
+              render(
+                :template   => "/errors/error_#{status}",
+                :layout     => "application",
+                :status     => status,
+                :locals     => { error: e }
+              )
+            end
+
+            format.xml do
+              render xml: {
+                :error    => response.message,
+                :code     => status
+              }, status: status
+            end
+
+            format.json do
+              render json: {
+                :error    => response.message,
+                :code     => status
+              }, status: status
+            end
+
+            format.text do
+              render(
+                :text     => "#{status} - #{response.message}",
+                :status   => status
+              )
+            end
+
+            format.any do
+              head status
+            end
           end
         end
       end
-    end # CustomErrors
+    end
   end
 end

data/lib/outpost/controller/helpers.rb

@@ -1,37 +1,9 @@
-## 
+##
 # Outpost::Controller::Helpers
 module Outpost
   module Controller
     module Helpers
       extend ActiveSupport::Concern
-      include Outpost::Controller::Ordering
-      
-      included do
-        helper_method :sort_mode, :order
-      end
-
-      # Public: The order that the records are currently sorted by.
-      # This gets passed directly to ActiveRecord, so it should be
-      # a valid database order.
-      #
-      # Returns String of the order.
-      def order
-        @order ||= set_order
-      end
-
-      # Public: The sort mode that the records are currently sorted by.
-      # This gets passed directory to ActiveRecord, so it should be
-      # a valid database sort mode.
-      #
-      # Examples
-      #
-      #   sort_mode
-      #   # => "asc"
-      #
-      # Returns String of the sort mode.
-      def sort_mode
-        @sort_mode ||= set_sort_mode
-      end
 
       # Public: Set the flash[:notice] message, only for HTML requests.
       #

data/lib/outpost/controller/ordering.rb

@@ -1,8 +1,50 @@
 module Outpost
   module Controller
     module Ordering
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :order_direction, :order_attribute, :order
+      end
+
+      # Public: The order that the records are currently sorted by.
+      # This gets passed directly to ActiveRecord, so it should be
+      # a valid database order.
+      #
+      # Returns String of the order.
+      def order_attribute
+        @order_attribute ||= set_order_attribute
+      end
+
+      # Public: The sort mode that the records are currently sorted by.
+      # This gets passed directory to ActiveRecord, so it should be
+      # a valid database sort mode.
+      #
+      # Examples
+      #
+      #   order_direction
+      #   # => "ASC"
+      #
+      # Returns String of the sort mode.
+      def order_direction
+        @order_direction ||= set_order_direction
+      end
+
+      # Public: The order string to be passed into ActiveRecord
+      #
+      # Examples
+      #
+      #   order
+      #   # => "updated_at DESC"
+      #
+      # Returns String of the order.
+      def order
+        @order ||= "#{order_attribute} #{order_direction}"
+      end
+
+
       private
-      
+
       # Set which attribute is doing the sorting
       #
       # If params[:order] is present, then set the
@@ -12,33 +54,34 @@ module Outpost
       # then use the preferred order.
       #
       # Otherwise use the list order.
-      def set_order
-        key = "#{model.content_key}_order"
+      def set_order_attribute
+        key = "#{model.content_key}_order_attribute"
         preferred_order = preference(key)
 
-        @order = if params[:order].present?
+        @order_attribute = if params[:order].present?
           set_preference(key, params[:order])
         elsif preferred_order.present?
           preferred_order
         else
-          list.default_order
+          list.default_order_attribute
         end
       end
 
-      # Set the sort mode
+      # Set the order direction
       #
-      # It will either be the requested sort mode, or if not available, 
-      # then the table's default sort mode.
-      def set_sort_mode
-        key = "#{model.content_key}_sort_mode"
-        preferred_sort_mode = preference(key)
+      # It will either be the requested direction, or if not available,
+      # then the table's default direction.
+      def set_order_direction
+        key = "#{model.content_key}_order_direction"
+        preferred_direction = preference(key)
 
-        @sort_mode = if %w{ asc desc }.include?(params[:sort_mode])
-          set_preference(key, params[:sort_mode])
-        elsif preferred_sort_mode.present?
-          preferred_sort_mode
+        @order_direction = if [Outpost::ASCENDING, Outpost::DESCENDING]
+        .include?(params[:direction])
+          set_preference(key, params[:direction])
+        elsif preferred_direction.present?
+          preferred_direction
         else
-          list.default_sort_mode
+          list.default_order_direction
         end
       end
     end