concen 0.1.4 → 0.1.5

data/README.md

@@ -128,7 +128,11 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Version History
 
-- **0.1.4** (23 August 2011):
+- **0.1.5** (23 August 2011):
+
+  - A better approach of handling slug. Slug by default is generated from title. It can then be overwritten by specifying "Slug" in metadata declaration (from the text editor).
+
+- **0.1.4** (22 August 2011):
 
   - Simpler setup process (only in 2 steps).
   - Brief guide is available upon the completion of setup.

data/app/models/concen/page.rb

@@ -18,7 +18,7 @@ module Concen
     field :level, :type => Integer
     field :title, :type => String
     field :description, :type => String
-    field :default_slug, :type => String
+    field :slug, :type => String
     field :raw_text, :type => String
     field :content, :type => Hash, :default => {}
     field :position, :type => Integer
@@ -29,12 +29,12 @@ module Concen
     field :status, :type => String
 
     validates_presence_of :title
-    validates_presence_of :default_slug
+    validates_presence_of :slug
     validates_uniqueness_of :title, :scope => [:parent_id, :level], :case_sensitive => false
-    validates_uniqueness_of :default_slug, :scope => [:parent_id, :level], :case_sensitive => false
+    validates_uniqueness_of :slug, :scope => [:parent_id, :level], :case_sensitive => false
 
     before_validation :parse_raw_text
-    before_validation :set_default_slug
+    before_validation :set_slug
     before_save :set_publish_month
     before_create :set_position
     after_save :unset_unused_dynamic_fields
@@ -45,7 +45,7 @@ module Concen
     # This scope should not be chained with other any_of criteria.
     # Because the mongo driver takes a hash for a query,
     # and a hash doesn't allow duplicate keys.
-    scope :with_slug, ->(slug) { any_of({:slug => slug}, {:default_slug => slug}) }
+    scope :with_slug, ->(slug) { where(:slug => slug) }
 
     scope :with_position, where(:position.exists => true)
     scope :published, lambda {
@@ -57,22 +57,14 @@ module Concen
 
     index :parent_id, :background => true
     index :publish_time, :background => true
-    index :default_slug, :background => true
+    index :slug, :background => true
 
     # Get the list of dynamic fields by checking againts this array.
     # Values should mirror the listed fields above.
-    PREDEFINED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :default_slug, :content, :raw_text, :position, :grid_files, :title, :description, :publish_time, :labels, :authors, :status]
+    PREDEFINED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :slug, :content, :raw_text, :position, :grid_files, :title, :description, :publish_time, :labels, :authors, :status]
 
     # These fields can't be overwritten by user's meta data when parsing raw_text.
-    PROTECTED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :default_slug, :content, :raw_text, :position, :grid_files]
-
-    def slug
-      if user_defined_slug = self.read_attribute(:slug)
-        user_defined_slug
-      else
-        self.default_slug
-      end
-    end
+    PROTECTED_FIELDS = [:_id, :parent_id, :level, :created_at, :updated_at, :content, :raw_text, :position, :grid_files]
 
     def content_in_html(key = "main", data={})
       if content = self.content.try(:[], key)
@@ -230,8 +222,12 @@ module Concen
 
     protected
 
-    def set_default_slug
-      self.default_slug = self.title.parameterize if self.title
+    def set_slug
+      if self.slug.blank?
+        self.slug = self.title.parameterize if self.title
+      else
+        self.slug = self.slug.parameterize
+      end
     end
 
     def set_position

data/concen.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email = ["steve.randy@gmail.com"]
   s.homepage = "https://github.com/steverandy/concen"
   s.summary = "Control and monitor Rails application."
-  s.description = "A Rails Engine to control and monitor Rails application from a web interface. It includes content capturing system, real-time traffic monitoring, and real-time performance monitoring. It’s built to be flexible and customizable."
+  s.description = "A Rails Engine to control and monitor Rails application from a web interface. It includes content capturing system, real-time traffic monitoring, and real-time performance monitoring. It's built to be flexible and customizable."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project = "concen"

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/test/support/raw_text/code_blocks.txt

@@ -14,6 +14,4 @@ Redcarpet is basically a Ruby wrapper of [Upskirt](https://github.com/tanoku/red
 
 To integrate Rercarpet and Haml in your Rails app, first add the Redcarpet gem in the `Gemfile`.
 
-```
-gem "redcarpet", "~> 1.17.2"
-```
+    gem "redcarpet", "~> 1.17.2"

data/test/support/raw_text/slug.txt

@@ -0,0 +1,3 @@
+Title: Something
+
+Slug: something-else

data/test/support/raw_text/title.txt

@@ -0,0 +1 @@
+Title: Something New

data/test/unit/grid_file_test.rb

@@ -36,6 +36,6 @@ class GridFileTest < ActiveSupport::TestCase
     page = Fabricate "concen/page"
     grid_file = page.grid_files.build
     grid_file.store File.read("#{Rails.root}/public/404.html"), "404.html"
-    assert grid_file.filename.include?(grid_file.id.to_s), "Filename does not include grid_file id."
+    assert grid_file.filename.include?(grid_file.grid_id.to_s), "Filename does not include grid_id."
   end
 end

data/test/unit/page_test.rb

@@ -60,10 +60,21 @@ class PageTest < ActiveSupport::TestCase
     assert_equal page.content_in_html, File.read("#{File.dirname(__FILE__)}/../support/raw_text/code_blocks.html")
   end
 
-  test "should have default_slug" do
-    page = Fabricate "concen/page"
-    assert_not_nil page.default_slug
-    assert page.default_slug.length > 0
+  test "should have slug automatically generated" do
+    page1 = Fabricate "concen/page", :title => "Something New"
+    assert_equal page1.slug, "something-new"
+
+    page2 = Fabricate.build "concen/page", :title => nil
+    page2.raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/title.txt"
+    page2.save
+    assert_equal page2.slug, "something-new"
+  end
+
+  test "should be able to set slug from raw_text" do
+    page = Fabricate.build "concen/page", :title => nil
+    page.raw_text = File.read "#{File.dirname(__FILE__)}/../support/raw_text/slug.txt"
+    page.save
+    assert_equal page.slug, "something-else"
   end
 
   test "should not be created without title" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-22 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70288294752920 !ruby/object:Gem::Requirement
+  requirement: &70272212467340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.11.5
   type: :development
   prerelease: false
-  version_requirements: *70288294752920
+  version_requirements: *70272212467340
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70288294752460 !ruby/object:Gem::Requirement
+  requirement: &70272212466880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70288294752460
+  version_requirements: *70272212466880
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70288294752000 !ruby/object:Gem::Requirement
+  requirement: &70272212466420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70288294752000
+  version_requirements: *70272212466420
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70288294751540 !ruby/object:Gem::Requirement
+  requirement: &70272212465960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0b3
   type: :runtime
   prerelease: false
-  version_requirements: *70288294751540
+  version_requirements: *70272212465960
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70288294751080 !ruby/object:Gem::Requirement
+  requirement: &70272212465500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70288294751080
+  version_requirements: *70272212465500
 - !ruby/object:Gem::Dependency
   name: mongo-rails-instrumentation
-  requirement: &70288294750620 !ruby/object:Gem::Requirement
+  requirement: &70272212465040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70288294750620
+  version_requirements: *70272212465040
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70288294750160 !ruby/object:Gem::Requirement
+  requirement: &70272212464580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70288294750160
+  version_requirements: *70272212464580
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70288294749700 !ruby/object:Gem::Requirement
+  requirement: &70272212464120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70288294749700
+  version_requirements: *70272212464120
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70288294749240 !ruby/object:Gem::Requirement
+  requirement: &70272212463660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70288294749240
+  version_requirements: *70272212463660
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70288294748780 !ruby/object:Gem::Requirement
+  requirement: &70272212463200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70288294748780
+  version_requirements: *70272212463200
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70288294748320 !ruby/object:Gem::Requirement
+  requirement: &70272212462740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 2.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70288294748320
+  version_requirements: *70272212462740
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70288294747860 !ruby/object:Gem::Requirement
+  requirement: &70272212462280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70288294747860
+  version_requirements: *70272212462280
 description: A Rails Engine to control and monitor Rails application from a web interface.
   It includes content capturing system, real-time traffic monitoring, and real-time
-  performance monitoring. It’s built to be flexible and customizable.
+  performance monitoring. It's built to be flexible and customizable.
 email:
 - steve.randy@gmail.com
 executables: []
@@ -380,10 +380,12 @@ files:
 - test/support/raw_text/code_blocks.txt
 - test/support/raw_text/multi_content.html
 - test/support/raw_text/multi_content.txt
+- test/support/raw_text/slug.txt
 - test/support/raw_text/smartypants.html
 - test/support/raw_text/smartypants.txt
 - test/support/raw_text/smartypants_escape.html
 - test/support/raw_text/smartypants_escape.txt
+- test/support/raw_text/title.txt
 - test/test_helper.rb
 - test/unit/concen_test.rb
 - test/unit/grid_file_test.rb
@@ -452,10 +454,12 @@ test_files:
 - test/support/raw_text/code_blocks.txt
 - test/support/raw_text/multi_content.html
 - test/support/raw_text/multi_content.txt
+- test/support/raw_text/slug.txt
 - test/support/raw_text/smartypants.html
 - test/support/raw_text/smartypants.txt
 - test/support/raw_text/smartypants_escape.html
 - test/support/raw_text/smartypants_escape.txt
+- test/support/raw_text/title.txt
 - test/test_helper.rb
 - test/unit/concen_test.rb
 - test/unit/grid_file_test.rb