merb_viewfu 0.3.2 → 0.3.3

data/Rakefile

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

data/lib/view_fu/tag_helper.rb

@@ -114,42 +114,76 @@ module ViewFu
     def lorem
       "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
     end
-  
-    # Return a hidden attribute hash (useful in Haml tags - %div{hidden})
-    def hidden
-      {:style => "display:none"}
-    end
     
-    def add_class_if(css_class, condition)
-      if condition
+    # provides a slick way to add classes inside haml attribute collections
+    # 
+    # examples:
+    #   %div{add_class("current")} 
+    #   #=> adds the "current" class to the div
+    #   
+    #   %div{add_class("current", :if => current?)} 
+    #   #=> adds the "current" class to the div if current? method 
+    #
+    #   %div{add_class("highlight", :unless => logged_in?)} 
+    #   #=> adds the "highlight" class to the div unless logged_in? method returns true
+    def add_class(css_class, options = {})
+      return {} unless css_class
+      
+      unless options[:unless].nil?
+        if options[:unless]
+          return {}
+        end
+      end
+      
+      unless options[:if].nil?
+        if options[:if]
+          return {:class => css_class}
+        end
+      end
+      
+      if options[:if].nil? and options[:unless].nil?
         {:class => css_class}
       else
         {}
       end
     end
+    
+    def add_class_if(css_class, condition)
+      add_class(css_class, :if => condition)
+    end
 
     def add_class_unless(css_class, condition)
-      add_class_if(css_class, !condition)
+      add_class(css_class, :unless => condition)
     end
   
+    # Return a hidden attribute hash (useful in Haml tags - %div{hidden})
+    def hide(options = {})
+      unless options[:unless].nil?
+        if options[:unless]
+          return {}
+        end
+      end
+      
+      unless options[:if].nil?
+        unless options[:if]
+          return {}
+        end
+      end
+      
+      {:style => "display:none"}
+    end
+    alias :hidden :hide
+  
     # Return a hidden attribute hash if a condition evaluates to true
     def hide_if(condition)
-      if condition
-        hidden
-      else
-        {}
-      end
+      hide(:if => condition)
     end
     alias :hidden_if :hide_if
     alias :show_unless :hide_if
   
     # Return a hidden attribute hash if a condition evaluates to false
     def hide_unless(condition)
-      if !condition
-        hidden
-      else
-        {}
-      end
+      hide(:unless => condition)
     end
     alias :hidden_unless :hide_unless
     alias :show_if :hide_unless 
@@ -169,7 +203,7 @@ module ViewFu
   
     # Check if we're on production environment
     def production?
-      Merb.env == "production"
+      Merb.env?(:production)
     end
   
     # Display will_paginate paging links

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_viewfu
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-17 00:00:00 -08:00
+date: 2009-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency