merb_viewfu 0.3.4 → 0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_viewfu"
-GEM_VERSION = "0.3.4"
+GEM_VERSION = "0.5"
 AUTHOR = "Jacques Crocker"
 EMAIL = "merbjedi@gmail.com"
 HOMEPAGE = "http://merbjedi.com/"

data/lib/merb_viewfu.rb

@@ -1,6 +1,5 @@
 require "view_fu/tag_helper"
 require "view_fu/meta_helper"
-
 require "browser_detect/helper"
 require "headliner/helper"
 
@@ -8,12 +7,18 @@ require "headliner/helper"
 if defined?(Merb::Plugins)
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
-  Merb::Plugins.config[:viewfu] = {}
+  Merb::Plugins.config[:viewfu] = {
+    :tags => true,
+    :meta => true,    
+    :headliner => true,
+    :browser_detect => true
+  }
   
-  Merb::BootLoader.before_app_loads do
-    Merb::Controller.send(:include, ViewFu::MetaHelper)
-    Merb::Controller.send(:include, ViewFu::TagHelper)
-    Merb::Controller.send(:include, Headliner::Helper)
-    Merb::Controller.send(:include, BrowserDetect::Helper)
+  Merb::BootLoader.after_app_loads do
+    Merb::Plugins.config[:viewfu] ||= {}
+    Merb::Controller.send(:include, ViewFu::MetaHelper) if Merb::Plugins.config[:viewfu][:meta]
+    Merb::Controller.send(:include, ViewFu::TagHelper) if Merb::Plugins.config[:viewfu][:tags]
+    Merb::Controller.send(:include, Headliner::Helper) if Merb::Plugins.config[:viewfu][:headliner]
+    Merb::Controller.send(:include, BrowserDetect::Helper) if Merb::Plugins.config[:viewfu][:browser_detect]
   end
 end

data/lib/view_fu/tag_helper.rb

@@ -43,7 +43,7 @@ module ViewFu
     #
     # Now you can use the alternate layout in any of your views as normal 
     # and it will reuse the wrapping html on application.html.erb
-    def parent_layout
+    def parent_layout(layout, &block)
       render capture(&block), :layout => layout
     end
     
@@ -129,19 +129,15 @@ module ViewFu
     def add_class(css_class, options = {})
       return {} unless css_class
       
-      unless options[:unless].nil?
-        if options[:unless]
-          return {}
-        end
+      if options.has_key?(:unless) && options[:unless]
+        return {}
       end
       
-      unless options[:if].nil?
-        if options[:if]
-          return {:class => css_class}
-        end
+      if options.has_key?(:if) && options[:if]
+        return {:class => css_class}
       end
       
-      if options[:if].nil? and options[:unless].nil?
+      if !options.has_key?(:if) and !options.has_key?(:unless)
         {:class => css_class}
       else
         {}
@@ -158,16 +154,12 @@ module ViewFu
   
     # Return a hidden attribute hash (useful in Haml tags - %div{hidden})
     def hide(options = {})
-      unless options[:unless].nil?
-        if options[:unless]
-          return {}
-        end
+      if options.has_key?(:unless) && options[:unless]
+        return {}
       end
       
-      unless options[:if].nil?
-        unless options[:if]
-          return {}
-        end
+      if options.has_key?(:if) && !options[:if]
+        return {}
       end
       
       {:style => "display:none"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_viewfu
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: "0.5"
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-20 00:00:00 -07:00
+date: 2010-01-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,17 +35,16 @@ files:
 - LICENSE
 - README
 - Rakefile
-- lib/browser_detect
 - lib/browser_detect/helper.rb
-- lib/headliner
 - lib/headliner/helper.rb
 - lib/headliner/README
 - lib/merb_viewfu.rb
-- lib/view_fu
 - lib/view_fu/meta_helper.rb
 - lib/view_fu/tag_helper.rb
 has_rdoc: true
 homepage: http://merbjedi.com/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -66,9 +65,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: merb
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: View Helpers for Title, Meta tags, Browser Detect, and Common Tag Helpers
 test_files: []