georgia_blog 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89e123475dda925b9c169a65d1f601ed968b3c15
-  data.tar.gz: 473fd88fca305cc99346b81c7dc1cc344818c394
+  metadata.gz: 823b987e20ebeff992074bc98b59aca5ebed0581
+  data.tar.gz: 231b9eb74b5f3e6a5ca73c442e05d5cb9d13d503
 SHA512:
-  metadata.gz: a74913b3d30df19b83ca65c423af085bdaa8c4adfba780ac94e508948f4e8a13280247b14509dd672ed359d06be794a4e2567a565e9fc81b52a9ce6572d2e88d
-  data.tar.gz: b3e14474cc363c198d6726a251b119c44c109fb952a75f29c58022dde6fbc23e1889f278e49fcf27f49687f2d3fe5ec387d9afcdeb46e7411f17af147b17f2ae
+  metadata.gz: e5582cf470673e0ed8c31496c822ae0076782d1d0ca1952dc4499dfd1006c59bc9f3ff6af71f93608bc21a5ee41dea21f2d30429370347b1d8d81c26745fc5c8
+  data.tar.gz: 15d584d89ac04b13290fd51e616301497286e38efee1ff1faee8ee588d11ed71a1e68aff38e01d1e3b2c4a2d560860ff0766c5f36475a99cbc4e631699f0c9cc

data/README.md

@@ -1,3 +1,7 @@
 # Georgia Blog
 
+### Rails 3
+
+Checkout `rails3` branch for Rails 3.2 support.
+
 This project rocks and uses MIT-LICENSE.

data/app/controllers/georgia/blog/posts_controller.rb

@@ -0,0 +1,29 @@
+module Georgia
+  module Blog
+    class PostsController < Georgia::PagesController
+
+      before_filter :prepare_post_data, only: [:update, :settings]
+
+      private
+
+      def prepare_post_data
+        @post_data ||= @page.build_post_data unless @page and @page.post_data
+      end
+
+      def sanitized_params
+        parsed_params = ParseJsonTags.new(post_params).call
+        parsed_params = ParseJsonTags.new(parsed_params, key: :category_list).call
+        parsed_params
+      end
+
+      def post_params
+        params.require(:page).permit(permitted_keys + extra_permitted_keys)
+      end
+
+      def extra_permitted_keys
+        [ :category_list, { post_data_attributes: [:published_at, :author_id] } ]
+      end
+
+    end
+  end
+end

data/app/decorators/georgia/blog/post_decorator.rb

@@ -0,0 +1,6 @@
+module Georgia
+  module Blog
+    class PostDecorator < Georgia::PageDecorator
+    end
+  end
+end

data/app/decorators/georgia/blog/posts_decorator.rb

@@ -0,0 +1,6 @@
+module Georgia
+  module Blog
+    class PostsDecorator < PaginationDecorator
+    end
+  end
+end

data/app/models/georgia/blog/post.rb

@@ -0,0 +1,32 @@
+module Georgia
+  module Blog
+    class Post < Georgia::Page
+
+      include Elasticsearch::Model
+      include Elasticsearch::Model::Callbacks
+      index_name "georgai-blog-posts-#{Rails.env}"
+
+      has_one :post_data, foreign_key: :post_id
+      accepts_nested_attributes_for :post_data
+
+      acts_as_taggable_on :categories
+
+      delegate :published_at, :month, :year, to: :post_data, prefix: false, allow_nil: true
+
+      scope :recent, -> { joins(:post_data).order("georgia_post_data.published_at DESC") }
+      scope :by_tag, -> (tags) { tagged_with(tags, on: :tags) }
+      scope :by_category, -> (categories) { tagged_with(categories, on: :categories) }
+      scope :not_postponed, -> (time) { joins(:post_data).where(["georgia_post_data.published_at <= ?", time]).order("georgia_post_data.published_at DESC") }
+      scope :by_year_and_month, -> (year, month) { joins(:post_data).where(["georgia_post_data.published_at >= ? AND georgia_post_data.published_at <= ?", Time.new(year, month), Time.new(year, month)+1.month]).order("georgia_post_data.published_at DESC") }
+
+      class << self
+        alias_method :latest, :recent
+
+        def policy_class
+          Georgia::PagePolicy
+        end
+      end
+
+    end
+  end
+end

data/app/models/georgia/blog/post_data.rb

@@ -0,0 +1,18 @@
+module Georgia
+  module Blog
+    class PostData < ActiveRecord::Base
+
+      belongs_to :post
+      belongs_to :author, class_name: Georgia::User
+
+      def month
+        @month ||= published_at.strftime('%B %Y') if published_at.present?
+      end
+
+      def year
+        @year ||= published_at.year if published_at.present?
+      end
+
+    end
+  end
+end

data/app/views/georgia/blog/posts/fields/_extra_fields.html.erb

@@ -0,0 +1,38 @@
+<fieldset>
+  <div class="fieldset-help">
+    <legend>Author</legend>
+  </div>
+  <div class="fieldset-fields">
+    <%= f.fields_for :post_data do |pd| %>
+      <%= pd.association :author, label: false %>
+    <% end -%>
+  </div>
+</fieldset>
+
+<fieldset>
+  <div class="fieldset-help">
+    <legend>Published Date</legend>
+  </div>
+  <div class="fieldset-fields">
+    <%= f.fields_for :post_data do |pd| %>
+      <div class='input-group date'>
+        <%= pd.input_field :published_at, as: :string, class: "form-control js-datepicker", data: {format: "DD-MM-YYYY HH:mm"}, value: pd.object.try(:published_at).try(:strftime, '%d-%m-%Y %H:%M') %>
+        <span class="input-group-addon">
+          <span class="fa fa-calendar"></span>
+        </span>
+      </div>
+    <% end -%>
+  </div>
+</fieldset>
+
+<fieldset>
+  <div class="fieldset-help">
+    <legend>
+      Categories
+      <%= tooltip_tag(icon_tag('info-circle'), "Categories can be used to group similar posts.") %>
+    </legend>
+  </div>
+  <div class="fieldset-fields">
+    <%= f.input :category_list, as: :text, label: false, input_html: {class: 'js-taggable', rows: 1} %>
+  </div>
+</fieldset>

data/app/views/georgia/header/_blog.html.erb

@@ -1,3 +1,3 @@
-<% if can? :index, Georgia::Post %>
-  <%= sidebar_navigation_link 'Blog', georgia.search_posts_url, controller: 'posts', icon: 'coffee' %>
+<% if policy(Georgia::Blog::Post).index? %>
+  <%= sidebar_navigation_link 'Blog', georgia.search_blog_posts_url, controller: 'posts', icon: 'coffee' %>
 <% end -%>

data/app/views/public_activity/georgia_blog_post/_copy.html.erb

@@ -0,0 +1 @@
+<%= render 'public_activity/georgia_page/copy', activity: activity %>

data/app/views/public_activity/georgia_blog_post/_create.html.erb

@@ -0,0 +1 @@
+<%= render 'public_activity/georgia_page/create', activity: activity %>

data/app/views/public_activity/georgia_blog_post/_publish.html.erb

@@ -0,0 +1 @@
+<%= render 'public_activity/georgia_page/publish', activity: activity %>

data/app/views/public_activity/georgia_blog_post/_unpublish.html.erb

@@ -0,0 +1 @@
+<%= render 'public_activity/georgia_page/unpublish', activity: activity %>

data/app/views/public_activity/georgia_blog_post/_update.html.erb

@@ -0,0 +1 @@
+<%= render 'public_activity/georgia_page/update', activity: activity %>

data/config/routes.rb

@@ -1,33 +1,9 @@
 Georgia::Engine.routes.draw do
 
-  concern :pageable do
+  Georgia::PageableRouteConcern.included(self)
 
-    collection do
-      get :search
-      post :sort
-      post :publish
-      post :unpublish
-      post 'flush-cache', to: :flush_cache, as: :flush_cache
-      delete '/', to: :destroy
-    end
-
-    member do
-      get :copy
-      get :settings
-    end
-
-    resources :revisions do
-      member do
-        get :preview
-        get :review
-        get :approve
-        get :store
-        get :decline
-        get :restore
-      end
-    end
+  namespace :blog do
+    resources :posts, concerns: [:pageable]
   end
 
-  resources :posts, concerns: [:pageable]
-
 end

data/db/migrate/001_create_georgia_blog_post_data.rb

@@ -0,0 +1,10 @@
+class CreateGeorgiaBlogPostData < ActiveRecord::Migration
+  def change
+    create_table :georgia_blog_post_data do |t|
+      t.datetime :published_at
+      t.references :post, index: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/002_add_author_to_georgia_blog_post_data.rb

@@ -0,0 +1,6 @@
+class AddAuthorToGeorgiaBlogPostData < ActiveRecord::Migration
+  def change
+    add_column :georgia_blog_post_data, :author_id, :integer
+    add_index :georgia_blog_post_data, :author_id
+  end
+end

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

@@ -0,0 +1,20 @@
+module Georgia
+  module Blog
+    module Generators
+      class InstallGenerator < ::Rails::Generators::Base
+
+        def run_migrations
+          rake "railties:install:migrations"
+          rake "db:migrate"
+        end
+
+        def create_index
+          Georgia::Blog::Post.__elasticsearch__.indices.delete! Georgia::Blog::Post.index_name rescue nil
+          Georgia::Blog::Post.__elasticsearch__.create_index! force: true
+          Georgia::Blog::Post.import
+        end
+
+      end
+    end
+  end
+end

data/lib/georgia/blog/engine.rb

@@ -0,0 +1,10 @@
+module Georgia
+  module Blog
+    class Engine < ::Rails::Engine
+      require 'rubygems'
+      require 'georgia'
+
+      extend Georgia::Paths
+    end
+  end
+end

data/lib/georgia/blog/version.rb

@@ -0,0 +1,5 @@
+module Georgia
+  module Blog
+    VERSION = "0.8.0"
+  end
+end

data/lib/georgia_blog.rb

@@ -1,8 +1,10 @@
-require "georgia_blog/engine"
+require "georgia/blog/engine"
 
-module GeorgiaBlog
+module Georgia
+  module Blog
 
-  # Add to Georgia by default
-  Georgia.navigation += %w(blog)
+    # Add to Georgia by default
+    Georgia.navigation += %w(blog)
 
+  end
 end

data/lib/tasks/georgia_blog_tasks.rake

@@ -0,0 +1,18 @@
+namespace :georgia do
+
+  namespace :blog do
+
+    namespace :elasticsearch do
+
+      desc 'Setup ElasticSearch indices'
+      task setup: :environment do
+        Georgia::Blog::Post.__elasticsearch__.client.indices.delete index: Georgia::Blog::Post.index_name rescue nil
+        Georgia::Blog::Post.__elasticsearch__.create_index! force: true
+        Georgia::Blog::Post.import
+      end
+
+    end
+
+  end
+
+end

metadata

@@ -1,32 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: georgia_blog
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georgia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Adds a blogging engine to Motion Eleven's Georgia CMS system.
+        version: '0.8'
+description: Adds a blogging engine to Georgia CMS system.
 email:
-- mathieu@motioneleven.com
 - gagne.mathieu@hotmail.com
 executables: []
 extensions: []
@@ -35,21 +34,27 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/controllers/georgia/posts_controller.rb
-- app/decorators/georgia/post_decorator.rb
-- app/decorators/georgia/posts_decorator.rb
-- app/models/georgia/post.rb
-- app/models/georgia/post_data.rb
+- app/controllers/georgia/blog/posts_controller.rb
+- app/decorators/georgia/blog/post_decorator.rb
+- app/decorators/georgia/blog/posts_decorator.rb
+- app/models/georgia/blog/post.rb
+- app/models/georgia/blog/post_data.rb
+- app/views/georgia/blog/posts/fields/_extra_fields.html.erb
 - app/views/georgia/header/_blog.html.erb
-- app/views/georgia/posts/fields/_extra-fields.html.erb
+- app/views/public_activity/georgia_blog_post/_copy.html.erb
+- app/views/public_activity/georgia_blog_post/_create.html.erb
+- app/views/public_activity/georgia_blog_post/_publish.html.erb
+- app/views/public_activity/georgia_blog_post/_unpublish.html.erb
+- app/views/public_activity/georgia_blog_post/_update.html.erb
 - config/routes.rb
-- db/migrate/001_create_georgia_post_data.rb
-- lib/georgia/indexer/extensions/solr_adapter/georgia/post.rb
-- lib/georgia/indexer/extensions/tire_adapter/georgia/post.rb
+- db/migrate/001_create_georgia_blog_post_data.rb
+- db/migrate/002_add_author_to_georgia_blog_post_data.rb
+- lib/generators/georgia/blog/install/install_generator.rb
+- lib/georgia/blog/engine.rb
+- lib/georgia/blog/version.rb
 - lib/georgia_blog.rb
-- lib/georgia_blog/engine.rb
-- lib/georgia_blog/version.rb
-homepage: https://github.com/georgia-cms/georgia_blog
+- lib/tasks/georgia_blog_tasks.rake
+homepage: http://www.georgiacms.org
 licenses:
 - MIT
 metadata: {}
@@ -69,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blogging Engine - addon to Georgia

data/app/controllers/georgia/posts_controller.rb

@@ -1,12 +0,0 @@
-module Georgia
-  class PostsController < Georgia::PagesController
-
-    before_filter :prepare_post_data, only: [:update, :settings]
-
-    private
-
-    def prepare_post_data
-      @post_data ||= @page.build_post_data unless @page and @page.post_data
-    end
-  end
-end

data/app/decorators/georgia/post_decorator.rb

@@ -1,4 +0,0 @@
-module Georgia
-  class PostDecorator < Georgia::PageDecorator
-  end
-end

data/app/decorators/georgia/posts_decorator.rb

@@ -1,4 +0,0 @@
-module Georgia
-  class PostsDecorator < PaginationDecorator
-  end
-end

data/app/models/georgia/post.rb

@@ -1,19 +0,0 @@
-module Georgia
-  class Post < Georgia::Page
-
-    Georgia::Indexer.register_extension(:solr, Georgia::Post)
-    Georgia::Indexer.register_extension(:tire, Georgia::Post)
-    include Georgia::Indexer::Adapter
-
-    has_one :post_data, foreign_key: :post_id
-    accepts_nested_attributes_for :post_data
-    attr_accessible :post_data_attributes
-
-    delegate :published_at, :month, :year, to: :post_data, prefix: false, allow_nil: true
-
-    scope :recent, order("post_data.published_at DESC")
-    class << self
-      alias_method :latest, :recent
-    end
-  end
-end

data/app/models/georgia/post_data.rb

@@ -1,17 +0,0 @@
-module Georgia
-  class PostData < ActiveRecord::Base
-
-    belongs_to :post
-
-    attr_accessible :published_at
-
-    def month
-      @month ||= published_at.strftime('%B %Y') if published_at.present?
-    end
-
-    def year
-      @year ||= published_at.year if published_at.present?
-    end
-
-  end
-end

data/app/views/georgia/posts/fields/_extra-fields.html.erb

@@ -1,15 +0,0 @@
-<fieldset>
-  <div class="fieldset-help">
-    <legend>Published Date</legend>
-  </div>
-  <div class="fieldset-fields">
-    <%= f.fields_for :post_data do |pd| %>
-      <div class='input-group date'>
-        <%= pd.input_field :published_at, as: :string, class: "form-control js-datepicker", data: {format: "DD-MM-YYYY HH:mm"}, value: pd.object.try(:published_at).try(:strftime, '%d-%m-%Y %H:%M') %>
-        <span class="input-group-addon">
-          <span class="fa fa-calendar"></span>
-        </span>
-      </div>
-    <% end -%>
-  </div>
-</fieldset>

data/db/migrate/001_create_georgia_post_data.rb

@@ -1,10 +0,0 @@
-class CreateGeorgiaPostData < ActiveRecord::Migration
-  def change
-    create_table :georgia_post_data do |t|
-      t.datetime :published_at
-      t.integer :post_id
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,73 +0,0 @@
-require 'active_support/concern'
-
-module Georgia
-  module Indexer
-    module SolrAdapter
-      module GeorgiaPostExtension
-        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 :tags do
-              tag_list.join(', ')
-            end
-            text :url
-            text :template
-            string :title
-            string :excerpt
-            string :text
-            string :url
-            string :template
-            string :state do
-              public? ? 'public' : 'private'
-            end
-            string :class_name do
-              self.class.name
-            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 # Array for facets
-            string :tags, stored: true do # Single list for ordering
-              tag_list.join(', ')
-            end
-            string :month, stored: true
-            string :year, stored: true
-            time :published_at
-            time :updated_at # default order
-          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, :month, :tags
-              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))
-              with(:month, params[:m]) unless params[:m].blank?
-              with(:tags, params[:c]) unless params[:t].blank?
-            end.results
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,57 +0,0 @@
-require 'active_support/concern'
-
-module Georgia
-  module Indexer
-    module TireAdapter
-      module GeorgiaPostExtension
-
-        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,
-              month: month,
-              year: year
-            }
-            indexed_hash.to_json
-          end
-
-          def self.search_index params
-            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_blog/engine.rb

@@ -1,8 +0,0 @@
-module GeorgiaBlog
-  class Engine < ::Rails::Engine
-    require 'rubygems'
-    require 'georgia'
-
-    extend Georgia::Paths
-  end
-end

data/lib/georgia_blog/version.rb

@@ -1,3 +0,0 @@
-module GeorgiaBlog
-  VERSION = "0.7.3"
-end