georgia 0.7.3 → 0.7.4

data/lib/georgia/indexer/extensions/tire_adapter/georgia_page.rb

@@ -0,0 +1,55 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class TireAdapter
+      module GeorgiaPageExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          include ::Tire::Model::Search
+          include ::Tire::Model::Callbacks
+
+          def to_indexed_json
+            keywords = current_revision.present? ? current_revision.contents.map(&:keyword_list).flatten.uniq.join(', ') : ""
+            tags = tag_list.join(', ')
+            class_name = self.class.name
+
+            indexed_hash = {
+              title: title,
+              text: text,
+              excerpt: excerpt,
+              keywords: keywords,
+              url: url,
+              template: template,
+              tags: tags,
+              tag_list: tag_list,
+              publish_state: publish_state,
+              class_name: class_name,
+              updated_at: updated_at.strftime('%F'),
+              revision_id: revision_id
+            }
+            indexed_hash.to_json
+          end
+
+          def self.search model, params
+            model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 25)) do
+              if params[:query].present?
+                query do
+                  boolean do
+                    must { string params[:query], default_operator: "AND" }
+                  end
+                end
+                sort { by (params[:o] || :updated_at), (params[:dir] || :desc) }
+              end
+            end.results
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/georgia/indexer/solr_adapter.rb

@@ -1,23 +1,16 @@
 require 'sunspot_rails'
-require 'georgia/indexer/solr/georgia/page'
-require 'georgia/indexer/solr/georgia/message'
-require 'georgia/indexer/solr/ckeditor/asset'
-require 'georgia/indexer/solr/acts_as_taggable_on/tag'
+Dir[File.join(File.dirname(__FILE__), 'extensions', 'solr_adapter', '*.rb')].each {|file| require file }
 
-module Georgia::Indexer
-  class SolrAdapter < Adapter
+module Georgia
+  module Indexer
+    class SolrAdapter
 
-    def initialize
-      extend_models
-    end
-
-    private
+      # Delegate search_index to the model
+      # Search method is taken by Sunspot
+      def search model, params
+        model.search_index model, params
+      end
 
-    def extend_models
-      ::Georgia::Page.send(:extend, Georgia::Indexer::Solr::Georgia::Page)
-      ::Georgia::Message.send(:extend, Georgia::Indexer::Solr::Georgia::Message)
-      ::Ckeditor::Asset.send(:extend, Georgia::Indexer::Solr::Ckeditor::Asset)
-      ::ActsAsTaggableOn::Tag.send(:extend, Georgia::Indexer::Solr::ActsAsTaggableOn::Tag)
     end
   end
 end

data/lib/georgia/indexer/tire_adapter.rb

@@ -1,21 +1,15 @@
 require 'tire'
-require 'georgia/indexer/tire/georgia/page'
-require 'georgia/indexer/tire/georgia/message'
-require 'georgia/indexer/tire/ckeditor/asset'
+Dir[File.join(File.dirname(__FILE__), 'extensions', 'tire_adapter', '*.rb')].each {|file| require file }
 
-module Georgia::Indexer
-  class TireAdapter < Adapter
+module Georgia
+  module Indexer
+    class TireAdapter
 
-    def initialize
-      extend_models
-    end
-
-    private
+      # Delegate search to the model
+      def search model, params
+        model.search model, params
+      end
 
-    def extend_models
-      ::Georgia::Page.send(:extend, Georgia::Indexer::Tire::Georgia::Page)
-      ::Georgia::Message.send(:extend, Georgia::Indexer::Tire::Georgia::Message)
-      ::Ckeditor::Asset.send(:extend, Georgia::Indexer::Tire::Ckeditor::Asset)
     end
   end
 end

data/lib/georgia/version.rb

@@ -1,3 +1,3 @@
 module Georgia
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -168,16 +168,16 @@ dependencies:
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.8
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -346,20 +346,6 @@ dependencies:
     - - '>'
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: cloudfiles
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mousetrap-rails
   requirement: !ruby/object:Gem::Requirement
@@ -388,20 +374,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sendgrid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: routing_concerns
   requirement: !ruby/object:Gem::Requirement
@@ -416,34 +388,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rakismet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sidekiq
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is simply the best CMS in town. User authentication, widgets, slideshows,
   easy UI with drag and drop, publishing system, versioning, etc.
 email:
@@ -460,7 +404,6 @@ files:
 - app/assets/javascripts/georgia/components/tags.js.coffee
 - app/assets/javascripts/georgia/components/media-library.js.coffee
 - app/assets/javascripts/georgia/components/flash.js.coffee
-- app/assets/javascripts/georgia/components/tables/messages.js.coffee
 - app/assets/javascripts/georgia/components/tables/media.js.coffee
 - app/assets/javascripts/georgia/components/tables/pages.js.coffee
 - app/assets/javascripts/georgia/components/tables/checkbox.js.coffee
@@ -586,9 +529,7 @@ files:
 - app/decorators/georgia/pages_decorator.rb
 - app/decorators/georgia/application_decorator.rb
 - app/decorators/georgia/revision_decorator.rb
-- app/decorators/georgia/message_decorator.rb
 - app/decorators/georgia/links_decorator.rb
-- app/decorators/georgia/messages_decorator.rb
 - app/decorators/ckeditor/assets_decorator.rb
 - app/decorators/ckeditor/asset_decorator.rb
 - app/decorators/ckeditor/pictures_decorator.rb
@@ -614,10 +555,10 @@ files:
 - app/models/georgia/menu.rb
 - app/models/georgia/slide.rb
 - app/models/georgia/ui_section.rb
-- app/models/georgia/message.rb
 - app/models/georgia/revision.rb
 - app/models/georgia/status.rb
 - app/models/ability.rb
+- app/models/acts_as_taggable_on/tag.rb
 - app/models/ckeditor/attachment_file.rb
 - app/models/ckeditor/picture.rb
 - app/models/ckeditor/asset.rb
@@ -636,19 +577,15 @@ files:
 - app/controllers/georgia/links_controller.rb
 - app/controllers/georgia/slides_controller.rb
 - app/controllers/georgia/pages_controller.rb
-- app/controllers/georgia/messages_controller.rb
 - app/controllers/georgia/widgets_controller.rb
-- app/controllers/messages_controller.rb
 - app/views/menus/_dropdown_link.html.erb
 - app/views/menus/_link.html.erb
 - app/views/menus/_menu.html.erb
 - app/views/menus/_dropdown_group.html.erb
 - app/views/menus/_dropdown_menu.html.erb
-- app/views/messages/create.js.erb
 - app/views/georgia/api/media/pictures.html.erb
 - app/views/georgia/header/_pages.html.erb
 - app/views/georgia/header/_dashboard.html.erb
-- app/views/georgia/header/_messages.html.erb
 - app/views/georgia/header/_media.html.erb
 - app/views/georgia/header/_widgets.html.erb
 - app/views/georgia/header/_users.html.erb
@@ -662,10 +599,6 @@ files:
 - app/views/georgia/dashboard/show.html.erb
 - app/views/georgia/dashboard/panels/_messages.html.erb
 - app/views/georgia/dashboard/panels/_reviews.html.erb
-- app/views/georgia/messages/_message.html.erb
-- app/views/georgia/messages/destroy.js.erb
-- app/views/georgia/messages/show.html.erb
-- app/views/georgia/messages/search.html.erb
 - app/views/georgia/users/_user.html.erb
 - app/views/georgia/users/edit.html.erb
 - app/views/georgia/users/_form.html.erb
@@ -721,7 +654,6 @@ files:
 - app/views/layouts/georgia/application.html.erb
 - app/views/layouts/georgia/_footer.html.erb
 - app/views/layouts/georgia/_sidebar.html.erb
-- app/workers/spam_worker.rb
 - app/policies/georgia/revision_policy.rb
 - app/policies/georgia/policy.rb
 - app/mailers/georgia/notifier.rb
@@ -739,7 +671,6 @@ files:
 - app/presenters/georgia/active_facet_presenter.rb
 - app/presenters/georgia/portlet.rb
 - app/presenters/georgia/warning_message.rb
-- app/presenters/georgia/message_actions_presenter.rb
 - app/presenters/georgia/subpage_portlet.rb
 - app/presenters/georgia/pagination_presenter.rb
 - app/helpers/georgia/states_helper.rb
@@ -747,7 +678,6 @@ files:
 - app/helpers/georgia/pages_helper.rb
 - app/helpers/georgia/pagination_helper.rb
 - app/helpers/georgia/meta_tags_helper.rb
-- app/helpers/georgia/messages_helper.rb
 - app/helpers/georgia/devise_helper.rb
 - app/helpers/georgia/ui_helper.rb
 - app/helpers/georgia/sidebar_helper.rb
@@ -805,14 +735,12 @@ files:
 - lib/georgia/assets.rb
 - lib/georgia/indexer/tire_adapter.rb
 - lib/georgia/indexer/solr_adapter.rb
-- lib/georgia/indexer/tire/georgia/page.rb
-- lib/georgia/indexer/tire/georgia/message.rb
-- lib/georgia/indexer/tire/ckeditor/asset.rb
-- lib/georgia/indexer/solr/georgia/page.rb
-- lib/georgia/indexer/solr/georgia/message.rb
-- lib/georgia/indexer/solr/acts_as_taggable_on/tag.rb
-- lib/georgia/indexer/solr/ckeditor/asset.rb
-- lib/georgia/indexer/adapter.rb
+- lib/georgia/indexer/extensions/solr_adapter/georgia_page.rb
+- lib/georgia/indexer/extensions/solr_adapter/ckeditor_asset.rb
+- lib/georgia/indexer/extensions/solr_adapter/acts_as_taggable_on_tag.rb
+- lib/georgia/indexer/extensions/tire_adapter/georgia_page.rb
+- lib/georgia/indexer/extensions/tire_adapter/ckeditor_asset.rb
+- lib/georgia/indexer/extensions/tire_adapter/acts_as_taggable_on_tag.rb
 - MIT-LICENSE
 - Rakefile
 - README.md

data/app/assets/javascripts/georgia/components/tables/messages.js.coffee

@@ -1,59 +0,0 @@
-class @MessagesTable
-
-  constructor: (element) ->
-    @element          = $(element)
-    @checkboxes       = @element.find("input:checkbox")
-    @deleteBtn        = @element.find('.js-delete')
-    @spamBtn          = @element.find('.js-spam')
-    @hamBtn           = @element.find('.js-ham')
-    @setBindings()
-
-  setBindings: () =>
-    @checkboxes.on('change', @update)
-    @deleteBtn.on('click', @delete)
-    @spamBtn.on('click', @spam)
-    @hamBtn.on('click', @ham)
-
-  update: () =>
-    if @getChecked().length then @enableActions() else @disableActions()
-
-  delete: (event) =>
-    @stopEvent(event)
-    $.ajax(
-      url: "/admin/messages/#{@getIds()}"
-      type: 'DELETE'
-    )
-
-  spam: (event) ->
-    @stopEvent(event)
-    # TODO: send event to controller
-
-  ham: (event) ->
-    @stopEvent(event)
-    # TODO: send event to controller
-
-  enableActions: () =>
-    @spamBtn.removeClass('disabled').addClass('btn-warning')
-    @hamBtn.removeClass('disabled').addClass('btn-warning')
-    @deleteBtn.removeClass('disabled').addClass('btn-danger')
-
-  disableActions: () =>
-    @spamBtn.addClass('disabled').removeClass('btn-warning')
-    @hamBtn.addClass('disabled').removeClass('btn-warning')
-    @deleteBtn.addClass('disabled').removeClass('btn-danger')
-
-  stopEvent: (event) ->
-    event.stopPropagation()
-    event.preventDefault()
-
-  getChecked: () => @element.find("input:checkbox:checked[data-checkbox='child']")
-  getId:      (c) => $(c).data('id')
-  getIds:     () => $.map(@getChecked(), (c) => @getId(c))
-
-$.fn.actsAsMessagesTable = () ->
-  @each ->
-    new MessagesTable($(this))
-
-jQuery ->
-  $("table.messages.js-checkboxable").each ->
-    $(this).actsAsMessagesTable()

data/app/controllers/georgia/messages_controller.rb

@@ -1,66 +0,0 @@
-module Georgia
-  class MessagesController < ApplicationController
-
-    load_and_authorize_resource class: Georgia::Message
-
-    before_filter :prepare_search, only: [:search, :show, :spam, :ham]
-
-
-    def index
-      redirect_to action: :search
-    end
-
-    def search
-    end
-
-    # Destroy multiple assets
-    def destroy
-      ids = params[:id].split(',')
-      if @messages = Message.destroy(ids)
-        render layout: false
-      else
-        head :internal_server_error
-      end
-    end
-
-    def destroy_all_spam
-      if Message.spam.destroy_all
-        redirect_to :back, notice: 'All spam messages have been successfully deleted.'
-      else
-        redirect_to :back, alert: 'Oups. Something went wrong.'
-      end
-    end
-
-    def show
-      @message = Message.find(params[:id]).decorate
-    end
-
-    def spam
-      @message = Message.find(params[:id])
-      if @message.spam!
-        @message.update_attribute(:spam, true)
-        redirect_to :back, notice: 'Message successfully marked as spam.'
-      else
-        redirect_to :back, alert: 'Oups. Something went wrong.'
-      end
-    end
-
-    def ham
-      @message = Message.find(params[:id])
-      if @message.ham! == false
-        @message.update_attribute(:spam, false)
-        redirect_to :back, notice: 'Message successfully marked as ham.'
-      else
-        redirect_to :back, alert: 'Oups. Something went wrong.'
-      end
-    end
-
-    private
-
-    def prepare_search
-      @results = Georgia::Indexer.adapter.search(Georgia::Message, params)
-      @messages = Georgia::MessageDecorator.decorate_collection(@results)
-    end
-
-  end
-end