site_logic 1.6.10 → 1.7.0

data/Gemfile

@@ -10,6 +10,7 @@ gem 'rails', '>= 3.0.1'
 gem 'rmagick', '2.12.2' # version compatible with heroku
 gem 'scaffold_logic', '>= 1.0.3'
 gem 'SystemTimer'
+gem 'tanker'
 
 group :development do
   gem 'jeweler'

data/VERSION

@@ -1 +1 @@
-1.6.10
+1.7.0

data/app/models/page.rb

@@ -1,11 +1,20 @@
 class Page
-
   include Mongoid::Document
   include Mongoid::Timestamps
   include SiteLogic::Base
+  include Tanker
 
-  # Attributes =====================================================================================
+  # Constants ======================================================================================
+  STATES = ['draft', 'published']
+
+  # Scopes =========================================================================================
+  scope :drafts,      :where => {:state => 'draft'}
+  scope :for_sitemap, :where => {:sitemap => true}
+  scope :indexed,     :where => {:noindex => false}
+  scope :noindex,     :where => {:noindex => true}
+  scope :published,   :where => {:state => 'published'}
 
+  # Mongoid ========================================================================================
   field :slug
   field :sitemap, :type => Boolean
   field :noindex, :type => Boolean
@@ -17,44 +26,34 @@ class Page
   field :state
   field :publication_date, :type => DateTime
 
-  # Indices ========================================================================================
   index :slug, :unique => false
   index :state, :unique => false
 
-  # Constants ======================================================================================
-  STATES = ['draft', 'published']
-
-  # Scopes ===================================================================================
-  scope :drafts,      :where => {:state => 'draft'}
-  scope :published,   :where => {:state => 'published'}
-  scope :noindex,     :where => {:noindex => true}
-  scope :indexed,     :where => {:noindex => false}
-  scope :for_sitemap, :where => {:sitemap => true}
-
-  # Relationships ==================================================================================
   embedded_in :site, :inverse_of => :pages
 
   # Behavior =======================================================================================
-  attr_accessor :desired_slug
   attr_accessor :create_navigation_item
+  attr_accessor :desired_slug
   has_slug :desired_slug
 
-  # Callbacks ======================================================================================
+  # Tanker =========================================================================================
+  tankit 'idx' do
+    indexes :content
+    indexes :meta_description
+    indexes :meta_keywords
+    indexes :page_title
+  end
 
-  # Validations ====================================================================================
+  after_destroy :delete_tank_indexes
+  after_save :update_tank_indexes
 
+  # Validations ====================================================================================
   class DesiredSlugPresenceAndUniquenessValidator < ActiveModel::EachValidator
     def validate_each(object, attribute, value)
       return unless object.desired_slug
       if object.site && object.site.pages.map{|p| p.slug unless p == object}.include?(object.desired_slug)
-        object.errors[attribute] << (options[:message] || "must be unique.")
+        object.errors[attribute] << (options[:message] || 'must be unique.')
       end
-
-#       if object.desired_slug.nil? && object.slug.nil?
-#         object.errors[attribute] << (options[:message] || "cannot be blank.")
-#       elsif object.site && object.site.pages.map{|p| p.slug unless p == object}.include?(object.desired_slug)
-#         object.errors[attribute] << (options[:message] || "must be unique.")
-#       end
     end
   end
 
@@ -62,24 +61,21 @@ class Page
   validates_presence_of :page_title
   validates_presence_of :content
 
-  # Class methods ==================================================================================
-
   # Instance methods ===============================================================================
-
   def draft?
     self.state == 'draft' || self.state.nil?
   end
 
   def humanize_path
-    if self.slug == ''
-      "/"
-    else
-      "/#{self.slug}/".gsub(/\/\//,'/').gsub(/\/\//,'/')
-    end
+    self.path
+  end
+
+  def path
+    self.slug == '' ? '/' : "/#{self.slug}/".gsub(/\/\//,'/').gsub(/\/\//,'/')
   end
 
   def publish!
-    self.update_attributes(:state => 'published', :publication_date => Time.zone.now)
+    self.update_attributes :state => 'published', :publication_date => Time.zone.now
   end
 
   def published?
@@ -87,7 +83,15 @@ class Page
   end
 
   def unpublish!
-    self.update_attributes(:state => 'draft', :publication_date => nil)
+    self.update_attributes :state => 'draft', :publication_date => nil
+  end
+
+  def search_description
+    self.meta_description.blank? ? self.content.gsub(/<\/?[^>]*>/, '')[0..199].html_safe : self.meta_description
+  end
+
+  def search_title
+    self.window_title
   end
 
   def sitemap
@@ -101,5 +105,4 @@ class Page
   def window_title
     self[:window_title] || self.page_title
   end
-
-end
+end

data/config/environments/test.rb

@@ -32,4 +32,8 @@ SiteLogic::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  # tanker gem
+  config.index_tank_url = 'http://:PctyyJitroN8iv@82wog.api.indextank.com'
+  config.tanker_pagination_backend = :kaminari
 end

data/site_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{site_logic}
-  s.version = "1.6.10"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-01}
   s.description = %q{An engine for search-engine-optimized content management.}
   s.email = %q{corey@seologic.com}
   s.extra_rdoc_files = [
@@ -835,6 +835,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
+      s.add_runtime_dependency(%q<tanker>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
@@ -847,6 +848,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_dependency(%q<SystemTimer>, [">= 0"])
+      s.add_dependency(%q<tanker>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
@@ -860,6 +862,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rmagick>, ["= 2.12.2"])
     s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
     s.add_dependency(%q<SystemTimer>, [">= 0"])
+    s.add_dependency(%q<tanker>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: site_logic
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 6
-  - 10
-  version: 1.6.10
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -05:00
+date: 2011-09-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,7 +155,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: tanker
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -166,12 +166,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -183,7 +197,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: An engine for search-engine-optimized content management.
 email: corey@seologic.com
 executables: []