faraday 0.9.0.rc7 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7a6a74fd366e7546ba28ccb1c27483fdfb6447
-  data.tar.gz: 991320c247d7c297118ab9bbf66c4abbfe141ec5
+  metadata.gz: 0e442daff424089e143751d7cb1d684c169bf4fc
+  data.tar.gz: ba1dd50171576d5064350e48b8869364c0710a26
 SHA512:
-  metadata.gz: 54db2e8aeeae9dae10066a17642533230a58ef76ea25036428dbf053af9b9ed0fe98f83acaa36bdeaf3e84c30ccb679410ed9e1203b3133ce0de94f1febbae8b
-  data.tar.gz: e6fad8763e2b855fcc9341d314776bfebe162d070be92b566b48eec569732ce35718d0a4a4d920f46fd8e82c6ce308d4c4e176a13678a147f14cd55c73aef7b3
+  metadata.gz: 80c7a955f7d0a2217fcde0be2760649b9e5fc2d950929b118383ba61ea7282410b224315e289b40fec12be13898b0b00551e441704462ac39269368a8f9d5931
+  data.tar.gz: cdef47ebdb9519d0e45e7511326ed1368fa520ad314a4055ea154187193c967f8821573705161e3bbca5d3cbbf40f219071223ba8d24821c5dd89e37ddd16a9e

data/Gemfile

@@ -12,7 +12,7 @@ group :test do
   gem 'httpclient', '>= 2.2'
   gem 'leftright', '>= 0.9', :require => false
   gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
-  gem 'minitest', '~> 5.0.5'
+  gem 'minitest', '>= 5.0.5'
   gem 'net-http-persistent', '>= 2.5', :require => false
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.9.0.rc7"
+  VERSION = "0.9.0"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.

data/lib/faraday/options.rb

@@ -9,6 +9,7 @@ module Faraday
 
     # Public
     def each
+      return to_enum(:each) unless block_given?
       members.each do |key|
         yield(key.to_sym, send(key))
       end
@@ -41,6 +42,11 @@ module Faraday
       value
     end
 
+    # Public
+    def clear
+      members.each { |member| delete(member) }
+    end
+
     # Public
     def merge(value)
       dup.update(value)
@@ -68,9 +74,44 @@ module Faraday
 
     # Public
     def keys
-      members.reject { |m| send(m).nil? }
+      members.reject { |member| send(member).nil? }
+    end
+
+    # Public
+    def empty?
+      keys.empty?
+    end
+
+    # Public
+    def each_key
+      return to_enum(:each_key) unless block_given?
+      keys.each do |key|
+        yield(key)
+      end
+    end
+
+    # Public
+    def key?(key)
+      keys.include?(key)
     end
 
+    alias has_key? key?
+
+    # Public
+    def each_value
+      return to_enum(:each_value) unless block_given?
+      values.each do |value|
+        yield(value)
+      end
+    end
+
+    # Public
+    def value?(value)
+      values.include?(value)
+    end
+
+    alias has_value? value?
+
     # Public
     def to_hash
       hash = {}
@@ -84,9 +125,9 @@ module Faraday
     # Internal
     def inspect
       values = []
-      members.each do |m|
-        value = send(m)
-        values << "#{m}=#{value.inspect}" if value
+      members.each do |member|
+        value = send(member)
+        values << "#{member}=#{value.inspect}" if value
       end
       values = values.empty? ? ' (empty)' : (' ' << values.join(", "))
 

data/test/options_test.rb

@@ -6,6 +6,56 @@ class OptionsTest < Faraday::TestCase
     options :c => SubOptions
   end
 
+  def test_clear
+    options = SubOptions.new(1)
+    assert !options.empty?
+    assert options.clear
+    assert options.empty?
+  end
+
+  def test_empty
+    options = SubOptions.new
+    assert options.empty?
+    options.sub = 1
+    assert !options.empty?
+    options.delete(:sub)
+    assert options.empty?
+  end
+
+  def test_each_key
+    options = ParentOptions.new(1, 2, 3)
+    enum = options.each_key
+    assert_equal enum.next.to_sym, :a
+    assert_equal enum.next.to_sym, :b
+    assert_equal enum.next.to_sym, :c
+  end
+
+  def test_key?
+    options = SubOptions.new
+    assert !options.key?(:sub)
+    options.sub = 1
+    if RUBY_VERSION >= '1.9'
+      assert options.key?(:sub)
+    else
+      assert options.key?("sub")
+    end
+  end
+
+  def test_each_value
+    options = ParentOptions.new(1, 2, 3)
+    enum = options.each_value
+    assert_equal enum.next, 1
+    assert_equal enum.next, 2
+    assert_equal enum.next, 3
+  end
+
+  def test_value?
+    options = SubOptions.new
+    assert !options.value?(1)
+    options.sub = 1
+    assert options.value?(1)
+  end
+
   def test_request_proxy_setter
     options = Faraday::RequestOptions.new
     assert_nil options.proxy
@@ -48,7 +98,7 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_from_options
-    options = ParentOptions.new 1
+    options = ParentOptions.new(1)
 
     value = ParentOptions.from(options)
     assert_equal 1, value.a
@@ -56,7 +106,7 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_from_options_with_sub_object
-    sub = SubOptions.new 1
+    sub = SubOptions.new(1)
     options = ParentOptions.from :a => 1, :c => sub
     assert_kind_of ParentOptions, options
     assert_equal 1, options.a
@@ -115,7 +165,7 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_update
-    options = ParentOptions.new 1
+    options = ParentOptions.new(1)
     assert_equal 1, options.a
     assert_nil options.b
 
@@ -126,14 +176,14 @@ class OptionsTest < Faraday::TestCase
   end
 
   def test_delete
-    options = ParentOptions.new 1
+    options = ParentOptions.new(1)
     assert_equal 1, options.a
     assert_equal 1, options.delete(:a)
     assert_nil options.a
   end
 
   def test_merge
-    options = ParentOptions.new 1
+    options = ParentOptions.new(1)
     assert_equal 1, options.a
     assert_nil options.b
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc7
+  version: 0.9.0
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -142,9 +142,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: 1.3.5
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0