backports 3.1.1 → 3.2.0

data/.travis.yml

@@ -12,7 +12,6 @@ rvm:
 
 matrix:
   allow_failures:
-    - rvm: "2.0.0" # Must wait for 2.0.0p0...
     - rvm: jruby-18mode
     - rvm: jruby-19mode
     - rvm: rbx-18mode

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = Backports --- History
 
+== Version 3.2.0 - April 2nd, 2013
+
+* Moved `Dir.mktmpdir` to the stdlib 'tmpdir' for Ruby 1.8.7
+
+* Removed `returning` as it is no longer part of Rails.
+
 == Version 3.1.0 - March 5th, 2013
 
 * Backports can now be loaded separately!

data/Gemfile

@@ -9,6 +9,7 @@ gemspec
 group :test do
   gem "rake"
   gem 'mspec', :git => 'git://github.com/rubyspec/mspec.git'
+  gem 'activesupport'
 end
 
 # Declare any dependencies that are still in development here instead of in

data/Gemfile.lock

@@ -7,11 +7,16 @@ GIT
 PATH
   remote: .
   specs:
-    backports (3.1.1)
+    backports (3.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
+      multi_json (~> 1.0)
+    i18n (0.6.1)
+    multi_json (1.7.2)
     rake (10.0.3)
 
 PLATFORMS
@@ -19,6 +24,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   backports!
   mspec!
   rake

data/README.rdoc

@@ -1,4 +1,4 @@
-= Backports Library {<img src="https://travis-ci.org/marcandre/backports.png?branch=master">}[https://travis-ci.org/marcandre/backports]
+= Backports Library {<img src="https://travis-ci.org/marcandre/backports.png?branch=master">}[https://travis-ci.org/marcandre/backports] {<img src="https://badge.fury.io/rb/backports.png" alt="Gem Version" />}[http://badge.fury.io/rb/backports] {<img alt='Click here to lend your support to: Ruby Backports and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/19510.png?skin_name=chrome' border='0'}[http://www.pledgie.com/campaigns/19510]
 
 * Yearning to use some of the new cool features in Ruby 2.0.0 while using 1.8.6?
 * One of your client is stuck with Ruby 1.8.6 but you want to use a gem using some features of 1.8.7?
@@ -255,7 +255,6 @@ Some generic methods from Rails methods have been copied:
 
 * Object
   * +try+
-  * +returning+
 
 * String
   * +camelize+, +underscore+

data/lib/backports/1.8.7/stdlib.rb

@@ -0,0 +1 @@
+Backports::StdLib.extend_relative

data/lib/backports/1.8.7/{dir/mktmpdir.rb → stdlib/tmpdir.rb}

@@ -1,5 +1,5 @@
-unless Dir.method_defined? :mktmpdir
-  class Dir
+unless Dir.respond_to? :mktmpdir
+  class << Dir
     def mktmpdir(prefix_suffix=nil, tmpdir=nil)
       raise NoMethodError, "undefined method `mktmpdir' for Dir:Class; you must require 'tmpdir'" unless respond_to? :tmpdir
 

data/lib/backports/rails/hash.rb

@@ -2,12 +2,12 @@ class Hash
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def reverse_merge(other_hash)
     other_hash.merge(self)
-  end
+  end unless method_defined? :reverse_merge
 
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def reverse_merge!(other_hash)
     replace(reverse_merge(other_hash))
-  end
+  end unless method_defined? :reverse_merge!
 
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html]
   def symbolize_keys

data/lib/backports/rails/kernel.rb

@@ -1,12 +1,6 @@
-module Kernel
+class Object
   # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/Object.html]
   def try(method_id, *args, &block)
     send(method_id, *args, &block) unless self.nil?
   end unless method_defined? :try
-
-  # Standard in rails. See official documentation[http://api.rubyonrails.org/classes/Object.html]
-  def returning(obj)
-    yield obj
-    obj
-  end unless method_defined? :returning
 end

data/lib/backports/rails/module.rb

@@ -1,6 +1,6 @@
 class Module
   # Standard in rails... See official documentation[http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Module.html]
-  def alias_method_chain(target, feature)
-    Backports.alias_method_chain(self, target, feature)
+  def alias_method_chain(target, feature, &block)
+    Backports.alias_method_chain(self, target, feature, &block)
   end unless method_defined? :alias_method_chain
 end

data/lib/backports/tools.rb

@@ -256,8 +256,8 @@ module Backports
   # Safe alias_method that will only alias if the source exists and destination doesn't
   def self.alias_method(mod, new_name, old_name)
     mod.instance_eval do
-      alias_method new_name, old_name if method_defined?(old_name) and not method_defined?(new_name)
-    end
+      alias_method new_name, old_name
+    end if mod.method_defined?(old_name) && !mod.method_defined?(new_name)
   end
 
   # Used internally to combine {IO|File} options hash into mode (String or Integer)

data/lib/backports/version.rb

@@ -1,3 +1,3 @@
 module Backports
-  VERSION = "3.1.1" unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+  VERSION = "3.2.0" unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
 end

data/test/_backport_guards_test.rb

@@ -31,7 +31,7 @@ class AAA_TestBackportGuards < Test::Unit::TestCase
     $stderr = @prev
   end
 
-  EXCLUDE = %w[require] # Overriden in all circumstances to load the std-lib
+  EXCLUDE = %w[require require_with_backports require_without_backports] # Overriden in all circumstances to load the std-lib
   EXCLUDE.map!(&:to_sym) if instance_methods.first.is_a?(Symbol)
 
   # For some very strange reason, Hash[kvp.flatten] doesn't always work in 1.8.6??
@@ -73,7 +73,7 @@ class AAA_TestBackportGuards < Test::Unit::TestCase
       compare = after[klass]
       d = methods.map do |name, unbound|
         name unless unbound == compare[name]
-      end
+      end + (compare.map(&:first) - methods.map(&:first))
       d.compact!
       delta[klass] = d unless d.empty?
     end
@@ -89,12 +89,13 @@ class AAA_TestBackportGuards < Test::Unit::TestCase
   # Order super important!
   def test__2_backports_wont_override_unnecessarily
     before = digest
+    latest = "2.0.0"
     unless RUBY_VERSION <= '1.8.6'
-      require "backports/#{RUBY_VERSION}"
+      require "backports/#{[RUBY_VERSION, latest].min}"
       after = digest
       assert_nil digest_delta(before, after)
     end
-    unless RUBY_VERSION == "2.0.0"
+    unless RUBY_VERSION >= latest
       require "backports"
       after = digest
       assert !digest_delta(before, after).nil?
@@ -137,4 +138,13 @@ class AAA_TestBackportGuards < Test::Unit::TestCase
     require 'backports/1.8.7/enumerator/next'
     assert_equal 1, [1,2,3].each.next # [Bug #70]
   end
+
+  def test_rails
+    require 'active_support/all'
+    $stderr.string = '' # disregard warnings by Rails
+    before = digest
+    require "backports/rails"
+    after = digest
+    assert_nil digest_delta(before, after)
+  end
 end

data/test/lazy_test.rb

@@ -388,10 +388,10 @@ class TestLazyEnumerator < Test::Unit::TestCase
                  (1..10).lazy.cycle.inspect)
     assert_equal("#<Enumerator::Lazy: #<Enumerator::Lazy: 1..10>:cycle(3)>",
                  (1..10).lazy.cycle(3).inspect)
-    l = (1..10).lazy.map {}.collect {}.flat_map {}.collect_concat {}.select {}.find_all {}.reject {}.grep(1).zip(?a..?c).take(10).take_while {}.drop(3).drop_while {}.cycle(3)
+    l = (1..10).lazy.map {}.flat_map {}.select {}.reject {}.grep(1).zip(?a..?c).take(10).take_while {}.drop(3).drop_while {}.cycle(3)
     ### Backport: Modified because I don't think the actual name we were called under in case of aliases is important enough to care
     assert_equal(<<EOS.chomp, l.inspect)
-#<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: 1..10>:map>:map>:flat_map>:flat_map>:select>:select>:reject>:grep(1)>:zip("a".."c")>:take(10)>:take_while>:drop(3)>:drop_while>:cycle(3)>
+#<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: #<Enumerator::Lazy: 1..10>:map>:flat_map>:select>:reject>:grep(1)>:zip(\"a\"..\"c\")>:take(10)>:take_while>:drop(3)>:drop_while>:cycle(3)>
 EOS
   end if [].respond_to?(:flat_map)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backports
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies: []
 description: Essential backports that enable many of the nice features of Ruby 1.8.7
   up to 2.0.0 for earlier versions.
@@ -69,7 +69,6 @@ files:
 - lib/backports/1.8.7/dir.rb
 - lib/backports/1.8.7/dir/each.rb
 - lib/backports/1.8.7/dir/foreach.rb
-- lib/backports/1.8.7/dir/mktmpdir.rb
 - lib/backports/1.8.7/enumerable.rb
 - lib/backports/1.8.7/enumerable/count.rb
 - lib/backports/1.8.7/enumerable/cycle.rb
@@ -174,6 +173,8 @@ files:
 - lib/backports/1.8.7/range/step.rb
 - lib/backports/1.8.7/regexp.rb
 - lib/backports/1.8.7/regexp/union.rb
+- lib/backports/1.8.7/stdlib.rb
+- lib/backports/1.8.7/stdlib/tmpdir.rb
 - lib/backports/1.8.7/stop_iteration.rb
 - lib/backports/1.8.7/string.rb
 - lib/backports/1.8.7/string/bytes.rb
@@ -519,18 +520,24 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2299400734931840914
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2299400734931840914
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Backports of Ruby features for older Ruby.
@@ -540,4 +547,3 @@ test_files:
 - test/lazy_test.rb
 - test/socket_interaction_test.rb
 - test/test_helper.rb
-has_rdoc: