gorillib 0.0.7 → 0.0.8

data/.gitignore

@@ -0,0 +1,49 @@
+## OS
+.DS_Store
+Icon?
+nohup.out
+.bak
+
+## EDITORS
+\#*
+.\#*
+\#*\#
+*~
+*.swp
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+
+## COMPILED
+a.out
+*.o
+*.pyc
+*.so
+
+## OTHER SCM
+.bzr
+.hg
+.svn
+
+## PROJECT::GENERAL
+coverage
+rdoc
+doc
+pkg
+.rake_test_cache
+.bundle
+.yardoc
+*_private.*
+*.pem
+
+log/*
+tmp/*
+pkg/*
+
+## PROJECT::SPECIFIC
+*.rdb

data/.rspec

@@ -1 +1,3 @@
 --color
+--format documentation
+--drb

data/CHANGELOG.textile

@@ -0,0 +1,49 @@
+
+h3. Version 0.0.7: full test coverage!
+
+<pre>
+        lib/
+        |-- gorillib.rb
+        `-- gorillib
+            |-- array
+            |   |-- compact_blank.rb
+            |   |-- deep_compact.rb
+            |   `-- extract_options.rb
+            |-- base.rb
+            |-- datetime
+            |   |-- #flat.rb#
+            |   |-- flat.rb
+            |   `-- parse.rb
+            |-- enumerable
+            |   `-- sum.rb
+            |-- hash
+            |   |-- compact.rb
+            |   |-- deep_compact.rb
+            |   |-- deep_merge.rb
+            |   |-- keys.rb
+            |   |-- reverse_merge.rb
+            |   |-- slice.rb
+            |   `-- zip.rb
+            |-- logger
+            |   `-- log.rb
+            |-- metaprogramming
+            |   |-- aliasing.rb
+            |   |-- cattr_accessor.rb
+            |   |-- class_attribute.rb
+            |   |-- delegation.rb
+            |   |-- mattr_accessor.rb
+            |   |-- remove_method.rb
+            |   `-- singleton_class.rb
+            |-- numeric
+            |   `-- clamp.rb
+            |-- object
+            |   |-- blank.rb
+            |   |-- try.rb
+            |   `-- try_dup.rb
+            |-- some.rb
+            `-- string
+                |-- constantize.rb
+                |-- human.rb
+                |-- inflections.rb
+                `-- truncate.rb
+</pre>

data/Gemfile

@@ -0,0 +1,15 @@
+source "http://rubygems.org"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem 'bundler',   "~> 1.0.12"
+  gem 'yard',      "~> 0.6.7"
+  gem 'jeweler',   "~> 1.5.2"
+  gem 'rspec',     "~> 2.5.0"
+  gem 'spork',     "~> 0.9.0.rc5"
+  gem 'RedCloth' # for yard
+  # only interesting for coverage testing
+  gem 'rcov',      ">= 0.9.9"
+  gem 'watchr'
+end

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.7)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    spork (0.9.0.rc7)
+    watchr (0.7)
+    yard (0.6.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  bundler (~> 1.0.12)
+  jeweler (~> 1.5.2)
+  rcov (>= 0.9.9)
+  rspec (~> 2.5.0)
+  spork (~> 0.9.0.rc5)
+  watchr
+  yard (~> 0.6.7)

data/README.textile

@@ -3,7 +3,12 @@ h2. Gorillib: infochimps' lightweight subset of ruby convenience methods
 * No creep: include only what you need
 * No dependencies unless audaciously advertised.
 * Compatibile with active_record and extlib
-* NO COMMITS UNLESS JACOB SAYS OK
+
+
+h3. TODO:
+
+* Gorillib.demands(:cattr_accessor) -- raises if not included and recommends what to include
+
 
 h3. require 'gorillib'
 

data/Rakefile

@@ -1,5 +1,12 @@
-require 'rubygems'
-require 'rake'
+require 'rubygems' unless defined?(Gem)
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -12,15 +19,41 @@ Jeweler::Tasks.new do |gem|
   gem.email       = "coders@infochimps.org"
   gem.authors     = ["Infochimps"]
 
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency "yard", "~> 0.6.0"
-  gem.add_development_dependency "jeweler", "~> 1.5.2"
-  gem.add_development_dependency "rcov", ">= 0"
+  gem.add_development_dependency 'bundler', "~> 1.0.12"
+  gem.add_development_dependency 'yard',    "~> 0.6.7"
+  gem.add_development_dependency 'jeweler', "~> 1.5.2"
+  gem.add_development_dependency 'rspec',   "~> 2.5.0"
+  gem.add_development_dependency 'rcov',    ">= 0.9.9"
+  gem.add_development_dependency 'spork',   "~> 0.9.0.rc5"
+  gem.add_development_dependency 'watchr'
+
+  ignores = File.readlines(".gitignore").grep(/^[^#]\S+/).map{|s| s.chomp }
+  dotfiles = [".gemtest", ".gitignore", ".rspec", ".yardopts"]
+  gem.files = dotfiles + Dir["**/*"].
+    reject{|f| f =~ %r{^(vendor|coverage)/} }.
+    reject{|f| File.directory?(f) }.
+    reject{|f| ignores.any?{|i| File.fnmatch(i, f) || File.fnmatch(i+'/**/*', f) } }
+  gem.test_files = gem.files.grep(/^spec\//)
+  gem.require_paths = ['lib']
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = %w[ --exclude .rvm --no-comments --text-summary]
+end
+
+task :default => :spec
+
 require 'yard'
 YARD::Rake::YardocTask.new
+
+# App-specific tasks
+Dir[File.dirname(__FILE__)+'/lib/tasks/**/*.rake'].sort.each{|f| load f }

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/gorillib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gorillib}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = %q{2011-05-05}
+  s.date = %q{2011-05-20}
   s.description = %q{Gorillib: infochimps lightweight subset of ruby convenience methods}
   s.email = %q{coders@infochimps.org}
   s.extra_rdoc_files = [
@@ -17,19 +17,22 @@ Gem::Specification.new do |s|
     "README.textile"
   ]
   s.files = [
-    ".document",
+    ".gitignore",
     ".rspec",
+    "CHANGELOG.textile",
+    "Gemfile",
+    "Gemfile.lock",
     "LICENSE.textile",
     "README.textile",
     "Rakefile",
     "VERSION",
-    "fiddle/hubahuba.rb",
     "gorillib.gemspec",
     "lib/gorillib.rb",
     "lib/gorillib/array/compact_blank.rb",
     "lib/gorillib/array/deep_compact.rb",
     "lib/gorillib/array/extract_options.rb",
     "lib/gorillib/base.rb",
+    "lib/gorillib/datetime/#flat.rb#",
     "lib/gorillib/datetime/flat.rb",
     "lib/gorillib/datetime/parse.rb",
     "lib/gorillib/enumerable/sum.rb",
@@ -50,100 +53,134 @@ Gem::Specification.new do |s|
     "lib/gorillib/metaprogramming/singleton_class.rb",
     "lib/gorillib/numeric/clamp.rb",
     "lib/gorillib/object/blank.rb",
+    "lib/gorillib/object/try.rb",
+    "lib/gorillib/object/try_dup.rb",
     "lib/gorillib/some.rb",
     "lib/gorillib/string/constantize.rb",
     "lib/gorillib/string/human.rb",
     "lib/gorillib/string/inflections.rb",
     "lib/gorillib/string/truncate.rb",
-    "spec/blank_spec.rb",
-    "spec/deep_compact_spec.rb",
-    "spec/gorillib_spec.rb",
-    "spec/numeric_spec.rb",
-    "spec/rcov.opts",
-    "spec/spec.opts",
+    "spec/array/compact_blank_spec.rb",
+    "spec/array/extract_options_spec.rb",
+    "spec/datetime/flat_spec.rb",
+    "spec/datetime/parse_spec.rb",
+    "spec/enumerable/sum_spec.rb",
+    "spec/hash/compact_spec.rb",
+    "spec/hash/deep_compact_spec.rb",
+    "spec/hash/deep_merge_spec.rb",
+    "spec/hash/keys_spec.rb",
+    "spec/hash/reverse_merge_spec.rb",
+    "spec/hash/slice_spec.rb",
+    "spec/hash/zip_spec.rb",
+    "spec/logger/log_spec.rb",
+    "spec/metaprogramming/aliasing_spec.rb",
+    "spec/metaprogramming/cattr_accessor_spec.rb",
+    "spec/metaprogramming/class_attribute_spec.rb",
+    "spec/metaprogramming/delegation_spec.rb",
+    "spec/metaprogramming/mattr_accessor_spec.rb",
+    "spec/metaprogramming/singleton_class_spec.rb",
+    "spec/numeric/clamp_spec.rb",
+    "spec/object/blank_spec.rb",
+    "spec/object/try_dup_spec.rb",
+    "spec/object/try_spec.rb",
     "spec/spec_helper.rb",
-    "spec/spec_tasks.rake",
-    "test/abstract_unit.rb",
-    "test/array/compact_blank_test.rb",
-    "test/array/extract_options_test.rb",
-    "test/datetime/flat_test.rb",
-    "test/datetime/parse_test.rb",
-    "test/enumerable/sum_test.rb",
-    "test/hash/compact_test.rb",
-    "test/hash/deep_merge_test.rb",
-    "test/hash/keys_test.rb",
-    "test/hash/reverse_merge_test.rb",
-    "test/hash/slice_test.rb",
-    "test/hash/zip_test.rb",
-    "test/logger/log_test.rb",
-    "test/metaprogramming/aliasing_test.rb",
-    "test/metaprogramming/cattr_accessor_test.rb",
-    "test/metaprogramming/class_attribute_test.rb",
-    "test/metaprogramming/delegation_test.rb",
-    "test/metaprogramming/mattr_accessor_test.rb",
-    "test/metaprogramming/singleton_class_test.rb",
-    "test/object/blank_test.rb",
-    "test/string/constantize_test.rb",
-    "test/string/human_test.rb",
-    "test/string/inflections_test.rb",
-    "test/string/inflector_test_cases.rb",
-    "test/string/truncate_test.rb"
+    "spec/string/constantize_spec.rb",
+    "spec/string/human_spec.rb",
+    "spec/string/inflections_spec.rb",
+    "spec/string/inflector_test_cases.rb",
+    "spec/string/truncate_spec.rb",
+    "spec/support/kcode_test_helper.rb"
   ]
   s.homepage = %q{http://infochimps.com/labs}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{include only what you need. No dependencies, no creep}
   s.test_files = [
-    "spec/blank_spec.rb",
-    "spec/deep_compact_spec.rb",
-    "spec/gorillib_spec.rb",
-    "spec/numeric_spec.rb",
+    "spec/array/compact_blank_spec.rb",
+    "spec/array/extract_options_spec.rb",
+    "spec/datetime/flat_spec.rb",
+    "spec/datetime/parse_spec.rb",
+    "spec/enumerable/sum_spec.rb",
+    "spec/hash/compact_spec.rb",
+    "spec/hash/deep_compact_spec.rb",
+    "spec/hash/deep_merge_spec.rb",
+    "spec/hash/keys_spec.rb",
+    "spec/hash/reverse_merge_spec.rb",
+    "spec/hash/slice_spec.rb",
+    "spec/hash/zip_spec.rb",
+    "spec/logger/log_spec.rb",
+    "spec/metaprogramming/aliasing_spec.rb",
+    "spec/metaprogramming/cattr_accessor_spec.rb",
+    "spec/metaprogramming/class_attribute_spec.rb",
+    "spec/metaprogramming/delegation_spec.rb",
+    "spec/metaprogramming/mattr_accessor_spec.rb",
+    "spec/metaprogramming/singleton_class_spec.rb",
+    "spec/numeric/clamp_spec.rb",
+    "spec/object/blank_spec.rb",
+    "spec/object/try_dup_spec.rb",
+    "spec/object/try_spec.rb",
     "spec/spec_helper.rb",
-    "test/abstract_unit.rb",
-    "test/array/compact_blank_test.rb",
-    "test/array/extract_options_test.rb",
-    "test/datetime/flat_test.rb",
-    "test/datetime/parse_test.rb",
-    "test/enumerable/sum_test.rb",
-    "test/hash/compact_test.rb",
-    "test/hash/deep_merge_test.rb",
-    "test/hash/keys_test.rb",
-    "test/hash/reverse_merge_test.rb",
-    "test/hash/slice_test.rb",
-    "test/hash/zip_test.rb",
-    "test/logger/log_test.rb",
-    "test/metaprogramming/aliasing_test.rb",
-    "test/metaprogramming/cattr_accessor_test.rb",
-    "test/metaprogramming/class_attribute_test.rb",
-    "test/metaprogramming/delegation_test.rb",
-    "test/metaprogramming/mattr_accessor_test.rb",
-    "test/metaprogramming/singleton_class_test.rb",
-    "test/object/blank_test.rb",
-    "test/string/constantize_test.rb",
-    "test/string/human_test.rb",
-    "test/string/inflections_test.rb",
-    "test/string/inflector_test_cases.rb",
-    "test/string/truncate_test.rb"
+    "spec/string/constantize_spec.rb",
+    "spec/string/human_spec.rb",
+    "spec/string/inflections_spec.rb",
+    "spec/string/inflector_test_cases.rb",
+    "spec/string/truncate_spec.rb",
+    "spec/support/kcode_test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.12"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+      s.add_development_dependency(%q<RedCloth>, [">= 0"])
+      s.add_development_dependency(%q<rcov>, [">= 0.9.9"])
+      s.add_development_dependency(%q<watchr>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.12"])
+      s.add_development_dependency(%q<yard>, ["~> 0.6.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_development_dependency(%q<rcov>, [">= 0.9.9"])
+      s.add_development_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+      s.add_development_dependency(%q<watchr>, [">= 0"])
     else
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.12"])
+      s.add_dependency(%q<yard>, ["~> 0.6.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<rcov>, [">= 0.9.9"])
+      s.add_dependency(%q<watchr>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.12"])
+      s.add_dependency(%q<yard>, ["~> 0.6.7"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<rcov>, [">= 0.9.9"])
+      s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+      s.add_dependency(%q<watchr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.12"])
+    s.add_dependency(%q<yard>, ["~> 0.6.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<rcov>, [">= 0.9.9"])
+    s.add_dependency(%q<watchr>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.12"])
+    s.add_dependency(%q<yard>, ["~> 0.6.7"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<rcov>, [">= 0.9.9"])
+    s.add_dependency(%q<spork>, ["~> 0.9.0.rc5"])
+    s.add_dependency(%q<watchr>, [">= 0"])
   end
 end
 

data/lib/gorillib/array/deep_compact.rb

@@ -6,17 +6,8 @@ require 'gorillib/object/blank'
 class Array
   def deep_compact!
     self.map! do |val|
-      case val
-      when Hash
-        val = val.deep_compact!
-      when Array
-        val = val.deep_compact!
-      when String
-        val = nil if val.blank?
-      end
-      val
-    end
-    self.compact!
-    self.blank? ? nil : self
+      val.deep_compact! if val.respond_to?(:deep_compact!)
+      val unless val.blank?
+    end.compact!
   end
 end

data/lib/gorillib/datetime/#flat.rb#

@@ -0,0 +1,30 @@
+require 'time'
+class Time
+  # strftime() format to flatten a date
+  FLAT_FORMAT = "%Y%m%d%H%M%S" unless defined?(FLAT_FORMAT)
+
+  # Flatten
+  def to_flat
+    utc.strftime(FLAT_FORMAT)
+  end unless method_defined?(:to_flat)
+end
+
+class DateTime < Date
+  # strftime() format to flatten a date
+  FLAT_FORMAT = "%Y%m%d%H%M%S" unless defined?(FLAT_FORMAT)
+
+  # Flatten
+  def to_flat
+    strftime(FLAT_FORMAT)
+  end unless method_defined?(:to_flat)
+end
+
+class Date
+  # strftime() format to flatten a date
+  FLAT_FORMAT = "%Y%m%d" unless defined?(FLAT_FORMAT)
+
+  # Flatten
+  def to_flat
+    strftime(FLAT_FORMAT)
+  end unless method_defined?(:to_flat)
+end

data/lib/gorillib/datetime/flat.rb

@@ -1,3 +1,5 @@
+require 'time'
+require 'date'
 class Time
   # strftime() format to flatten a date
   FLAT_FORMAT = "%Y%m%d%H%M%S" unless defined?(FLAT_FORMAT)
@@ -8,16 +10,6 @@ class Time
   end unless method_defined?(:to_flat)
 end
 
-class DateTime < Date
-  # strftime() format to flatten a date
-  FLAT_FORMAT = "%Y%m%d%H%M%S" unless defined?(FLAT_FORMAT)
-
-  # Flatten
-  def to_flat
-    strftime(FLAT_FORMAT)
-  end unless method_defined?(:to_flat)
-end
-
 class Date
   # strftime() format to flatten a date
   FLAT_FORMAT = "%Y%m%d" unless defined?(FLAT_FORMAT)

data/lib/gorillib/datetime/parse.rb

@@ -1,3 +1,5 @@
+require 'time'
+require 'date'
 class Time
   #
   # Parses the time but never fails.
@@ -7,7 +9,7 @@ class Time
   # time zone by parsing it as YYYYmmddHHMMMSSZ <- 'Z' at end
   #
   def self.parse_safely dt
-    return nil if dt.blank?
+    return nil if dt.nil? || (dt.respond_to?(:empty) && dt.empty?)
     begin
       case
       when dt.is_a?(Time)               then dt.utc

data/lib/gorillib/enumerable/sum.rb

@@ -1,38 +1,40 @@
-module Enumerable
-  # Calculates a sum from the elements. Examples:
-  #
-  #  payments.sum { |p| p.price * p.tax_rate }
-  #  payments.sum(&:price)
-  #
-  # The latter is a shortcut for:
-  #
-  #  payments.inject(0) { |sum, p| sum + p.price }
-  #
-  # It can also calculate the sum without the use of a block.
-  #
-  #  [5, 15, 10].sum # => 30
-  #  ["foo", "bar"].sum # => "foobar"
-  #  [[1, 2], [3, 1, 5]].sum => [1, 2, 3, 1, 5]
-  #
-  # The default sum of an empty list is zero. You can override this default:
-  #
-  #  [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
-  #
-  def sum(identity = 0, &block)
-    if block_given?
-      map(&block).sum(identity)
-    else
-      inject { |sum, element| sum + element } || identity
+unless Enumerable.method_defined?(:sum)
+  module Enumerable
+    # Calculates a sum from the elements. Examples:
+    #
+    #  payments.sum { |p| p.price * p.tax_rate }
+    #  payments.sum(&:price)
+    #
+    # The latter is a shortcut for:
+    #
+    #  payments.inject(0) { |sum, p| sum + p.price }
+    #
+    # It can also calculate the sum without the use of a block.
+    #
+    #  [5, 15, 10].sum # => 30
+    #  ["foo", "bar"].sum # => "foobar"
+    #  [[1, 2], [3, 1, 5]].sum => [1, 2, 3, 1, 5]
+    #
+    # The default sum of an empty list is zero. You can override this default:
+    #
+    #  [].sum(Payment.new(0)) { |i| i.amount } # => Payment.new(0)
+    #
+    def sum(identity = 0, &block)
+      if block_given?
+        map(&block).sum(identity)
+      else
+        inject { |sum, element| sum + element } || identity
+      end
     end
-  end unless method_defined?(:sum)
-end
+  end
 
-class Range #:nodoc:
-  # Optimize range sum to use arithmetic progression if a block is not given and
-  # we have a range of numeric values.
-  def sum(identity = 0)
-    return super if block_given? || !(first.instance_of?(Integer) && last.instance_of?(Integer))
-    actual_last = exclude_end? ? (last - 1) : last
-    (actual_last - first + 1) * (actual_last + first) / 2
-  end unless method_defined?(:sum)
+  class Range #:nodoc:
+    # Optimize range sum to use arithmetic progression if a block is not given and
+    # we have a range of numeric values.
+    def sum(identity = 0)
+      return super if block_given? || !(first.instance_of?(Integer) && last.instance_of?(Integer))
+      actual_last = exclude_end? ? (last - 1) : last
+      (actual_last - first + 1) * (actual_last + first) / 2
+    end
+  end
 end