merb_laszlo 0.5.0 → 0.9.5

data/Rakefile

@@ -19,7 +19,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb_laszlo"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = "0.5.0" + PKG_BUILD
+GEM_VERSION = "0.9.5" + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -37,7 +37,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.4')
+  s.add_dependency('merb-core', '>= 0.9.5')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,specs}/**/*")
 end

data/lib/merb-laszlo/helpers.rb

@@ -23,14 +23,21 @@ module Merb
       self_closing_tag(:text, {:text => text}.merge(opts))
     end
     
-    def lz_window(width, height, opts = {}, &blk)
-      opts = {:resizable => true, :width => width, :height => height}.merge!(opts)
+    def lz_window(width = nil, height = nil, opts = {}, &blk)
+      mrg = {:resizable => true}
+      mrg.merge!(:width => width) if width
+      mrg.merge!(:height => height) if height
+      opts = mrg.merge(opts)
       tag(:window, nil, opts, &blk)
     end
     
-    def lz_resource(name, src, opts = {})
+    def add_lz_resource(src)
       @lz_resources ||= []
-      @lz_resources << src
+      @lz_resources << src unless URI.parse(src).scheme
+    end
+    
+    def lz_resource(name, src, opts = {})
+      add_lz_resource(src)
       opts.merge!(:name => name, :src => src)
       self_closing_tag(:resource, opts)
     end
@@ -40,6 +47,25 @@ module Merb
       options.merge!(:args => args.map {|x| x.to_s}.join(", ")) unless args.empty?
       tag(:handler, capture(&blk), options)
     end
+    
+    def lz_attr(name, value, type = nil)
+      mrg = {:name => name, :value => value}
+      mrg.merge!(:type => type) if type
+      self_closing_tag(:attribute, mrg)
+    end
+
+    def lz_def(name, *args, &blk)
+      tag(:method, blk ? capture(&blk) : "", :name => name, :args => args.map {|x| x.to_s}.join(","))
+    end
+    
+    def lz_view(width, height, bgcolor, options = {}, &blk)
+      tag(:view, blk ? capture(&blk) : "", {:width => width, :height => height, :bgcolor => bgcolor}.merge(options))
+    end
+    
+    def lz_resource_view(src, options = {}, &blk)
+      add_lz_resource(src)
+      tag(:view, blk ? capture(&blk) : "", {:resource => src}.merge(options))
+    end
   
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_laszlo
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.9.5
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-03 00:00:00 +03:00
+date: 2008-08-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 description: Merb plugin that provides support for Laszlo.
 email: ykatz@engineyard.com