georgia 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca6c1088ccbab0f52eff3ed79cd151ca4820787
-  data.tar.gz: 5276e31dc6309e9f8f26d604bf5e37b7e825b3f7
+  metadata.gz: cd1a27f515ca78cc69f58d4e59d1feb142d67075
+  data.tar.gz: 78a2a2a4ec57a76be7f9ccc0e9039894e4ccac17
 SHA512:
-  metadata.gz: 9e9bdc07d844634e0a21b5130e7ae416dbb2c0fa9461267fa8f7b33b3ec8dd9afbf5cd1c7cd9068b66da56a343ab03cd82f4dbbc1c9b34fce9c270fab0ddd39f
-  data.tar.gz: 67f8b0f80832d20262f96b25312eb5329baf56de508b02016f4846208ea336575114d6e69f19e2b045f12855da8c4f1975882611b0a211eb7b85faa993369496
+  metadata.gz: ba641378b4d8279b895669a966df089b3cf9b19ec412b1257390cfc834479bf0b92c9d7c8103c052645ab93a580ec0dcf3eb9225a6401697a4cfd2559f7f1692
+  data.tar.gz: 6b97374a1349361749d00cb58dfbc7cd75e51f856b64c388ee7a01995fbc2d9ca728dc4bf03590326ca23f06b2a4ddcd5469d2f1597aa8e912ec7a2cf8cd58c3

data/README.md

@@ -1,6 +1,33 @@
 ## Georgia
 
-This project rocks and uses MIT-LICENSE.
+[![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)
+
+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).
+
+### Features
+
+* Media library on the cloud
+* Spam filter on emails
+* Multilingual from the get-go
+* Review & Preview before publishing
+* Rollback to previous revisions
+* Great UI, nice search, gravatars
+* Editable menus
+* Extendable
+* Widgets
+* Slides
+* Permission levels
+
+### Why? aka Comparison with refinerycms
+
+* Because diversity is good.
+* Because Georgia is a Rails Engine. You can add to an existing application.
+* Because it's prettier.
+* Because the guys on refinerycms did a great job and you should check them out.
+* Because it's easy to start a website and push to Heroku.
+* Rails 4 compatible.. almost.
 
 ### Getting started
 
@@ -16,7 +43,7 @@ Then run the generator to mount routes, run migrations & setup initial instances
 
 Start your server (`rails server`) and go to [http://localhost:3000/admin](http://localhost:3000/admin) to get started.
 
-#### Heroku
+### Heroku
 
 You will need certain addons to make it work. I suggest going with this list matching Georgia's default tools:
 
@@ -35,9 +62,6 @@ Finally, create your indices with these commands:
 
 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
+### Spam filtering
 
-#### Run rspec
-
-    cd spec/dummy
-    rspec spec
+TODO

data/Rakefile

@@ -20,8 +20,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-
-
-
 Bundler::GemHelper.install_tasks
-
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'

data/app/controllers/georgia/api/tags_controller.rb

@@ -1,3 +1,4 @@
+# TODO: Move to Georgia::Indexer
 module Georgia
   module Api
     class TagsController < Georgia::ApplicationController

data/app/controllers/georgia/media_controller.rb

@@ -11,17 +11,8 @@ module Georgia
 
     def search
       @asset = Ckeditor::Asset.new
-      session[:search_params] = params
-      @search = Ckeditor::Asset.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
-      @assets = Ckeditor::AssetDecorator.decorate_collection(@search.results)
+      @results = Georgia::Indexer.adapter.search(Ckeditor::Asset, params)
+      @assets = Ckeditor::AssetDecorator.decorate_collection(@results)
     end
 
     def create

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

@@ -18,5 +18,5 @@
 </header>
 
 <%= content_for :footer do %>
-  <%= render 'georgia/shared/modals/page' %>
+  <%= render 'georgia/shared/modals/page' if can?(:create, model) %>
 <% end -%>

data/config/initializers/acts_as_taggable_on.rb

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

data/lib/georgia/indexer/solr/acts_as_taggable_on/tag.rb

@@ -0,0 +1,17 @@
+module Georgia
+  module Indexer
+    module Solr
+      module ActsAsTaggableOn
+        module Tag
+          def self.extended(base)
+            base.class_eval do
+              searchable do
+                text :name
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -21,10 +21,23 @@ module Georgia
                   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
+              end
             end
           end
         end
       end
     end
   end
-end
+end
+

data/lib/georgia/indexer/solr_adapter.rb

@@ -1,8 +1,23 @@
+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'
 
 module Georgia::Indexer
   class SolrAdapter < Adapter
+
+    def initialize
+      extend_models
+    end
+
+    private
+
+    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/ckeditor/asset.rb

@@ -17,8 +17,17 @@ module Georgia
                 indexes :updated_at, :type => 'date'
               end
 
-              def self.search_index model, params
-                model.search(params[:query], page: (params[:page] || 1))
+              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

data/lib/georgia/indexer/tire_adapter.rb

@@ -1,3 +1,4 @@
+require 'tire'
 require 'georgia/indexer/tire/georgia/page'
 require 'georgia/indexer/tire/georgia/message'
 require 'georgia/indexer/tire/ckeditor/asset'

data/lib/georgia/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -810,6 +810,7 @@ files:
 - 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
 - MIT-LICENSE