sinatra-pages 1.1.3 → 1.2.0

data/Rakefile

@@ -3,8 +3,6 @@ require 'rake/clean'
 require 'rake/gempackagetask'
 require 'spec/rake/spectask'
 
-GEM_COMMAND = RUBY_VERSION.to_f < 1.9 ? 'gem' : 'gem19'
-
 CLEAN.include %w[cov/ pkg/]
 
 desc 'Load the GemSpec definition file.'
@@ -19,7 +17,7 @@ end
 
 desc "Install the generated Gem into your system."
 task :install => [:clean, :package] do
-  sh "sudo #{GEM_COMMAND} install pkg/*.gem --no-ri --no-rdoc"
+  sh "gem install pkg/*.gem --no-ri --no-rdoc"
 end
 
 namespace :deployment do 
@@ -27,7 +25,7 @@ namespace :deployment do
   task :repositories do
     sh 'git checkout master'
     sh 'git merge development'
-    sh 'git push rock-n-code master --tags'
+    sh 'git push github master --tags'
     sh 'git push server master --tags'
     sh 'git checkout development'
   end
@@ -43,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[--colour --format profile --loadby mtime --reverse --timeout 20 --diff]
+  task.spec_opts = %w[--colour --format progress --loadby mtime --timeout 20 --diff --backtrace]
   task.libs = %w[lib spec]
   task.spec_files = FileList['spec/**/*.rb']
   task.rcov = false
@@ -51,7 +49,7 @@ end
 
 desc 'Functional testing with RSpec and RCov.'
 Spec::Rake::SpecTask.new :rcov do |task|
-  task.spec_opts = %w[--colour --format profile --loadby mtime --reverse --timeout 20 --diff]
+  task.spec_opts = %w[--colour --format progress --loadby mtime --timeout 20 --diff --backtrace]
   task.libs = %w[lib spec]
   task.spec_files = FileList['spec/*_spec.rb']
   task.rcov = true

data/lib/sinatra/pages.rb

@@ -4,7 +4,10 @@ require 'haml'
 module Sinatra
   module Pages
     def self.registered(app)
-      %w[/? /:page /*/:page].each do |route|
+      app.set :root, Dir.pwd
+      app.enable :static
+      
+      %w[/? /:page/? /*/:page/?].each do |route|
         app.get route do
           params[:page] = 'home' if params[:page].nil?
 

data/spec/helpers.rb

@@ -0,0 +1,21 @@
+require 'fileutils'
+
+module HelperMethods
+  def file_of(page)
+    page.downcase.gsub(' ', '_')
+  end
+
+  def separate(text)
+    text.chomp.split("\n")
+  end
+
+  def create_file_for(page, directory = 'views', content = [])
+    page_to_create = page.class == String ? page : page.keys.first
+    content << '= "#{params[:page]}"' if content.empty?
+
+    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
+end

data/spec/pages_spec.rb

@@ -2,34 +2,71 @@ require 'spec_helper'
 
 describe Sinatra::Pages do
   include Rack::Test::Methods
+  include HelperMethods
   
   def app
-    Sinatra::Application
+    TestApp
   end
 
-  PAGES = ['Home','Generic',{'Generic Test'=>'Test'},{'Another Generic Test'=>{'Generic Test'=>'Test'}},'Not Found']
-
   before :all do
     PAGES.each{|page| create_file_for(page)}
   end
   
-  context "uses HTTP GET request method" do
+  context 'built-in settings' do
+    context 'by default' do
+      subject {app}
+      its(:root) {should == Dir.pwd}
+      its(:public) {should == File.join(Dir.pwd, 'public')}
+      its(:views) {should == File.join(Dir.pwd, 'views')}
+      its(:static) {should == true} 
+    end
+
+    context 'on defining' do
+      before {app.set :root, Dir.pwd}
+      
+      context '#root' do
+        subject {app.set :root, File.dirname(__FILE__)}
+        its(:root) {should == File.dirname(__FILE__)}
+        its(:public) {should == File.join(File.dirname(__FILE__), 'public')}
+        its(:views) {should == File.join(File.dirname(__FILE__), 'views')}
+        its(:static) {should == true}
+      end
+
+      context '#public' do
+        subject {app.set :public, File.join(File.dirname(__FILE__), 'public')}
+        its(:root) {should == Dir.pwd}
+        its(:public) {should == File.join(File.dirname(__FILE__), 'public')}
+        its(:views) {should == File.join(Dir.pwd, 'views')}
+        its(:static) {should == true}
+      end
+
+      context '#views' do
+        subject {app.set :views, File.join(File.dirname(__FILE__), 'views')}
+        its(:root) {should == Dir.pwd}
+        its(:public) {should == File.join(Dir.pwd, 'public')}
+        its(:views) {should == File.join(File.dirname(__FILE__), 'views')}
+        its(:static) {should == true}
+      end
+    end
+  end
+  
+  context "on HTTP GET" do
     context "in synchronous mode" do
       context "with no Layout file" do
-        it "should render just the Home page if the given route is either empty or root." do
+        it "should render only the Home page if the given route is either empty or root." do
           File.exist?("views/#{file_of('Layout')}.haml").should be_false
           File.exist?("views/#{file_of('Home')}.haml").should be_true
 
           ['/', ''].each do |route|
             get route
-
+            
             last_request.should_not be_xhr
             last_response.should be_ok
             last_response.body.chomp.should == file_of('Home')
           end
         end
         
-        it "should render just an existing page if the given route match the '/:page' or '/*/:page' patterns." do
+        it "should render only 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?(file).should be_true
@@ -44,7 +81,7 @@ describe Sinatra::Pages do
           end
         end
         
-        it "should render just the Not Found page if a given route can't find its static page on 'views/'." do
+        it "should render only the Not Found page if a given route can't find its static page on 'views/'." do
           File.exist?("views/#{file_of('Layout')}.haml").should be_false
           File.exist?("views/#{file_of('Do Not Exist')}.haml").should be_false
 

data/spec/spec_helper.rb

@@ -1,25 +1,10 @@
-require 'sinatra'
-require 'rack/test'
-require 'fileutils'
 require File.join(Dir.pwd, %w{lib sinatra pages})
+require 'rack/test'
+require 'helpers'
 
-set :environment, :test
-set :views, "#{Dir.pwd}/views"
-
-def file_of(page)
-  page.downcase.gsub(' ', '_')
-end
-
-def separate(text)
-  text.chomp.split("\n")
-end
+ENV['RACK_ENV'] = 'test'
+PAGES = ['Home','Generic',{'Generic Test'=>'Test'},{'Another Generic Test'=>{'Generic Test'=>'Test'}},'Not Found']
 
-def create_file_for(page, directory = 'views', content = [])
-  page_to_create = page.class == String ? page : page.keys.first
-  content << '= "#{params[:page]}"' if content.empty?
-  
-  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
+class TestApp < Sinatra::Base
+  register Sinatra::Pages
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Julio Javier Cicchelli
@@ -9,59 +15,89 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 00:00:00 +01:00
+date: 2010-08-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.20
-    version: 
+        hash: 25
+        segments: 
+        - 3
+        - 0
+        - 15
+        version: 3.0.15
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.3
-    version: 
+        hash: 3
+        segments: 
+        - 0
+        - 5
+        - 4
+        version: 0.5.4
+  type: :development
+  version_requirements: *id005
 description: "    A Sinatra extension for static pages rendering.\n"
 email: javier@rock-n-code.com
 executables: []
@@ -75,6 +111,7 @@ files:
 - README.markdown
 - Rakefile
 - lib/sinatra/pages.rb
+- spec/helpers.rb
 - spec/pages_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -87,24 +124,35 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 17
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Sinatra extension for static pages rendering.
 test_files: 
+- spec/helpers.rb
 - spec/pages_spec.rb
 - spec/spec_helper.rb