georgia 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4227bcee7bf428523ca796ad7b3bcb89d16b85c
-  data.tar.gz: fcaa610998dfcb51fb2429ac828b4efd15ce718e
+  metadata.gz: 3e6ad208668a7070cb8265fbac2fd21e2216df43
+  data.tar.gz: e003d41f4e19d141fcfcb5629335744a5b9eb205
 SHA512:
-  metadata.gz: 3eeb73c3ff21b760a31b29b36fab8af91f4e9d06ca98febb45ba09e3728922ab8e8c9a71b8b4194d0a98dcb97c8836e2a98099c87b6955e2234dc61e922bcb8c
-  data.tar.gz: 166b5c173ebcfae295010b9e114d9d5b1602a6c0f5841ab8f023b487c702e88b41191811021d644ae0706c6d193a2e9c3b4cb4cac22e07f97fd7ee0373131580
+  metadata.gz: 4c54848250467dc0896fe3be6077a8082e586c4f69bd262f40891d3eb08a811674fff7bb879407895f4baddb0999ae9e63215c0b99977429ca574030b6d03ab3
+  data.tar.gz: 15734547e9bfa5631ef996570349ce563b2fe70c36ff6ad31fc1770403c614a0b7cb7532649905e977ca52809a5659c13d11d686194b52c32c846554f1f95234

data/README.md

@@ -29,7 +29,6 @@ Rails. Engine. CMS. Plug-and-play content management system for Ruby on Rails. H
 * 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
 
@@ -43,6 +42,10 @@ Then run the generator to mount routes, run migrations & setup initial instances
 
     rails generate georgia:install
 
+We built Georgia to help you quickly develop an application with a CMS (Content Management System). However, we don't want to be in your way when you need to customize it.
+
+    rails generate georgia:views
+
 Start your server (`rails server`) and go to [http://localhost:3000/admin](http://localhost:3000/admin) to get started.
 
 ### Heroku
@@ -56,9 +59,13 @@ Add `config/initializers/bonsai.rb` with:
 
     ENV['ELASTICSEARCH_URL'] = ENV['BONSAI_URL']
 
-Finally, create your indices with these commands:
+Create your indices with these commands:
 
     heroku run rake environment tire:import CLASS=Georgia::Page FORCE=true
     heroku run rake environment tire:import CLASS=Ckeditor::Asset FORCE=true
 
+Finally, create your first admin user to access to web panel:
+
+    heroku run rake georgia:seed
+
 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/controllers/georgia/dashboard_controller.rb

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

data/app/controllers/georgia/revisions_controller.rb

@@ -16,6 +16,8 @@ module Georgia
     end
 
     def edit
+      locale = params.fetch(:locale, current_locale)
+      @slides = @revision.slides.ordered.with_locale(locale)
       @ui_sections = Georgia::UiSection.all
     end
 

data/app/decorators/georgia/application_decorator.rb

@@ -2,5 +2,20 @@ module Georgia
   class ApplicationDecorator < Draper::Decorator
     delegate_all
 
+
+    def pretty_created_at
+      prettify_date(created_at)
+    end
+
+    def pretty_updated_at
+      prettify_date(updated_at)
+    end
+
+    private
+
+    def prettify_date date
+      date.is_a?(String) ? date : date.try(:strftime, '%F')
+    end
+
   end
 end

data/app/models/acts_as_taggable_on/tag.rb

@@ -1,9 +1,5 @@
 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,10 +1,6 @@
 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

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

@@ -10,8 +10,11 @@ module Georgia
         accepts_nested_attributes_for :contents
         attr_accessible :contents_attributes
 
-        def content
-          @content ||= contents.select{|c| c.locale == I18n.locale.to_s}.first || Georgia::Content.new
+        scope :with_locale, lambda {|locale| joins(:contents).where(georgia_contents: {locale: locale})}
+
+        def content(locale=nil)
+          locale ||= I18n.locale.to_s
+          @content ||= contents.select{|c| c.locale == locale}.first || Georgia::Content.new
         end
 
 				delegate :title, :text, :excerpt, :keywords, :keyword_list, :image, :locale, to: :content

data/app/models/georgia/page.rb

@@ -2,11 +2,6 @@ module Georgia
   class Page < ActiveRecord::Base
 
     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/app/views/georgia/pages/_page.html.erb

@@ -14,6 +14,6 @@
     <%= facet_tag(page.template, :t) %>
   </td>
   <td class='timestamp'>
-    <em><%= page.updated_at %></em>
+    <em><%= page.pretty_updated_at %></em>
   </td>
 </tr>

data/app/views/georgia/revisions/fields/_slides.html.erb

@@ -9,8 +9,8 @@
     <div class="control-group">
       <div class="slides js-slides">
         <ul class="nav-list js-sortable">
-          <% @revision.slides.each do |slide| %>
-            <%= slide_portlet_tag(slide) %>
+          <% @slides.each do |slide| %>
+            <%= slide_portlet_tag(slide, content: slide.content(params[:locale])) %>
           <% end -%>
         </ul>
       </div>

data/app/views/georgia/slides/new.html.erb

@@ -1 +1 @@
-<%= slide_portlet_tag(@slide, content: @slide.contents.first) %>
+<%= slide_portlet_tag(@slide, content: @slide.content(params[:locale])) %>

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

@@ -39,8 +39,16 @@ module Georgia
       end
 
       def copy_templates
-        template "config/initializers/georgia.rb"
-        template "app/controllers/pages_controller.rb"
+        copy_file "config/initializers/georgia.rb"
+        copy_file "app/controllers/pages_controller.rb"
+      end
+
+      def create_indices
+        if defined? Tire
+          say("Creating elasticsearch indices", :yellow)
+          rake "environment tire:import CLASS=Georgia::Page FORCE=true"
+          rake "environment tire:import CLASS=Ckeditor::Asset FORCE=true"
+        end
       end
 
       def show_readme

data/lib/generators/georgia/views/templates/app/views/pages/show.html.erb

@@ -0,0 +1,7 @@
+<%= content_for :head do %>
+  <%= meta_title @page.try(:title) %>
+  <%= meta_keywords @page.try(:keywords) %>
+  <%= meta_description @page.try(:excerpt) %>
+<% end -%>
+
+<%= render @page.template_path, page: @page %>

data/lib/generators/georgia/views/templates/app/views/pages/templates/_default.html.erb

@@ -0,0 +1 @@
+<%= render 'pages/templates/one-column' %>

data/lib/generators/georgia/views/templates/app/views/pages/templates/_one-column.html.erb

@@ -0,0 +1 @@
+<%= @page.text.html_safe %>

data/lib/generators/georgia/views/templates/app/views/pages/templates/_sidebar-left.html.erb

@@ -0,0 +1,24 @@
+<section id="main">
+  <div class='container'>
+
+    <div class="row">
+
+      <aside id="sidebar-left" class="col-md-3">
+        <% @page.widgets.each do |widget| %>
+          <div class="widget">
+            <h4><%= widget.title %></h4>
+            <p>
+              <%= widget.text.html_safe %>
+            </p>
+          </div>
+        <% end -%>
+      </aside>
+
+      <div id='content' class="col-md-9">
+        <%= @page.text.html_safe %>
+      </div>
+
+    </div>
+
+  </div>
+</section>

data/lib/generators/georgia/views/templates/app/views/pages/templates/_sidebar-right.html.erb

@@ -0,0 +1,24 @@
+<section id="main">
+  <div class='container'>
+
+    <div class="row">
+
+      <div id='content' class="col-md-9">
+        <%= @page.text.html_safe %>
+      </div>
+
+      <aside id="sidebar-right" class="col-md-3">
+        <% @page.widgets.each do |widget| %>
+          <div class="widget">
+            <h4><%= widget.title %></h4>
+            <p>
+              <%= widget.text.html_safe %>
+            </p>
+          </div>
+        <% end -%>
+      </aside>
+
+    </div>
+
+  </div>
+</section>

data/lib/generators/georgia/views/views_generator.rb

@@ -0,0 +1,17 @@
+module Georgia
+  module Generators
+    class ViewsGenerator < ::Rails::Generators::Base
+      source_root File.expand_path('../templates', __FILE__)
+
+      def copy_pages_views
+        copy_file "app/views/pages/show.html.erb"
+        copy_file "app/views/pages/templates/_default.html.erb"
+        copy_file "app/views/pages/templates/_one-column.html.erb"
+        copy_file "app/views/pages/templates/_sidebar-left.html.erb"
+        copy_file "app/views/pages/templates/_sidebar-right.html.erb"
+        say("Successfully copied Georgia default templates to your application views.", :green)
+      end
+
+    end
+  end
+end

data/lib/georgia/engine.rb

@@ -34,6 +34,7 @@ module Georgia
       ActiveSupport.on_load :action_controller do
         helper Georgia::MetaTagsHelper
         helper Georgia::InternationalizationHelper
+        helper Georgia::MenusHelper
       end
     end
 

data/lib/georgia/indexer.rb

@@ -14,28 +14,47 @@ module Georgia
       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 SolrAdapter.new
-        when :tire then TireAdapter.new
+      @adapter_lookup ||= (case Georgia.indexer
+        when :solr then SolrAdapter
+        when :tire then TireAdapter
         else
-          TireAdapter.new
+          TireAdapter
         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])
+      class << self
+        def included(klass)
+          extension = Extension.new(klass)
+          begin
+            require extension.path
+            klass.send(:include, extension.name)
+          rescue => ex
+            raise "No extension for the #{Georgia.indexer} indexer: #{ex.message}"
+          end
+        end
+
+        class Extension
+          def initialize klass
+            @klass = klass
+          end
+
+          def name
+            name = @klass.to_s.gsub('::', '') + 'Extension'
+            "#{Georgia::Indexer.adapter}::#{name}".constantize
+          end
+
+          def path
+            "georgia/indexer/extensions/#{Georgia.indexer}_adapter/#{filename}"
+          end
+
+          def filename
+            @klass.to_s.underscore
+          end
         end
       end
     end

data/lib/georgia/indexer/extensions/solr_adapter/{acts_as_taggable_on_tag.rb → acts_as_taggable_on/tag.rb}

@@ -2,7 +2,7 @@ require 'active_support/concern'
 
 module Georgia
   module Indexer
-    class SolrAdapter
+    module SolrAdapter
       module ActsAsTaggableOnTagExtension
 
         extend ActiveSupport::Concern

data/lib/georgia/indexer/extensions/solr_adapter/{ckeditor_asset.rb → ckeditor/asset.rb}

@@ -2,7 +2,7 @@ require 'active_support/concern'
 
 module Georgia
   module Indexer
-    class SolrAdapter
+    module SolrAdapter
       module CkeditorAssetExtension
 
         extend ActiveSupport::Concern

data/lib/georgia/indexer/extensions/solr_adapter/{georgia_page.rb → georgia/page.rb}

@@ -2,7 +2,7 @@ require 'active_support/concern'
 
 module Georgia
   module Indexer
-    class SolrAdapter
+    module SolrAdapter
       module GeorgiaPageExtension
 
         extend ActiveSupport::Concern

data/lib/georgia/indexer/solr_adapter.rb

@@ -1,13 +1,12 @@
-require 'sunspot_rails' if defined?(Sunspot)
-Dir[File.join(File.dirname(__FILE__), 'extensions', 'solr_adapter', '*.rb')].each {|file| require file }
-
 module Georgia
   module Indexer
-    class SolrAdapter
+    module SolrAdapter
+
+      require 'sunspot_rails' if defined?(Sunspot)
 
       # Delegate search_index to the model
       # Search method is taken by Sunspot
-      def search model, params
+      def self.search model, params
         model.search_index model, params
       end
 

data/lib/georgia/indexer/tire_adapter.rb

@@ -1,5 +1,7 @@
-require 'tire' if defined?(Tire)
-Dir[File.join(File.dirname(__FILE__), 'extensions', 'tire_adapter', '*.rb')].each {|file| require file }
+if defined?(Tire)
+  require 'tire'
+  Dir[File.join(File.dirname(__FILE__), 'extensions', 'tire_adapter', '*.rb')].each {|file| require file }
+end
 
 module Georgia
   module Indexer

data/lib/georgia/version.rb

@@ -1,3 +1,3 @@
 module Georgia
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/lib/tasks/georgia.rake

@@ -11,19 +11,4 @@ namespace :georgia do
     end
   end
 
-  namespace :messages do
-
-    desc "Send to Akismet all unverified messages"
-    task verify: :environment do
-      puts "Check for spam. Currently have #{Georgia::Message.spam.count} spam and #{Georgia::Message.ham.count} ham messages."
-      puts "Checking #{Georgia::Message.where(verified_at: nil).count} unverified messages."
-      Georgia::Message.where(verified_at: nil).find_each do |message|
-        message.update_attributes(spam: message.spam?, verified_at: Time.zone.now)
-      end
-      puts "Check completed. #{Georgia::Message.spam.count} spam. #{Georgia::Message.ham.count} ham."
-    end
-
-  end
-
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -719,6 +719,12 @@ files:
 - lib/tasks/georgia.rake
 - lib/tasks/upgrade.rake
 - lib/tasks/assets.rake
+- lib/generators/georgia/views/templates/app/views/pages/templates/_one-column.html.erb
+- lib/generators/georgia/views/templates/app/views/pages/templates/_default.html.erb
+- lib/generators/georgia/views/templates/app/views/pages/templates/_sidebar-right.html.erb
+- lib/generators/georgia/views/templates/app/views/pages/templates/_sidebar-left.html.erb
+- lib/generators/georgia/views/templates/app/views/pages/show.html.erb
+- lib/generators/georgia/views/views_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
@@ -735,9 +741,9 @@ files:
 - lib/georgia/assets.rb
 - lib/georgia/indexer/tire_adapter.rb
 - lib/georgia/indexer/solr_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/solr_adapter/georgia/page.rb
+- lib/georgia/indexer/extensions/solr_adapter/acts_as_taggable_on/tag.rb
+- lib/georgia/indexer/extensions/solr_adapter/ckeditor/asset.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