georgia_blog 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 873c373459eba195409c2c28d6a5d607c9f53edd
-  data.tar.gz: 950416a5d33a968cf5e5a2430f5f5b0d0eb1536f
+  metadata.gz: 85e8250e827054ea0ba8e0527f47fde4a09f7410
+  data.tar.gz: 1e4c8a783dd1a110b17797b576d8841a73f7afec
 SHA512:
-  metadata.gz: aec5888f4b02ec3e78f5c653911d2a4059c2ec0bb37633488f5c36e4f0484b6e6e5e4f95cec12e673cf5f1dca3b7d22813ea2698905a5ed45f098dd17122b66a
-  data.tar.gz: bbaeedb96ad023469e129ba2567f1de21dac413a0a94ff57dc4754c61205435b7aa80523f3eebfa92c98c80a9229c9763a8941fcba2f26b8143c4b8c9b970abe
+  metadata.gz: 5345d90113439e653d297c1f050d058811dc58488464b876cba27a3325b5b450d5f32e683ab301fb2d3aae203670da099a6199c1ac113a7ec2817c8789c43ac3
+  data.tar.gz: a4186fa42cd0c3cb60430cdca585036e4a0292514e18b298bb951322c1bfabf2a382f065c5baa6cd5b471b7bde703201a206f3f5ec6158673642de6d0709e703

data/README.md

@@ -0,0 +1,3 @@
+# Georgia Blog
+
+This project rocks and uses MIT-LICENSE.

data/app/models/georgia/post.rb

@@ -1,73 +1,16 @@
 module Georgia
   class Post < Georgia::Page
 
-    attr_accessible :published_at
+    Georgia::Indexer.register_extension(:solr, Georgia::Post)
+    Georgia::Indexer.register_extension(:tire, Georgia::Post)
+    include Georgia::Indexer::Adapter
 
-    scope :recent, order("published_at DESC")
-    class << self
-      alias_method :latest, :recent
-    end
-
-    def month
-      @month ||= published_at.strftime('%B %Y') if published_at.present?
-    end
-
-    def year
-      @year ||= published_at.year if published_at.present?
-    end
-
-    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
+    has_one :post_data
+    delegate :published_at, :month, :year, to: :post_data, prefix: false, allow_nil: true
 
+    scope :recent, order("post_data.published_at DESC")
     class << self
-
-      def extra_search_params
-        Proc.new {
-          facet :month, :tags
-          with(:month, params[:m]) unless params[:m].blank?
-          with(:tags, params[:c]) unless params[:t].blank?
-        }
-      end
-
+      alias_method :latest, :recent
     end
   end
 end

data/app/models/georgia/post_data.rb

@@ -0,0 +1,17 @@
+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/header/_blog.html.erb

@@ -1,5 +1,3 @@
-<% if can? :manage, Georgia::Post %>
-  <li class="<%= 'active' if controller_name == 'posts' %>">
-    <%= link_to 'Blog', georgia.search_posts_url %>
-  </li>
-<% end -%>
+<% if can? :index, Georgia::Post %>
+  <%= sidebar_navigation_link 'Blog', georgia.search_posts_url, controller: 'posts', icon: 'coffee' %>
+<% end -%>

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

@@ -0,0 +1,73 @@
+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

@@ -0,0 +1,57 @@
+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

@@ -2,7 +2,5 @@ module GeorgiaBlog
   class Engine < ::Rails::Engine
     require 'rubygems'
     require 'georgia'
-
-    extend Georgia::Paths
   end
 end

data/lib/georgia_blog/version.rb

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

data/lib/georgia_blog.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: georgia_blog
 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-23 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: georgia
   requirement: !ruby/object:Gem::Requirement
@@ -47,17 +33,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.rdoc
+- 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/views/georgia/header/_blog.html.erb
 - app/views/georgia/posts/fields/_extra-fields.html.erb
-- config/initializers/georgia.rb
 - 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
 - lib/georgia_blog.rb
 - lib/georgia_blog/engine.rb
 - lib/georgia_blog/version.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= Georgia Blog
-
-This project rocks and uses MIT-LICENSE.

data/config/initializers/georgia.rb

@@ -1,3 +0,0 @@
-Georgia.setup do |config|
-  config.navigation += %w(blog)
-end