georgia 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1a27f515ca78cc69f58d4e59d1feb142d67075
-  data.tar.gz: 78a2a2a4ec57a76be7f9ccc0e9039894e4ccac17
+  metadata.gz: a3f4c9543e2181d35f09f90bd82cf2f523053974
+  data.tar.gz: 05657441a546365bb0011bc5e9b518acf44d602c
 SHA512:
-  metadata.gz: ba641378b4d8279b895669a966df089b3cf9b19ec412b1257390cfc834479bf0b92c9d7c8103c052645ab93a580ec0dcf3eb9225a6401697a4cfd2559f7f1692
-  data.tar.gz: 6b97374a1349361749d00cb58dfbc7cd75e51f856b64c388ee7a01995fbc2d9ca728dc4bf03590326ca23f06b2a4ddcd5469d2f1597aa8e912ec7a2cf8cd58c3
+  metadata.gz: 03bc9f24c25a6972570bb1636b38f1c5cf4d65a9f807bcde8cbc33e55c70cee9aa84b073594bed7fda169eda3f9069c434cb17d2bcb38f0ca9f9ddf4c3640511
+  data.tar.gz: a8c4409742f2d91a1a2dd2c9eed84f49158c1983d107e1be6d4cbdf56904d6904255455aaa8561bb4b80a2d3f70fd48a56bc403862a7e5488213dc3e6a480cb1

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/georgia.png)](http://badge.fury.io/rb/georgia)
 [![Build Status](https://travis-ci.org/georgia-cms/georgia.png?branch=master)](https://travis-ci.org/georgia-cms/georgia)
 [![Code Climate](https://codeclimate.com/github/georgia-cms/georgia.png)](https://codeclimate.com/github/georgia-cms/georgia)
+[![Coverage Status](https://coveralls.io/repos/georgia-cms/georgia/badge.png)](https://coveralls.io/r/georgia-cms/georgia)
 
 Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. Have a peak at the [demo](http://sorrynodemoyet.com/i-promise-it-s-on-its-way).
 
@@ -11,8 +12,9 @@ Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. H
 * Media library on the cloud
 * Spam filter on emails
 * Multilingual from the get-go
-* Review & Preview before publishing
-* Rollback to previous revisions
+* Review you pairs and draft new pages
+* Preview before publishing
+* Rollback to previous revisions when it hits the fan
 * Great UI, nice search, gravatars
 * Editable menus
 * Extendable
@@ -39,7 +41,7 @@ Georgia uses available_locales to know which translations should be configured o
 
 Then run the generator to mount routes, run migrations & setup initial instances.
 
-  rails g georgia:install
+    rails generate georgia:install
 
 Start your server (`rails server`) and go to [http://localhost:3000/admin](http://localhost:3000/admin) to get started.
 
@@ -57,11 +59,6 @@ Add `config/initializers/bonsai.rb` with:
 Finally, create your indices with these commands:
 
     heroku run rake environment tire:import CLASS=Georgia::Page FORCE=true
-    heroku run rake environment tire:import CLASS=Georgia::Message FORCE=true
     heroku run rake environment tire:import CLASS=Ckeditor::Asset FORCE=true
 
-For more information, you can also follow these [instructions](https://gist.github.com/nz/2041121) to setup bonsai.io. More [here](https://devcenter.heroku.com/articles/bonsai) on heroku.com
-
-### Spam filtering
-
-TODO
+For more information, you can also follow these [instructions](https://gist.github.com/nz/2041121) to setup bonsai.io. More [here](https://devcenter.heroku.com/articles/bonsai) on heroku.com

data/app/assets/javascripts/georgia/ckeditor/config.js

@@ -1,7 +1,5 @@
-var CKEDITOR_BASEPATH = '/assets/ckeditor/';
 CKEDITOR.config.ignoreEmptyParagraph = false;
 CKEDITOR.config.allowedContent = true;
-CKEDITOR.config.baseHref = '/assets/ckeditor/';
 CKEDITOR.config.height = 400;
 CKEDITOR.config.width = '95.5%';
 CKEDITOR.config.toolbarStartupExpanded = false;

data/app/controllers/georgia/dashboard_controller.rb

@@ -5,8 +5,10 @@ module Georgia
       if can?(:approve, Georgia::Revision) or can?(:review, Georgia::Revision)
         @awaiting_revisions = Georgia::Revision.reviews.select{|r| r.revisionable.present?}
       end
-      if can?(:index, Georgia::Message)
-        @messages = Georgia::Message.ham.latest.limit(5).decorate
+      if defined? GeorgiaMailer::Message
+        if can?(:index, Georgia::Message)
+          @messages = Georgia::Message.ham.latest.limit(5).decorate
+        end
       end
     end
 

data/app/mailers/georgia/notifier.rb

@@ -1,8 +1,6 @@
 module Georgia
   class Notifier < ActionMailer::Base
 
-    include SendGrid
-
     def notify_admins(message, url)
       @message = message
       @url = url

data/app/models/acts_as_taggable_on/tag.rb

@@ -0,0 +1,9 @@
+ActsAsTaggableOn::Tag.class_eval do
+
+  include Georgia::Indexer::Adapter
+  is_searchable({
+    solr: Georgia::Indexer::SolrAdapter::ActsAsTaggableOnTagExtension,
+    tire: Georgia::Indexer::TireAdapter::ActsAsTaggableOnTagExtension,
+  })
+
+end

data/app/models/ckeditor/asset.rb

@@ -1,11 +1,16 @@
 class Ckeditor::Asset < ActiveRecord::Base
 
+  include Georgia::Indexer::Adapter
+  is_searchable({
+    solr: Georgia::Indexer::SolrAdapter::CkeditorAssetExtension,
+    tire: Georgia::Indexer::TireAdapter::CkeditorAssetExtension,
+  })
+
   # to allow media_path in to_jq_upload
   include Georgia::Engine.routes.url_helpers
 
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Georgia::Concerns::Taggable
-  include Georgia::Indexer
 
   delegate :url, :current_path, :content_type, to: :data
 
@@ -40,6 +45,4 @@ class Ckeditor::Asset < ActiveRecord::Base
     '> 1 MB' => 1000..999999
   }
 
-
-
 end

data/app/models/georgia/page.rb

@@ -1,7 +1,12 @@
 module Georgia
   class Page < ActiveRecord::Base
 
-    include Georgia::Indexer
+    include Georgia::Indexer::Adapter
+    is_searchable({
+      solr: Georgia::Indexer::SolrAdapter::GeorgiaPageExtension,
+      tire: Georgia::Indexer::TireAdapter::GeorgiaPageExtension
+    })
+
     include Georgia::Concerns::Taggable
     include Georgia::Concerns::Orderable
     include Georgia::Concerns::Slugable

data/config/routes.rb

@@ -51,24 +51,12 @@ Georgia::Engine.routes.draw do
     end
   end
   resources :users
-  resources :messages do
-    collection do
-      get :search
-      get :destroy_all_spam
-    end
-    member do
-      get :spam
-      get :ham
-    end
-  end
   resources :menus, path: 'navigation'
   resources :links, only: [:create, :show]
   resources :widgets
   resources :ui_associations, path: 'ui-associations', only: [:new]
   resources :slides, only: [:new]
 
-  match '/search/messages', to: 'search#messages'
-
   unauthenticated do
     as :user do
       root :to => 'users/sessions#new'

data/lib/georgia.rb

@@ -16,10 +16,10 @@ module Georgia
   @@url = "http://www.example.com"
 
   mattr_accessor :navigation
-  @@navigation = %w(dashboard pages messages media navigation widgets)
+  @@navigation = %w(dashboard pages media navigation widgets)
 
   mattr_accessor :indexer
-  @@indexer = :solr
+  @@indexer = :tire
 
   def self.setup
     yield self

data/lib/georgia/engine.rb

@@ -17,12 +17,8 @@ module Georgia
     require 'carrierwave'
     require 'draper'
     require 'ancestry'
-    require 'cloudfiles'
     require 'state_machine'
-    require 'sendgrid'
     require 'routing_concerns'
-    require 'rakismet'
-    require 'sidekiq'
 
     require 'sass-rails'
     require 'bourbon'
@@ -36,13 +32,7 @@ module Georgia
 
     initializer 'georgia.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-        helper Georgia::DeviseHelper
-        helper Georgia::FormsHelper
-        helper Georgia::RoutesHelper
-        helper Georgia::UiHelper
-        helper Georgia::MenusHelper
         helper Georgia::MetaTagsHelper
-        helper Georgia::TwitterHelper
         helper Georgia::InternationalizationHelper
       end
     end

data/lib/georgia/indexer.rb

@@ -1,26 +1,44 @@
-require 'georgia/indexer/adapter'
+require 'active_support/concern'
 
 module Georgia
   module Indexer
     autoload :SolrAdapter, 'georgia/indexer/solr_adapter'
     autoload :TireAdapter, 'georgia/indexer/tire_adapter'
 
-    mattr_accessor :adapter
-
-    def self.included(base)
+    def self.adapter
       @@adapter ||= adapter_lookup
     end
 
+    # Delegates search to the adapter
+    def self.search model, params
+      adapter.search model, params
+    end
+
+    def self.searching model, extension
+      adapter.searching model, extension
+    end
+
     private
 
     def self.adapter_lookup
       (case Georgia.indexer
-        when :solr then Georgia::Indexer::SolrAdapter.new
-        when :tire then Georgia::Indexer::TireAdapter.new
+        when :solr then SolrAdapter.new
+        when :tire then TireAdapter.new
         else
-          Georgia::Indexer::TireAdapter.new
+          TireAdapter.new
         end)
     end
 
+    module Adapter
+      extend ActiveSupport::Concern
+
+      included do
+        def self.is_searchable extensions={}
+          raise "No extension for the #{Georgia.indexer} indexer" unless extensions[Georgia.indexer].present?
+          self.send(:include, extensions[Georgia.indexer])
+        end
+      end
+    end
+
   end
 end

data/lib/georgia/indexer/extensions/solr_adapter/acts_as_taggable_on_tag.rb

@@ -0,0 +1,21 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class SolrAdapter
+      module ActsAsTaggableOnTagExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          searchable do
+            text :name
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/georgia/indexer/extensions/solr_adapter/ckeditor_asset.rb

@@ -0,0 +1,46 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class SolrAdapter
+      module CkeditorAssetExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          searchable do
+            text :filename, stored: true
+            text :tags do
+              tag_list.join(', ')
+            end
+            string :tags, stored: true, multiple: true do
+              tag_list
+            end
+            string :extension, stored: true do
+              extension.try(:downcase)
+            end
+            time :updated_at
+            integer :size, stored: true do
+              size / 1024 # gives size in KB
+            end
+          end
+
+          def self.search_index model, params
+            @search = model.search do
+              fulltext params[:query] do
+                fields(:filename, :tags)
+              end
+              with(:extension, params[:e]) unless params[:e].blank?
+              with(:tags).any_of(params[:tg]) unless params[:tg].blank?
+              order_by (params[:o] || :updated_at), (params[:dir] || :desc)
+              paginate(page: params[:page], per_page: (params[:per] || 8))
+            end.results
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class SolrAdapter
+      module GeorgiaPageExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          searchable do
+            text :title, stored: true do
+              revisions.map{|r| r.contents.map(&:title)}.flatten.uniq.join(', ')
+            end
+            text :excerpt, stored: true do
+              revisions.map{|r| r.contents.map(&:excerpt)}.flatten.uniq.join(', ')
+            end
+            text :text do
+              revisions.map{|r| r.contents.map(&:text)}.flatten.uniq.join(', ')
+            end
+            text :keywords do
+              revisions.map{|r| r.contents.map(&:keyword_list)}.flatten.uniq.join(', ')
+            end
+            text :template do
+              revisions.map(&:template).uniq.join(', ')
+            end
+            text :tags do
+              tag_list.join(', ')
+            end
+            text :url
+            string :class_name do
+              self.class.name
+            end
+            string :title
+            string :excerpt
+            string :text
+            string :url
+            string :template
+            string :state do
+              publish_state
+            end
+            string :keywords, stored: true, multiple: true do
+              revisions.map{|r| r.contents.map(&:keyword_list)}.flatten.uniq
+            end
+            string :tag_list, stored: true, multiple: true #Facets (multiple)
+            string :tags do #Ordering (single list)
+              tag_list.join(', ')
+            end
+            time :updated_at # default for ordering
+          end
+
+          def self.search_index model, params
+            @search = model.search do
+              fulltext params[:query] do
+                fields(:title, :excerpt, :text, :keywords, :tags, :url, :template)
+              end
+              facet :state, :template, :tag_list
+              # ensure pages indexed in the wrong bucket don't get displayed
+              with(:class_name, model.to_s)
+              with(:state, params[:s]) unless params[:s].blank?
+              with(:template, params[:t]) unless params[:t].blank?
+              with(:tag_list).all_of(params[:tg]) unless params[:tg].blank?
+              order_by (params[:o] || :updated_at), (params[:dir] || :desc)
+              paginate(page: params[:page], per_page: (params[:per] || 25))
+              instance_eval &model.extra_search_params if model.respond_to? :extra_search_params
+            end.results
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class TireAdapter
+      module ActsAsTaggableOnTagExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          include ::Tire::Model::Search
+          include ::Tire::Model::Callbacks
+
+          def to_indexed_json
+            {name: name}.to_json
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    class TireAdapter
+      module CkeditorAssetExtension
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          include ::Tire::Model::Search
+          include ::Tire::Model::Callbacks
+
+          mapping do
+            indexes :id,           :index    => :not_analyzed
+            indexes :filename
+            indexes :tags
+            indexes :extension
+            indexes :updated_at, :type => 'date'
+          end
+
+          def self.search model, params
+            model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 8)) 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