kelredd-useful 0.1.10 → 0.1.11

data/lib/useful/cap_tasks/cache.rb

@@ -1,11 +1,5 @@
 Capistrano::Configuration.instance.load do
   namespace :cache do
   
-    desc "Update code, run 'rake gems:install'"
-    task :install, :roles => :app do
-      deploy.update_code
-      run "cd #{current_release}; sudo #{fetch(:rake, "rake")} #{"RAILS_ENV=#{rails_env}" if defined?(rails_env)} gems:install"
-    end
-  
   end  
 end

data/lib/useful/cap_tasks/{gems.rb → gemsconfig.rb}

@@ -1,10 +1,10 @@
 Capistrano::Configuration.instance.load do
-  namespace :gems do
+  namespace :gemsconfig do
 
-    desc "Update code, run 'rake gems:install'"
+    desc "Update code, run 'rake gemsconfig:install'"
     task :install, :roles => fetch(:install_roles, :app) do
       deploy.update_code
-      run_with_password("sudo #{fetch(:rake, "rake")} -f #{current_release}/Rakefile #{"RAILS_ENV=#{rails_env}" if rails_env} #{fetch(:gems, "gems")}:install", {
+      run_with_password("sudo #{fetch(:rake, "rake")} -f #{current_release}/Rakefile #{"RAILS_ENV=#{rails_env}" if rails_env} #{fetch(:gemsconfig, "gemsconfig")}:install", {
         :prompt => "Enter sudo pw: ",
         :pty => false
       })

data/lib/useful/sinatra_helpers/erb/forms.rb

@@ -0,0 +1,131 @@
+require 'sinatra/base'
+require File.join(File.dirname(__FILE__), 'helpers.rb')
+require File.join(File.dirname(__FILE__), 'tags.rb')
+
+module Useful
+  module SinatraHelpers
+    module Erb
+      module Forms
+        
+        include Useful::SinatraHelpers::Erb::Helpers
+        
+        def form_tag(url, options={}, &block) 
+          options[:method] = 'post' unless ['get','post','put','delete'].include?(options[:method])
+          options.update :action => url
+          if multipart = options.delete(:multipart)
+            options[:enctype] = sinatra_erb_helper_multipart_option
+          end
+          if block_given?
+            @_out_buf << tag(:form, options) { sinatra_erb_helper_capture(&block) }
+          else
+            tag(:form, options)
+          end
+        end
+        
+        def field_set_tag(legend=nil, options={}, &block)
+          legend_html = legend.nil? ? '' : tag(:legend) { legend.to_s }
+          if block_given?
+            @_out_buf << tag(:fieldset, options) { legend_html + sinatra_erb_helper_capture(&block) }
+          else
+            tag(:fieldset, options) { legend_html }
+          end
+        end
+        
+        def label_tag(name, value=nil, options={})
+          value ||= name.to_s.capitalize
+          options.update :for => name.to_s
+          tag(:label, options) { value }
+        end
+        
+        def hidden_field_tag(name, value=nil, options={}) 
+          input_tag('hidden', name, value, options)
+        end
+        
+        def password_field_tag(name="password", value=nil, options={}) 
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          input_tag('password', name, value, options)
+        end
+        
+        def file_field_tag(name, options={})
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          input_tag('file', name, nil, options)
+        end
+        
+       def check_box_tag(name, label=nil, value='1', checked=false, options={})
+          tag_name = options.delete(:tag) || :div
+          if options.has_key?(:class)
+            options[:class] += ' checkbox'
+          else
+            options[:class] = 'checkbox'
+          end
+          options[:id] ||= sinatra_erb_helper_safe_id(rand(1000).to_s)
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          options[:checked] = sinatra_erb_helper_checked_option if checked
+          input_str = input_tag('checkbox', name, value, options)
+          if label.nil?
+            input_str
+          else
+            tag(tag_name, :class => 'checkbox') { input_str + label_tag(options[:id], label)  }
+          end
+        end
+        
+        def radio_button_tag(name, value, label=nil, checked=false, options={}) 
+          tag_name = options.delete(:tag) || :span
+          if options.has_key?(:class)
+            options[:class] += ' radiobutton'
+          else
+            options[:class] = 'radiobutton'
+          end
+          label ||= value.to_s.capitalize
+          options[:id] ||= sinatra_erb_helper_safe_id(rand(1000).to_s)
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          options[:checked] = sinatra_erb_helper_checked_option if checked
+          input_str = input_tag('radio', name, value, options)
+          if label.nil?
+            input_str
+          else
+            label_tag(options[:id], input_str + tag(tag_name) { label }, :class => options.delete(:class))
+          end
+        end
+        
+        def select_tag(name, options={}, &block) 
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          html_name = (options[:multiple] == true && !name.to_s[(name.to_s.length-2)..-1] == "[]") ? "#{name}[]" : name
+          options[:multiple] = sinatra_erb_helper_multiple_option if options[:multiple] == true
+          options[:tag] = 'select'
+          if block_given?
+            @_out_buf << input_tag(:select, html_name, nil, options) { sinatra_erb_helper_capture(&block) }
+          else
+            input_tag(:select, html_name, nil, options)
+          end
+        end
+
+        def text_area_tag(name, content=nil, options={}) 
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          options[:tag] = 'textarea'
+          input_tag(nil, name, nil, options) { content || '' }
+        end
+        
+        def text_field_tag(name, value=nil, options={}) 
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          input_tag('text', name, value, options)
+        end
+        
+        def submit_tag(value="Save", options={}) 
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          input_tag('submit', 'commit', value, options)
+        end
+        
+        def image_submit_tag(source, options={})
+          options[:disabled] = sinatra_erb_helper_disabled_option if options[:disabled]
+          options[:src] = source
+          options[:alt] ||= 'Save'
+          input_tag('image', nil, nil, options)
+        end
+        
+      end
+    end
+  end
+end
+
+Sinatra::Application.helpers Useful::SinatraHelpers::Erb::Forms

data/lib/useful/sinatra_helpers/erb/helpers.rb

@@ -0,0 +1,45 @@
+module Useful
+  module SinatraHelpers
+    module Erb
+      module Helpers
+        
+        def sinatra_erb_helper_safe_id(id)
+          id.gsub(/\W/,'')
+        end
+        
+        def sinatra_erb_helper_capture(*args, &block)
+          sinatra_erb_helper_with_output_buffer { block.call(*args) }
+        end
+        
+        def sinatra_erb_helper_with_output_buffer(buf = '') #:nodoc:
+          @_out_buf, old_buffer = buf, @_out_buf
+          yield
+          @_out_buf
+        ensure
+          @_out_buf = old_buffer
+        end
+        
+        def sinatra_erb_helper_hash_to_html_attrs(a_hash)
+          a_hash.collect{|key, val| "#{key}=\"#{val}\""}.join(' ')
+        end
+
+        def sinatra_erb_helper_disabled_option
+          'disabled' 
+        end
+        
+        def sinatra_erb_helper_checked_option
+          'checked'
+        end
+        
+        def sinatra_erb_helper_multiple_option
+          'multiple'
+        end
+        
+        def sinatra_erb_helper_multipart_option
+          'multipart/form-data'
+        end
+        
+      end      
+    end
+  end
+end

data/lib/useful/sinatra_helpers/{tags → erb}/links.rb

@@ -1,9 +1,9 @@
 require 'sinatra/base'
-require File.join(File.dirname(__FILE__), 'globals.rb')
+require File.join(File.dirname(__FILE__), 'tags.rb')
 
 module Sinatra
   module SinatraHelpers
-    module Tags
+    module Erb
       module Links
         
         # helper to emulate action view's 'link_to'
@@ -63,5 +63,5 @@ module Sinatra
     end
   end
   
-  Sinatra::Application.helpers Sinatra::SinatraHelpers::Tags::Links
+  Sinatra::Application.helpers Sinatra::SinatraHelpers::Erb::Links
 end

data/lib/useful/sinatra_helpers/{tags/globals.rb → erb/tags.rb}

@@ -3,17 +3,17 @@ require File.join(File.dirname(__FILE__), 'helpers.rb')
 
 module Useful
   module SinatraHelpers
-    module Tags
-      module Globals
+    module Erb
+      module Tags
         
-        include Useful::SinatraHelpers::Tags::Helpers
+        include Useful::SinatraHelpers::Erb::Helpers
         
         def input_tag(type, name, value, options={}, &block)
           options[:tag] ||= :input
           options[:type] = type unless type.nil?
           unless name.nil?
             options[:name] = name 
-            options[:id] ||= sinatra_tag_helper_safe_id(name)
+            options[:id] ||= sinatra_erb_helper_safe_id(name)
           end
           options[:value] = value unless value.nil?
           tag(options.delete(:tag), options, &block)
@@ -32,8 +32,8 @@ module Useful
         # emulator for 'tag'
         # EX : tag :h1, "shizam", :title => "shizam"
         # => <h1 title="shizam">shizam</h1>
-        def tag(name,options={})
-          "<#{name.to_s} #{sinatra_tag_helper_hash_to_html_attrs(options)} #{block_given? ? ">#{yield}</#{name}" : "/"}>"
+        def tag(name, options={})
+          "<#{name.to_s} #{sinatra_erb_helper_hash_to_html_attrs(options)} #{block_given? ? ">#{yield}</#{name}" : "/"}>"
         end
         
       end      
@@ -41,5 +41,5 @@ module Useful
   end
 end
 
-Sinatra::Application.helpers Useful::SinatraHelpers::Tags::Globals
+Sinatra::Application.helpers Useful::SinatraHelpers::Erb::Tags
 

data/lib/useful/version.rb

@@ -3,7 +3,7 @@ module Useful
     
     MAJOR = 0
     MINOR = 1
-    TINY  = 10
+    TINY  = 11
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-useful
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors: 
 - Kelredd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -07:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,7 +30,7 @@ files:
 - lib/useful/active_record_helpers.rb
 - lib/useful/cap_tasks
 - lib/useful/cap_tasks/cache.rb
-- lib/useful/cap_tasks/gems.rb
+- lib/useful/cap_tasks/gemsconfig.rb
 - lib/useful/cap_tasks/globals.rb
 - lib/useful/cap_tasks.rb
 - lib/useful/rails_extensions
@@ -61,14 +61,12 @@ files:
 - lib/useful/sinatra_helpers/environment_tests.rb
 - lib/useful/sinatra_helpers/erb
 - lib/useful/sinatra_helpers/erb/error_pages.rb
+- lib/useful/sinatra_helpers/erb/forms.rb
+- lib/useful/sinatra_helpers/erb/helpers.rb
+- lib/useful/sinatra_helpers/erb/links.rb
 - lib/useful/sinatra_helpers/erb/partials.rb
+- lib/useful/sinatra_helpers/erb/tags.rb
 - lib/useful/sinatra_helpers/erb.rb
-- lib/useful/sinatra_helpers/tags
-- lib/useful/sinatra_helpers/tags/forms.rb
-- lib/useful/sinatra_helpers/tags/globals.rb
-- lib/useful/sinatra_helpers/tags/helpers.rb
-- lib/useful/sinatra_helpers/tags/links.rb
-- lib/useful/sinatra_helpers/tags.rb
 - lib/useful/sinatra_helpers.rb
 - lib/useful/version.rb
 - lib/useful.rb

data/lib/useful/sinatra_helpers/tags/forms.rb

@@ -1,110 +0,0 @@
-require 'sinatra/base'
-require File.join(File.dirname(__FILE__), 'helpers.rb')
-require File.join(File.dirname(__FILE__), 'globals.rb')
-
-module Useful
-  module SinatraHelpers
-    module Tags
-      module Forms
-        
-        include Useful::SinatraHelpers::Tags::Helpers
-        
-        def form_tag(url, options={}, &block) 
-          options.update :action => url
-          tag(:form, options, &block)
-        end
-        
-        def field_set_tag(legend=nil, options=nil, &block)
-          content = "#{tag(:legend) { lengend.to_s } unless legend.nil?}#{sinatra_tag_helper_capture(&block)}"
-          tag(:fieldset, options) { content }
-        end
-        
-        def label_tag(name, value=nil, options={})
-          value ||= name.to_s.capitalize
-          options.update :for => name.to_s
-          tag(:label, options) { value }
-        end
-        
-        def hidden_field_tag(name, value=nil, options={}) 
-          input_tag('hidden', name, value, options)
-        end
-        
-        def password_field_tag(name="password", value=nil, options={}) 
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          input_tag('password', name, value, options)
-        end
-        
-        def file_field_tag(name, options={})
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          input_tag('file', name, nil, options)
-        end
-        
-       def check_box_tag(name, label=nil, value='1', checked=false, options={})
-          options[:tag] ||= :div
-          if options.has_key?(:class)
-            options[:class] += ' checkbox'
-          else
-            options[:class] = 'checkbox'
-          end
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          options[:checked] = sinatra_tag_helper_checked_option if checked
-          input_str = input_tag('checkbox', name, value, options)
-          if label.nil?
-            input_str
-          else
-            tag(options.delete(:tag), :class => 'checkbox') { input_str + label_tag(options[:id], label)  }
-          end
-        end
-        
-        def radio_button_tag(name, value, label, checked=false, options={}) 
-          options[:tag] ||= :span
-          if options.has_key?(:class)
-            options[:class] += ' radiobutton'
-          else
-            options[:class] = 'radiobutton'
-          end
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          options[:checked] = sinatra_tag_helper_checked_option if checked
-          input_str = input_tag('radio', name, value, options)
-          if label.nil?
-            input_str
-          else
-            label_tag(name, input_str + tag(options.delete(:tag)) { label }, :class => options.delete(:class))
-          end
-        end
-        
-        def select_tag(name, option_tags=nil, options={}) 
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          html_name = (options[:multiple] == true && !name.to_s[(name.to_s.length-2)..-1] == "[]") ? "#{name}[]" : name
-          options[:multiple] = sinatra_tag_helper_multiple_option if options[:multiple] == true
-          input_tag('select', name, nil, options) { option_tags || '' }
-        end
-
-        def text_area_tag(name, content=nil, options={}) 
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          options[:tag] = 'textarea'
-          input_tag(nil, name, nil, options) { content || '' }
-        end
-        
-        def text_field_tag(name, value=nil, options={}) 
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          input_tag('text', name, value, options)
-        end
-        
-        def submit_tag(value="Save", options={}) 
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          input_tag('submit', 'commit', value, options)
-        end
-        
-        def image_submit_tag(source, options={})
-          options[:disabled] = sinatra_tag_helper_disabled_option if options[:disabled]
-          options[:src] = source
-          input_tag('image', nil, nil, options)
-        end
-        
-      end
-    end
-  end
-end
-
-Sinatra::Application.helpers Useful::SinatraHelpers::Tags::Forms

data/lib/useful/sinatra_helpers/tags/helpers.rb

@@ -1,33 +0,0 @@
-module Useful
-  module SinatraHelpers
-    module Tags
-      module Helpers
-        
-        def sinatra_tag_helper_safe_id(id)
-          id.gsub(/\W/,'')
-        end
-        
-        def sinatra_tag_helper_capture(*args, &block)
-          block.call(*args)
-        end
-        
-        def sinatra_tag_helper_disabled_option
-          'disabled' 
-        end
-        
-        def sinatra_tag_helper_checked_option
-          'checked'
-        end
-        
-        def sinatra_tag_helper_multiple_option
-          'multiple'
-        end
-        
-        def sinatra_tag_helper_hash_to_html_attrs(a_hash)
-          a_hash.collect{|key, val| "#{key}=\"#{val}\""}.join(' ')
-        end
-
-      end      
-    end
-  end
-end

data/lib/useful/sinatra_helpers/tags.rb

@@ -1,3 +0,0 @@
-Dir[File.join(File.dirname(__FILE__), "tags" ,"*.rb")].each do |file|
-  require file
-end