outpost-cms 0.0.3 → 0.0.4

data/lib/outpost/controller/preferences.rb

@@ -22,7 +22,7 @@ module Outpost
       def preference(key)
         session["preference_#{key}"]
       end
-      
+
       # Public: Writer for preference.
       #
       # key   - (String) The key to write to.
@@ -34,7 +34,7 @@ module Outpost
       #   preference("posts_order")
       #   # => "updated_at"
       #
-      # Returns nothing. 
+      # Returns nothing.
       def set_preference(key, value)
         session["preference_#{key}"] = value
       end
@@ -56,7 +56,7 @@ module Outpost
 
 
       private
-      
+
       def remove_preferences
         Outpost.config.preferences.each do |preference|
           key = "#{model.content_key}_#{preference}"

data/lib/outpost/helpers/naming.rb

@@ -10,8 +10,8 @@ module Outpost
   module Helpers
     module Naming
       extend self
-      
-      # These helpers expect a controller param, 
+
+      # These helpers expect a controller param,
       # such as 'outpost/news_stories'
       # "outpost/news_stories" => NewsStory
       def to_class(controller)

data/lib/outpost/hook.rb

@@ -5,24 +5,24 @@
 module Outpost
   class Hook
     attr_accessor :data, :path
-    
+
     def initialize(options={})
       @path = options[:path]
       @data = options[:data] || { touch: true }
     end
-    
+
     # Publish the message
     def publish
       response = connection.post do |request|
         request.url @path
         request.params = @data
       end
-      
+
       response
     end
-        
+
     private
-    
+
     def connection
       @connection ||= begin
         Faraday.new(url: Rails.application.config.node.server) do |conn|

data/lib/outpost/list.rb

@@ -4,9 +4,9 @@ module Outpost
   module List
     extend ActiveSupport::Autoload
 
-    DEFAULT_ORDER     = "id"
-    DEFAULT_SORT_MODE = "desc"
-    DEFAULT_PER_PAGE  = 25
+    DEFAULT_ORDER_ATTRIBUTE   = "id"
+    DEFAULT_ORDER_DIRECTION   = DESCENDING
+    DEFAULT_PER_PAGE          = 25
 
     autoload :Base
     autoload :Column

data/lib/outpost/list/base.rb

@@ -9,18 +9,27 @@ module Outpost
 
         yield self if block_given?
 
-        @default_order     ||= List::DEFAULT_ORDER
-        @default_sort_mode ||= List::DEFAULT_SORT_MODE
-        @per_page          ||= List::DEFAULT_PER_PAGE
+        @default_order_attribute     ||= List::DEFAULT_ORDER_ATTRIBUTE
+        @default_order_direction     ||= List::DEFAULT_ORDER_DIRECTION
+        @per_page                    ||= List::DEFAULT_PER_PAGE
       end
 
-      attr_accessor :default_order, :default_sort_mode
-      attr_reader :columns, :fields, :filters, :per_page, :model
-      
+
+      attr_accessor \
+        :default_order_attribute,
+        :default_order_direction
+
+      attr_reader \
+        :columns,
+        :fields,
+        :filters,
+        :per_page,
+        :model
+
       # Public: Set the per_page for pagination.
       #
       # val - (Integer) The value to send to pagination. Also accepts :all,
-      #       which passes `nil` to pagination and therefore will not 
+      #       which passes `nil` to pagination and therefore will not
       #       paginate.
       #
       # Returns nothing.
@@ -31,13 +40,13 @@ module Outpost
       # Public: Add a column to the list.
       #
       # attribute - (String) The attribute that this column represents.
-      # options   - (Hash) A hash of options. Gets passed directly to 
+      # options   - (Hash) A hash of options. Gets passed directly to
       #             List::Column (default: {}).
-      #             * header  - (String) The title of the column, displayed in 
-      #                         the table header 
+      #             * header  - (String) The title of the column, displayed in
+      #                         the table header
       #                         (default: self.attribute.titleize).
       #             * display - (Symbol or Proc) How to display this attribute.
-      #                         * If symbol, should be the name of a method in 
+      #                         * If symbol, should be the name of a method in
       #                           AdminListHelper
       #                         * If Proc, gets run as an instance of the class.
       #                         * See AdminListHelper for more info.
@@ -46,7 +55,8 @@ module Outpost
       #
       #   define_list do
       #     column :name, header: "Full Name", display: :display_full_name
-      #     column :user, header: "Associated User", display: proc { self.user.name }
+      #     column :user,
+      #       header: "Associated User", display: proc { self.user.name }
       #   end
       #
       # Returns nothing.
@@ -54,7 +64,7 @@ module Outpost
         column = Column.new(attribute, self, options)
         @columns[attribute] = column
       end
-      
+
       # Public: Define a filter for the list.
       #
       # attribute - (String) The attribute on which to filter.

data/lib/outpost/list/column.rb

@@ -1,12 +1,20 @@
 module Outpost
   module List
     class Column
-      attr_accessor :attribute, :display, :position, :list, :quick_edit, 
-        :sortable, :default_sort_mode, :_display_helper, :header
+      attr_accessor \
+        :attribute,
+        :display,
+        :position,
+        :list,
+        :quick_edit,
+        :sortable,
+        :default_order_direction,
+        :_display_helper,
+        :header
 
       alias_method :quick_edit?, :quick_edit
       alias_method :sortable?, :sortable
-      
+
       def initialize(attribute, list, attributes={})
         @attribute = attribute.to_s
         @list      = list
@@ -17,7 +25,8 @@ module Outpost
         @quick_edit = !!attributes[:quick_edit]
         @sortable   = !!attributes[:sortable]
 
-        @default_sort_mode = attributes[:default_sort_mode] || List::DEFAULT_SORT_MODE
+        @default_order_direction =
+          attributes[:default_order_direction] || List::DEFAULT_ORDER_DIRECTION
       end
     end
   end

data/lib/outpost/list/filter.rb

@@ -7,12 +7,12 @@ module Outpost
       BOOLEAN_COLLECT = [["Yes", 1], ["No", 0]]
 
       attr_accessor :attribute, :collection, :title, :list
-      
+
       def initialize(attribute, list, options={})
         @attribute  = attribute.to_s
         @list       = list
         @title      = options[:title] || @attribute.titleize
-        
+
         collection = options[:collection]
         @collection = begin
           case collection
@@ -25,10 +25,10 @@ module Outpost
           end
         end
       end
-      
+
 
       private
-      
+
       def _boolean_collection
         -> { BOOLEAN_COLLECT }
       end

data/lib/outpost/model.rb

@@ -4,7 +4,7 @@ module Outpost
   module Model
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    
+
     autoload :Authentication
     autoload :Authorization
     autoload :Methods
@@ -12,7 +12,7 @@ module Outpost
     autoload :Routing
     autoload :Naming
     autoload :Serializer
-    
+
     module ClassMethods
       def outpost_model
         include Methods, Identifier, Routing, Naming, Serializer

data/lib/outpost/model/authentication.rb

@@ -7,13 +7,17 @@ module Outpost
         has_secure_password
 
         before_validation :downcase_email, if: -> { self.email_changed? }
+
         validates :name, presence: true
-        validates Outpost.config.authentication_attribute, presence: true, uniqueness: true
+        validates Outpost.config.authentication_attribute,
+          :presence     => true,
+          :uniqueness   => true
       end
 
       module ClassMethods
         def authenticate(login, unencrypted_password)
-          if user = self.send("find_by_#{Outpost.config.authentication_attribute}", login)
+          if user = self.send(
+          "find_by_#{Outpost.config.authentication_attribute}", login)
             user.authenticate(unencrypted_password)
           else
             false

data/lib/outpost/model/authorization.rb

@@ -7,6 +7,7 @@ module Outpost
         has_many :user_permissions
         has_many :permissions, through: :user_permissions
       end
+
       # Check if a user can manage the passed-in resource(s)
       #
       # If multiple resources are passed in, a user must be
@@ -19,8 +20,6 @@ module Outpost
         self.is_superuser? or (allowed_resources & resources) == resources
       end
 
-      #
-      
       def allowed_resources
         @allowed_resources ||= begin
           p = self.is_superuser? ? Permission.all : self.permissions

data/lib/outpost/model/identifier.rb

@@ -8,31 +8,36 @@ module Outpost
     module Identifier
       extend ActiveSupport::Concern
 
-      
+      OBJ_KEY_SEPARATOR = "-"
+
       module ClassMethods
         def content_key
-          if self.respond_to? :table_name
-            self.table_name.gsub(/_/, "/")
-          else
-            self.name.tableize
-          end
+          self.name.tableize.singularize
+        end
+
+        def obj_key(id)
+          [self.content_key, id || "new"].join(OBJ_KEY_SEPARATOR)
+        end
+
+        def new_obj_key
+          obj_key(nil)
         end
-        
+
         # Wrappers for ActiveModel::Naming
         # NewsStory => news_stories
         def route_key
           ActiveModel::Naming.route_key(self)
         end
-        
+
         # NewsStory => news_story
         def singular_route_key
           ActiveModel::Naming.singular_route_key(self)
         end
       end
-      
+
       # Default obj_key pattern
       def obj_key
-        @obj_key ||= [self.class.content_key,self.id || "new"].join(":")
+        @obj_key ||= self.class.obj_key(self.id)
       end
     end # Identifier
   end # Model

data/lib/outpost/model/methods.rb

@@ -6,12 +6,12 @@ module Outpost
   module Model
     module Methods
       extend ActiveSupport::Concern
-      
+
       def persisted_record
         @persisted_record ||= begin
           # If this record isn't persisted, return nil
           return nil if !self.persisted?
-        
+
           # If attributes have been changed, then fetch
           # the persisted record from the database
           # Otherwise just use self

data/lib/outpost/model/naming.rb

@@ -6,14 +6,14 @@ module Outpost
   module Model
     module Naming
       extend ActiveSupport::Concern
-      
+
       module ClassMethods
         # NewsStory => News Story
         def to_title
           self.name.demodulize.titleize
         end
       end
-      
+
       # Convert any AR object into a human-readable title
       # Tries the attributes in config.title_attributes
       # And falls back to "BlogEntry #99"
@@ -30,9 +30,12 @@ module Outpost
       #
       # Usage:
       #
-      #   story = NewsStory.last #=> NewsStory(id: 900, title: "Cool Story, Bro")
-      #   blog  = Blog.last      #=> Blog(id: 5, name: "Some Blog")
-      #   photo = Photo.last     #=> Photo(id: 10, url: "http://photos.com/kitty")
+      #   story = NewsStory.last
+      #     #=> NewsStory(id: 900, title: "Cool Story, Bro")
+      #   blog  = Blog.last
+      #     #=> Blog(id: 5, name: "Some Blog")
+      #   photo = Photo.last
+      #     #=> Photo(id: 10, url: "http://photos.com/kitty")
       #
       #   story.to_title  #=> "Cool Story, Bro"
       #   blog.to_title   #=> "Some Blog"
@@ -44,11 +47,11 @@ module Outpost
           attributes.find { |a| self.respond_to?(a) }
         end
       end
-      
+
       def to_title
         @to_title ||= self.send(self.title_method)
       end
-      
+
       def simple_title
         @simple_title ||= begin
           if self.new_record?

data/lib/outpost/model/routing.rb

@@ -20,13 +20,13 @@ module Outpost
     # even though they are the same path.
     module Routing
       extend ActiveSupport::Concern
-      
+
       module ClassMethods
         # /outpost/blog_entries/new
         def admin_new_path
           collection_route("new_outpost_#{self.singular_route_key}_path")
         end
-        
+
         # http://kpcc.org/outpost/blog_entries/new
         def admin_new_url
           collection_route("new_outpost_#{self.singular_route_key}_url")
@@ -37,7 +37,7 @@ module Outpost
         def admin_index_path
           collection_route("outpost_#{self.route_key}_path")
         end
-        
+
         alias_method :admin_create_path, :admin_index_path
 
         # http://kpcc.org/outpost/blog_entries
@@ -83,13 +83,13 @@ module Outpost
       alias_method :admin_update_url, :admin_show_url
       alias_method :admin_destroy_url, :admin_show_url
 
-      
+
       # Uses self.class::ROUTE_KEY to generate
       # the front-end path to this object
       # If an object doesn't have a front-end path,
       # do not define a ROUTE_KEY on the class.
       #
-      # If the object isn't public, then leave route_hash 
+      # If the object isn't public, then leave route_hash
       # empty as well.
       def public_path(options={})
         if self.route_hash.present? && defined?(self.class::ROUTE_KEY)
@@ -110,7 +110,7 @@ module Outpost
       def route_hash
         {}
       end
-      
+
 
       # http://scpr.org/blogs/2012/...
       def public_url(options={})

data/lib/outpost/model/serializer.rb

@@ -2,20 +2,20 @@ module Outpost
   module Model
     module Serializer
       extend ActiveSupport::Concern
-      
+
       # This method should be overridden
       # Don't override as_json unless you don't
       # want its baked-in goodies
       def json
         {}
       end
-      
+
       # Define some defaults for as_json
       # Override +#json+ to add attributes
       # or override any of these.
       def as_json(*args)
         super.merge({
-          "id"         => self.obj_key, 
+          "id"         => self.obj_key,
           "obj_key"    => self.obj_key,
           "link_path"  => self.public_path,
           "to_title"   => self.to_title,