fancyviews 1.4.0 → 1.4.2

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.2

data/fancyviews.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fancyviews}
-  s.version = "1.4.0"
+  s.version = "1.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Myles Byrne"]
-  s.date = %q{2009-11-11}
+  s.date = %q{2009-12-16}
   s.email = %q{myles@myles.id.au}
   s.extra_rdoc_files = [
     "README.markdown"

data/lib/sinatra/fancyviews.rb

@@ -3,7 +3,7 @@ require 'haml'
 require 'sass'
 
 module Sinatra
-  
+
   module StyleFilter
     include Haml::Filters::Base
 
@@ -12,7 +12,7 @@ module Sinatra
     end
   end
   Haml::Filters.defined['style'] = StyleFilter
-  
+
   module ScriptFilter
     include Haml::Filters::Base
 
@@ -21,24 +21,24 @@ module Sinatra
     end
   end
   Haml::Filters.defined['script'] = ScriptFilter
-  
+
   class FancyViews
-    
+
     # current view
     attr_accessor :view_name
-    
+
     def initialize(app)
       @app = app
     end
-    
+
     def include_style(name, sass)
       included_styles << [name, sass] unless included_styles.detect { |s| s == [name, sass] }
     end
-    
+
     def included_styles
       @included_styles ||= []
     end
-    
+
     def include_script(name, js)
       included_scripts << [name, js] unless included_scripts.detect { |s| s == [name, js] }
     end
@@ -46,11 +46,11 @@ module Sinatra
     def included_scripts
       @included_scripts ||= []
     end
-    
+
   end
-  
+
   module FancyHelpers
-    
+
     # use this instead of `haml` when rendering a template, unlike the haml
     # method, layout is false by default
     def view(name, options = {})
@@ -61,23 +61,22 @@ module Sinatra
       fancyviews.view_name = parent_view
       rendered
     end
-    
+
     # same as `view` but has layout by default
     def page(name, options = {})
       options[:layout] = true unless options.has_key?(:layout)
       view(name, options)
     end
-    
+
     # renders all the styles captured by the :style filter
     def styles(options = {})
       imported = if options[:import]
         [*options[:import]].map { |name| File.read("#{self.options.views}/#{name}.sass") }.join("\n")
       end
 
-      rendered_styles = fancyviews.included_styles.map do |name, sass| 
+      rendered_styles = fancyviews.included_styles.map do |name, sass|
         # would be nice if construction took an :offest to go along with the :filename
         eng = Sass::Engine.new((imported || '') + "\n" + sass,
-                               :attribute_syntax => :normal,
                                :load_paths => [self.options.views])
         "\n/* -- #{name} -- */\n" + eng.render
       end.join
@@ -97,7 +96,7 @@ module Sinatra
         "\n/* -- #{name} -- */\n" + js
       end.join)
     end
-    
+
     def script_tag(scripts)
       capture_haml do
         haml_tag(:script, scripts, :type => ("text/javascript" if haml_format != :html5))
@@ -105,13 +104,13 @@ module Sinatra
     end
 
     def haml_format
-      (options.haml && options.haml[:format]) || :xhtml
+      (options.member?(:haml) && options.haml[:format]) || :xhtml
     end
-    
+
     def fancyviews
       @fancyviews ||= FancyViews.new(self)
     end
-  
+
   end
 
   helpers FancyHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fancyviews
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors: 
 - Myles Byrne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +11:00
+date: 2009-12-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency