qwerty 0.0.4.pre → 0.0.5.pre

data/app/controllers/documents_controller.rb

@@ -7,14 +7,14 @@ class DocumentsController < QwertyBaseController
   end
 
   def show
-    path = request.path == '/' ? '/home' : request.path
+    path = permalink_path || home_path || request.path
     @document = Document.public.find_by_permalink!(path)
     prepare_view_environment
     render locate_template(@document) 
   end
 
   private
-  
+
   def prepare_view_environment
     # e.g @blog
     instance_variable_set("@#{@document.node_name}", @document)
@@ -66,4 +66,12 @@ class DocumentsController < QwertyBaseController
     end
     raise NoTemplateFound
   end
+
+  def permalink_path
+    params[:permalink].present? ? '/' + params[:permalink] : nil
+  end
+
+  def home_path
+    request.path == '/' ? '/home' : nil
+  end
 end

data/lib/qwerty/version.rb

@@ -1,3 +1,3 @@
 module Qwerty
-  VERSION = "0.0.4.pre"
+  VERSION = "0.0.5.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qwerty
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
+  version: 0.0.5.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &2151902820 !ruby/object:Gem::Requirement
+  requirement: &2157591740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151902820
+  version_requirements: *2157591740
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &2151900280 !ruby/object:Gem::Requirement
+  requirement: &2157591300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151900280
+  version_requirements: *2157591300
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &2151899040 !ruby/object:Gem::Requirement
+  requirement: &2157590820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151899040
+  version_requirements: *2157590820
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &2151897940 !ruby/object:Gem::Requirement
+  requirement: &2157590380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151897940
+  version_requirements: *2157590380
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2151897020 !ruby/object:Gem::Requirement
+  requirement: &2157589820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151897020
+  version_requirements: *2157589820
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &2151896020 !ruby/object:Gem::Requirement
+  requirement: &2157589400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151896020
+  version_requirements: *2157589400
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2151895300 !ruby/object:Gem::Requirement
+  requirement: &2157588980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151895300
+  version_requirements: *2157588980
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2151894500 !ruby/object:Gem::Requirement
+  requirement: &2157588460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2151894500
+  version_requirements: *2157588460
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2151893580 !ruby/object:Gem::Requirement
+  requirement: &2157587960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *2151893580
+  version_requirements: *2157587960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151892840 !ruby/object:Gem::Requirement
+  requirement: &2157587440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151892840
+  version_requirements: *2157587440
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2151891940 !ruby/object:Gem::Requirement
+  requirement: &2157586980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151891940
+  version_requirements: *2157586980
 description: The core functionality on which to build a fully featured Content Management
   System using Rails 3
 email:
@@ -576,6 +576,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1995161888139260598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: