hobosupport 0.8.10 → 0.9.0

data/Rakefile

@@ -2,30 +2,29 @@ require 'activerecord'
 ActiveRecord::ActiveRecordError # hack for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
 require File.dirname(__FILE__) + '/lib/hobo_support.rb'
 
+RUBY = ENV['RUBY'] || (defined?(JRUBY_VERSION) ? 'jruby' : 'ruby')
+RUBYDOCTEST = ENV['RUBYDOCTEST'] || "#{RUBY} `which rubydoctest`"
+
 namespace "test" do
   desc "Run the doctests"
   task :doctest do |t|
-    exit(1) if !system("rubydoctest test/*.rdoctest test/hobosupport/*.rdoctest")
+    exit(1) if !system("#{RUBYDOCTEST} test/*.rdoctest test/hobosupport/*.rdoctest")
   end
 end
 
 # --- build gem via Jeweller --- #
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.version      = HoboSupport::VERSION
-    gemspec.name         = "hobosupport"
-    gemspec.email        = "tom@tomlocke.com"
-    gemspec.summary      = "Core Ruby extensions from the Hobo project"
-    gemspec.homepage     = "http://hobocentral.net/"
-    gemspec.authors      = ["Tom Locke"]
-    gemspec.rubyforge_project = "hobosupport"
-  end
-  Jeweler::GemcutterTasks.new
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = false
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+require 'jeweler'
+Jeweler::Tasks.new do |gemspec|
+  gemspec.version      = HoboSupport::VERSION
+  gemspec.name         = "hobosupport"
+  gemspec.email        = "tom@tomlocke.com"
+  gemspec.summary      = "Core Ruby extensions from the Hobo project"
+  gemspec.homepage     = "http://hobocentral.net/"
+  gemspec.authors      = ["Tom Locke"]
+  gemspec.rubyforge_project = "hobosupport"
+end
+Jeweler::GemcutterTasks.new
+Jeweler::RubyforgeTasks.new do |rubyforge|
+  rubyforge.doc_task = false
 end

data/lib/hobo_support.rb

@@ -1,6 +1,6 @@
 module HoboSupport
 
-  VERSION = "0.8.10"
+  VERSION = "0.9.0"
 
   RAILS_VERSION_FLOAT = Object.const_defined?(:Rails) ? Rails::VERSION::STRING.match(/^\d+\.\d+/)[0].to_f : 0
   

data/lib/hobo_support/array.rb

@@ -17,6 +17,24 @@ class Array
     self
   end
 
+  # useful function from Rails 2.3
+  if !respond_to? :wrap
+    def self.wrap(object)
+      case object
+      when nil
+        []
+      when self
+        object
+      else
+        if object.respond_to?(:to_ary)
+          object.to_ary
+        else
+          [object]
+        end
+      end
+    end
+  end
+
 end
 
 

data/lib/hobo_support/hash.rb

@@ -113,5 +113,9 @@ end
 if defined? ActiveSupport
   class ActiveSupport::OrderedHash
     alias each_pair each
+
+    def first
+      empty? ? nil : [keys.first, values.first]
+    end
   end
 end

data/lib/hobo_support/module.rb

@@ -15,27 +15,41 @@ class Module
   end
 
   # Creates a class attribute reader that will delegate to the superclass
-  # if not defined on self
+  # if not defined on self. Default values can be a Proc object that takes the class as a parameter.
   def inheriting_cattr_reader(*names)
     names_with_defaults = (names.pop if names.last.is_a?(Hash)) || {}
 
-    names_with_defaults.each do |name, default|
-      instance_variable_set("@#{name}", default) unless instance_variable_get("@#{name}") != nil || superclass.respond_to?(name)
-    end
-
     (names + names_with_defaults.keys).each do |name|
-      class_eval %{
-        def self.#{name}
-          if defined? @#{name}
-            @#{name}
-          elsif superclass.respond_to?('#{name}')
-            superclass.#{name}
+      ivar_name = "@#{name}"
+      block = names_with_defaults[name]
+      self.send(self.class == Module ? :define_method : :meta_def, name) do
+        if instance_variable_defined? ivar_name
+          instance_variable_get(ivar_name)
+        else
+          superclass.respond_to?(name) && superclass.send(name) ||
+          block && begin
+            result = block.is_a?(Proc) ? block.call(self) : block
+            instance_variable_set(ivar_name, result) if result
           end
         end
-      }
+      end
     end
   end
 
+  def inheriting_cattr_accessor(*names)
+    names_with_defaults = (names.pop if names.last.is_a?(Hash)) || {}
+
+    names_with_defaults.keys.each do |name|
+      attr_writer name
+      inheriting_cattr_reader names_with_defaults.slice(name)
+    end
+    names.each do |name|
+      attr_writer name
+      inheriting_cattr_reader name
+    end
+  end
+
+
   # creates a #foo= and #foo? pair, with optional default values, e.g.
   # bool_attr_accessor :happy => true
   def bool_attr_accessor(*args)

data/test/hobosupport.rdoctest

@@ -8,7 +8,7 @@ HoboSupport is a mixed bag of core ruby extensions that have been extracted from
 {.hidden}
 
     >> HoboSupport::VERSION
-    => "0.8.9"
+    => "0.9.0"
 
 ## Contents
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobosupport
 version: !ruby/object:Gem::Version 
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 +01:00
+date: 2009-11-17 00:00:00 +00:00
 default_executable: 
 dependencies: []