hatena_fotolife 0.1.3 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +37 -25
  3. data/README.md +4 -1
  4. data/hatena_fotolife.gemspec +8 -9
  5. data/lib/hatena_fotolife/client.rb +31 -10
  6. data/lib/hatena_fotolife/requester.rb +1 -1
  7. data/lib/hatena_fotolife/version.rb +1 -1
  8. metadata +29 -29
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 71097216deb9ca88fbb9c13434b0b86bc57cfca3c79b61dd1d3d21917e204f65
4
- data.tar.gz: b1299b7151f4654401bc9c61ec351563bdb23dc902539e4b1f32bf5e64ef00ad
3
+ metadata.gz: 3a9189e7847064679b8797e31c24f4fe1e2e5fb7672a6e581c076bce977c77e5
4
+ data.tar.gz: abc92815bde2cdb49b746c5aa70b6f804ced320d6b60454b72608845136b4be6
5
5
  SHA512:
6
- metadata.gz: ab82cbe1d10000b77dbd8e0a95fc3e88af239f17b3fe2c44ed82d4384efa0055358a912756a4f6777837fc89a8aa94ffe925c586b542afd7493e872dbda5d7a6
7
- data.tar.gz: 9fc484cb6c59734cde9b0e29425e00c0185db08b5ed5151c511c424ae1f3212b0671400bb58bea29a87723e576ad38f82b092536e277eb794e126bd1635d47e6
6
+ metadata.gz: 2ec02f20ed6ad37fd468895e57b497ab4e2224f2e8f207d44ac812a7683aafbfec18218715c78fee2dd2391e9855f5082d63743c61b003de0ad4666d91a88ece
7
+ data.tar.gz: 569e6a60600aebc79e0a5ff8cafcd8560daef5d851346e2534eae4b48e8b5fbb57dfaaa430eeac88455ce65e1cc5a940ca5551e8b42152c6c56084b8e0727780
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- hatena_fotolife (0.1.3)
4
+ hatena_fotolife (0.1.4)
5
5
  hatenablog
6
6
  nokogiri
7
7
  oauth
@@ -9,34 +9,46 @@ PATH
9
9
  GEM
10
10
  remote: https://rubygems.org/
11
11
  specs:
12
- coderay (1.1.2)
13
- diff-lcs (1.3)
14
- hatenablog (0.6.0)
12
+ coderay (1.1.3)
13
+ diff-lcs (1.6.1)
14
+ hashie (5.0.0)
15
+ hatenablog (0.9.0)
15
16
  nokogiri
16
17
  oauth
17
- method_source (1.0.0)
18
- mini_portile2 (2.4.0)
19
- nokogiri (1.10.9)
20
- mini_portile2 (~> 2.4.0)
21
- oauth (0.5.4)
22
- pry (0.13.1)
18
+ method_source (1.1.0)
19
+ mini_portile2 (2.8.8)
20
+ nokogiri (1.18.6)
21
+ mini_portile2 (~> 2.8.2)
22
+ racc (~> 1.4)
23
+ oauth (1.1.0)
24
+ oauth-tty (~> 1.0, >= 1.0.1)
25
+ snaky_hash (~> 2.0)
26
+ version_gem (~> 1.1)
27
+ oauth-tty (1.0.5)
28
+ version_gem (~> 1.1, >= 1.1.1)
29
+ pry (0.15.2)
23
30
  coderay (~> 1.1)
24
31
  method_source (~> 1.0)
25
- rake (10.5.0)
26
- rspec (3.9.0)
27
- rspec-core (~> 3.9.0)
28
- rspec-expectations (~> 3.9.0)
29
- rspec-mocks (~> 3.9.0)
30
- rspec-core (3.9.2)
31
- rspec-support (~> 3.9.3)
32
- rspec-expectations (3.9.2)
32
+ racc (1.8.1)
33
+ rake (13.2.1)
34
+ rspec (3.13.0)
35
+ rspec-core (~> 3.13.0)
36
+ rspec-expectations (~> 3.13.0)
37
+ rspec-mocks (~> 3.13.0)
38
+ rspec-core (3.13.3)
39
+ rspec-support (~> 3.13.0)
40
+ rspec-expectations (3.13.3)
33
41
  diff-lcs (>= 1.2.0, < 2.0)
34
- rspec-support (~> 3.9.0)
35
- rspec-mocks (3.9.1)
42
+ rspec-support (~> 3.13.0)
43
+ rspec-mocks (3.13.2)
36
44
  diff-lcs (>= 1.2.0, < 2.0)
37
- rspec-support (~> 3.9.0)
38
- rspec-support (3.9.3)
39
- yard (0.9.25)
45
+ rspec-support (~> 3.13.0)
46
+ rspec-support (3.13.2)
47
+ snaky_hash (2.0.1)
48
+ hashie
49
+ version_gem (~> 1.1, >= 1.1.1)
50
+ version_gem (1.1.6)
51
+ yard (0.9.37)
40
52
 
41
53
  PLATFORMS
42
54
  ruby
@@ -45,9 +57,9 @@ DEPENDENCIES
45
57
  bundler (~> 2.0)
46
58
  hatena_fotolife!
47
59
  pry
48
- rake (~> 10.0)
60
+ rake (~> 13.0)
49
61
  rspec (~> 3.0)
50
62
  yard
51
63
 
52
64
  BUNDLED WITH
53
- 2.0.2
65
+ 2.6.6
data/README.md CHANGED
@@ -24,7 +24,7 @@ Or install it yourself as:
24
24
  Hatena Fotolife API requires user authentication with OAuth.
25
25
  So you need to get OAuth 1.0a keys and consumer tokens before using this gem.
26
26
 
27
- ### 1. Get consumer_key & consumer_secret
27
+ ### 1. Get consumer_key & consumer_secret
28
28
  Get consumer_key and consumer_secret from [Hatena Developer Center](https://www.hatena.ne.jp/rlho/config/auth/develop)
29
29
 
30
30
  ### 2. Get access_token & access_token_secret
@@ -41,6 +41,9 @@ consumer_key: <Hatena application consumer key>
41
41
  consumer_secret: <Hatena application consumer secret>
42
42
  access_token: <Hatena application access token>
43
43
  access_token_secret: <Hatena application access token secret>
44
+ consumer_options:
45
+ timeout: 300
46
+ open_timeout: 60
44
47
  ```
45
48
 
46
49
  2. Run
data/hatena_fotolife.gemspec CHANGED
@@ -1,4 +1,3 @@
1
-
2
1
  lib = File.expand_path("../lib", __FILE__)
3
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
3
  require "hatena_fotolife/version"
@@ -23,13 +22,13 @@ Gem::Specification.new do |spec|
23
22
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
24
23
  spec.require_paths = ["lib"]
25
24
 
26
- spec.add_dependency "nokogiri"
27
- spec.add_dependency "oauth"
28
- spec.add_dependency "hatenablog"
25
+ spec.add_dependency "nokogiri", "~> 1.15"
26
+ spec.add_dependency "oauth", "~> 2.0"
27
+ spec.add_dependency "hatenablog", "~> 0.1.0"
29
28
 
30
- spec.add_development_dependency "bundler", "~> 2.0"
31
- spec.add_development_dependency "rake", "~> 10.0"
32
- spec.add_development_dependency "rspec", "~> 3.0"
33
- spec.add_development_dependency "pry"
34
- spec.add_development_dependency "yard"
29
+ spec.add_development_dependency "bundler", "~> 2.4"
30
+ spec.add_development_dependency "rake", "~> 13.0"
31
+ spec.add_development_dependency "rspec", "~> 3.12"
32
+ spec.add_development_dependency "pry", "~> 0.14.2"
33
+ spec.add_development_dependency "yard", "~> 0.9.34"
35
34
  end
data/lib/hatena_fotolife/client.rb CHANGED
@@ -28,18 +28,35 @@ module HatenaFotolife
28
28
  @requester = Requester.create(config)
29
29
  end
30
30
 
31
+ def file_path_to_mime_type(file_path:)
32
+ ext = File.extname(file_path).downcase
33
+ mime_type = case ext
34
+ when '.png' then 'image/png'
35
+ when '.gif' then 'image/gif'
36
+ when '.jpg','.jpeg' then 'image/jpeg'
37
+ else
38
+ raise "Unsupported file extension: #{ext}"
39
+ end
40
+ return mime_type
41
+ end
42
+
31
43
  # Post a image.
32
44
  # @param [String] title entry title
33
45
  # @param [String] content entry content
34
- # @return [HatenaImage::Image] posted image
46
+ # @return [String] URI of posted image
35
47
  def post_image(title: nil, file_path:, subject: nil)
36
- title = File.basename(file_path, '.*') unless title
37
- content = Base64.encode64(open(file_path).read)
38
- entry_xml = image_xml(title: title, content: content)
39
- response = post(entry_xml)
40
- image = Image.load_xml(response.body)
41
- puts "Image url: #{image.image_uri}"
42
- image.image_uri
48
+ begin
49
+ title = File.basename(file_path, '.*') unless title
50
+ content = Base64.encode64(File.open(file_path, 'rb').read)
51
+ mime_type = file_path_to_mime_type(file_path: file_path)
52
+ entry_xml = image_xml(title: title, content: content, subject: subject, mime_type: mime_type)
53
+ response = post(entry_xml)
54
+ image = Image.load_xml(response.body)
55
+ puts "Image url: #{image.image_uri}"
56
+ image.image_uri
57
+ rescue StandardError => e
58
+ puts "Error: #{e.message}"
59
+ end
43
60
  end
44
61
 
45
62
  # Build a entry XML from arguments.
@@ -47,11 +64,15 @@ module HatenaFotolife
47
64
  # @param [String] subject folder name
48
65
  # @param [String] content entry content
49
66
  # @return [String] XML string
50
- def image_xml(title:, content:)
67
+ def image_xml(title:, content:, subject:, mime_type:)
51
68
  builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |xml|
52
69
  xml.entry('xmlns' => 'http://purl.org/atom/ns') do
53
70
  xml.title title
54
- xml.content(content, type: 'image/jpeg', mode: 'base64')
71
+ xml.content(content, type: mime_type, mode: 'base64')
72
+ if subject
73
+ xml.doc.root.add_namespace_definition('dc', 'http://purl.org/dc/elements/1.1/')
74
+ xml['dc'].subject(subject)
75
+ end
55
76
  end
56
77
  end
57
78
  builder.to_xml
data/lib/hatena_fotolife/requester.rb CHANGED
@@ -9,7 +9,7 @@ module HatenaFotolife
9
9
  class RequestError < StandardError; end
10
10
 
11
11
  def self.create(config)
12
- consumer = ::OAuth::Consumer.new(config.consumer_key, config.consumer_secret)
12
+ consumer = ::OAuth::Consumer.new(config.consumer_key, config.consumer_secret, config.consumer_options || {})
13
13
  Requester::OAuth.new(::OAuth::AccessToken.new(consumer, config.access_token, config.access_token_secret))
14
14
  end
15
15
 
data/lib/hatena_fotolife/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module HatenaFotolife
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.5"
3
3
  end
metadata CHANGED
@@ -1,127 +1,127 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hatena_fotolife
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - riho.takagi
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-05-16 00:00:00.000000000 Z
11
+ date: 2025-03-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '1.15'
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: '1.15'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: oauth
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '2.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
- version: '0'
40
+ version: '2.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: hatenablog
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: 0.1.0
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.1.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '2.0'
61
+ version: '2.4'
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
- version: '2.0'
68
+ version: '2.4'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rake
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '10.0'
75
+ version: '13.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: '10.0'
82
+ version: '13.0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: rspec
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '3.0'
89
+ version: '3.12'
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: '3.0'
96
+ version: '3.12'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: pry
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '0'
103
+ version: 0.14.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
- version: '0'
110
+ version: 0.14.2
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: yard
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ">="
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: '0'
117
+ version: 0.9.34
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ">="
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: '0'
124
+ version: 0.9.34
125
125
  description: A ruby gem for Uploading image to Hatena Fotolife
126
126
  email:
127
127
  - rihohearts@gmail.com
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
166
166
  - !ruby/object:Gem::Version
167
167
  version: '0'
168
168
  requirements: []
169
- rubygems_version: 3.0.3
169
+ rubygems_version: 3.0.3.1
170
170
  signing_key:
171
171
  specification_version: 4
172
172
  summary: A ruby gem for Uploading image to Hatena Fotolife