fedex 3.3.1 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. data/Readme.md +1 -1
  2. data/fedex.gemspec +2 -2
  3. data/lib/fedex/request/address.rb +4 -2
  4. data/lib/fedex/version.rb +1 -1
  5. data/spec/lib/fedex/address_spec.rb +3 -3
  6. metadata +14 -14
data/Readme.md CHANGED
@@ -212,7 +212,7 @@ To verify an address is valid and deliverable:
212
212
  ```ruby
213
213
 
214
214
  address = {
215
- :street => "5 Elm Street",
215
+ :address => "5 Elm Street",
216
216
  :city => "Norwalk",
217
217
  :state => "CT",
218
218
  :postal_code => "06850",
data/fedex.gemspec CHANGED
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
16
16
 
17
17
  s.license = 'MIT'
18
18
 
19
- s.add_dependency 'httparty', '~> 0.11.0'
20
- s.add_dependency 'nokogiri', '~> 1.5.0'
19
+ s.add_dependency 'httparty', '~> 0.12.0'
20
+ s.add_dependency 'nokogiri', '~> 1.6.0'
21
21
 
22
22
  s.add_development_dependency "rspec", '~> 2.9.0'
23
23
  s.add_development_dependency 'vcr', '~> 2.0.0'
data/lib/fedex/request/address.rb CHANGED
@@ -9,6 +9,8 @@ module Fedex
9
9
  requires!(options, :address)
10
10
  @credentials = credentials
11
11
  @address = options[:address]
12
+
13
+ @address[:address] ||= @address[:street]
12
14
  end
13
15
 
14
16
  def process_request
@@ -17,7 +19,7 @@ module Fedex
17
19
  response = parse_response(api_response)
18
20
  if success?(response)
19
21
  options = response[:address_validation_reply][:address_results][:proposed_address_details]
20
- options = Array(options).first
22
+ options = options.first if options.is_a? Array
21
23
  Fedex::Address.new(options)
22
24
  else
23
25
  error_message = if response[:address_validation_reply]
@@ -69,7 +71,7 @@ module Fedex
69
71
  xml.AddressesToValidate{
70
72
  xml.CompanyName @address[:company] unless @address[:company].nil? or @address[:company].empty?
71
73
  xml.Address{
72
- Array(@address[:street]).take(2).each do |address_line|
74
+ Array(@address[:address]).take(2).each do |address_line|
73
75
  xml.StreetLines address_line
74
76
  end
75
77
  xml.City @address[:city]
data/lib/fedex/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Fedex
2
- VERSION = "3.3.1"
2
+ VERSION = "3.4.0"
3
3
  end
data/spec/lib/fedex/address_spec.rb CHANGED
@@ -11,7 +11,7 @@ module Fedex
11
11
  context "valid address", :vcr do
12
12
  let(:address) do
13
13
  {
14
- :street => "5 Elm Street",
14
+ :address => "5 Elm Street",
15
15
  :city => "Norwalk",
16
16
  :state => "CT",
17
17
  :postal_code => "06850",
@@ -37,7 +37,7 @@ module Fedex
37
37
  context "multiple address validation results", :vcr do
38
38
  let(:address) do
39
39
  {
40
- :street => "301 Las Colinas Blvd",
40
+ :address => "301 Las Colinas Blvd",
41
41
  :city => "Irving",
42
42
  :state => "TX",
43
43
  :postal_code => "75039",
@@ -56,4 +56,4 @@ module Fedex
56
56
 
57
57
  end
58
58
  end
59
- end
59
+ end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fedex
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.1
4
+ version: 3.4.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,33 +9,33 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-21 00:00:00.000000000 Z
12
+ date: 2013-12-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: httparty
16
- requirement: &70294995885800 !ruby/object:Gem::Requirement
16
+ requirement: &70203879296160 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 0.11.0
21
+ version: 0.12.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70294995885800
24
+ version_requirements: *70203879296160
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: nokogiri
27
- requirement: &70294995885280 !ruby/object:Gem::Requirement
27
+ requirement: &70203879295600 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: 1.5.0
32
+ version: 1.6.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70294995885280
35
+ version_requirements: *70203879295600
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &70294995884680 !ruby/object:Gem::Requirement
38
+ requirement: &70203879295140 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 2.9.0
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70294995884680
46
+ version_requirements: *70203879295140
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: vcr
49
- requirement: &70294995884140 !ruby/object:Gem::Requirement
49
+ requirement: &70203879294660 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.0.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70294995884140
57
+ version_requirements: *70203879294660
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: webmock
60
- requirement: &70294995883540 !ruby/object:Gem::Requirement
60
+ requirement: &70203879294200 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: 1.8.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70294995883540
68
+ version_requirements: *70203879294200
69
69
  description: Provides an interface to Fedex Web Services(version 10) - shipping rates,
70
70
  generate labels and address validation
71
71
  email: