sinatra-pages 1.3.0 → 1.4.0

data/README.markdown

@@ -80,9 +80,18 @@ You can try your modular application by executing the following command in your
   
 In order to verify if you application is working, open your web browser with the address that will appear after the execution described above.
 
-### Customization
-This extension assumes the __:views__ and __:public__ configuration are located on the *./views* and *./public* directories respectively. In any case, you are able to change these values as required.
+### Built-in variables
+This extension have a default configuration that assumes the __:views__ and __:public__ configuration are located on the *./views* and *./public* directories respectively. As well, it preset the __:html__ version to use as *:v5*, the way to __:format__ the HTML code as *:tidy* and the HTML __:escaping__ is disabled by default.
+
+In any case, you are able to change these values as required.
 
+* __:views__ => <*Path to your views directory*>
+* __:public__ => <*Path to your public directory*>
+* __:html__ => [*:v4*, *:vX*, *:v5*]
+* __:format__ => [*:tidy*, *:ugly*]
+* __:escaping__ => [*true*, *false*]
+
+### Customization
 Depending on the kind of Sinatra application you're developing, you should proceed as follows. If you follow the __Classic__ approach, then you just need to set these configuration parameters in the *app.rb* file.
 
     require 'sinatra'

data/lib/sinatra/pages.rb

@@ -4,9 +4,16 @@ require 'haml'
 module Sinatra
   module Pages
     def self.registered(app)
-      app.set :root, Dir.pwd
-      app.enable :static
+      app.set :html, :v5
+      app.set :format, :tidy
+      app.disable :escaping
       
+      app.configure do
+        app.set :root, Dir.pwd
+        app.set :haml, Proc.new {setup(app)}
+        app.enable :static
+      end
+
       %w[/? /:page/? /*/:page/?].each do |route|
         app.get route do
           params[:page] = 'home' if params[:page].nil?
@@ -28,6 +35,22 @@ module Sinatra
         haml :not_found, :layout => !request.xhr?
       end
     end
+
+    private
+    
+    def setup(app)
+      options = {:format => nil, :ugly => nil, :escape_html => nil}
+
+      options[:ugly] = app.format == :ugly ? true : false
+      options[:escape_html] = app.escaping
+      options[:format] = case app.html
+        when :v5 then :html5
+        when :v4 then :html4
+        when :vX then :xhtml
+      end
+      
+      options
+    end
   end
   
   register Pages

data/spec/pages_spec.rb

@@ -46,6 +46,45 @@ describe Sinatra::Pages do
     end
   end
   
+  context 'HAML settings' do
+    context 'by default' do
+      subject {app}
+      its(:html) {should == :v5}
+      its(:format) {should == :tidy}
+      its(:escaping) {should == false}
+      its(:haml) {should == {:format => :html5, :ugly => false, :escape_html => false}}
+    end
+    
+    context 'on defining' do
+      before do
+        app.set :html, :v5
+        app.set :format, :tidy
+        app.disable :escaping
+      end
+      
+      [:v4, :vX].each do |value|
+        context '#html' do
+          subject {app.set :html, value}
+          its(:html) {should == value}
+          it {subject.haml[:format].should == (value == :v4 ? :html4 : :xhtml)}
+        end
+      end
+      
+      context '#format' do
+        subject {app.set :format, :ugly}
+        its(:format) {should == :ugly}
+        it {subject.haml[:ugly].should == true}
+      end
+      
+      context '#escaping' do
+        #subject {app.enable :escaping}
+        subject {app.set :escaping, true}
+        its(:escaping) {should == true}
+        it {subject.haml[:escape_html].should == true}
+      end
+    end
+  end
+  
   context 'on HTTP GET' do
     before :all do
       PAGES.each{|page| create_file_for(page, app.views)}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
+  - 4
   - 0
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Julio Javier Cicchelli
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +02:00
+date: 2010-08-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency