blog_logic 1.1.8 → 1.1.9

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/app/models/blog.rb

@@ -14,9 +14,8 @@ class Blog
   field :posts_per_page, :type => Integer
   field :rss_enabled, :type => Boolean
   field :has_topics, :type => Boolean, :default => false
-  embeds_many :posts
   has_many :blog_categories
-  has_many :post2s
+  has_many :posts
 
   # Behavior =======================================================================================
   attr_accessor :desired_slug
@@ -30,6 +29,7 @@ class Blog
     self.posts.each do |post|
       p = Post2.create :slug => post.slug, :content => post.content, :tags => post.tags, :author => post.author, :published_at => post.published_at, :state => post.state, :publication_date => post.publication_date, :summary => post.summary
       p.title = post.title
+      p.blog_category_ids = post.blog_category_ids
       p.save
       self.post2s << p
     end

data/app/models/blog_category.rb

@@ -12,6 +12,7 @@ class BlogCategory
   # Behavior =======================================================================================
   before_destroy :destroy_children
   before_save :set_slug
+  has_and_belongs_to_many :posts
   validates_presence_of :name
   validates_uniqueness_of :name
 
@@ -62,10 +63,6 @@ class BlogCategory
     (self.posts + self.children.map{ |c| c.posts }).uniq.flatten
   end
 
-  def posts
-    Blog.first.posts.select{ |p| p.blog_category_ids.include? self.id }
-  end
-
   def subcategory?
     ! self.root?
   end

data/app/models/post.rb

@@ -1,7 +1,7 @@
 class Post
+  include LuckySneaks::StringExtensions
   include Mongoid::Document
   include Mongoid::Timestamps
-  include BlogLogic::Base
   include Tanker
 
   # Constants ======================================================================================
@@ -27,12 +27,11 @@ class Post
   index :slug, :unique => false
   index :state, :unique => false
 
-  embedded_in :blog, :inverse_of => :posts
+  belongs_to :blog
   has_and_belongs_to_many :blog_categories
 
   # Behavior =======================================================================================
-  attr_accessor :desired_slug
-  has_slug :desired_slug
+  after_create :set_slug
 
   # Tanker =========================================================================================
   tankit 'idx' do
@@ -47,24 +46,31 @@ 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
+#   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
 
   # Instance methods ===============================================================================
- def draft?
+  def draft?
     self.state == 'draft' || self.state.nil?
   end
 
+  def fix_blog_category_join
+    self.blog_categories.each do |cat|
+      cat.post_ids << self.id
+      cat.save
+    end
+  end
+
   def full_path
     self.path
   end
@@ -109,6 +115,11 @@ 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

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

@@ -17,7 +17,6 @@
   <div class="form_column">
     <%= f.text_field :title, :label => 'Title', :help => 'This title will appear on the post before any content and is used by search engines to identify the main idea of the post.' -%>
     <%= f.text_field :title_short, :label => 'Short Title', :help => 'This is an optional, shortened title used when the layout imposes a length constraint for cosmetic reasons. As with the title above, it will appear on the post before any content and is used by search engines to identify the main idea of the post.' -%>
-    <%= f.text_field :desired_slug, :help => "The slug forms part of the URL for this post. For example, entering my-post will create the URL '#{@blog.humanize_path}my-post/'.", :label => 'URL Slug', :value => @post.slug -%>
   </div>
   <div class="form_column">
     <%= f.date_select :publication_date, :start_year => 2002 -%>

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

@@ -5,10 +5,10 @@
 <%- else -%>
   <table class="standard">
     <tr>
-      <th style="width: 20%;"><%= sort_link("admin/blogs/#{@blog.id}/posts", 'slug', params) -%></th>
-      <th style="width: 20%;"><%= sort_link("admin/blogs/#{@blog.id}/posts", 'title', params) -%></th>
-      <th style="width: 10%;"><%= sort_link("admin/blogs/#{@blog.id}/posts", 'state', params) -%></th>
-      <th style="width: 10%;"><%= sort_link("admin/blogs/#{@blog.id}/posts", 'publication_date', params) -%></th>
+      <th style="width: 20%;"><%= sort_link("admin/blogs/#{params[:id]}/posts", 'slug', params) -%></th>
+      <th style="width: 20%;"><%= sort_link("admin/blogs/#{params[:id]}/posts", 'title', params) -%></th>
+      <th style="width: 10%;"><%= sort_link("admin/blogs/#{params[:id]}/posts", 'state', params) -%></th>
+      <th style="width: 10%;"><%= sort_link("admin/blogs/#{params[:id]}/posts", 'publication_date', params) -%></th>
       <th style="width: 5%;"></th>
   </tr>
 

data/blog_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blog_logic"
-  s.version = "1.1.8"
+  s.version = "1.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-09-22"
+  s.date = "2011-09-27"
   s.description = "An engine for search-engine-optimized blog management."
   s.email = "corey@seologic.com"
   s.extra_rdoc_files = [
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     "app/models/ckeditor/attachment_file.rb",
     "app/models/ckeditor/picture.rb",
     "app/models/post.rb",
-    "app/models/post2.rb",
     "app/uploaders/blog_image_uploader.rb",
     "app/views/admin/blog_categories/_blog_category.html.erb",
     "app/views/admin/blog_categories/_form.html.erb",

data/features/browse_blog.feature

@@ -9,9 +9,9 @@ Feature: Browse blog
   Scenario: Access the blog page
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | summary | state     |
-      | foo          | Foo   | Foo is foo.  | First   | published |
-      | bar          | Bar   | Bar is bar.  | Second  | draft     |
+      | 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"
     And I should see "My blog description"
@@ -22,18 +22,17 @@ Feature: Browse blog
   Scenario: View published blog post
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | summary | state     |
-      | foo          | Foo   | Foo is foo.  | First   | published |
+      | title | content      | summary | state     |
+      | Foo   | Foo is foo.  | First   | published |
     When I visit the blog page
     And I follow "Read More..."
     Then I should see "Foo"
-    And I should see "Foo is foo."
 
   Scenario: Search for blog posts
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | summary | state     |
-      | foo          | Foo   | Foo is foo.  | First   | published |
+      | title | content      | summary | state     |
+      | Foo   | Foo is foo.  | First   | published |
     When I visit the blog search page
     And I fill in "keyword" with "foo"
     And I press "GO"
@@ -44,8 +43,8 @@ Feature: Browse blog
   Scenario: Access the archive
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | summary | state     | publication_date |
-      | foo          | Foo   | Foo is foo.  | First   | published | 2011-03-22       |
+      | title | content      | summary | state     | publication_date |
+      | Foo   | Foo is foo.  | First   | published | 2011-03-22       |
     When I visit the blog archive page
     Then I should see "March 2011"
     And I should see "Foo"
@@ -53,8 +52,8 @@ Feature: Browse blog
   Scenario: Access the RSS feed
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | summary | state     | publication_date |
-      | foo          | Foo   | Foo is foo.  | First   | published | 2011-03-22       |
+      | title | content      | summary | state     | publication_date |
+      | Foo   | Foo is foo.  | First   | published | 2011-03-22       |
     When I visit the blog RSS feed
     Then I should see "Foo"
     And I should see "Foo is foo."

data/features/post_to_blog.feature

@@ -13,9 +13,9 @@ Feature: Post to blog
   Scenario: View populated list of blog posts
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | state     |
-      | foo          | Foo   | Foo is foo.  | draft     |
-      | bar          | Bar   | Bar is bar.  | published |
+      | title | content      | state     |
+      | Foo   | Foo is foo.  | draft     |
+      | Bar   | Bar is bar.  | published |
     When go to the admin_blogs page
     And I follow "Manage Posts"
     Then I should see "Blog Posts"
@@ -29,7 +29,6 @@ Feature: Post to blog
     And I follow "New Post..."
     Then I should see "Create a New Post"
     And I fill in "post_title" with "My First Post"
-    And I fill in "post_desired_slug" with "my-first-post"
     And I select "Draft" from "post_state"
     And I fill in "content_field" with "Blah blah blah"
     And I press "Save"
@@ -41,8 +40,8 @@ Feature: Post to blog
   Scenario: Edit a blog post
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | state     |
-      | foo          | Foo   | Foo is foo.  | draft     |
+      | title | content      | state     |
+      | Foo   | Foo is foo.  | draft     |
     When go to the admin_blogs page
     And I follow "Manage Posts"
     And I follow "Edit" within "[@class='crud_links']"
@@ -55,8 +54,8 @@ Feature: Post to blog
   Scenario: Publish a blog post
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | state     |
-      | foo          | Foo   | Foo is foo.  | draft     |
+      | title | content      | state     |
+      | Foo   | Foo is foo.  | draft     |
     When go to the admin_blogs page
     And I follow "Manage Posts"
     And I follow "Edit" within "[@class='crud_links']"
@@ -67,8 +66,8 @@ Feature: Post to blog
   Scenario: Delete a blog post
     Given I have a blog
     Given the following blog posts exist:
-      | desired_slug | title | content      | state     |
-      | foo          | Foo   | Foo is foo.  | draft     |
+      | title | content      | state     |
+      | Foo   | Foo is foo.  | draft     |
     When go to the admin_blogs page
     And I follow "Manage Posts"
     And I press "" within "[@class='crud_links']"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blog_logic
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 1
-  - 8
-  version: 1.1.8
+  - 9
+  version: 1.1.9
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 Z
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -234,7 +234,6 @@ files:
 - app/models/ckeditor/attachment_file.rb
 - app/models/ckeditor/picture.rb
 - app/models/post.rb
-- app/models/post2.rb
 - app/uploaders/blog_image_uploader.rb
 - app/views/admin/blog_categories/_blog_category.html.erb
 - app/views/admin/blog_categories/_form.html.erb

data/app/models/post2.rb

@@ -1,127 +0,0 @@
-class Post2
-  include LuckySneaks::StringExtensions
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include Tanker
-
-  # Constants ======================================================================================
-  STATES = ['draft', 'published']
-
-  # Scopes =========================================================================================
-  scope :drafts,      :where => {:state => 'draft'}
-  scope :published,   :where => {:state => 'published'}, :descending => :publication_date
-  scope :by_slug, lambda {|slug| {:where => {:slug.in => ["#{slug}".gsub('//','/'), "/#{slug}/".gsub('//','/')] } } }
-
-  # Mongoid ========================================================================================
-  field :title
-  field :title_short # because "title" is often too long for a decent layout
-  field :content
-  field :tags, :type => Array
-  field :slug
-  field :author
-  field :published_at, :type => Date
-  field :state
-  field :publication_date, :type => DateTime
-  field :summary
-
-  index :slug, :unique => false
-  index :state, :unique => false
-
-  belongs_to :blog
-  references_and_referenced_in_many :blog_categories
-
-  # Behavior =======================================================================================
-  after_create :set_slug
-
-  # Tanker =========================================================================================
-  tankit 'idx' do
-    indexes :author
-    indexes :content
-    indexes :summary
-    indexes :tags
-    indexes :title
-  end
-
-  after_destroy :delete_tank_indexes
-  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
-
-  # Instance methods ===============================================================================
-  def draft?
-    self.state == 'draft' || self.state.nil?
-  end
-
-  def full_path
-    self.path
-  end
-
-  def humanize_path
-    "/#{self.slug}".gsub('//', '/')
-  end
-
-  def my_index
-    self.blog.posts.index(self)
-  end
-
-  def next_post
-    i = self.my_index + 1
-    i = 0 if i > (self.blog.posts.size - 1)
-    self.blog.posts[i]
-  end
-
-  def path
-    "#{self.blog.humanize_path}#{self.humanize_path}".gsub('//', '/')
-  end
-
-  def previous_post
-    i = self.my_index - 1
-    i = self.blog.posts.size - 1 if i < 0
-    self.blog.posts[i]
-  end
-
-  def publish!
-    self.update_attributes :state => 'published', :published_at => Time.zone.now
-  end
-
-  def published?
-    self.state == 'published'
-  end
-
-  def search_description
-    self.summary.gsub(/<\/?[^>]*>/, '')[0..199].html_safe
-  end
-
-  def search_title
-    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
-
-  def state=(arg)
-    self[:state] = arg.downcase
-  end
-
-  def status
-    self.state ? self.state.capitalize : 'Draft'
-  end
-end