georgia 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abd20d9ab3944e295ac4a7f5745aeb6bfa1a97e6
-  data.tar.gz: 6ba851a725b0976c07f71abd9f8b8163d886eddf
+  metadata.gz: aca6c1088ccbab0f52eff3ed79cd151ca4820787
+  data.tar.gz: 5276e31dc6309e9f8f26d604bf5e37b7e825b3f7
 SHA512:
-  metadata.gz: dbc9ddd0cc66f29d279b3fc906d627d4cfa1d8e2ec871f12ec31f407937961bc569fa0704a955aff468e681104c46108235a6ad156e6cdf5ae1f5e489f9a03ba
-  data.tar.gz: b8fb78cfcde16ffd6b0604ea7f9fee64ee73f05ed8330f7de656cf2a31ff29ba3e72f6d93a2916af52b8b3265e376a043cc777536413b40b1d4741e61c67c9b6
+  metadata.gz: 9e9bdc07d844634e0a21b5130e7ae416dbb2c0fa9461267fa8f7b33b3ec8dd9afbf5cd1c7cd9068b66da56a343ab03cd82f4dbbc1c9b34fce9c270fab0ddd39f
+  data.tar.gz: 67f8b0f80832d20262f96b25312eb5329baf56de508b02016f4846208ea336575114d6e69f19e2b045f12855da8c4f1975882611b0a211eb7b85faa993369496

data/README.md

@@ -1,24 +1,43 @@
-= Georgia
+## Georgia
 
 This project rocks and uses MIT-LICENSE.
 
-== Getting started
+### Getting started
 
 Make sure you have properly identify your default locale and possible available ones.
 Georgia uses available_locales to know which translations should be configured or not.
 
-  config.i18n.default_locale = :en
-  config.i18n.available_locales = [:en]
+    config.i18n.default_locale = :en
+    config.i18n.available_locales = [:en]
 
 Then run the generator to mount routes, run migrations & setup initial instances.
 
   rails g georgia:install
 
-Start your server (`rails server`) and go to (http://localhost:3000/admin)[http://localhost:3000/admin] to get started.
+Start your server (`rails server`) and go to [http://localhost:3000/admin](http://localhost:3000/admin) to get started.
 
-== Testing
+#### Heroku
 
-=== Run rspec
+You will need certain addons to make it work. I suggest going with this list matching Georgia's default tools:
 
-  cd spec/dummy
-  rspec spec
+    heroku addons:add bonsai
+    heroku addons:add sendgrid
+
+Add `config/initializers/bonsai.rb` with:
+
+    ENV['ELASTICSEARCH_URL'] = ENV['BONSAI_URL']
+
+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
+
+### Testing
+
+#### Run rspec
+
+    cd spec/dummy
+    rspec spec

data/app/controllers/georgia/messages_controller.rb

@@ -58,16 +58,8 @@ module Georgia
     private
 
     def prepare_search
-      @search = Georgia::Message.search do
-        fulltext params[:query] do
-          fields(:name, :email, :message, :subject, :phone)
-        end
-        facet :spam
-        with(:spam, (params[:s] || 'clean'))
-        order_by (params[:o] || :created_at), (params[:dir] || :desc)
-        paginate(page: params[:page], per_page: (params[:per] || 25))
-      end
-      @messages = Georgia::MessageDecorator.decorate_collection(@search.results)
+      @results = Georgia::Indexer.adapter.search(Georgia::Message, params)
+      @messages = Georgia::MessageDecorator.decorate_collection(@results)
     end
 
   end

data/app/controllers/georgia/pages_controller.rb

@@ -149,21 +149,8 @@ module Georgia
 
     def search
       session[:search_params] = 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
-      @pages = Georgia::PageDecorator.decorate_collection(@search.results)
+      @results = Georgia::Indexer.adapter.search(model, params)
+      @pages = Georgia::PageDecorator.decorate_collection(@results)
     end
 
     private

data/app/models/ckeditor/asset.rb

@@ -5,6 +5,7 @@ class Ckeditor::Asset < ActiveRecord::Base
 
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Georgia::Concerns::Taggable
+  include Georgia::Indexer
 
   delegate :url, :current_path, :content_type, to: :data
 
@@ -31,23 +32,6 @@ class Ckeditor::Asset < ActiveRecord::Base
     @extension ||= data_content_type.gsub(/.*\/(.*)/, '\1')
   end
 
-  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
-
   SIZE_RANGE = {
     '< 25 KB' => 0..25,
     '25 KB to 100 KB' => 25..100,

data/app/models/georgia/message.rb

@@ -1,6 +1,8 @@
 module Georgia
 	class Message < ActiveRecord::Base
 
+    include Georgia::Indexer
+
     attr_accessible :name, :email, :subject, :message, :attachment, :phone
     delegate :url, :current_path, :size, :content_type, :filename, to: :attachment
 
@@ -20,25 +22,6 @@ module Georgia
     scope :ham, where(spam: false)
     scope :latest, order("created_at DESC")
 
-    # Search
-    searchable do
-      text :name
-      text :email
-      text :message
-      text :subject
-      text :phone
-      string :spam do
-        status
-      end
-      # For sorting:
-      string :name
-      string :email
-      string :phone
-      string :subject
-      string :message
-      time :created_at
-    end
-
     def status
       @status ||= spam ? 'spam' : 'clean'
     end

data/app/models/georgia/page.rb

@@ -1,12 +1,12 @@
 module Georgia
   class Page < ActiveRecord::Base
 
+    include Georgia::Indexer
     include Georgia::Concerns::Taggable
     include Georgia::Concerns::Orderable
     include Georgia::Concerns::Slugable
     include Georgia::Concerns::Revisionable
     include Georgia::Concerns::Publishable
-    include Georgia::Concerns::Indexable
     include Georgia::Concerns::Treeable
     include Georgia::Concerns::Cacheable
 

data/app/views/georgia/pages/_page.html.erb

@@ -4,7 +4,7 @@
   </td>
   <td>
     <%= icon_tag 'pencil hide pull-right muted' %>
-    <%= link_to page.title, [:edit, page, page.current_revision], class: 'page-title js-toggle-icon' %>
+    <%= link_to page.title, edit_page_revision_path(page_id: page.id, id: page.revision_id), class: 'page-title js-toggle-icon' %>
   </td>
   <td>
     <%= facet_list_tag(page.tag_list, :tg) %>
@@ -14,6 +14,6 @@
     <%= facet_tag(page.template, :t) %>
   </td>
   <td class='timestamp'>
-    <em><%= page.updated_at.strftime('%F') %></em>
+    <em><%= page.updated_at %></em>
   </td>
 </tr>

data/config/initializers/acts_as_taggable_on.rb

@@ -12,8 +12,10 @@ ActsAsTaggableOn.remove_unused_tags = true
 # If you would like tags to be case-sensitive and not use LIKE queries for creation:
 # ActsAsTaggableOn.strict_case_match = true
 
-ActsAsTaggableOn::Tag.class_eval do
-  searchable do
-    text :name
+if defined?(Sunspot)
+  ActsAsTaggableOn::Tag.class_eval do
+    searchable do
+      text :name
+    end
   end
 end

data/lib/generators/georgia/install/install_generator.rb

@@ -35,27 +35,12 @@ module Georgia
 
       def create_admin_user
         say("You're almost done. You need an admin user to get started.", :yellow)
-        first_name = ask("First name:")
-        last_name = ask("Last name:")
-        email = ask("Email:")
-        password = ask("Password:")
-        Georgia::User.create(first_name: first_name, last_name: last_name, email: email, password: password, password_confirmation: password) do |user|
-          user.roles << Georgia::Role.all
-        end
+        rake "georgia:seed"
       end
 
       def copy_templates
         template "config/initializers/georgia.rb"
         template "app/controllers/pages_controller.rb"
-        template 'Procfile'
-      end
-
-      def add_dev_gems
-        gem_group :development do
-          gem "foreman"
-          gem "sunspot_solr", '2.0.0'
-        end
-        run "bundle"
       end
 
       def show_readme

data/lib/generators/georgia/install/templates/README

@@ -7,8 +7,6 @@ Some setup you must do manually if you haven't yet:
 
   2. Ensure your routes we've just added are in order.
 
-  3. Run foreman to start solr whenever you start your rails server.
-
-       bundle exec foreman start
+  3. Ensure you chose one of the 2 indexers currently available (solr or elasticsearch).
 
 ===============================================================================

data/lib/generators/georgia/install/templates/config/initializers/georgia.rb

@@ -11,5 +11,9 @@ Georgia.setup do |config|
 
   # Georgia Headers
   # Add to this list or simply change order
-  # config.header = %w(dashboard pages messages media navigation widgets)
+  # config.navigation = %w(dashboard pages messages media navigation widgets)
+
+  # Indexer
+  # Choices are :solr or :tire
+  # config.indexer = :tire
 end

data/lib/georgia/engine.rb

@@ -18,7 +18,6 @@ module Georgia
     require 'draper'
     require 'ancestry'
     require 'cloudfiles'
-    require 'sunspot_rails'
     require 'state_machine'
     require 'sendgrid'
     require 'routing_concerns'

data/lib/georgia/indexer/adapter.rb

@@ -0,0 +1,10 @@
+module Georgia::Indexer
+  class Adapter
+
+    # Delegate search to the model
+    def search model, params
+      model.search model, params
+    end
+
+  end
+end

data/lib/georgia/indexer/solr/ckeditor/asset.rb

@@ -0,0 +1,30 @@
+module Georgia
+  module Indexer
+    module Solr
+      module Ckeditor
+        module Asset
+          def self.extended(base)
+            base.class_eval 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
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/georgia/indexer/solr/georgia/message.rb

@@ -0,0 +1,31 @@
+module Georgia
+  module Indexer
+    module Solr
+      module Georgia
+        module Message
+          def self.extended(base)
+            base.class_eval do
+              searchable do
+                text :name
+                text :email
+                text :message
+                text :subject
+                text :phone
+                string :spam do
+                  status
+                end
+                # For sorting:
+                string :name
+                string :email
+                string :phone
+                string :subject
+                string :message
+                time :created_at
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/georgia/indexer/solr/georgia/page.rb

@@ -0,0 +1,71 @@
+module Georgia
+  module Indexer
+    module Solr
+      module Georgia
+        module Page
+          def self.extended(base)
+            base.class_eval 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
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/georgia/indexer/solr_adapter.rb

@@ -0,0 +1,8 @@
+require 'georgia/indexer/solr/georgia/page'
+require 'georgia/indexer/solr/georgia/message'
+require 'georgia/indexer/solr/ckeditor/asset'
+
+module Georgia::Indexer
+  class SolrAdapter < Adapter
+  end
+end

data/lib/georgia/indexer/tire/ckeditor/asset.rb

@@ -0,0 +1,29 @@
+module Georgia
+  module Indexer
+    module Tire
+      module Ckeditor
+        module Asset
+          def self.extended(base)
+            base.class_eval 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_index model, params
+                model.search(params[:query], page: (params[:page] || 1))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/georgia/indexer/tire/georgia/message.rb

@@ -0,0 +1,41 @@
+module Georgia
+  module Indexer
+    module Tire
+      module Georgia
+        module Message
+          def self.extended(base)
+            base.class_eval do
+              include ::Tire::Model::Search
+              include ::Tire::Model::Callbacks
+
+              def to_indexed_json
+                {
+                  name: name,
+                  email: email,
+                  message: message,
+                  subject: subject,
+                  phone: phone,
+                  spam: spam,
+                  updated_at: updated_at.strftime('%F')
+                }.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
+  end
+end

data/lib/georgia/indexer/tire/georgia/page.rb

@@ -0,0 +1,54 @@
+module Georgia
+  module Indexer
+    module Tire
+      module Georgia
+        module Page
+          def self.extended(base)
+            base.class_eval do
+              include ::Tire::Model::Search
+              include ::Tire::Model::Callbacks
+
+              def to_indexed_json
+                title   = revisions.map{|r| r.contents.map(&:title)}.flatten.uniq.join(', ')
+                text    = revisions.map{|r| r.contents.map(&:text)}.flatten.uniq.join(', ')
+                excerpt = revisions.map{|r| r.contents.map(&:excerpt)}.flatten.uniq.join(', ')
+                keywords = revisions.map{|r| r.contents.map(&:keyword_list)}.flatten.uniq.join(', ')
+                template = revisions.map(&:template).uniq.join(', ')
+                tags = tag_list.join(', ')
+                class_name = self.class.name
+
+                {
+                  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
+                }.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
+  end
+end

data/lib/georgia/indexer/tire_adapter.rb

@@ -0,0 +1,20 @@
+require 'georgia/indexer/tire/georgia/page'
+require 'georgia/indexer/tire/georgia/message'
+require 'georgia/indexer/tire/ckeditor/asset'
+
+module Georgia::Indexer
+  class TireAdapter < Adapter
+
+    def initialize
+      extend_models
+    end
+
+    private
+
+    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/indexer.rb

@@ -0,0 +1,26 @@
+require 'georgia/indexer/adapter'
+
+module Georgia
+  module Indexer
+    autoload :SolrAdapter, 'georgia/indexer/solr_adapter'
+    autoload :TireAdapter, 'georgia/indexer/tire_adapter'
+
+    mattr_accessor :adapter
+
+    def self.included(base)
+      @@adapter ||= adapter_lookup
+    end
+
+    private
+
+    def self.adapter_lookup
+      (case Georgia.indexer
+        when :solr then Georgia::Indexer::SolrAdapter.new
+        when :tire then Georgia::Indexer::TireAdapter.new
+        else
+          Georgia::Indexer::TireAdapter.new
+        end)
+    end
+
+  end
+end

data/lib/georgia/version.rb

@@ -1,3 +1,3 @@
 module Georgia
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/georgia.rb

@@ -2,6 +2,7 @@ require "georgia/version"
 require "georgia/paths"
 require "georgia/engine"
 require "georgia/assets"
+require "georgia/indexer"
 
 module Georgia
 
@@ -14,11 +15,22 @@ module Georgia
   mattr_accessor :url
   @@url = "http://www.example.com"
 
-  mattr_accessor :header
-  @@header = %w(dashboard pages messages media navigation widgets)
+  mattr_accessor :navigation
+  @@navigation = %w(dashboard pages messages media navigation widgets)
+
+  mattr_accessor :indexer
+  @@indexer = :solr
 
   def self.setup
     yield self
   end
 
+  class << self
+    alias :header :navigation
+
+    def header= value
+      ActiveSupport::Deprecation.warn("config.header is deprecated, use config.navigation instead.", caller)
+    end
+  end
+
 end

data/lib/tasks/georgia.rake

@@ -1,46 +1,14 @@
 namespace :georgia do
 
-  namespace :migrate do
-
-    desc "Saves ancestry from legacy parent_id"
-    task ancestry: :environment do
-
-      Georgia::Page.find_each do |page|
-        if parent = page.attributes['parent_id']
-          begin
-            page.parent = Georgia::Page.find(parent)
-            page.save!
-          rescue ActiveRecord::RecordNotFound
-            puts 'Page not found'
-          end
-        end
-      end
-
-    end
-
-    desc "Saves keywords to tags list"
-    task tags: :environment do
-
-      Georgia::Content.find_each do |content|
-        content.keyword_list = content.keywords
-        content.save
-      end
-
-    end
-  end
-
-  desc "Purge assets that don't have an existing file in the cloud"
-  task purge: :environment do
-    count = 0
-    Ckeditor::Asset.find_each do |asset|
-      begin
-        if !asset.data.file.exists?
-          asset.destroy
-          count += 1
-        end
-      end
+  desc "Creates an Admin user to get started"
+  task seed: :environment do
+    first_name = ask("First name:")
+    last_name = ask("Last name:")
+    email = ask("Email:")
+    password = ask("Password:")
+    Georgia::User.create(first_name: first_name, last_name: last_name, email: email, password: password, password_confirmation: password) do |user|
+      user.roles << Georgia::Role.all
     end
-    puts "#{count} assets purged."
   end
 
   namespace :messages do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -374,20 +374,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sunspot_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -592,7 +578,6 @@ files:
 - app/assets/stylesheets/georgia/vendor/_tooltip.scss
 - app/assets/stylesheets/georgia/overrides/_select2.scss
 - app/assets/stylesheets/georgia/application.css.scss
-- app/decorators/sunspot/highlighted_hit_decorator.rb
 - app/decorators/pagination_decorator.rb
 - app/decorators/georgia/link_decorator.rb
 - app/decorators/georgia/widget_decorator.rb
@@ -622,7 +607,6 @@ files:
 - app/models/georgia/concerns/statable.rb
 - app/models/georgia/concerns/templatable.rb
 - app/models/georgia/concerns/orderable.rb
-- app/models/georgia/concerns/indexable.rb
 - app/models/georgia/concerns/contentable.rb
 - app/models/georgia/concerns/taggable.rb
 - app/models/georgia/concerns/treeable.rb
@@ -805,12 +789,6 @@ files:
 - lib/tasks/georgia.rake
 - lib/tasks/upgrade.rake
 - lib/tasks/assets.rake
-- lib/generators/georgia/upgrade/templates/add_contents_counter_cache_to_images.rb
-- lib/generators/georgia/upgrade/templates/create_georgia_revisions.rb
-- lib/generators/georgia/upgrade/templates/add_state_to_georgia_pages.rb
-- lib/generators/georgia/upgrade/templates/add_public_to_georgia_pages.rb
-- lib/generators/georgia/upgrade/templates/add_anti_spam_to_messages.rb
-- lib/generators/georgia/upgrade/upgrade_generator.rb
 - lib/generators/georgia/install/templates/Procfile
 - lib/generators/georgia/install/templates/app/controllers/pages_controller.rb
 - lib/generators/georgia/install/templates/config/initializers/georgia.rb
@@ -823,7 +801,17 @@ files:
 - lib/georgia/engine.rb
 - lib/georgia/version.rb
 - lib/georgia/paths.rb
+- lib/georgia/indexer.rb
 - 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/ckeditor/asset.rb
+- lib/georgia/indexer/adapter.rb
 - MIT-LICENSE
 - Rakefile
 - README.md

data/app/decorators/sunspot/highlighted_hit_decorator.rb

@@ -1,29 +0,0 @@
-module Sunspot
-  class HighlightedHitDecorator < ::ApplicationDecorator
-
-    def method_missing(meth, *args, &block)
-      if source.highlights(meth) and source.highlights(meth).present?
-        highlight_text_on(meth)
-      elsif source.stored(meth) and source.stored(meth).is_a? Array
-        source.stored(meth).join(', ')
-      elsif source.stored(meth) and source.stored(meth).present?
-        source.stored(meth)
-      elsif source.result
-        source.result.send(meth)
-      else
-        super
-      end
-    end
-
-    def source_class_name
-      source.class_name.parameterize
-    end
-
-    private
-
-    def highlight_text_on key, options={}
-      source.highlights(key).map{|hl| hl.format{|word| h.content_tag(:span, word, class: 'highlight') } }.join().html_safe
-    end
-
-  end
-end

data/app/models/georgia/concerns/indexable.rb

@@ -1,67 +0,0 @@
-require 'active_support/concern'
-
-module Georgia
-  module Concerns
-    module Indexable
-      extend ActiveSupport::Concern
-
-      included do
-
-        class << self
-
-          # Default fields to be include in searchable block
-          # Children of Georgia::Page can use this to extend their own searchable block
-          def indexable_fields
-            Proc.new {
-              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
-
-        end
-
-        searchable do
-          instance_eval &self.indexable_fields
-        end
-
-      end
-
-    end
-  end
-end

data/lib/generators/georgia/upgrade/templates/add_anti_spam_to_messages.rb

@@ -1,12 +0,0 @@
-class AddAntiSpamToMessages < ActiveRecord::Migration
-
-  def change
-    add_column :georgia_messages, :spam, :boolean, default: false
-    add_column :georgia_messages, :verified_at, :datetime
-    add_column :georgia_messages, :permalink, :string
-    add_column :georgia_messages, :user_ip, :string
-    add_column :georgia_messages, :user_agent, :string
-    add_column :georgia_messages, :referrer, :string
-  end
-
-end

data/lib/generators/georgia/upgrade/templates/add_contents_counter_cache_to_images.rb

@@ -1,15 +0,0 @@
-class AddContentsCounterCacheToImages < ActiveRecord::Migration
-
-  def up
-    add_column :ckeditor_assets, :contents_count, :integer, default: 0
-    Ckeditor::Picture.reset_column_information
-    Ckeditor::Picture.find_each do |u|
-      Ckeditor::Picture.update_counters u.id, :contents_count => u.contents.length
-    end
-  end
-
-  def down
-    remove_column :ckeditor_assets, :contents_count
-  end
-
-end

data/lib/generators/georgia/upgrade/templates/add_public_to_georgia_pages.rb

@@ -1,8 +0,0 @@
-class AddPublicToGeorgiaPages < ActiveRecord::Migration
-
-  def change
-    add_column :georgia_pages, :public, :boolean, default: false
-    add_index :georgia_pages, :public
-  end
-
-end

data/lib/generators/georgia/upgrade/templates/add_state_to_georgia_pages.rb

@@ -1,13 +0,0 @@
-class AddStateToGeorgiaPages < ActiveRecord::Migration
-
-  def up
-    add_column  :georgia_pages, :state, :string
-    add_index   :georgia_pages, :state
-  end
-
-  def down
-    remove_column :georgia_pages, :state
-    remove_index  :georgia_pages, :state
-  end
-
-end

data/lib/generators/georgia/upgrade/templates/create_georgia_revisions.rb

@@ -1,12 +0,0 @@
-class CreateGeorgiaRevisions < ActiveRecord::Migration
-
-  def change
-    create_table :georgia_revisions do |t|
-      t.string :state, default: 'draft'
-      t.string :template
-      t.references :revisionable, polymorphic: true
-      t.timestamps
-    end
-  end
-
-end

data/lib/generators/georgia/upgrade/upgrade_generator.rb

@@ -1,34 +0,0 @@
-# encoding: UTF-8
-require 'rails/generators/migration'
-require 'rails/generators/active_record'
-
-module Georgia
-  module Generators
-    class UpgradeGenerator < ::Rails::Generators::Base
-      include Rails::Generators::Migration
-
-      source_root File.expand_path('../templates', __FILE__)
-
-      desc "Upgrades Georgia CMS to fit latest changes"
-
-      def self.next_migration_number(number)
-        ActiveRecord::Generators::Base.next_migration_number(number)
-      end
-
-      def run_migrations
-        migration_template "add_public_to_georgia_pages.rb", "db/migrate/add_public_to_georgia_pages.rb"
-        migration_template "add_state_to_georgia_pages.rb", "db/migrate/add_state_to_georgia_pages.rb"
-        migration_template "add_anti_spam_to_messages.rb", "db/migrate/add_anti_spam_to_messages.rb"
-        migration_template "create_georgia_revisions.rb", "db/migrate/create_georgia_revisions.rb"
-        migration_template "add_contents_counter_cache_to_images.rb", "db/migrate/add_contents_counter_cache_to_images.rb"
-        rake 'db:migrate'
-      end
-
-      def run_tasks
-        rake 'georgia:statuses'
-        rake 'georgia:revisions'
-      end
-
-    end
-  end
-end