grifter 0.3.1 → 0.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +2 -2
  3. data/Gemfile.lock +43 -41
  4. data/grifter.gemspec +8 -8
  5. data/lib/grifter/http_service.rb +5 -1
  6. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92ce55f73d37a2bd96b3794973480bb2bf46e43f
4
- data.tar.gz: e1a182a45e88bedfa500ce26f320893c5d6b9d45
3
+ metadata.gz: f65192478a13844ee1baa9e2b14e643fcf90bf8d
4
+ data.tar.gz: 0c77141f8d51cd0e8c7acfcbe1e46989140a5be5
5
5
  SHA512:
6
- metadata.gz: 0cafba4d159158bef39eb31306987b67d53b220356751c1615d331ca39a11a1712c12da3c7997bdfd3a0a1635fb4144de2fea62f42d92593210efa266f7e5cb6
7
- data.tar.gz: 9b246185773fe8071f3dafc45e7e845f3f4d2f2477cc5bc16ee6c0dbacf47fab7569675d53687415d8e7549966208d462d5e4206fc30f4c046ee913c1eaec77a
6
+ metadata.gz: 58e0aa61a159be1e07c07e277cdf45c1c9a492a8bb5b849e1c7595d9e500c0604d12cac1d45594861aef7d96e0fec3000d53c065ccf701338cbfa1d76561d4ba
7
+ data.tar.gz: be2d539d498b1236908331f6eef91c9005079f546181e12cffb1a851095af7eb328edf674d945a87821dccbc3b953cc1bf5e328fa416b06c49b55f74dde767bf
data/Gemfile CHANGED
@@ -2,9 +2,9 @@ source :rubygems
2
2
 
3
3
  #gemspec
4
4
 
5
- gem 'faraday'
5
+ gem 'faraday', '0.9.0'
6
6
  gem 'json'
7
- gem 'typhoeus'
7
+ gem 'typhoeus', '0.6.4'
8
8
 
9
9
  group :development do
10
10
  gem 'rspec'
data/Gemfile.lock CHANGED
@@ -2,80 +2,82 @@ GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
4
  addressable (2.3.5)
5
- awesome_print (1.1.0)
5
+ awesome_print (1.2.0)
6
6
  builder (3.2.2)
7
- coderay (1.0.9)
8
- diff-lcs (1.2.4)
9
- ethon (0.6.1)
7
+ coderay (1.1.0)
8
+ descendants_tracker (0.0.3)
9
+ diff-lcs (1.2.5)
10
+ ethon (0.6.2)
10
11
  ffi (>= 1.3.0)
11
12
  mime-types (~> 1.18)
12
- faraday (0.8.8)
13
- multipart-post (~> 1.2.0)
13
+ faraday (0.9.0)
14
+ multipart-post (>= 1.2, < 3)
14
15
  ffi (1.9.3)
15
- git (1.2.5)
16
- github_api (0.10.1)
17
- addressable
18
- faraday (~> 0.8.1)
16
+ git (1.2.6)
17
+ github_api (0.11.1)
18
+ addressable (~> 2.3)
19
+ descendants_tracker (~> 0.0.1)
20
+ faraday (~> 0.8, < 0.10)
19
21
  hashie (>= 1.2)
20
- multi_json (~> 1.4)
21
- nokogiri (~> 1.5.2)
22
+ multi_json (>= 1.7.5, < 2.0)
23
+ nokogiri (~> 1.6.0)
22
24
  oauth2
23
25
  hashie (2.0.5)
24
- highline (1.6.19)
25
- httpauth (0.2.0)
26
- jeweler (1.8.6)
26
+ highline (1.6.20)
27
+ jeweler (2.0.0)
27
28
  builder
28
- bundler (~> 1.0)
29
+ bundler (>= 1.0)
29
30
  git (>= 1.2.5)
30
- github_api (= 0.10.1)
31
+ github_api
31
32
  highline (>= 1.6.15)
32
- nokogiri (= 1.5.10)
33
+ nokogiri (>= 1.5.10)
33
34
  rake
34
35
  rdoc
35
- json (1.8.0)
36
- jwt (0.1.8)
36
+ json (1.8.1)
37
+ jwt (0.1.11)
37
38
  multi_json (>= 1.5)
38
39
  method_source (0.8.2)
39
40
  mime-types (1.25.1)
40
- multi_json (1.7.8)
41
- multi_xml (0.5.4)
42
- multipart-post (1.2.0)
43
- nokogiri (1.5.10)
44
- oauth2 (0.9.2)
45
- faraday (~> 0.8)
46
- httpauth (~> 0.2)
47
- jwt (~> 0.1.4)
48
- multi_json (~> 1.0)
41
+ mini_portile (0.5.2)
42
+ multi_json (1.8.4)
43
+ multi_xml (0.5.5)
44
+ multipart-post (2.0.0)
45
+ nokogiri (1.6.1)
46
+ mini_portile (~> 0.5.0)
47
+ oauth2 (0.9.3)
48
+ faraday (>= 0.8, < 0.10)
49
+ jwt (~> 0.1.8)
50
+ multi_json (~> 1.3)
49
51
  multi_xml (~> 0.5)
50
52
  rack (~> 1.2)
51
- pry (0.9.12.2)
52
- coderay (~> 1.0.5)
53
+ pry (0.9.12.4)
54
+ coderay (~> 1.0)
53
55
  method_source (~> 0.8)
54
56
  slop (~> 3.4)
55
57
  rack (1.5.2)
56
- rake (10.1.0)
57
- rdoc (4.0.1)
58
+ rake (10.1.1)
59
+ rdoc (4.1.1)
58
60
  json (~> 1.4)
59
61
  rspec (2.14.1)
60
62
  rspec-core (~> 2.14.0)
61
63
  rspec-expectations (~> 2.14.0)
62
64
  rspec-mocks (~> 2.14.0)
63
- rspec-core (2.14.4)
64
- rspec-expectations (2.14.0)
65
+ rspec-core (2.14.7)
66
+ rspec-expectations (2.14.4)
65
67
  diff-lcs (>= 1.1.3, < 2.0)
66
- rspec-mocks (2.14.2)
67
- slop (3.4.6)
68
- typhoeus (0.6.6)
69
- ethon (~> 0.6.1)
68
+ rspec-mocks (2.14.4)
69
+ slop (3.4.7)
70
+ typhoeus (0.6.4)
71
+ ethon (~> 0.6.0)
70
72
 
71
73
  PLATFORMS
72
74
  ruby
73
75
 
74
76
  DEPENDENCIES
75
77
  awesome_print
76
- faraday
78
+ faraday (= 0.9.0)
77
79
  jeweler
78
80
  json
79
81
  pry
80
82
  rspec
81
- typhoeus
83
+ typhoeus (= 0.6.4)
data/grifter.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "grifter"
8
- s.version = "0.3.1"
8
+ s.version = "0.3.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Robert Schultheis"]
12
- s.date = "2014-01-15"
12
+ s.date = "2014-01-26"
13
13
  s.description = "convention based approach to interfacing with an HTTP JSON API."
14
14
  s.email = "rob@knewton.com"
15
15
  s.executables = ["grift"]
@@ -42,26 +42,26 @@ Gem::Specification.new do |s|
42
42
  s.specification_version = 4
43
43
 
44
44
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
45
- s.add_runtime_dependency(%q<faraday>, [">= 0"])
45
+ s.add_runtime_dependency(%q<faraday>, ["= 0.9.0"])
46
46
  s.add_runtime_dependency(%q<json>, [">= 0"])
47
- s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
47
+ s.add_runtime_dependency(%q<typhoeus>, ["= 0.6.4"])
48
48
  s.add_development_dependency(%q<rspec>, [">= 0"])
49
49
  s.add_development_dependency(%q<pry>, [">= 0"])
50
50
  s.add_development_dependency(%q<awesome_print>, [">= 0"])
51
51
  s.add_development_dependency(%q<jeweler>, [">= 0"])
52
52
  else
53
- s.add_dependency(%q<faraday>, [">= 0"])
53
+ s.add_dependency(%q<faraday>, ["= 0.9.0"])
54
54
  s.add_dependency(%q<json>, [">= 0"])
55
- s.add_dependency(%q<typhoeus>, [">= 0"])
55
+ s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
56
56
  s.add_dependency(%q<rspec>, [">= 0"])
57
57
  s.add_dependency(%q<pry>, [">= 0"])
58
58
  s.add_dependency(%q<awesome_print>, [">= 0"])
59
59
  s.add_dependency(%q<jeweler>, [">= 0"])
60
60
  end
61
61
  else
62
- s.add_dependency(%q<faraday>, [">= 0"])
62
+ s.add_dependency(%q<faraday>, ["= 0.9.0"])
63
63
  s.add_dependency(%q<json>, [">= 0"])
64
- s.add_dependency(%q<typhoeus>, [">= 0"])
64
+ s.add_dependency(%q<typhoeus>, ["= 0.6.4"])
65
65
  s.add_dependency(%q<rspec>, [">= 0"])
66
66
  s.add_dependency(%q<pry>, [">= 0"])
67
67
  s.add_dependency(%q<awesome_print>, [">= 0"])
data/lib/grifter/http_service.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'faraday'
2
2
  require 'typhoeus'
3
3
  require 'typhoeus/adapters/faraday' #https://github.com/typhoeus/typhoeus/issues/226#issuecomment-9919517
4
+ #Faraday.require_libs 'parameters'
4
5
 
5
6
  require_relative 'json_helpers'
6
7
  require_relative 'log'
@@ -27,9 +28,12 @@ class Grifter
27
28
  #do our own logging
28
29
  #conn_builder.response logger: logger
29
30
  #conn_builder.adapter Faraday.default_adapter # make requests with Net::HTTP
30
- conn_builder.adapter :typhoeus
31
+ conn_builder.adapter @config.fetch(:adapter, :typhoeus).intern
31
32
  conn_builder.ssl[:verify] = false if @config[:ignore_ssl_cert]
32
33
 
34
+ #defaulting this to flat adapter avoids issues when duplicating parameters
35
+ conn_builder.options[:params_encoder] = Faraday.const_get(@config.fetch(:params_encoder, 'FlatParamsEncoder'))
36
+
33
37
  #this nonsense dont work?! https://github.com/lostisland/faraday_middleware/issues/76
34
38
  #conn_builder.use :instrumentation
35
39
  end
metadata CHANGED
@@ -1,29 +1,29 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: grifter
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.1
4
+ version: 0.3.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Robert Schultheis
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-15 00:00:00.000000000 Z
11
+ date: 2014-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: 0.9.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: 0.9.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: json
29
29
  requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
42
42
  name: typhoeus
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: 0.6.4
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: 0.6.4
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rspec
57
57
  requirement: !ruby/object:Gem::Requirement