merb_helpers 0.9.5 → 0.9.6

data/Rakefile

@@ -18,7 +18,7 @@ GEM_EMAIL  = "ykatz@engineyard.com"
 
 GEM_NAME    = "merb_helpers"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -36,7 +36,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.5')
+  s.add_dependency('merb-core', '>= 0.9.6')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs}/**/*")
 end
@@ -50,13 +50,13 @@ end
 ##############################################################################
 desc "Install the gem"
 task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+  sh install_command(GEM_NAME, GEM_VERSION)
 end
 
 namespace :jruby do
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+    sh jinstall_command(GEM_NAME, GEM_VERSION)
   end
 end
 

data/lib/merb_helpers/core_ext.rb

@@ -30,4 +30,17 @@ class Time
   
   def to_time; self; end
   public :to_date
-end
+end
+
+# Truncates a string to the given length and appends the given suffix if the string is, in fact, truncated.
+#
+# ==== Examples:
+#  "This is a long string right here".truncate(10, "...")  #=> "This is..."
+
+class String
+  def truncate(length = 30, truncate_string = "...")
+    return self unless self.length > length
+    length = length - truncate_string.split(//).length
+    self[0...length] + truncate_string
+  end
+end

data/lib/merb_helpers/form/builder.rb

@@ -33,8 +33,8 @@ module Merb::Helpers::Form::Builder
       # Unless the method is :get, fake out the method using :post
       attrs[:method] = :post unless attrs[:method] == :get
       # Use a fake PUT if the object is not new, otherwise use the method
-      # passed in.
-      method ||= (@obj && !@obj.new_record? ? :put : :post)
+      # passed in. Defaults to :post if no method is set.
+      method ||= (@obj.respond_to?(:new_record?) && !@obj.new_record?) || (@obj.respond_to?(:new?) && !@obj.new?) ? :put : :post
 
       attrs[:enctype] = "multipart/form-data" if attrs.delete(:multipart) || @multipart
 
@@ -68,7 +68,7 @@ module Merb::Helpers::Form::Builder
     def update_bound_check_box(method, attrs)
       raise ArgumentError, ":value can't be used with a bound_check_box" if attrs.has_key?(:value)
 
-      attrs[:boolean] ||= true
+      attrs[:boolean] = attrs.fetch(:boolean, true)
 
       val = @obj.send(method)
       attrs[:checked] = attrs.key?(:on) ? val == attrs[:on] : considered_true?(val)
@@ -168,6 +168,7 @@ module Merb::Helpers::Form::Builder
 
     def unbound_select(attrs = {})
       update_unbound_controls(attrs, "select")
+      attrs[:name] << "[]" if attrs[:multiple] && !(attrs[:name] =~ /\[\]$/)
       tag(:select, options_for(attrs), attrs)
     end
 
@@ -180,6 +181,15 @@ module Merb::Helpers::Form::Builder
       end.join
     end
 
+    def unbound_radio_group(arr, attrs = {})
+      arr.map do |ind_attrs|
+        ind_attrs = {:value => ind_attrs} unless ind_attrs.is_a?(Hash)
+        joined = attrs.merge(ind_attrs)
+        joined.merge!(:label => joined[:label] || joined[:value])
+        unbound_radio_button(joined)
+      end.join
+    end
+
     def unbound_text_area(contents, attrs)
       update_unbound_controls(attrs, "text_area")
       tag(:textarea, contents, attrs)
@@ -277,22 +287,14 @@ module Merb::Helpers::Form::Builder
       super
     end
 
-    # Provides a generic HTML label.
-    #
-    # ==== Parameters
-    # attrs<Hash>:: HTML attributes
-    #
-    # ==== Returns
-    # String:: HTML
-    #
-    # ==== Example
-    #   <%= label :for => "name", :label => "Full Name" %> 
-    #   => <label for="name">Full Name</label>
-    def label(attrs)
-      attrs ||= {}
-      for_attr = attrs[:id] ? {:for => attrs[:id]} : {}
-      if label_text = attrs.delete(:label)
-        tag(:label, label_text, for_attr)
+    def label(contents, attrs = {})
+      if contents.is_a?(Hash)
+        attrs    = contents
+        contents = attrs.delete(:label)
+      end
+      if contents
+        for_attr = attrs[:id] ? {:for => attrs[:id]} : {}
+        tag(:label, contents, for_attr)
       else
         ""
       end
@@ -377,7 +379,7 @@ module Merb::Helpers::Form::Builder
 
   module Resourceful
     def process_form_attrs(attrs)
-      attrs[:action] ||= url(@name, @obj) if @origin
+      attrs[:action] ||= @origin.url(@name, @obj) if @origin
       super
     end
   end

data/lib/merb_helpers/form/helpers.rb

@@ -1,8 +1,5 @@
 # Form helpers provide a number of methods to simplify the creation of HTML forms.
 # They can work directly with models (bound) or standalone (unbound).
-#
-# The core method of this helper, +form_for+, gives you the ability to create a form for a resource.
-# For example, let's say that you have a model <tt>Person</tt> and want to create a new instance of it:
 module Merb::Helpers::Form
 
   def _singleton_form_context
@@ -152,6 +149,21 @@ module Merb::Helpers::Form
     end
   end
 
+  # Provides a generic HTML label.
+  #
+  # ==== Parameters
+  # attrs<Hash>:: HTML attributes
+  #
+  # ==== Returns
+  # String:: HTML
+  #
+  # ==== Example
+  #   <%= label "Full Name", :for => "name" %> 
+  #   => <label for="name">Full Name</label>
+  def label(*args)
+    current_form_context.label(*args)
+  end
+
   # Provides a HTML text input tag
   #
   # ==== Parameters

data/lib/merb_helpers/text_helpers.rb

@@ -0,0 +1,61 @@
+module Merb::Helpers::Text
+  # Allows you to cycle through elements in an array
+  #
+  # ==== Parameters
+  # values<Array>:: Array of objects to cycle through
+  # values<Hash>:: Last element of array can be a hash with the key of
+  #                :name to specify the name of the cycle
+  #
+  # ==== Returns
+  # String
+  #
+  # ==== Notes
+  # * Default name is :default
+  #
+  # ==== Example
+  # <%= 5.times { cycle("odd! ","even! "} %>
+  #
+  # Generates:
+  #
+  # odd! even! odd! even! odd!
+  def cycle(*values)
+    options = extract_options_from_args!(values) || {}
+    key = (options[:name] || :default).to_sym
+    (@cycle_positions ||= {})[key] ||= {:position => -1, :values => values}
+    unless values == @cycle_positions[key][:values]
+      @cycle_positions[key] = {:position => -1, :values => values}
+    end
+    current = @cycle_positions[key][:position]
+    @cycle_positions[key][:position] = current + 1
+    values.at( (current + 1) % values.length).to_s
+  end
+
+  # Allows you to reset a cycle
+  #
+  # ==== Parameters
+  # name<Symbol|String>:: Name of the cycle
+  #
+  # ==== Returns
+  # True if successful, otherwise nil
+  #
+  # ==== Notes
+  # * Default name is :default
+  #
+  # ==== Example
+  # <%= cycle("odd! ","even! ","what comes after even?") %>
+  # <%= cycle("odd! ","even! ","what comes after even?") %>
+  # <% reset_cycle %>
+  # <%= cycle("odd! ","even! ","what comes after even?") %>
+  #
+  # Generates:
+  #
+  # odd! even! odd!
+  def reset_cycle(name = :default)
+    (@cycle_positions[name.to_sym] = nil) &&
+      true if @cycle_positions && @cycle_positions[name.to_sym]
+  end
+end
+
+class Merb::Controller
+  include Merb::Helpers::Text
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Yehuda Katz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +03:00
+date: 2008-09-08 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.5
+        version: 0.9.6
     version: 
 description: Helper support for merb (similar to the Rails form helpers)
 email: ykatz@engineyard.com
@@ -46,6 +46,7 @@ files:
 - lib/merb_helpers/form_helpers.rb
 - lib/merb_helpers/ordinalize.rb
 - lib/merb_helpers/tag_helpers.rb
+- lib/merb_helpers/text_helpers.rb
 - lib/merb_helpers/time_dsl.rb
 - lib/merb_helpers.rb
 has_rdoc: true