fancyviews 0.5 → 1.0

data/Rakefile

@@ -2,10 +2,10 @@ gem "sr-mg", "0.0.2"
 
 task :default => :test
 
-desc "Run tests"
+desc "Run example test app"
 task :test do
   dir = File.dirname(__FILE__)
-  system "cd #{dir} && ruby test/test.rb -p 2222 "
+  system "cd #{dir} && ruby test/test.rb -p 2222"
 end
 
 begin

data/fancyviews.gemspec

@@ -1,6 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "fancyviews"
-  s.version  = "0.5"
+  s.rubyforge_project = 'fancyviews'
+  s.version  = "1.0"
   s.summary  = "Fancy Views"
   s.description  = "Fancy Views"
   s.email    = "myles@myles.id.au"
@@ -14,4 +15,5 @@ lib/sinatra/fancyviews.rb
 test/test.rb
 ]
   s.add_dependency("sinatra", [">= 0.9.1.1"])
+  s.add_dependency("haml", [">= 2.2"])
 end

data/lib/sinatra/fancyviews.rb

@@ -4,16 +4,61 @@ require 'sass'
 
 module Sinatra
   
-  module FancyViews
+  module StyleFilter
+    include Haml::Filters::Base
+
+    def compile(precompiler, text)
+      precompiler.send :push_silent, %(fancyviews.include_style(fancyviews.view_name, #{text.inspect}))
+    end
+  end
+  Haml::Filters.defined['style'] = StyleFilter
+  
+  module ScriptFilter
+    include Haml::Filters::Base
+
+    def compile(precompiler, text)
+      precompiler.send :push_silent, %(fancyviews.include_script(fancyviews.view_name, #{text.inspect}))
+    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
+
+    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 = {})
-      parent_view = @view_name
-      @view_name = name.to_s
+      parent_view = fancyviews.view_name.to_s
+      fancyviews.view_name = name.to_s
       options[:layout] = false unless options.has_key?(:layout)
       rendered = haml(name, options)
-      @view_name = parent_view
+      fancyviews.view_name = parent_view
       rendered
     end
     
@@ -23,70 +68,33 @@ module Sinatra
       view(name, options)
     end
     
-    # use the :styles filter to define styles and the `styles` method to
-    # render them
-    
+    # renders all the styles captured by the :style filter
     def styles(options = {})
       imported = options.has_key?(:import) ?
         File.read("#{self.options.views}/#{options[:import]}.sass") : ''
 
-      rendered_styles = 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)
         "\n/* -- #{name} -- */\n" + eng.render
       end.join
       
-      capture_haml { haml_tag(:style, rendered_styles, :type => 'text/css') }.strip
+      capture_haml { haml_tag(:style, rendered_styles) }.strip
     end
     
-    def script
-      scripts = included_scripts.map do |name, js|
+    # renders all the scripts captured by the :script filter
+    def scripts
+      scripts = fancyviews.included_scripts.map do |name, js|
         "\n/* -- #{name} -- */\n" + js
       end.join
-      capture_haml { haml_tag(:script, scripts, :type => 'text/javascript') }.strip
-    end
-    
-    # private
-    
-    def view_name
-      @view_name
-    end
-    
-    module StyleFilter
-      include Haml::Filters::Base
-
-      def compile(precompiler, text)
-        precompiler.send :push_silent, %(include_style(view_name, #{text.inspect}))
-      end
-    end
-    Haml::Filters.defined['styles'] = StyleFilter
-    
-    module ScriptFilter
-      include Haml::Filters::Base
-
-      def compile(precompiler, text)
-        precompiler.send :push_silent, %(include_script(view_name, #{text.inspect}))
-      end
-    end
-    Haml::Filters.defined['script'] = ScriptFilter
-    
-    def include_style(name, sass)
-      included_styles << [name, sass] unless included_styles.detect { |s| s == [name, sass] }
-    end
-
-    def included_styles
-      @included_styles ||= []
+      capture_haml { haml_tag(:script, scripts) }.strip
     end
     
-    def include_script(name, js)
-      included_scripts << [name, js] unless included_scripts.detect { |s| s == [name, js] }
+    def fancyviews
+      @fancyviews ||= FancyViews.new(self)
     end
-
-    def included_scripts
-      @included_scripts ||= []
-    end
-    
+  
   end
 
-  helpers FancyViews
+  helpers FancyHelpers
 end

data/test/test.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'sinatra'
-require File.dirname(__FILE__) + '/../lib/fancyviews'
+require File.dirname(__FILE__) + '/../lib/sinatra/fancyviews'
+
+set :haml, :format => :html5
 
 get('/') { page :home }
 
@@ -8,32 +10,39 @@ __END__
 
 @@layout
 !!!
-%html
-  %head
-    %title FancyTest
-    = styles
-  %body
-    = yield
-    = script
+%head
+  %title FancyTest
+  = styles
+%body
+  = yield
+  = scripts
 
 @@home
-:styles
+:style
   #fancydiv
-    :background red
-    :color white
-
-:script
-  alert('hello');
+    :border 10px solid goldenrod
+    :position fixed
+    :top 20%
+    :left 50%
+    :width 600px
+    :margin-left -300px
+    :cursor pointer
 
-#fancydiv red
-= view :some_partial
+#fancydiv= view :some_partial
+  
 
 @@some_partial
-:styles
-  #partial
-    :background blue
+:style
+  #fancy
+    :font-family Helvetica
+    :font-size 200px
+    :font-weight bold
+    :color black
+    :margin 0
+    :padding 10px
+    :letter-spacing -4px
 
 :script
-  alert('partial')
+  document.getElementById('fancy').onclick = function() { alert('Fancy click') } 
 
-#partial this is a partial
+%h1#fancy Oooh! Fancy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fancyviews
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "1.0"
 platform: ruby
 authors: 
 - Myles Byrne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 +10:00
+date: 2009-08-11 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.2"
+    version: 
 description: Fancy Views
 email: myles@myles.id.au
 executables: []
@@ -56,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: fancyviews
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2