sinatra-pages 1.5.2 → 1.5.3

data/README.markdown

@@ -151,7 +151,7 @@ The following sites are proudly using this extension:
 If your site is also using this extension, please let us know!
 
 ### Notes
-This extension have been tested on the versions 1.8.6, 1.8.7 and 1.9.1 of the [Ruby interpreter][8].
+This extension have been tested on [MRI][8] 1.8.6, 1.8.7, 1.9.1 and 1.9.2.
 
 ### License
 This extension is licensed under the [MIT License][9].

data/lib/sinatra/pages.rb

@@ -16,7 +16,7 @@ module Sinatra
       app.set :stylesheet, :scss
       app.set :cache, :write
       app.set :format, :tidy
-      app.set :encoding, :utf8
+      app.set :encoding, :utf8 if RUBY_VERSION.to_f > 1.8
       app.disable :escaping
       
       app.configure do
@@ -75,11 +75,13 @@ module Sinatra
           options[:read_cache] = true if settings.cache == :read
       end
       
-      options[:encoding] = case settings.encoding
-        when :utf8 then 'utf-8'
-        when :utf16 then 'utf-16'
-        when :utf32 then 'utf-32'
-        when :ascii then 'ascii-8bits'
+      if RUBY_VERSION.to_f > 1.8
+        options[:encoding] = case settings.encoding
+          when :utf8 then 'utf-8'
+          when :utf16 then 'utf-16'
+          when :utf32 then 'utf-32'
+          when :ascii then 'ascii-8bits'
+        end
       end
       
       options

data/spec/pages_spec.rb

@@ -65,7 +65,12 @@ describe Sinatra::Pages do
       its(:html) {should == :v5}
       its(:format) {should == :tidy}
       its(:escaping) {should == false}
-      its(:haml) {should == {:format => :html5, :ugly => false, :escape_html => false}}
+      if RUBY_VERSION.to_f > 1.8
+        its(:encoding) {should == :utf8}
+        its(:haml) {should == {:format => :html5, :ugly => false, :escape_html => false, :encoding => 'utf-8'}}
+      else
+        its(:haml) {should == {:format => :html5, :ugly => false, :escape_html => false}}
+      end
     end
     
     context 'on defining' do
@@ -99,16 +104,37 @@ describe Sinatra::Pages do
           it {subject.haml[:escape_html].should == escaping}
         end
       end
+      
+      if RUBY_VERSION.to_f > 1.8
+        [:utf8, :utf16, :utf32, :ascii].each do |encoding|
+          context '#encoding' do
+            subject {app.set :encoding, encoding}
+            its(:encoding) {should == encoding}
+            case encoding
+            when :utf8 then it {subject.haml[:encoding].should == 'utf-8'}
+            when :utf16 then it {subject.haml[:encoding].should == 'utf-16'}
+            when :utf32 then it {subject.haml[:encoding].should == 'utf-32'}
+            when :ascii then it {subject.haml[:encoding].should == 'ascii-8bits'}
+            end
+          end
+        end
+      end
     end
   end
   
   context 'SASS settings' do
     context 'by default' do
+      before {app.set :encoding, :utf8}
       subject {app}
       its(:stylesheet) {should == :scss}
       its(:format) {should == :tidy}
       its(:cache) {should == :write}
-      its(:sass) {should == {:style => :expanded, :syntax => :scss, :cache => true}}
+      if RUBY_VERSION.to_f > 1.8
+        its(:encoding) {should == :utf8}
+        its(:sass) {should == {:style => :expanded, :syntax => :scss, :cache => true, :encoding => 'utf-8'}}
+      else
+        its(:sass) {should == {:style => :expanded, :syntax => :scss, :cache => true}}
+      end
     end
     
     context 'on defining' do
@@ -148,6 +174,21 @@ describe Sinatra::Pages do
           end
         end
       end
+      
+      if RUBY_VERSION.to_f > 1.8
+        [:utf8, :utf16, :utf32, :ascii].each do |encoding|
+          context '#encoding' do
+            subject {app.set :encoding, encoding}
+            its(:encoding) {should == encoding}
+            case encoding
+            when :utf8 then it {subject.sass[:encoding].should == 'utf-8'}
+            when :utf16 then it {subject.sass[:encoding].should == 'utf-16'}
+            when :utf32 then it {subject.sass[:encoding].should == 'utf-32'}
+            when :ascii then it {subject.sass[:encoding].should == 'ascii-8bits'}
+            end
+          end
+        end
+      end
     end
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-pages
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 1
   - 5
-  - 2
-  version: 1.5.2
+  - 3
+  version: 1.5.3
 platform: ruby
 authors: 
 - Julio Javier Cicchelli
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-10-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency