kelredd-useful 0.4.0 → 0.4.1

data/lib/useful/erb_helpers/proper.rb

@@ -5,7 +5,7 @@
 require 'useful/erb_helpers/common'
 require 'useful/erb_helpers/tags'
 require 'useful/ruby_extensions/string' unless ::String.new.respond_to?('ends_with?')
-unless ::Object.new.respond_to?('blank?') && ::Object.new.respond_to?('is_true?') && ::Object.new.respond_to?('returning')
+unless ::Object.new.respond_to?('blank?') && ::Object.new.respond_to?('is_true?')
   require 'useful/ruby_extensions/object'
 end
 
@@ -13,14 +13,14 @@ module Useful; end
 module Useful::ErbHelpers; end
 
 module Useful::ErbHelpers::Proper
-      
+
   include Useful::ErbHelpers::Common
-  
+
   # This one's a little different than the corresponding actionpack version:
   # => ie. you don't pass an options string as the 2nd argument
   # => you, instead, pass a block that should return the desired options string
   # => ie, proper_select_tag('user') { '<option>test</option>' }
-  def proper_select_tag(name, options={}, &block) 
+  def proper_select_tag(name, options={}, &block)
     html_name = (options[:multiple].is_true? && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
     options[:multiple] = OPTIONS[:multiple] if options[:multiple] == true
     options[:tag] = 'select'
@@ -37,13 +37,13 @@ module Useful::ErbHelpers::Proper
     unchecked_value = options.delete(:unchecked_value)
     unchecked_value = '0' if unchecked_value.nil?
     disable_unchecked_value = options.delete(:disable_unchecked_value)
-    returning html = '' do
+    ''.tap do |html|
       html << input_tag(:hidden, name, unchecked_value, :id => "#{options[:id]}_hidden") unless disable_unchecked_value.is_true?
       html << input_tag(:checkbox, name, value, options)
       html << tag(:label, :for => options[:id]) { label_text } unless label_text.blank?
     end
   end
-  
+
   # TODO: write tests
   def proper_radio_button_tag(*args)
     name, value, checked, options = proper_check_radio_options(nil, args)
@@ -52,7 +52,7 @@ module Useful::ErbHelpers::Proper
     label_text = options.delete(:label) || value.to_s.humanize
     label_container_tag = options.delete(:tag) || :span
     radio_button_str = input_tag(:radio, name, value, options)
-    returning html = '' do
+    ''.tap do |html|
       html << if label_text.blank?
         radio_button_str
       else
@@ -66,9 +66,9 @@ module Useful::ErbHelpers::Proper
   def self.included(receiver)
     receiver.send :include, Useful::ErbHelpers::Tags
   end
-  
+
   private
-  
+
   def proper_check_radio_options(default_value, args)
     # args should be passed to proper checkbox and radiobutton tags like this:
     # => name, value, checked, options={}
@@ -101,7 +101,7 @@ module Useful::ErbHelpers::Proper
       raise ArgumentError, "please specify 1 to 4 arguments for name, value, checked, and options"
     end
   end
-  
+
   def case_arg_options_for_length(length, args)
     args.length == length || (args.length == (length-1) && !(args[(length-2)].kind_of?(::Hash) || args[(length-2)].nil?))
   end

data/lib/useful/ruby_extensions/object.rb

@@ -56,58 +56,14 @@ module Useful::RubyExtensions::Object
       self.nil? || self.false? || (self.respond_to?(:empty?) ? self.empty? : false)
     end unless ::Object.new.respond_to?('blank?')
 
-    # Returns +value+ after yielding +value+ to the block. This simplifies the
-    # process of constructing an object, performing work on the object, and then
-    # returning the object from a method. It is a Ruby-ized realization of the K
-    # combinator, courtesy of Mikael Brockman.
-    #
-    # ==== Examples
-    #
-    #  # Without returning
-    #  def foo
-    #    values = []
-    #    values << "bar"
-    #    values << "baz"
-    #    return values
-    #  end
-    #
-    #  foo # => ['bar', 'baz']
-    #
-    #  # returning with a local variable
-    #  def foo
-    #    returning values = [] do
-    #      values << 'bar'
-    #      values << 'baz'
-    #    end
-    #  end
-    #
-    #  foo # => ['bar', 'baz']
-    #
-    #  # returning with a block argument
-    #  def foo
-    #    returning [] do |values|
-    #      values << 'bar'
-    #      values << 'baz'
-    #    end
-    #  end
-    #
-    #  foo # => ['bar', 'baz']
     def returning(value)
-      yield(value)
+      warn "[DEPRECATION] `returning` is deprecated.  Please use `tap` instead."
+        yield(value)
       value
     end unless ::Object.new.respond_to?('returning')
 
-    # Yields <code>x</code> to the block, and then returns <code>x</code>.
-    # The primary purpose of this method is to "tap into" a method chain,
-    # in order to perform operations on intermediate results within the chain.
-    #
-    #   (1..10).tap { |x| puts "original: #{x.inspect}" }.to_a.
-    #     tap    { |x| puts "array: #{x.inspect}" }.
-    #     select { |x| x%2 == 0 }.
-    #     tap    { |x| puts "evens: #{x.inspect}" }.
-    #     map    { |x| x*x }.
-    #     tap    { |x| puts "squares: #{x.inspect}" }
     def tap
+      warn "[DEPRECATION] `tap` will be deprecated because it is part of the object kernel in 1.8.7 up."
       yield self
       self
     end unless ::Object.new.respond_to?('tap')

data/lib/useful/ruby_helpers/logger.rb

@@ -26,7 +26,7 @@ module Useful::RubyHelpers::Logger
       if name.empty? && msg.empty?
         nil
       else
-        returning formatted_log_msg(name, msg, opts) do |log_msg|
+        formatted_log_msg(name, msg, opts).tap do |log_msg|
           logger.send(opts[:level].to_s, log_msg)
         end
       end
@@ -50,18 +50,11 @@ module Useful::RubyHelpers::Logger
     end
 
     def formatted_log_msg(name, msg, opts)
+      name = name.strip
+      msg = msg.strip
       opts[:newlines] ||= 0
       opts[:color] = true if opts[:color].nil?
-      opts[:prefix] ||= case opts[:level].to_s
-      when 'info'
-        "*"  # green
-      when 'warn'
-        "~"  # cyan
-      when 'error'
-        "!"  # red
-      else # debug
-        "-"
-      end
+
       color_level = opts[:color] ? opts[:level].to_s : 'none'
       color = case color_level
       when 'debug'
@@ -78,7 +71,8 @@ module Useful::RubyHelpers::Logger
       end
       color_reg = "0;#{color}"
       color_underlined = "4;#{color}"
-      "\e[0m#{"\n"*opts[:newlines].to_i.abs}  \e[#{color_reg}m#{opts[:prefix]}\e[0m#{opts[:prefix].empty? ? '' : '  '}\e[#{color_underlined}m#{name}\e[0m#{name.empty? ? '' : '  '}#{msg}"
+
+      "\e[0m#{"\n"*opts[:newlines].to_i.abs}  \e[#{color_underlined}m#{name}\e[0m#{name.empty? ? '' : "\t"}#{msg}"
     end
 
     def handle_log_args(args)

data/lib/useful/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kelredd-useful
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -05:00
+date: 2010-09-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency