georgia 0.7.8 → 0.8.0

data/app/policies/georgia/concerns/publishing_policy.rb

@@ -0,0 +1,52 @@
+require 'active_support/concern'
+
+module Georgia
+  module Concerns
+    module PublishingPolicy
+      extend ActiveSupport::Concern
+
+      included do
+
+        def request_review?
+          publishing_user_permissions(:request_review).include?(true)
+        end
+
+        def draft?
+          publishing_user_permissions(:draft_changes).include?(true)
+        end
+
+        def approve?
+          publishing_user_permissions(:approve_changes).include?(true)
+        end
+
+        def decline?
+          publishing_user_permissions(:decline_changes).include?(true)
+        end
+
+        def restore?
+          publishing_user_permissions(:restore_changes).include?(true)
+        end
+
+        def publish?
+          publishing_user_permissions(:publish_pages).include?(true)
+        end
+
+        def unpublish?
+          publishing_user_permissions(:unpublish_pages).include?(true)
+        end
+
+        private
+
+        def publishing_permissions
+          Georgia.permissions[:publishing]
+        end
+
+        def publishing_user_permissions action
+          user_permissions(publishing_permissions, action)
+        end
+
+      end
+
+    end
+  end
+end

data/app/policies/georgia/dashboard_policy.rb

@@ -0,0 +1,19 @@
+module Georgia
+  class DashboardPolicy < ApplicationPolicy
+
+    def show?
+      true
+    end
+
+    class Scope < Struct.new(:user, :scope)
+      def resolve
+        revision_policy = Georgia::RevisionPolicy.new(current_user, Georgia::Revision)
+        if revision_policy.approve? or revision_policy.review?
+          scope.review.select{|r| r.revisionable.present?}
+        else
+          scope.none
+        end
+      end
+    end
+  end
+end

data/app/policies/georgia/media_policy.rb

@@ -0,0 +1,56 @@
+module Georgia
+  class MediaPolicy < ApplicationPolicy
+
+    def index?
+      media_user_permissions(:show_media_assets).include?(true)
+    end
+
+    def search?
+      index?
+    end
+
+    def show?
+      edit?
+    end
+
+    def new?
+      create?
+    end
+
+    def create?
+      media_user_permissions(:upload_media_assets).include?(true)
+    end
+
+    def edit?
+      update?
+    end
+
+    def update?
+      media_user_permissions(:update_media_assets).include?(true)
+    end
+
+    def destroy?
+      media_user_permissions(:delete_media_assets).include?(true)
+    end
+
+    def download?
+      media_user_permissions(:download_media_assets).include?(true)
+    end
+
+    # API calls
+
+    def pictures?
+      index?
+    end
+
+    private
+
+    def media_permissions
+      Georgia.permissions[:media_library]
+    end
+
+    def media_user_permissions action
+      user_permissions(media_permissions, action)
+    end
+  end
+end

data/app/policies/georgia/navigation_policy.rb

@@ -0,0 +1,42 @@
+module Georgia
+  class NavigationPolicy < ApplicationPolicy
+
+    def index?
+      navigation_user_permissions(:show_menus).include?(true)
+    end
+
+    def show?
+      edit?
+    end
+
+    def new?
+      create?
+    end
+
+    def create?
+      navigation_user_permissions(:create_menus).include?(true)
+    end
+
+    def edit?
+      update?
+    end
+
+    def update?
+      navigation_user_permissions(:update_menus).include?(true)
+    end
+
+    def destroy?
+      navigation_user_permissions(:delete_menus).include?(true)
+    end
+
+    private
+
+    def navigation_permissions
+      Georgia.permissions[:navigation]
+    end
+
+    def navigation_user_permissions action
+      user_permissions(navigation_permissions, action)
+    end
+  end
+end

data/app/policies/georgia/page_policy.rb

@@ -0,0 +1,26 @@
+module Georgia
+  class PagePolicy < ApplicationPolicy
+
+    include Georgia::Concerns::ContentPolicy
+    include Georgia::Concerns::PublishingPolicy
+
+    class Scope < Struct.new(:user, :scope)
+      def resolve
+        Georgia::Page.all
+      end
+    end
+
+    def index?
+      content_user_permissions(:show_pages).include?(true)
+    end
+
+    def create?
+      content_user_permissions(:create_pages).include?(true)
+    end
+
+    def settings?
+      content_user_permissions(:edit_page_settings).include?(true)
+    end
+
+  end
+end

data/app/policies/georgia/revision_policy.rb

@@ -1,52 +1,15 @@
 module Georgia
-  class RevisionPolicy < Policy
+  class RevisionPolicy < ApplicationPolicy
 
-    attr_reader :page, :attributes
-    attr_accessor :revision
+    include Georgia::Concerns::ContentPolicy
+    include Georgia::Concerns::PublishingPolicy
 
-    def initialize controller, page, revision, attributes
-      @page = page
-      @revision = revision
-      @attributes = attributes
-      super
+    def index?
+      publishing_user_permissions(:show_revisions).include?(true)
     end
 
-    def self.update controller, page, revision, attributes
-      new(controller, page, revision, attributes).update_attributes
-    end
-
-    def update_attributes
-      if can? :manage, revision
-        admin_update_attributes
-      elsif can? :review, revision
-        contributor_update_attributes
-      else
-        false
-      end
-    end
-
-    private
-
-    def admin_update_attributes
-      page.store if current_revision?
-      revision.update_attributes(attributes)
-    end
-
-    def contributor_update_attributes
-      if current_revision?
-        page.store
-        page.approve_revision(page.revisions.last)
-      end
-      revision.review
-      revision.update_attributes(attributes)
-    end
-
-    def current_revision?
-      @is_current_revision ||= (page.current_revision == revision)
-    end
-
-    def current_review?
-      @is_current_review ||= (revision.review? and revision.revised_by?(current_user))
+    def create?
+      publishing_user_permissions(:create_new_revision).include?(true)
     end
 
   end

data/app/policies/georgia/ui_association_policy.rb

@@ -0,0 +1,4 @@
+module Georgia
+  class UiAssociationPolicy < WidgetPolicy
+  end
+end

data/app/policies/georgia/user_policy.rb

@@ -0,0 +1,46 @@
+module Georgia
+  class UserPolicy < ApplicationPolicy
+
+    def index?
+      users_user_permissions(:show_users).include?(true)
+    end
+
+    def show?
+      edit?
+    end
+
+    def new?
+      create?
+    end
+
+    def create?
+      users_user_permissions(:create_users).include?(true)
+    end
+
+    def edit?
+      update?
+    end
+
+    def update?
+      users_user_permissions(:update_users).include?(true)
+    end
+
+    def destroy?
+      users_user_permissions(:delete_users).include?(true)
+    end
+
+    def permissions?
+      true
+    end
+
+    private
+
+    def users_permissions
+      Georgia.permissions[:users]
+    end
+
+    def users_user_permissions action
+      user_permissions(users_permissions, action)
+    end
+  end
+end

data/app/policies/georgia/widget_policy.rb

@@ -0,0 +1,42 @@
+module Georgia
+  class WidgetPolicy < ApplicationPolicy
+
+    def index?
+      manage?
+    end
+
+    def show?
+      manage?
+    end
+
+    def new?
+      manage?
+    end
+
+    def create?
+      manage?
+    end
+
+    def edit?
+      manage?
+    end
+
+    def update?
+      manage?
+    end
+
+    def destroy?
+      manage?
+    end
+
+    private
+
+    def manage?
+      user_permissions(widget_permissions, :manage_widgets).include?(true)
+    end
+
+    def widget_permissions
+      Georgia.permissions[:content]
+    end
+  end
+end

data/app/presenters/georgia/active_facet_presenter.rb

@@ -19,7 +19,8 @@ module Georgia
     private
 
     def unmerged_params
-      params.merge(param => ((params[param] || []) - [text]))
+      facets = (params[param] || []) - [text]
+      facets.any? ? params.merge(param => facets) : params.except(param)
     end
   end
 end

data/app/presenters/georgia/link_portlet.rb

@@ -66,13 +66,13 @@ module Georgia
     end
 
     def expand_tag options={}
-      options[:class] = 'toggle btn btn-warning js-expand'
+      options[:class] = 'toggle btn js-expand'
       options[:class] << ' hide' if last_descendant?
       link_to('#', options) {icon_tag('caret-down') + icon_tag('caret-up hide')}
     end
 
     def remove_tag
-      link_to(icon_tag('times'), '#', class: 'btn btn-danger js-remove-link')
+      link_to(icon_tag('times'), '#', class: 'btn js-remove-link')
     end
 
     def actions_tag options={}

data/app/presenters/georgia/pagination_presenter.rb

@@ -8,7 +8,7 @@ module Georgia
     end
 
     def to_s
-      return unless @search and !@search.total.zero?
+      return unless @search and !@search.total_count.zero?
       content_tag(:div, class: 'header-pagination') do
         search_count_tag + navigation_tags
       end
@@ -28,20 +28,17 @@ module Georgia
     end
 
     def search_count
-      page = @search.results.offset+1
-      count = @search.results.last_page? ? @search.total : @search.results.offset+@search.results.per_page
-      total = @search.total
-      "#{page} - #{count} of #{total}"
+      SearchCount.new(@search).to_s
     end
 
     def previous_page
       text = icon_tag('chevron-left')
-      link_to_previous_page(@search.hits, text, class: btn_class, params: params) || link_to_disabled(text)
+      link_to_previous_page(@search.records, text, class: btn_class, params: params) || link_to_disabled(text)
     end
 
     def next_page
       text = icon_tag('chevron-right')
-      link_to_next_page(@search.hits, text, class: btn_class, role: 'button', params: params) || link_to_disabled(text)
+      link_to_next_page(@search.records, text, class: btn_class, role: 'button', params: params) || link_to_disabled(text)
     end
 
     def btn_class
@@ -52,5 +49,46 @@ module Georgia
       link_to(text, '#', class: "#{btn_class} disabled", role: 'button')
     end
 
+    class SearchCount
+
+      def initialize(search)
+        @search = search
+      end
+
+      def to_s
+        "#{from} - #{to} of #{total}"
+      end
+
+      private
+
+      def from
+        if @search.first_page?
+          1
+        else
+          (page-1)*records_per_page+1
+        end
+      end
+
+      def to
+        if @search.first_page?
+          @search.size
+        else
+          from+@search.size-1
+        end
+      end
+
+      def total
+        @search.total_count
+      end
+
+      def page
+        @search.current_page
+      end
+
+      def records_per_page
+        @search.limit_value
+      end
+    end
+
   end
 end