blog_logic 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/app/models/blog.rb

@@ -1,5 +1,5 @@
 class Blog
-  include BlogLogic::Base
+  include LuckySneaks::StringExtensions
   include Mongoid::Document
   include Mongoid::Timestamps
 
@@ -14,15 +14,14 @@ class Blog
   field :posts_per_page, :type => Integer
   field :rss_enabled, :type => Boolean
   field :has_topics, :type => Boolean, :default => false
+  index :slug
   has_many :blog_categories
-  has_many :posts
+  has_many :posts, :dependent => :destroy
 
   # Behavior =======================================================================================
-  attr_accessor :desired_slug
-  has_slug :desired_slug
-
-  # Validations ====================================================================================
-  validates_presence_of :title, :description, :desired_slug
+  before_save :set_slug
+  validates_presence_of :description, :title
+  validates_uniqueness_of :slug
 
   # Instance methods ===============================================================================
   def copy_posts
@@ -44,13 +43,13 @@ class Blog
   end
 
   def path
-    "/#{self.slug}/".gsub(/\/\//,'/').gsub(/\/\//,'/')
+    "/#{self.slug}"
   end
 
   def posts_by_month
     dates = {}
     self.posts.published.each do |p|
-      date = p.publication_date.to_s(:year_month)
+      date = p.publication_date.to_s :year_month
       dates[date] ||= {}
       dates[date][:full_date] ||= p.publication_date.to_s(:month_year)
       dates[date][:posts] ||= []
@@ -60,6 +59,12 @@ class Blog
   end
 
   def search(keyword)
-    self.posts.published.where(:content => /#{keyword}/i)
+    self.posts.published.where :content => /#{keyword}/i
+  end
+
+  private
+
+  def set_slug
+    self.slug = self.title.to_s.to_url if self.slug.blank?
   end
-end
+end

data/app/models/post.rb

@@ -23,15 +23,14 @@ class Post
   field :state
   field :publication_date, :type => DateTime
   field :summary
-
-  index :slug, :unique => false
+  index :slug
   index :state, :unique => false
-
   belongs_to :blog
   has_and_belongs_to_many :blog_categories
 
   # Behavior =======================================================================================
-  after_create :set_slug
+  before_save :set_slug
+  validates_uniqueness_of :slug
 
   # Tanker =========================================================================================
   tankit 'idx' do
@@ -46,18 +45,12 @@ class Post
   after_save :update_tank_indexes
 
   # Validations ====================================================================================
-#   class DesiredSlugPresenceAndUniquenessValidator < ActiveModel::EachValidator
-#     def validate_each(object, attribute, value)
-#       object.desired_slug = object.title unless object.desired_slug
-#       if object.blog && object.blog.posts.map{|p| p.slug unless p == object}.include?(object.desired_slug)
-#         object.errors[attribute] << (options[:message] || "must be unique.")
-#       end
-#     end
-#   end
-
-#   validates :desired_slug, :desired_slug_presence_and_uniqueness => true
-  validates_presence_of :title
-  validates_presence_of :content
+  validates_presence_of :content, :title
+
+  # Instance methods: Overrides ====================================================================
+  def publication_date
+    self[:publication_date] || self.published_at
+  end
 
   # Instance methods ===============================================================================
   def draft?
@@ -76,7 +69,7 @@ class Post
   end
 
   def humanize_path
-    "/#{self.slug}".gsub('//', '/')
+    self.path
   end
 
   def my_index
@@ -90,7 +83,7 @@ class Post
   end
 
   def path
-    "#{self.blog.humanize_path}#{self.humanize_path}".gsub('//', '/')
+    "#{self.blog.path}/#{self.slug}".gsub('//', '/')
   end
 
   def previous_post
@@ -115,11 +108,6 @@ class Post
     self.title
   end
 
-  # Sets the slug for this locale. Slugs from the locale tree are used to build this locale's URL.
-  def set_slug
-    self.slug = self.title.to_s.to_url
-  end
-
   def unpublish!
     self.update_attributes :state => 'draft'
   end
@@ -131,4 +119,10 @@ class Post
   def status
     self.state ? self.state.capitalize : 'Draft'
   end
+
+  private
+
+  def set_slug
+    self.slug = self.title.to_s.to_url if self.slug.blank?
+  end
 end

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

@@ -18,7 +18,7 @@
 
   <div class="form_column">
     <%= f.text_field :title, :label => 'Blog Title' -%>
-    <%= f.text_field :desired_slug, :label => 'URL Slug', :value => @blog.slug || '/blog/' -%>
+    <%= f.text_field :slug, :value => @blog.slug -%>
     <%= f.select :posts_per_page, %w{10 20 30 50} -%>
   </div>
   <div class="form_column">

data/blog_logic.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "blog_logic"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
@@ -90,8 +90,6 @@ Gem::Specification.new do |s|
     "features/support/paths.rb",
     "init.rb",
     "lib/blog_logic.rb",
-    "lib/blog_logic/base.rb",
-    "lib/blog_logic/engine.rb",
     "lib/blog_logic/import.rb",
     "lib/blog_logic/railtie.rb",
     "lib/tasks/.gitkeep",

data/features/browse_blog.feature

@@ -7,20 +7,20 @@ Feature: Browse blog
   I want to browse the blog
 
   Scenario: Access the blog page
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | summary | state     |
       | Foo   | Foo is foo.  | First   | published |
       | Bar   | Bar is bar.  | Second  | draft     |
     When I visit the blog page
-    Then I should see "Default Blog"
+    Then I should see "My Blog"
     And I should see "My blog description"
     And I should see "Foo"
     And I should see "First"
     And I should not see "Bar"
 
   Scenario: View published blog post
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | summary | state     |
       | Foo   | Foo is foo.  | First   | published |
@@ -29,7 +29,7 @@ Feature: Browse blog
     Then I should see "Foo"
 
   Scenario: Search for blog posts
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | summary | state     |
       | Foo   | Foo is foo.  | First   | published |
@@ -41,7 +41,7 @@ Feature: Browse blog
     And I should see "First"
 
   Scenario: Access the archive
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | summary | state     | publication_date |
       | Foo   | Foo is foo.  | First   | published | 2011-03-22       |
@@ -50,7 +50,7 @@ Feature: Browse blog
     And I should see "Foo"
 
   Scenario: Access the RSS feed
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | summary | state     | publication_date |
       | Foo   | Foo is foo.  | First   | published | 2011-03-22       |

data/features/manage_blog.feature

@@ -9,7 +9,6 @@ Feature: Manage Blog
     When go to the admin_blogs page
     And I follow "Set Up Blog"
     And I fill in "Blog Title" with "Adventures at 7-11"
-    And I fill in "URL" with "7-11-adventures"
     And I fill in "Description" with "An epic tale of strange stuff that happens at my local convenience store."
     And I select "10" from "Posts Per Page"
     And I press "Save"
@@ -19,7 +18,7 @@ Feature: Manage Blog
     And I should see "10"
 
   Scenario: Edit a blog
-    Given I have a blog
+    Given I have a blog "My Blog"
     When go to the admin_blogs page
     And I follow "Blog Configuration"
     Then I should see "Blog Details"
@@ -27,5 +26,4 @@ Feature: Manage Blog
     And I fill in "Blog Title" with "Adventures at Circle K"
     And I press "Save"
     Then I should see "Successfully modified the blog."
-    And I should see "Adventures at Circle K"
-
+    And I should see "Adventures at Circle K"

data/features/post_to_blog.feature

@@ -4,14 +4,14 @@ Feature: Post to blog
   I want to create and manage blog posts
 
   Scenario: View empty list of blog posts
-    Given I have a blog
+    Given I have a blog "My Blog"
     When go to the admin_blogs page
     And I follow "Manage Posts"
     Then I should see "Blog Posts"
     And I should see "No posts have been written yet."
 
   Scenario: View populated list of blog posts
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | state     |
       | Foo   | Foo is foo.  | draft     |
@@ -23,7 +23,7 @@ Feature: Post to blog
     And I should see "Bar"
 
   Scenario: Create a draft blog post
-    Given I have a blog
+    Given I have a blog "My Blog"
     When go to the admin_blogs page
     And I follow "Manage Posts"
     And I follow "New Post..."
@@ -34,11 +34,12 @@ Feature: Post to blog
     And I press "Save"
     Then I should see "About This Post"
     And I should see "My First Post"
+    And post slug should be "my-first-post"
 
   Scenario: Attach an image to a blog post
 
   Scenario: Edit a blog post
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | state     |
       | Foo   | Foo is foo.  | draft     |
@@ -52,7 +53,7 @@ Feature: Post to blog
     And I should see "My Earliest Post"
 
   Scenario: Publish a blog post
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | state     |
       | Foo   | Foo is foo.  | draft     |
@@ -64,7 +65,7 @@ Feature: Post to blog
     And I should see "Published"
 
   Scenario: Delete a blog post
-    Given I have a blog
+    Given I have a blog "My Blog"
     Given the following blog posts exist:
       | title | content      | state     |
       | Foo   | Foo is foo.  | draft     |

data/features/step_definitions/blog_steps.rb

@@ -14,9 +14,10 @@ When /^I visit the blog RSS feed$/ do
   visit Blog.first.feed_address
 end
 
-Given /^I have a blog$/ do
-  Blog.destroy_all
-  Blog.create(:title => 'Default Blog', :desired_slug => 'my-blog', :description => 'My blog description')
+Given /^I have a blog "([^"]*)"$/ do |title|
+  Blog.delete_all
+  Post.delete_all
+  Blog.make :title => title
 end
 
 Given /the following blog posts exist:/ do |table|
@@ -24,5 +25,10 @@ Given /the following blog posts exist:/ do |table|
 end
 
 Given /^no blogs exist$/ do
-  Blog.destroy_all
+  Blog.delete_all
+  Post.delete_all
 end
+
+Then /^post slug should be "([^"]*)"$/ do |slug|
+  Blog.first.posts.last.slug.should == slug
+end

data/features/support/env.rb

@@ -6,6 +6,7 @@
 
 ENV["RAILS_ENV"] ||= "test"
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require File.expand_path(File.dirname(__FILE__) + "/../../spec/blueprints")
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/rspec'

data/lib/blog_logic.rb

@@ -1,13 +1,8 @@
 module BlogLogic
-
-  require 'mongoid'
-  require 'blog_logic/engine' if defined?(Rails)
-  require 'blog_logic/railtie' if defined?(Rails)
-  require 'blog_logic/base'
   require 'blog_logic/import'
+  require 'blog_logic/railtie'
 
   def self.setup
     yield self
   end
-
-end
+end

data/lib/blog_logic/import.rb

@@ -1,11 +1,7 @@
 # NOTE: search-and-replace content> with contents> before importing
-
 module BlogLogic
-
   module Import
-
     class WordPress
-
       attr_accessor :source_file
 
       def initialize(file)
@@ -20,8 +16,7 @@ module BlogLogic
             :publication_date => post.publication_date,
             :content => post.content,
             :summary => post.content.truncate(255),
-            :state => "published",
-            :desired_slug => "#{post.title.to_s}"
+            :state => 'published'
           )
         end
       end
@@ -31,10 +26,10 @@ module BlogLogic
         if @posts.empty?
           raw_posts.each do |item|
             @posts << Post.new(
-              :title => item.xpath(".//title").first.content,
-              :date => item.xpath(".//pubDate").first.content,
-              :content => item.xpath(".//contents").children.first.content,
-              :summary => item.xpath(".//excerpt").first.try(:content)
+              :title => item.xpath('.//title').first.content,
+              :date => item.xpath('.//pubDate').first.content,
+              :content => item.xpath('.//contents').children.first.content,
+              :summary => item.xpath('.//excerpt').first.try(:content)
             )
           end
         end
@@ -46,7 +41,7 @@ module BlogLogic
       end
 
       def raw_posts
-        self.source.xpath("//item")
+        self.source.xpath('//item')
       end
 
       class Post
@@ -58,9 +53,6 @@ module BlogLogic
           DateTime.parse(self.date)
         end
       end
-
     end
-
   end
-
 end

data/lib/blog_logic/railtie.rb

@@ -1,5 +1,3 @@
-require 'blog_logic'
-require 'rails'
 module BlogLogic
   class Railtie < Rails::Railtie
     rake_tasks do

data/spec/blueprints.rb

@@ -1,18 +1,14 @@
-require 'machinist/mongoid'
-require 'sham'
 require 'faker'
+require 'machinist/mongoid'
 
 Blog.blueprint do
-  title        { Faker::Lorem.words(5) * " " }
-  desired_slug { "my-blog" }
-  description  { "My incredibly insightful blog" }
+  title        { Faker::Lorem.words(5) * ' ' }
+  description  { 'My blog description' }
 end
 
 Post.blueprint do
-  title             { Faker::Lorem.words(5) * " " }
-  summary           { Faker::Lorem.words(5) * " " }
-  content           { Faker::Lorem.words(5) * " " }
-  slug              { Faker::Lorem.words(5) * "-" }
-  publication_date  { Time.zone.now }
-  state             { 'published' }
+  title            { Faker::Lorem.words(5) * ' ' }
+  content          { Faker::Lorem.words(5) * ' ' }
+  publication_date { Time.zone.now }
+  state            { 'published' }
 end

data/spec/controllers/admin/posts_controller_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Admin::PostsController do
   before :each do
-    Blog.destroy_all
+    Blog.delete_all
+    Post.delete_all
     @blog = Blog.make
-    @post = Post.make
-    @blog.posts << @post
-    @blog.save
+    @blog.posts.create Post.plan
+    @post = @blog.posts.first
   end
 
   it 'gets index action' do

data/spec/models/blog_spec.rb

@@ -6,12 +6,12 @@ describe Blog do
     @blog = Blog.make
   end
 
-  it "returns its feed address" do
-    @blog.feed_address.should == "/my-blog/feed.rss"
+  it "returns its path" do
+    @blog.humanize_path.should == "/#{@blog.title.to_url}"
   end
 
-  it "returns its humanized path" do
-    @blog.humanize_path.should == "/my-blog/"
+  it "returns its feed address" do
+    @blog.feed_address.should == "/#{@blog.title.to_url}/feed.rss"
   end
 
   it "retrieves posts by month" do

data/spec/models/post_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Post do
   before :all do
+    Post.delete_all
     @blog = Blog.make
   end
 
@@ -9,19 +10,15 @@ describe Post do
     @blog.posts.new.draft?.should be_true
   end
 
-  it 'returns its relative URL' do
-    @blog.posts.new(:slug => 'foo').full_path.should == '/my-blog/foo'
-  end
-
-  it 'returns its formatted slug' do
-    @blog.posts.new(:slug => 'foo').humanize_path.should == '/foo'
+  it 'returns its path' do
+    @blog.posts.new(:slug => 'foo').path.should == "/#{@blog.title.to_url}/foo"
   end
 
   it 'publishes, setting its publication date' do
     post = @blog.posts.create(Post.make.attributes)
     post.publish!
     post.status.should == 'Published'
-    post.publication_date.to_s(:concise).should == Time.now.to_s(:concise)
+    post.published_at.to_s(:concise).should == Time.now.to_s(:concise)
   end
 
   it 'unpublishes, clearing its publication date' do
@@ -31,13 +28,12 @@ describe Post do
     post.status.should == 'Draft'
   end
 
-  it 'defaults its desired slug to its title' do
+  it 'defaults slug to its title' do
     post = @blog.posts.new(
       :title => 'Test Post',
-      :summary => 'Foo',
       :content => 'Bar'
     )
-    post.save.should be_true
+    post.save
     post.slug.should == 'test-post'
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blog_logic
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Bantik
@@ -288,8 +288,6 @@ files:
 - features/support/paths.rb
 - init.rb
 - lib/blog_logic.rb
-- lib/blog_logic/base.rb
-- lib/blog_logic/engine.rb
 - lib/blog_logic/import.rb
 - lib/blog_logic/railtie.rb
 - lib/tasks/.gitkeep

data/lib/blog_logic/base.rb

@@ -1,41 +0,0 @@
-module BlogLogic
-
-  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?(:page_title)
-        text = self.page_title.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
-
-  end
-
-end

data/lib/blog_logic/engine.rb

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