webfinger 1.0.0 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: e286fe52073be7eb045d401a409cce77f8af303d
4
- data.tar.gz: a4e1e90738dc64a9fbafa4743093b9e47cf4c817
2
+ SHA256:
3
+ metadata.gz: 44b7fa12cb19c4fec968c4a6a815c0539a5475a3e2b400d0750a87172a500242
4
+ data.tar.gz: 6dd748518f967ffa779027d35d65bf2233f5960ee7277d7efbf6e263e3c59cf3
5
5
  SHA512:
6
- metadata.gz: ddc0f52acae3f1b8f66e470dc307acf4e77f249e1d55cd2012e6bedba43976b89ffc1835ed44bf0fb2bdb2011372c7b9698a14651a89e4d1169908d155b9e583
7
- data.tar.gz: f1137598156ff0416b2fa0ed1019e4969463db9c205b1865dd77a7c72a6ba525a9f808e9d8c6d2f0ac5d9705dc0335ae2a99304d62eab142158ecd91cd457b6d
6
+ metadata.gz: 88bb1d045369cb436e0b633b35698ef6ba9511d1e907c5ddfb19587ba61953ac6a8c40076dd56fad632c05977d1ba6b51165d6911055262004444676484962e0
7
+ data.tar.gz: a22df1a0edf557ac81eeb0d630a177baab6efc3814cf931cbbe4726879881ddab108b85c39e5083e6d4ee03fc4c71c1131102b31189d2a8faf968b173f38dc6b
data/.travis.yml CHANGED
@@ -1,3 +1,8 @@
1
+ before_install:
2
+ - gem install bundler
3
+
1
4
  rvm:
2
- - 1.9.3
3
- - 2.0.0
5
+ - 2.5.8
6
+ - 2.6.6
7
+ - 2.7.2
8
+ - 3.0.0
data/Rakefile CHANGED
@@ -1,18 +1,19 @@
1
- require 'bundler/gem_tasks'
1
+ require 'bundler'
2
+ Bundler::GemHelper.install_tasks
2
3
 
3
4
  require 'rspec/core/rake_task'
4
5
  RSpec::Core::RakeTask.new(:spec)
5
6
 
6
- namespace :cover_me do
7
- desc "Generates and opens code coverage report."
7
+ namespace :coverage do
8
+ desc "Open coverage report"
8
9
  task :report do
9
- require 'cover_me'
10
- CoverMe.complete!
10
+ require 'simplecov'
11
+ `open "#{File.join SimpleCov.coverage_path, 'index.html'}"`
11
12
  end
12
13
  end
13
14
 
14
15
  task :spec do
15
- Rake::Task['cover_me:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
16
+ Rake::Task[:'coverage:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
16
17
  end
17
18
 
18
- task default: :spec
19
+ task :default => :spec
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0
1
+ 1.2.0
@@ -51,7 +51,7 @@ module WebFinger
51
51
 
52
52
  def handle_response
53
53
  raw_response = yield
54
- jrd = MultiJson.load(raw_response).with_indifferent_access
54
+ jrd = JSON.parse(raw_response).with_indifferent_access
55
55
  Response.new jrd
56
56
  rescue HTTPClient::BadResponseError => e
57
57
  case e.res.try(:status)
@@ -70,4 +70,4 @@ module WebFinger
70
70
  end
71
71
  end
72
72
  end
73
- end
73
+ end
@@ -3,10 +3,6 @@
3
3
 
4
4
  module WebFinger
5
5
  class Response < ActiveSupport::HashWithIndifferentAccess
6
- def initialize(jrd)
7
- replace jrd
8
- end
9
-
10
6
  [:subject, :aliases, :properties, :links].each do |method|
11
7
  define_method method do
12
8
  self[method]
@@ -18,13 +14,5 @@ module WebFinger
18
14
  link[:rel] == rel
19
15
  end
20
16
  end
21
-
22
- class << self
23
- # NOTE: Ugly hack to avoid this ActiveSupport 4.0 bug.
24
- # https://github.com/rails/rails/issues/11087
25
- def new_from_hash_copying_default(hash)
26
- superclass.new_from_hash_copying_default hash
27
- end
28
- end
29
17
  end
30
18
  end
data/lib/webfinger.rb CHANGED
@@ -1,6 +1,6 @@
1
- require 'digest/md5'
1
+ require 'json'
2
2
  require 'httpclient'
3
- require 'multi_json'
3
+ require 'active_support'
4
4
  require 'active_support/core_ext'
5
5
 
6
6
  module WebFinger
@@ -45,6 +45,11 @@ module WebFinger
45
45
  _http_client_ = HTTPClient.new(
46
46
  agent_name: "WebFinger (#{VERSION})"
47
47
  )
48
+
49
+ # NOTE: httpclient gem seems stopped maintaining root certtificate set, use OS default.
50
+ _http_client_.ssl_config.clear_cert_store
51
+ _http_client_.ssl_config.cert_store.set_default_paths
52
+
48
53
  _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
49
54
  http_config.try(:call, _http_client_)
50
55
  _http_client_
@@ -57,4 +62,4 @@ end
57
62
  require 'webfinger/debugger'
58
63
  require 'webfinger/exception'
59
64
  require 'webfinger/request'
60
- require 'webfinger/response'
65
+ require 'webfinger/response'
data/spec/spec_helper.rb CHANGED
@@ -1,4 +1,17 @@
1
- require 'cover_me'
1
+ require 'simplecov'
2
+
3
+ SimpleCov.start do
4
+ add_filter 'spec'
5
+ end
6
+
2
7
  require 'rspec'
8
+ require 'rspec/its'
3
9
  require 'webfinger'
10
+
11
+ RSpec.configure do |config|
12
+ config.expect_with :rspec do |c|
13
+ c.syntax = [:should, :expect]
14
+ end
15
+ end
16
+
4
17
  require 'helpers/webmock_helper'
@@ -8,7 +8,7 @@ describe WebFinger::Debugger::RequestFilter do
8
8
 
9
9
  describe '#filter_request' do
10
10
  it 'should log request' do
11
- WebFinger.logger.should_receive(:info).with(
11
+ expect(WebFinger.logger).to receive(:info).with(
12
12
  "======= [WebFinger] HTTP REQUEST STARTED =======\n" +
13
13
  request.dump
14
14
  )
@@ -18,7 +18,7 @@ describe WebFinger::Debugger::RequestFilter do
18
18
 
19
19
  describe '#filter_response' do
20
20
  it 'should log response' do
21
- WebFinger.logger.should_receive(:info).with(
21
+ expect(WebFinger.logger).to receive(:info).with(
22
22
  "--------------------------------------------------\n" +
23
23
  response.dump +
24
24
  "\n======= [WebFinger] HTTP REQUEST FINISHED ======="
@@ -126,16 +126,16 @@ describe WebFinger do
126
126
  subject { WebFinger.debugging? }
127
127
 
128
128
  context 'as default' do
129
- it { should be_false }
129
+ it { should == false }
130
130
  end
131
131
 
132
132
  context 'when debugging' do
133
133
  before { WebFinger.debug! }
134
- it { should be_true }
134
+ it { should == true }
135
135
 
136
136
  context 'when debugging mode canceled' do
137
137
  before { WebFinger.debugging = false }
138
- it { should be_false }
138
+ it { should == false }
139
139
  end
140
140
  end
141
141
  end
data/webfinger.gemspec CHANGED
@@ -1,22 +1,22 @@
1
1
  Gem::Specification.new do |gem|
2
- gem.name = "webfinger"
3
- gem.version = File.read("VERSION").delete("\n\r")
4
- gem.authors = ["nov matake"]
5
- gem.email = ["nov@matake.jp"]
2
+ gem.name = 'webfinger'
3
+ gem.version = File.read('VERSION').delete("\n\r")
4
+ gem.authors = ['nov matake']
5
+ gem.email = ['nov@matake.jp']
6
6
  gem.description = %q{Ruby WebFinger client library}
7
7
  gem.summary = %q{Ruby WebFinger client library, following IETF WebFinger WG spec updates.}
8
- gem.homepage = "https://github.com/nov/webfinger"
8
+ gem.homepage = 'https://github.com/nov/webfinger'
9
9
  gem.license = 'MIT'
10
10
 
11
11
  gem.files = `git ls-files`.split($/)
12
12
  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
13
13
  gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
14
- gem.require_paths = ["lib"]
15
- gem.add_runtime_dependency "httpclient", ">= 2.2.0.2"
16
- gem.add_runtime_dependency "multi_json"
17
- gem.add_runtime_dependency "activesupport"
18
- gem.add_development_dependency "rake"
19
- gem.add_development_dependency "rspec", ">= 2"
20
- gem.add_development_dependency "cover_me", ">= 1.2.0"
21
- gem.add_development_dependency "webmock", ">= 1.6.2"
14
+ gem.require_paths = ['lib']
15
+ gem.add_runtime_dependency 'httpclient', '>= 2.4'
16
+ gem.add_runtime_dependency 'activesupport'
17
+ gem.add_development_dependency 'rake'
18
+ gem.add_development_dependency 'rspec'
19
+ gem.add_development_dependency 'rspec-its'
20
+ gem.add_development_dependency 'simplecov'
21
+ gem.add_development_dependency 'webmock', '>= 1.6.2'
22
22
  end
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: webfinger
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - nov matake
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-10-15 00:00:00.000000000 Z
11
+ date: 2021-10-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: httpclient
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 2.2.0.2
19
+ version: '2.4'
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: 2.2.0.2
26
+ version: '2.4'
27
27
  - !ruby/object:Gem::Dependency
28
- name: multi_json
28
+ name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
- name: activesupport
42
+ name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
- type: :runtime
48
+ type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: rake
56
+ name: rspec
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
- name: rspec
70
+ name: rspec-its
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: '2'
75
+ version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: '2'
82
+ version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
- name: cover_me
84
+ name: simplecov
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
- version: 1.2.0
89
+ version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
- version: 1.2.0
96
+ version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: webmock
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: 1.6.2
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: 1.6.2
111
111
  description: Ruby WebFinger client library
@@ -115,8 +115,8 @@ executables: []
115
115
  extensions: []
116
116
  extra_rdoc_files: []
117
117
  files:
118
- - .gitignore
119
- - .travis.yml
118
+ - ".gitignore"
119
+ - ".travis.yml"
120
120
  - Gemfile
121
121
  - LICENSE.txt
122
122
  - README.rdoc
@@ -148,17 +148,16 @@ require_paths:
148
148
  - lib
149
149
  required_ruby_version: !ruby/object:Gem::Requirement
150
150
  requirements:
151
- - - '>='
151
+ - - ">="
152
152
  - !ruby/object:Gem::Version
153
153
  version: '0'
154
154
  required_rubygems_version: !ruby/object:Gem::Requirement
155
155
  requirements:
156
- - - '>='
156
+ - - ">="
157
157
  - !ruby/object:Gem::Version
158
158
  version: '0'
159
159
  requirements: []
160
- rubyforge_project:
161
- rubygems_version: 2.0.3
160
+ rubygems_version: 3.1.4
162
161
  signing_key:
163
162
  specification_version: 4
164
163
  summary: Ruby WebFinger client library, following IETF WebFinger WG spec updates.