sinatra-pages 1.5.0 → 1.5.1

data/Rakefile

@@ -47,15 +47,5 @@ Spec::Rake::SpecTask.new :spec do |task|
   task.rcov = false
 end
 
-desc 'Functional testing with RSpec and RCov.'
-Spec::Rake::SpecTask.new :rcov do |task|
-  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
-  task.rcov_dir = 'cov'
-  task.rcov_opts = %w[--text-summary --exclude spec/]
-end
-
 desc "Default is Functional testing with RSpec."
 task :default => [:spec]

data/lib/sinatra/pages.rb

@@ -10,7 +10,7 @@ module Sinatra
         app.enable :static
       end
 
-      app.set :pages, Proc.new {File.join app.root, %w[pages]}
+      app.set :pages, Proc.new {app.views}
       app.set :styles, Proc.new {find_styles_directory app.public}
       app.set :html, :v5
       app.set :stylesheet, :scss
@@ -23,23 +23,13 @@ module Sinatra
         app.set :sass, Proc.new {generate_setup :sass, app}
       end
       
-      unless app.stylesheet == :css
-        app.get '/*.css' do
-          content_type :css, :charset => 'utf-8'
+      app.condition {app.stylesheet != :css}
+      app.get '/*.css' do
+        content_type :css, :charset => 'utf-8'
 
-          sass File.basename(params[:splat].first).to_sym, :views => settings.styles
-        end
+        sass File.basename(params[:splat].first).to_sym, :views => settings.styles
       end
-      
-      app.before do
-        unless settings.views == settings.pages
-          unless File.exist?(File.join settings.views, settings.pages.split('/').last)
-            FileUtils.ln_s settings.pages, settings.views \
-              if (File.exist?(settings.views) && File.exist?(settings.pages))
-          end
-        end
-      end
-      
+
       %w[/? /:page/? /*/:page/?].each do |route|
         app.get route do
           params[:page] = 'home' if params[:page].nil?

data/spec/pages_spec.rb

@@ -14,7 +14,7 @@ describe Sinatra::Pages do
       its(:root) {should == Dir.pwd}
       its(:public) {should == File.join(Dir.pwd, 'public')}
       its(:views) {should == File.join(Dir.pwd, 'views')}
-      its(:pages) {should == File.join(Dir.pwd, 'pages')}
+      its(:pages) {should == File.join(Dir.pwd, 'views')}
       its(:static) {should == true} 
     end
 
@@ -26,7 +26,7 @@ describe Sinatra::Pages do
         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(:pages) {should == File.join(File.dirname(__FILE__), 'pages')}
+        its(:pages) {should == File.join(File.dirname(__FILE__), 'views')}
         its(:static) {should == true}
       end
 
@@ -35,26 +35,25 @@ describe Sinatra::Pages do
         its(:root) {should == Dir.pwd}
         its(:public) {should == File.join(File.dirname(__FILE__), 'public')}
         its(:views) {should == File.join(Dir.pwd, 'views')}
-        its(:pages) {should == File.join(Dir.pwd, 'pages')}
+        its(:pages) {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(:public) {should == File.join(File.dirname(__FILE__), 'public')}
         its(:views) {should == File.join(File.dirname(__FILE__), 'views')}
-        its(:pages) {should == File.join(Dir.pwd, 'pages')}
+        its(:pages) {should == File.join(File.dirname(__FILE__), 'views')}
         its(:static) {should == true}
       end
       
       context '#pages' do
-        before {app.set :root, Dir.pwd}
-        subject {app.set :pages, File.join(File.dirname(__FILE__), 'pages')}
+        subject {app.set :pages, File.join(app.views, 'pages')}
         its(:root) {should == Dir.pwd}
-        its(:public) {should == File.join(Dir.pwd, 'public')}
-        its(:views) {should == File.join(Dir.pwd, 'views')}
-        its(:pages) {should == File.join(File.dirname(__FILE__), 'pages')}
+        its(:public) {should == File.join(File.dirname(__FILE__), 'public')}
+        its(:views) {should == File.join(File.dirname(__FILE__), 'views')}
+        its(:pages) {should == File.join(app.views, 'pages')}
         its(:static) {should == true}
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Julio Javier Cicchelli
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 1
-        - 0
         - 1
-        version: 1.0.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 45
         segments: 
         - 3
         - 0
-        - 15
-        version: 3.0.15
+        - 21
+        version: 3.0.21
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -82,38 +82,22 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 0
         - 5
-        - 4
-        version: 0.5.4
+        - 6
+        version: 0.5.6
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: "    A Sinatra extension for static pages rendering using the HAML rendering engine.\n"
 email: javier@rock-n-code.com
 executables: []