sinatra-pages 0.7.4 → 0.8.0

data/README.markdown

@@ -1,5 +1,5 @@
 # Sinatra Pages
-This is a [Sinatra Extension][1] that renders any page located under the *views/* directory inside your [Sinatra][2] application.
+This is a [Sinatra Extension][1] that renders any page or sub-pages located under the *views/* directory inside your [Sinatra][2] application.
 
 ### Installation
 In order to install this gem, you just need to install the gem from your command line like this:
@@ -18,9 +18,16 @@ Before plug in this extension, you should create the following file structure in
      |- config.ru
      |- views/
           |- home.haml
+          |- a_file.haml
+          |- another_file.haml
+          |- another_file/yet_another_file.haml
+          |- another_file/yet_another_file/still_another_file.haml
+          |- ...more file and subdirectories...
           |- layout.haml
           |- not_found.haml
 
+The only restriction is extension imposes is that you have to create the *home.haml* and the *not_found.haml* files inside your *views/* directory. Then you're free to add any page under any file structure hierarchy inside this directory.
+
 Then, you just need to plug it in inside your *config.ru* file.
 
     require 'sinatra'
@@ -49,7 +56,7 @@ In case you would like to contribute on this library, here's the list of extra d
 * [Julio Javier Cicchelli][7]
 
 ### Notes
-This library is being developed by using the [Ruby 1.9.1 interpreter][8] and was not being tested on any other version of the interpreter.
+This library is being developed by using the [Ruby 1.9.1 interpreter][8] and was not being tested on any other version of the interpreter nor any other implementation.
 
 ### License
 This extension is licensed under the [MIT License][9].

data/Rakefile

@@ -17,7 +17,7 @@ end
 
 desc "Install the generated Gem into your system."
 task :install => [:clean, :package] do
-  sh 'gem19 install pkg/*.gem --no-ri --no-rdoc'
+  sh 'sudo gem19 install pkg/*.gem --no-ri --no-rdoc'
 end
 
 namespace :deployment do 
@@ -41,7 +41,7 @@ task :deploy => ['deployment:repositories', 'deployment:gemcutter']
 
 desc 'Functional testing with RSpec.'
 Spec::Rake::SpecTask.new :spec do |task|
-  task.spec_opts = %w[--options spec/opts/spec.opts]
+  task.spec_opts = %w[--colour --format profile --loadby mtime --reverse --timeout 20 --diff]
   task.libs = %w[lib spec]
   task.spec_files = FileList['spec/**/*.rb']
   task.rcov = false
@@ -49,11 +49,12 @@ end
 
 desc 'Functional testing with RSpec and RCov.'
 Spec::Rake::SpecTask.new :rcov do |task|
-  task.spec_opts = %w[--options spec/opts/spec.opts]
+  task.spec_opts = %w[--colour --format profile --loadby mtime --reverse --timeout 20 --diff]
   task.libs = %w[lib spec]
   task.spec_files = FileList['spec/*_spec.rb']
   task.rcov = true
-  task.rcov_opts = IO.readlines('spec/opts/rcov.opts').each{|line| line.chomp!}
+  task.rcov_dir = 'cov'
+  task.rcov_opts = %w[--text-summary --exclude spec/]
 end
 
 desc "Default is Functional testing with RSpec."

data/lib/sinatra/pages.rb

@@ -3,12 +3,15 @@ require 'haml'
 
 module Sinatra
   class Pages < Sinatra::Base
-    %w[/? /:page].each do |route|
+    %w[/? /:page /*/:page].each do |route|
       get route do
         params[:page] = 'home' if params[:page].nil?
         
+        page_to_render = params[:splat].nil? ? '' : "#{params[:splat].first}/"
+        page_to_render << params[:page]
+        
         begin
-          haml params[:page].to_sym
+          haml page_to_render.to_sym
         rescue Errno::ENOENT
           halt 404
         end

data/spec/pages_spec.rb

@@ -7,14 +7,18 @@ describe Sinatra::Pages do
     Sinatra::Pages
   end
 
-  PAGES = ['Home', 'Generic', 'Generic Test', 'Another Generic Test', 'Not Found']
+  PAGES = ['Home','Generic',{'Generic Test'=>'Test'},{'Another Generic Test'=>{'Generic Test'=>'Test'}},'Not Found']
 
   file_of = ->(page){page.downcase.gsub ' ', '_'}
   separate = ->(text){text.chomp.split("\n")}
-  create_file_for = ->(page, content=[]) do 
+  create_file_for = ->(page, directory = 'views', content = []) do 
+    page_to_create = page.class == String ? page : page.keys.first
     content << '= "#{params[:page]}"' if content.empty?
     
-    File.open("views/#{file_of.(page)}.haml", 'w') {|file| content.each{|line| file.puts line}}
+    Dir.mkdir directory unless File.exist? "#{directory}/"
+    File.open("#{directory}/#{file_of.(page_to_create)}.haml", 'w'){|file| content.each{|line| file.puts line}}
+    
+    create_file_for.(page.values.first, "#{directory}/#{file_of.(page.keys.first)}") if page.class == Hash
   end
     
   before :all do
@@ -36,15 +40,17 @@ describe Sinatra::Pages do
         end
       end
 
-      it "should render just an existing page if the given route match the '/:page' pattern." do
-        PAGES.each do |page|
+      it "should render just an existing page if the given route match the '/:page' or '/*/:page' patterns." do
+        Dir.glob 'views/**/*.haml' do |file|
           File.exist?("views/#{file_of.('Layout')}.haml").should be_false
-          File.exist?("views/#{file_of.(page)}.haml").should be_true
+          File.exist?(file).should be_true
+          
+          directory = File.dirname(file)[5].nil? ? '' : File.dirname(file)[5, File.dirname(file).size]
 
-          get "/#{file_of.(page)}"
+          get "#{directory}/#{File.basename(file, '.haml')}"
 
           last_response.should be_ok
-          last_response.body.chomp.should == file_of.(page)
+          last_response.body.chomp.should == File.basename(file, '.haml')
         end
       end
 
@@ -61,7 +67,7 @@ describe Sinatra::Pages do
     
     context "with a Layout file" do
       before :all do
-        create_file_for.('Layout', ['Layout', '= yield'])
+        create_file_for.('Layout', 'views', ['Layout', '= yield'])
       end
       
       it "should render both the Layout and Home page if the given route is either empty or root." do
@@ -77,16 +83,18 @@ describe Sinatra::Pages do
         end
       end
 
-      it "should render both the Layout and an existing page if the given route match the '/:page' pattern." do
-        PAGES.each do |page|
+      it "should render both the Layout and an existing page if the given route match the '/:page' or '/*/:page' patterns." do
+        Dir.glob('views/**/*.haml').reject{|file| file =~ /layout/}.each do |file|
           File.exist?("views/#{file_of.('Layout')}.haml").should be_true
-          File.exist?("views/#{file_of.(page)}.haml").should be_true
-
-          get "/#{file_of.(page)}"
+          File.exist?(file).should be_true
+          
+          directory = File.dirname(file)[5].nil? ? '' : File.dirname(file)[5, File.dirname(file).size]
+          
+          get "#{directory}/#{File.basename(file, '.haml')}"
 
           last_response.should be_ok
           separate.(last_response.body).first.should == 'Layout'
-          separate.(last_response.body).last.should == file_of.(page)
+          separate.(last_response.body).last.should == File.basename(file, '.haml')
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Julio Javier Cicchelli
@@ -68,16 +68,13 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
-- LICENSE
+extra_rdoc_files: []
+
 files: 
 - LICENSE
 - README.markdown
 - Rakefile
 - lib/sinatra/pages.rb
-- spec/opts/rcov.opts
-- spec/opts/spec.opts
 - spec/pages_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -85,14 +82,8 @@ homepage: http://github.com/rock-n-code/sinatra-pages
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --title
-- Sinatra-Pages
-- --main
-- README.markdown
-- --line-numbers
-- --inline-source
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/spec/opts/rcov.opts

@@ -1,5 +0,0 @@
---text-summary
---exclude
-spec/
---output
-coverage

data/spec/opts/spec.opts

@@ -1,9 +0,0 @@
---colour
---format
-profile
---loadby
-mtime
---reverse
---timeout
-20
---diff