editorial_logic 1.3.3 → 1.4.0

data/Gemfile

@@ -8,6 +8,7 @@ gem 'fastercsv'
 gem 'mongoid'
 gem 'rails'
 gem 'scaffold_logic'#, :path => '~/Documents/projects/scaffold_logic'
+gem 'stringex'
 gem 'SystemTimer'
 gem 'tanker'
 

data/VERSION

@@ -1 +1 @@
-1.3.3
+1.4.0

data/app/models/faq_import.rb

@@ -23,7 +23,6 @@ class FaqImport < ScaffoldLogic::DataImport
   protected
 
   COLUMNS_BY_MODEL_FIELDS = {
-    'desired_slug' => 'row_map[:slug]',
     'headline' => 'row_map[:title]', # this is used as the title of the page and the link text of links pointing to the page
     'summary' => 'row_map[:summary]',  # used as meta description
     'keywords' => 'row_map[:keywords]',

data/app/models/managed_content.rb

@@ -1,5 +1,5 @@
 class ManagedContent
-  include EditorialLogic::Base
+  include LuckySneaks::StringExtensions
   include Mongoid::Document
   include Mongoid::Timestamps
   include Tanker
@@ -42,8 +42,7 @@ class ManagedContent
   alias_method :definition, :content
   alias_method :question, :headline
   alias_method :term, :headline
-  attr_accessor :desired_slug
-  has_slug :desired_slug
+  before_save :set_slug
   mount_uploader :document, DocumentUploader, :mount_on => :document_filename
   store_in :documents
 
@@ -60,14 +59,6 @@ class ManagedContent
   after_save :update_tank_indexes
 
   # Validations ====================================================================================
-  class DesiredSlugPresenceValidator < ActiveModel::EachValidator
-    def validate_each(object, attribute, value)
-      unless object.desired_slug || object.slug
-        object.errors[attribute] << (options[:message] || ' cannot be blank.')
-      end
-    end
-  end
-
   class ContentPresenceValidator < ActiveModel::EachValidator
     def validate_each(object, attribute, value)
       unless object.kind == 'Multiple Pages' || object.kind == 'Document'
@@ -89,7 +80,6 @@ class ManagedContent
   end
 
   validates :content, :content_presence => true
-  validates :desired_slug, :desired_slug_presence => true
   validates_presence_of :headline
   validates_uniqueness_of :slug
 
@@ -112,12 +102,17 @@ class ManagedContent
     self.kind == 'Multiple Pages'
   end
 
+  # @deprecated Please use {#path} instead
   def humanize_path
+    warn "[DEPRECATION] `humanize_path` is deprecated.  Please use `path` instead."
     self.path
   end
 
+  # Returns this managed-content's path.
+  #
+  # @return [String] the path for this managed content
   def path
-    kind == 'Document' ? self.document_url : "/#{self.publication.slug}/#{self.slug}".gsub('//', '/')
+    kind == 'Document' ? self.document_url : "#{self.publication.path}/#{self.slug}"
   end
 
   def publish!
@@ -151,4 +146,10 @@ class ManagedContent
   def state=(state)
     self[:state] = state.downcase
   end
-end
+
+  private
+
+  def set_slug
+    self.slug = self.headline.to_s.to_url if self.slug.blank?
+  end
+end

data/app/models/publication.rb

@@ -1,39 +1,33 @@
 class Publication
-  include EditorialLogic::Base
-
-  # Mongo Config ===================================================================================
+  include LuckySneaks::StringExtensions
   include Mongoid::Document
   include Mongoid::Timestamps
 
+  # Constants ======================================================================================
+  CONTENT_TYPES = ['Articles', 'FAQs', 'Terms and Definitions', 'Documents']
+
+  # Scopes =========================================================================================
+  scope :with_articles,   :where => {:content_type => 'Articles'}
+  scope :with_documents,  :where => {:content_type => 'Documents'}
+  scope :with_faqs,       :where => {:content_type => 'FAQs'}
+  scope :with_terms,      :where => {:content_type => 'Terms and Definitions'}
+
+  # Mongo Config ===================================================================================
   field :name
   field :description
   field :slug
   field :content_type
   field :rss_feed_enabled, :type => Boolean
   field :pdf_enabled, :type => Boolean
-
   index :name, :unique => true
   index :slug, :unique => true
   index :state, :unique => false
-
   embeds_many :managed_contents
 
-  # Constants ======================================================================================
-  CONTENT_TYPES = ['Articles', 'FAQs', 'Terms and Definitions', 'Documents']
-
-  # Scopes ===================================================================================
-  scope :with_articles,   :where => {:content_type => 'Articles'}
-  scope :with_documents,  :where => {:content_type => 'Documents'}
-  scope :with_faqs,       :where => {:content_type => 'FAQs'}
-  scope :with_terms,      :where => {:content_type => 'Terms and Definitions'}
-
   # Behavior =======================================================================================
-  attr_accessor :desired_slug
-  has_slug :desired_slug
+  before_save :set_slug
   validates_presence_of :name
-  validates_uniqueness_of :name
   validates_uniqueness_of :slug
-  validates_presence_of :desired_slug
 
   # Class methods ==================================================================================
   def self.matching_slug(slug)
@@ -51,6 +45,13 @@ class Publication
     label
   end
 
+  # Returns this publication's RSS feed.
+  #
+  # @return [String] the RSS feed as a URL path
+  def feed
+    "#{self.path}/feed"
+  end
+
   def has_articles?
     self.content_type == 'Articles'
   end
@@ -75,15 +76,28 @@ class Publication
     label
   end
 
+  # @deprecated Please use {#path} instead
   def humanize_path
+    warn "[DEPRECATION] `humanize_path` is deprecated.  Please use `path` instead."
     self.path
   end
 
+  # Returns this publication's path.
+  #
+  # @return [String] the path for this publication
   def path
-    "/#{self.slug}".gsub '//', '/'
+    "/#{self.slug}"
   end
 
+  # @deprecated Please use {#feed} instead
   def rss_feed_url
-    "#{self.humanize_path}/feed"
+    warn "[DEPRECATION] `rss_feed_url` is deprecated.  Please use `feed` instead."
+    self.feed
+  end
+
+  private
+
+  def set_slug
+    self.slug = self.name.to_s.to_url if self.slug.blank?
   end
 end

data/app/models/section.rb

@@ -1,13 +1,9 @@
 class Section
-
-  include EditorialLogic::Base
-
-  # Mongo Config ===================================================================================
-
+  include LuckySneaks::StringExtensions
   include Mongoid::Document
   include Mongoid::Timestamps
-#  include Mongoid::Versioning
 
+  # Mongo Config ===================================================================================
   field :headline
   field :slug
   field :content
@@ -16,54 +12,36 @@ class Section
   field :related_contents, :type => Array, :default => []
   index :slug, :unique => true
   index :state, :unique => false
-
-  # Constants ======================================================================================
-
-  # Scopes ===================================================================================
-
-  # Relationships ==================================================================================
   embedded_in :managed_content, :inverse_of => :sections
 
   # Behavior =======================================================================================
-  attr_accessor :desired_slug
-  has_slug :desired_slug
-
-  # Custom Validators ==============================================================================
-
-  # Validations ====================================================================================
-
-  class DesiredSlugPresenceValidator < ActiveModel::EachValidator
-    def validate_each(object, attribute, value)
-      unless object.slug || object.desired_slug
-        object.errors[attribute] << (options[:message] || "cannot be blank.")
-      end
-    end
-  end
-
-  validates_presence_of :content
-  validates_presence_of :headline
-  validates :desired_slug, :desired_slug_presence => true
+  before_save :set_slug
+  validates_presence_of :content, :headline
   validates_uniqueness_of :slug
 
-  # Class methods ==================================================================================
-
   # Instance methods ===============================================================================
 
+  # @deprecated Please use {#path} instead
   def humanize_path
-    if self.position == 1
-      "/#{self.managed_content.publication.slug}/#{self.managed_content.slug}/".gsub('//','/')
-    else
-      "/#{self.managed_content.publication.slug}/#{self.managed_content.slug}/#{self.slug}/".gsub('//','/')
-    end
+    warn "[DEPRECATION] `humanize_path` is deprecated.  Please use `path` instead."
+    self.path
   end
 
   def next_section
     self.managed_content.sections.where(:position => self.position + 1).first
   end
 
+  def path
+    self.position == 1 ? self.managed_content.path : "#{self.managed_content.path}/#{self.slug}"
+  end
+
   def siblings
     self.managed_content.sections.sort{|a,b| a.position.to_i <=> b.position.to_i}
   end
 
+  private
 
-end
+  def set_slug
+    self.slug = self.headline.to_s.to_url if self.slug.blank?
+  end
+end

data/app/views/admin/managed_contents/_article_fields.html.erb

@@ -11,7 +11,7 @@
       <%- if @managed_content.content.blank? -%>
         <%= f.select :kind, ['Single Page','Multiple Pages'], :label => 'Pages' -%>
       <%- end -%>
-      <%= f.text_field :desired_slug, :label => 'Permalink', :value => @managed_content.slug, :help => "The permalink is the portion of the URL that refers directly to this article. The full URL will consist of the permalink for the publication plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
+      <%= f.text_field :slug, :label => 'Permalink', :value => @managed_content.slug, :help => "The permalink is the portion of the URL that refers directly to this article. The full URL will consist of the permalink for the publication plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
       <%= f.text_area :summary, :help => 'The summary should provide a brief description of the content, up to 255 characters. The summary may be used by search engines to describe the content on this page.' -%>
     </div>
 

data/app/views/admin/managed_contents/_document_fields.html.erb

@@ -2,7 +2,7 @@
     <%= legend_tag 'About This Document' -%>
     <div class="form_column">
       <%= f.text_field :headline, :label => 'Title' -%>
-      <%= f.text_field :desired_slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this document. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
+      <%= f.text_field :slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this document. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
     </div>
     <div class="form_column">
       <%= f.select :state, ManagedContent::STATES.map{|s| s.capitalize} -%>

data/app/views/admin/managed_contents/_faq_fields.html.erb

@@ -3,7 +3,7 @@
     <div class="form_column">
       <%= f.text_field :headline, :label => 'Question' -%>
       <%= f.text_field :headline_short, :label => 'Shortened Headline/Question' -%>
-      <%= f.text_field :desired_slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this article. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
+      <%= f.text_field :slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this article. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
       <%= f.select :state, ManagedContent::STATES.map{|s| s} -%>
     </div>
     <div class="form_column">

data/app/views/admin/managed_contents/_index.html.erb

@@ -17,7 +17,7 @@
       <%- @managed_content.each do |managed_content| -%>
         <tr class="<%= cycle('odd', 'even') -%>" id="content_<%= managed_content.id -%>">
           <td><%= link_to managed_content.headline, admin_publication_managed_content_path(@publication, managed_content) -%></td>
-          <td><%= managed_content.humanize_path -%></td>
+          <td><%= managed_content.path -%></td>
           <td><%= managed_content.state.capitalize -%></td>
           <td><%= managed_content.publication_date ? managed_content.publication_date.to_s(:concise) : '-' -%></td>
           <td><%= managed_content.revision_date ? managed_content.revision_date.to_s(:concise) : '-' -%></td>

data/app/views/admin/managed_contents/_term_fields.html.erb

@@ -4,7 +4,7 @@
       <%= f.text_field :headline, :label => 'Term' -%>
     </div>
     <div class="form_column">
-      <%= f.text_field :desired_slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this term. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
+      <%= f.text_field :slug, :value => @managed_content.slug, :help => "The slug is the portion of the URL that refers directly to this term. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@managed_content.slug || 'foo'}/" -%>
       <%= f.select :state, ManagedContent::STATES.map{|s| s.capitalize} -%>
     </div>
     <br style="clear: both;" />

data/app/views/admin/managed_contents/show.html.erb

@@ -9,7 +9,7 @@
       <%= faux_field 'Subheader', @managed_content.subheader %>
       <%= faux_field 'Author', @managed_content.author %>
       <%= faux_field 'Status', @managed_content.state.capitalize %>
-      <%= faux_field 'URL', @managed_content.humanize_path %>
+      <%= faux_field 'URL', @managed_content.path %>
     </div>
     <div class="form_column">
       <%= faux_field 'Publication Date', @managed_content.publication_date %>

data/app/views/admin/publications/_form.html.erb

@@ -16,7 +16,7 @@
 
     <div class="form_column">
       <%= f.text_field :name, :help => 'The name you provide will be used in the page title for the publcation.' -%>
-      <%= f.text_field :desired_slug, :label => 'URL', :value => @publication.humanize_path, :help => 'Enter the desired web address for this publcation, e.g. /press-releases/' -%>
+      <%= f.text_field :slug, :label => 'URL', :value => @publication.path, :help => 'Enter the desired web address for this publcation, e.g. /press-releases/' -%>
       <%= f.select :content_type, Publication::CONTENT_TYPES, :include_blank => 'Select...' -%>
       <%= f.check_box :rss_feed_enabled, :label => "RSS Feed", :inline_label => "Enabled", :help => 'Click this checkbox to enable an RSS news feed for this publication.' -%><br />
       <%= f.check_box :pdf_enabled, :label => "Auto-Create PDFs", :inline_label => "Enabled", :help => 'Click this checkbox to automatically create PDF versions of content in this publication.' -%>

data/app/views/admin/publications/index.html.erb

@@ -18,7 +18,7 @@
   <%- @publications.each do |publication| -%>
     <tr class="<%= cycle('odd', 'even') -%>">
       <td><%= link_to publication.name, admin_publication_path(publication) -%></td>
-      <td><%= publication.humanize_path -%></td>
+      <td><%= publication.path -%></td>
       <td><%= publication.description.to_s.truncate(50) -%></td>
       <td><%= publication.content_type -%></td>
       <td><%= publication.managed_contents.count -%></td>

data/app/views/admin/publications/show.html.erb

@@ -8,13 +8,13 @@
 <%= tab_body :id => 'details', :label => 'About This Publication', :display => 'block' do -%>
   <div class="form_column">
     <%= faux_field 'Name', @publication.name %>
-    <%= faux_field 'URL', @publication.humanize_path %>
+    <%= faux_field 'URL', @publication.path %>
     <%= faux_field 'Content Type', @publication.content_type %>
   </div>
   <div class="form_column">
     <%= faux_field 'PDF Creation Enabled?', @publication.pdf_enabled? ? "Yes" : "No" %>
     <%= faux_field 'RSS Feed Enabled?', @publication.rss_feed_enabled? ? "Yes" : "No" %>
-    <%= faux_field 'RSS Feed URL', @publication.rss_feed_url if @publication.rss_feed_enabled? %>
+    <%= faux_field 'RSS Feed URL', @publication.feed if @publication.rss_feed_enabled? %>
     <%= faux_field 'Description', @publication.description %>
   </div>
   <br style="clear: both;" />

data/app/views/admin/sections/_form.html.erb

@@ -17,7 +17,7 @@
     <%= legend_tag 'About This Article Section' -%>
     <div class="form_column">
       <%= f.text_field :headline -%>
-      <%= f.text_field :desired_slug, :value => @section.slug, :help => "The slug is the portion of the URL that refers directly to this article. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@content.slug}/#{@section.slug || 'foo'}/" -%>
+      <%= f.text_field :slug, :value => @section.slug, :help => "The slug is the portion of the URL that refers directly to this article. The full URL will consist of the slug for the managed content section plus what you enter below, e.g. /#{@publication.slug}/#{@content.slug}/#{@section.slug || 'foo'}/" -%>
     </div>
     <div class="form_column">
       <%= f.text_area :summary, :help => 'The summary should provide a brief description of the content, up to 255 characters. The summary may be used by search engines to describe the content on this page.' -%>

data/app/views/admin/sections/_index.html.erb

@@ -17,7 +17,7 @@
     <%- @sections.each do |section| -%>
       <tr class="<%= cycle('odd', 'even') -%>" id="section_<%= section.id -%>">
         <td><%= link_to section.headline, admin_publication_managed_content_section_path(@publication, @managed_content, section) -%></td>
-        <td><%= section.humanize_path -%></td>
+        <td><%= section.path -%></td>
         <td><%= strip_tags(section.content.to_s).truncate(75) -%></td>
         <td class="crud_links">
           <%= link_to image_tag('/images/icons/view.png'), admin_publication_managed_content_section_path(@publication, @managed_content, section) -%>

data/app/views/admin/sections/show.html.erb

@@ -6,7 +6,7 @@
     <%= faux_field 'Title', @section.headline %>
   </div>
   <div class="form_column">
-    <%= faux_field 'URL', @section.humanize_path %>
+    <%= faux_field 'URL', @section.path %>
   </div>
 </fieldset>
 

data/app/views/managed_contents/show.html.erb

@@ -18,7 +18,7 @@
   <h3>Related <%= @content.publication.content_type -%></h3>
   <ul class="related_content_list">
   <%- @content.related_content.each do |related| -%>
-    <li><%= link_to related.headline, related.humanize_path -%></li>
+    <li><%= link_to related.headline, related.path -%></li>
   <%- end -%>
   </ul>
 <%- end -%>
@@ -30,5 +30,5 @@
   <p>Use or reference to this content on the Internet must be accompanied by a link to the page you cite.</p>
 <%- end -%>
 
-<%= link_to 'Download PDF', "#{@content.humanize_path.gsub(/\/$/,'.pdf')}", :class => :button if @content.publication.pdf_enabled -%>
-<%= link_to 'Back', @content.publication.humanize_path, :class => :button -%>
+<%= link_to 'Download PDF', "#{@content.path.gsub(/\/$/,'.pdf')}", :class => :button if @content.publication.pdf_enabled -%>
+<%= link_to 'Back', @content.publication.path, :class => :button -%>

data/app/views/publications/_articles.html.erb

@@ -1,7 +1,7 @@
   <%- unless @contents.blank? -%>
     <ul class="articles_list">
     <%- @contents.each do |content| -%>
-      <li><%= link_to content.headline, content.humanize_path -%></li>
+      <li><%= link_to content.headline, content.path -%></li>
     <%- end -%>
     </ul>
   <%- end -%>

data/app/views/publications/_faqs.html.erb

@@ -1,7 +1,7 @@
   <%- unless @contents.blank? -%>
     <ul class="faqs_list">
       <%- @contents.each do |content| -%>
-        <li><%= link_to content.headline, content.humanize_path -%></li>
+        <li><%= link_to content.headline, content.path -%></li>
       <%- end -%>
     </ul>
   <%- end -%>

data/app/views/publications/_terms.html.erb

@@ -2,7 +2,7 @@
     <%- @contents.in_groups(4, false).each do |group| -%>
       <ul class="terms_list">
         <%- group.each do |content| -%>
-          <li><%= link_to content.headline, content.humanize_path -%></li>
+          <li><%= link_to content.headline, content.path -%></li>
         <%- end -%>
       </ul>
     <%- end -%>

data/app/views/publications/feed.rss.builder

@@ -11,8 +11,8 @@ xml.rss :version => '2.0', :'xmlns:atom' => 'http://www.w3.org/2005/Atom' do
         xml.title article.headline
         xml.description article.summary
         xml.pubDate article.publication_date.strftime("%a, %d %b %Y %H:%M:%S %z")
-        xml.link "#{request.url.gsub(@publication.rss_feed_url, '')}#{article.humanize_path}"
-        xml.guid "#{request.url.gsub(@publication.rss_feed_url, '')}#{article.humanize_path}"
+        xml.link "#{request.url.gsub(@publication.feed, '')}#{article.path}"
+        xml.guid "#{request.url.gsub(@publication.feed, '')}#{article.path}"
       end
     end
   end

data/app/views/publications/show.html.erb

@@ -1,6 +1,6 @@
 <%- set_title @publication.name -%>
 <%- meta_description @publication.description -%>
-<%= auto_discovery_link_tag(:rss, @publication.rss_feed_url, {:title => @publication.name}) if @publication.rss_feed_enabled? -%>
+<%= auto_discovery_link_tag(:rss, @publication.feed, {:title => @publication.name}) if @publication.rss_feed_enabled? -%>
 
 <p>
   <%= @publication.description.to_s.html_safe -%>

data/app/views/sections/_contents.html.erb

@@ -7,7 +7,7 @@
           <%- if section == @section -%>
             <em><%= section.headline -%></em>
           <%- else -%>
-            <%= link_to section.headline, section.humanize_path -%>
+            <%= link_to section.headline, section.path -%>
           <%- end -%>
         </li>
       <%- end -%>

data/app/views/sections/show.html.erb

@@ -9,4 +9,4 @@
 <h3>Referring to This Page</h3>
 <p>Use or reference to this content on the Internet must be accompanied by a link to the page you cite.</p>
 
-<%= link_to 'Back', @content.publication.humanize_path, :class => :button -%>
+<%= link_to 'Back', @content.publication.path, :class => :button -%>

data/editorial_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "editorial_logic"
-  s.version = "1.3.3"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-09-28"
+  s.date = "2011-10-04"
   s.description = "An engine for enabling managed content, including articles, blogs, FAQs and glossaries."
   s.email = "corey@seologic.com"
   s.files = [
@@ -97,7 +97,6 @@ Gem::Specification.new do |s|
     "features/support/selectors.rb",
     "init.rb",
     "lib/editorial_logic.rb",
-    "lib/editorial_logic/engine.rb",
     "lib/editorial_logic/railtie.rb",
     "lib/tasks/cucumber.rake",
     "lib/tasks/rcov.rake",
@@ -796,7 +795,6 @@ Gem::Specification.new do |s|
     "spec/controllers/admin/publications_controller_spec.rb",
     "spec/controllers/managed_contents_controller_spec.rb",
     "spec/controllers/publications_controller_spec.rb",
-    "spec/editorial_logic_spec.rb",
     "spec/models/managed_content_spec.rb",
     "spec/models/publication_spec.rb",
     "spec/models/section_spec.rb",
@@ -820,6 +818,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, [">= 0"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
+      s.add_runtime_dependency(%q<stringex>, [">= 0"])
       s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
       s.add_runtime_dependency(%q<tanker>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -832,6 +831,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mongoid>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
+      s.add_dependency(%q<stringex>, [">= 0"])
       s.add_dependency(%q<SystemTimer>, [">= 0"])
       s.add_dependency(%q<tanker>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -845,6 +845,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mongoid>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
+    s.add_dependency(%q<stringex>, [">= 0"])
     s.add_dependency(%q<SystemTimer>, [">= 0"])
     s.add_dependency(%q<tanker>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/features/manage_articles_content.feature

@@ -11,7 +11,6 @@ Feature: Manage Articles Content
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "My Great Article"
     And I fill in "managed_content_content_editor" with "Here it is."
-    And I fill in "managed_content_desired_slug" with "my-great-article"
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "My Great Article"
@@ -100,7 +99,6 @@ Feature: Manage Articles Content
     Then I should see "Article Sections"
     And I follow "Add a Section"
     And I fill in "section_headline" with "Introduction"
-    And I fill in "section_desired_slug" with "my-introduction"
     And I fill in "section_content_editor" with "This is my intro."
     And I press "Save"
     Then I should see "Article Details"
@@ -117,7 +115,6 @@ Feature: Manage Articles Content
     Then I should see "Article Sections"
     And I follow "Add a Section"
     And I fill in "section_headline" with "Introduction"
-    And I fill in "section_desired_slug" with "my-introduction"
     And I fill in "section_content_editor" with "This is my intro."
     And I press "Save"
     Then I should see "Article Details"

data/features/manage_faq_content.feature

@@ -10,7 +10,6 @@ Feature: Manage FAQ Content
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "What is the answer?"
     And I fill in "managed_content_content_editor" with "Here it is."
-    And I fill in "managed_content_desired_slug" with "something"
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "What is the answer?"
@@ -21,7 +20,7 @@ Feature: Manage FAQ Content
     Given I have a publication named "FAQ" with "FAQs" content
     Given the publication "FAQ" has the following contents
       | headline | content | slug |
-      | Foo      | Stuff   | foo          |
+      | Foo      | Stuff   | foo  |
     When I visit "FAQ"
     Then I should see "Foo"
 
@@ -30,7 +29,7 @@ Feature: Manage FAQ Content
     Given I have a publication named "FAQ" with "FAQs" content
     Given the publication "FAQ" has the following contents
       | headline | content | slug |
-      | Foo      | Stuff   | foo          |
+      | Foo      | Stuff   | foo  |
     When I visit "FAQ"
     And I follow "View" within "[@class='crud_links']"
     Then I should see "FAQ Details"
@@ -41,7 +40,7 @@ Feature: Manage FAQ Content
     Given I have a publication named "FAQ" with "FAQs" content
     Given the publication "FAQ" has the following contents
       | headline | content | slug |
-      | Foo      | Stuff   | foo          |
+      | Foo      | Stuff   | foo  |
     When I visit "FAQ"
     And I follow "Edit" within "[@class='crud_links']"
     And I fill in "managed_content_headline" with "What was the answer?"
@@ -54,8 +53,7 @@ Feature: Manage FAQ Content
     Given I have a publication named "FAQ" with "FAQs" content
     Given the publication "FAQ" has the following contents
       | headline | content | slug |
-      | Foo      | Stuff   | foo          |
+      | Foo      | Stuff   | foo  |
     When I visit "FAQ"
     And I press "" within "[@class='crud_links']"
-    Then I should not see "Foo"
-
+    Then I should not see "Foo"

data/features/manage_glossary_content.feature

@@ -10,7 +10,6 @@ Feature: Manage Glossary Content
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "Foo"
     And I fill in "managed_content_content_editor" with "Something arbitrary."
-    And I fill in "managed_content_desired_slug" with "something"
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "Foo"

data/features/manage_publications.feature

@@ -16,7 +16,6 @@ Feature: Manage Publications
     And I am on the admin_publications page
     When I follow "New Publication"
     And I fill in "publication_name" with "Frequently Asked Questions"
-    And I fill in "publication_desired_slug" with "faqs"
     And I select "FAQs" from "publication_content_type"
     And I press "Save"
     Then I should see "Frequently Asked Questions"

data/features/step_definitions/publication_steps.rb

@@ -1,15 +1,15 @@
 Given /^I have publications named (.+)$/ do |names|
   names.split(', ').each do |name|
-    p = Publication.make(:name => "#{name}", :desired_slug => name, :content_type => 'Articles')
+    Publication.make :name => name, :content_type => 'Articles'
   end
 end
 
 Given /^I have a publication named "(.+)" with "(.+)" content/ do |name, content|
-  Publication.make(:name => "#{name}", :desired_slug => name, :content_type => "#{content}")
+  Publication.make :name => name, :content_type => content
 end
 
 Given /^the publication "(.+)" has an RSS feed$/ do |name|
-  Publication.where(:name => "#{name}").first.update_attributes(:rss_feed_enabled => true)
+  Publication.where(:name => name).first.update_attributes(:rss_feed_enabled => true)
 end
 
 Given /^I have no publications$/ do
@@ -23,5 +23,4 @@ end
 When /^I visit "(.+)"$/ do |publication|
   publication = Publication.where(:name => publication).first
   visit admin_publication_url(publication)
-end
-
+end

data/lib/editorial_logic.rb

@@ -1,52 +1,10 @@
 module EditorialLogic
   require 'editorial_logic/railtie.rb' if defined?(Rails)
-  require 'editorial_logic/engine.rb' if defined?(Rails)
 
-  def self.setup
-    yield self
+  class Engine < Rails::Engine
   end
 
-  def self.filter_time(attributes, name)
-     attrs = attributes.collect do |key, value|
-       if key =~ /^#{Regexp.escape(name.to_s)}\((\d+)(\w)\)$/
-         [$1.to_i, value.send("to_#$2")]
-       end
-     end.compact.sort_by(&:first).map(&:last)
-     Time.zone.local(*attrs) unless attrs.empty?
-  end
-
-  module Base
-    @@sluggable_attribute = nil
-
-    module ClassMethods
-      def has_slug(attr)
-        self.send(:set_callback, :save, :before, Proc.new{|doc| doc.make_slug})
-      end
-    end
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def make_slug
-      if self.desired_slug && ! self.desired_slug.blank?
-        text = self.desired_slug
-      elsif self.slug
-        text = self.slug
-      elsif self.respond_to?(:headline)
-        text = self.headline.to_s.downcase
-      elsif self.respond_to?(:name)
-        text = self.name.to_s.downcase
-      end
-
-      # Translation borrowed from permalink_fu
-      text = text.to_s
-      text.gsub!(/[^\x00-\x7F]+/, '-') # Remove anything non-ASCII entirely (e.g. diacritics).
-      text.gsub!(/[^\w_ \/\-]+/i,   '-') # Remove unwanted chars.
-      text.gsub!(/[ \-]+/i,      '-') # No more than one of the separator in a row.
-      text.gsub!(/^\-|\-$/i,      '') # Remove leading/trailing separator.
-      text.downcase!
-      self.slug = text
-    end
+  def self.setup
+    yield self
   end
 end

data/spec/blueprints.rb

@@ -4,7 +4,6 @@ require 'faker'
 
 Publication.blueprint do
   name Faker::Lorem.words(5) * " "
-  desired_slug Faker::Lorem.words(5) * " "
 end
 
 ManagedContent.blueprint do

data/spec/controllers/admin/managed_contents_controller_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Admin::ManagedContentsController do
   before :all do
     Publication.destroy_all
-    @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')
-    @content = @publication.managed_contents.create(:headline => 'foo', :content => 'bar', :desired_slug => 'foo')
+    @publication = Publication.create :name => 'FAQ'
+    @content = @publication.managed_contents.create :headline => 'foo', :content => 'bar'
   end
 
   it "show action should render show template" do
@@ -47,9 +47,9 @@ describe Admin::ManagedContentsController do
   end
 
   it "destroy action should destroy model and redirect to index action" do
-    @content_to_delete = @publication.managed_contents.create(:headline => 'foo', :content => 'bar', :desired_slug => 'football')
+    @content_to_delete = @publication.managed_contents.create :headline => 'foo', :content => 'bar'
     delete :destroy, :id => @content_to_delete.id, :publication_id => @publication.id
     response.should redirect_to(admin_publication_url(@publication))
     Publication.find(@publication.id).managed_contents.include?(@content_to_delete).should be_false
   end
-end
+end

data/spec/controllers/admin/publications_controller_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 describe Admin::PublicationsController do
   before :all do
     Publication.destroy_all
-    @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')
+    @publication = Publication.create :name => 'FAQ'
   end
 
   it "index action should render index template" do
@@ -29,7 +29,6 @@ describe Admin::PublicationsController do
 
   it "create action should redirect when model is valid" do
     Publication.any_instance.stubs(:valid?).returns(true)
-    Publication.any_instance.stubs(:desired_slug).returns('bar')
     post :create
     response.should redirect_to(admin_publication_url(assigns[:publication]))
   end
@@ -52,9 +51,9 @@ describe Admin::PublicationsController do
   end
 
   it "destroy action should destroy model and redirect to index action" do
-    @publication_to_delete = Publication.create(:name => 'iFAQs', :desired_slug => 'ifaq')
+    @publication_to_delete = Publication.create :name => 'iFAQs'
     delete :destroy, :id => @publication_to_delete.id
     response.should redirect_to(admin_publications_url)
     Publication.where(:id => @publication_to_delete.id).should be_empty
   end
-end
+end

data/spec/controllers/managed_contents_controller_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe ManagedContentsController do
   before :all do
     Publication.destroy_all
-    @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')
-    @content = @publication.managed_contents.create(:headline => 'foo', :content => 'bar', :desired_slug => 'foo')
+    @publication = Publication.create :name => 'FAQ'
+    @content = @publication.managed_contents.create :headline => 'foo', :content => 'bar'
   end
 
   it "show action should render show template" do

data/spec/controllers/publications_controller_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe PublicationsController do
   before :all do
     Publication.destroy_all
-    @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')
+    @publication = Publication.create :name => 'FAQ'
   end
 
   it "show action should render show template" do

data/spec/models/managed_content_spec.rb

@@ -4,11 +4,11 @@ describe ManagedContent do
 
   before :all do
     Publication.destroy_all
-    @publication = Publication.create(:name => 'FAQs', :desired_slug => 'faq')
-    @content = @publication.managed_contents.create(:headline => 'foo', :content => 'bar', :desired_slug => 'foo')
+    @publication = Publication.create :name => 'FAQ'
+    @content = @publication.managed_contents.create :headline => 'foo', :content => 'bar'
 
     # Pub with PDF documents
-    @pdfs = Publication.create(:name => 'Fact Sheets', :desired_slug => 'fact-sheets', :content_type => 'Documents')
+    @pdfs = Publication.create :name => 'Fact Sheets', :content_type => 'Documents'
   end
 
   it 'requires content for single-page articles' do
@@ -24,13 +24,13 @@ describe ManagedContent do
   end
 
   it 'returns an SEO-friendly URL' do
-    @content.humanize_path.should == '/faq/foo'
+    @content.path.should == '/faq/foo'
   end
 
   it 'returns the direct URL for an attached document' do
-    @document = @pdfs.managed_contents.create(:headline => 'Fact Sheet the First', :desired_slug => 'first', :kind => 'Document')
+    @document = @pdfs.managed_contents.create :headline => 'Fact Sheet the First', :kind => 'Document'
     @document.stubs(:document_url).returns('/first.pdf')
-    @document.humanize_path.should == '/first.pdf'
+    @document.path.should == '/first.pdf'
   end
 
   it 'publishes, setting its publication date' do
@@ -47,11 +47,10 @@ describe ManagedContent do
 
   describe 'slug' do
 
-    it 'is generated based on the desired_slug' do
+    it 'is generated based on the headline' do
       content = @publication.managed_contents.create(
-        :headline     => 'foo',
-        :content      => 'bar',
-        :desired_slug => 'flexible outings'
+        :headline     => 'Flexible Outings',
+        :content      => 'bar'
       )
       content.slug.should == 'flexible-outings'
     end
@@ -59,8 +58,7 @@ describe ManagedContent do
     it 'truncates extra hyphens' do
       content = @publication.managed_contents.create(
         :headline     => 'Mario!! Brothers',
-        :content      => 'bar',
-        :desired_slug => 'mario!! brothers'
+        :content      => 'bar'
       )
       content.slug.should == 'mario-brothers'
     end
@@ -68,8 +66,7 @@ describe ManagedContent do
     it 'truncates trailing hyphens' do
       content = @publication.managed_contents.create(
         :headline     => 'Blues Brothers?',
-        :content      => 'bar',
-        :desired_slug => 'blues brothers?'
+        :content      => 'bar'
       )
       content.slug.should == 'blues-brothers'
     end

data/spec/models/publication_spec.rb

@@ -51,41 +51,25 @@ describe Publication do
     end
   end
 
-  describe 'slug' do
+  describe 'path' do
     it 'returns an SEO-friendly URL' do
-      publication = Publication.new(
-        :name         => 'FAQs',
-        :desired_slug => 'somewhat-dense'
-      )
-      publication.make_slug
-      publication.humanize_path.should == '/somewhat-dense'
-    end
-
-    it 'is generated based on the desired_slug' do
-      publication = Publication.new(
-        :name         => 'FAQs',
-        :desired_slug => 'unfortunate beginnings'
-      )
-      publication.make_slug.should == 'unfortunate-beginnings'
+      Publication.create(:name => 'FAQ').path.should == '/faq'
     end
 
     it 'is generated based on the name' do
-      publication = Publication.new(:name => 'Flood Brothers')
-      publication.make_slug.should == 'flood-brothers'
+      Publication.create(:name => 'Flood Brothers').path.should == '/flood-brothers'
     end
 
     it 'truncates extra hyphens' do
-      publication = Publication.new(:name => 'Mario!! Brothers')
-      publication.make_slug.should == 'mario-brothers'
+      Publication.create(:name => 'Mario!! Brothers').path.should == '/mario-brothers'
     end
 
     it 'truncates trailing hyphens' do
-      publication = Publication.new(:name => 'Blues Brothers?')
-      publication.make_slug.should == 'blues-brothers'
+      Publication.create(:name => 'Blues Brothers?').path.should == '/blues-brothers'
     end
   end
 
   it 'returns its feed URL' do
-    Publication.create(:name => 'Blues News', :desired_slug => 'blues-news').rss_feed_url.should == '/blues-news/feed'
+    Publication.create(:name => 'Blues News').feed.should == '/blues-news/feed'
   end
 end

data/spec/models/section_spec.rb

@@ -1,27 +1,23 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Section do
-
-  it "should be valid with minimum values" do
+  it 'should be valid with minimum values' do
     Section.new(
       :headline => 'References',
-      :desired_slug => 'references',
       :content => 'Foo'
     ).should be_valid
   end
 
   describe 'handles siblings and urls' do
-
     before :all do
       Publication.destroy_all
       @publication = Publication.new(
-        :name         => 'Scholarly Articles',
-        :desired_slug => 'articles'
+        :name         => 'Scholarly Articles'
       )
-      @article = @publication.managed_contents.create(:headline => 'Article the First', :desired_slug => 'first', :content => '', :kind => 'Multiple Pages')
-      @intro = @article.sections.create(:headline => 'Intro', :desired_slug => 'intro', :content => 'Intro', :position => 1)
-      @meat = @article.sections.create(:headline => 'Body', :desired_slug => 'body', :content => 'Body', :position => 2)
-      @refs = @article.sections.create(:headline => 'References', :desired_slug => 'references', :content => 'References', :position => 3)
+      @article = @publication.managed_contents.create(:headline => 'Article the First', :kind => 'Multiple Pages')
+      @intro = @article.sections.create(:headline => 'Intro', :content => 'Intro', :position => 1)
+      @meat = @article.sections.create(:headline => 'Body', :content => 'Body', :position => 2)
+      @refs = @article.sections.create(:headline => 'References', :content => 'References', :position => 3)
     end
 
     it 'returning its siblings' do
@@ -35,13 +31,11 @@ describe Section do
     end
 
     it 'returns the URL for initial section' do
-      @intro.humanize_path.should == '/articles/first/'
+      @intro.path.should == "#{@intro.managed_content.path}"
     end
 
     it 'returns the URL for subsequent sections' do
-      @meat.humanize_path.should == '/articles/first/body/'
+      @meat.path.should == "#{@intro.managed_content.path}/body"
     end
-
   end
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: editorial_logic
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 3
-  version: 1.3.3
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 Z
+date: 2011-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -116,7 +116,7 @@ dependencies:
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: SystemTimer
+  name: stringex
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -130,7 +130,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: tanker
+  name: SystemTimer
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -144,7 +144,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
@@ -155,12 +155,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: 
     - - ">="
@@ -172,7 +186,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: An engine for enabling managed content, including articles, blogs, FAQs and glossaries.
 email: corey@seologic.com
 executables: []
@@ -266,7 +280,6 @@ files:
 - features/support/selectors.rb
 - init.rb
 - lib/editorial_logic.rb
-- lib/editorial_logic/engine.rb
 - lib/editorial_logic/railtie.rb
 - lib/tasks/cucumber.rake
 - lib/tasks/rcov.rake
@@ -965,7 +978,6 @@ files:
 - spec/controllers/admin/publications_controller_spec.rb
 - spec/controllers/managed_contents_controller_spec.rb
 - spec/controllers/publications_controller_spec.rb
-- spec/editorial_logic_spec.rb
 - spec/models/managed_content_spec.rb
 - spec/models/publication_spec.rb
 - spec/models/section_spec.rb

data/lib/editorial_logic/engine.rb

@@ -1,7 +0,0 @@
-require 'editorial_logic'
-require 'rails'
-
-module EditorialLogic
-  class Engine < Rails::Engine
-  end
-end

data/spec/editorial_logic_spec.rb

@@ -1,42 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-# Test vs the latest changes in the lib file, not the installed gem version
-require File.expand_path(File.dirname(__FILE__) + '/../lib/editorial_logic')
-
-describe "EditorialLogic" do
-
-  before :all do
-    class Foo
-      include Mongoid::Document
-      include EditorialLogic::Base
-      has_slug :desired_slug
-      attr_accessor :desired_slug
-      attr_accessor :slug
-    end
-  end
-
-  it 'adds the has_slug method to a class' do
-    Foo.respond_to?(:has_slug).should be_true
-  end
-
-  describe 'slug' do
-
-    it 'converts non-alpha-numeric characters' do
-      Foo.new(:desired_slug => 'dollars$and$cents').make_slug.should == 'dollars-and-cents'
-    end
-
-    it 'converts runs of hyphens' do
-      Foo.new(:desired_slug => 'dollars$$and$$cents').make_slug.should == 'dollars-and-cents'
-    end
-
-    it 'removes trailing hyphens' do
-      Foo.new(:desired_slug => 'dollars$').make_slug.should == 'dollars'
-    end
-
-    it 'removes leading hyphens' do
-      Foo.new(:desired_slug => '$dollars').make_slug.should == 'dollars'
-    end
-
-  end
-
-end