phrase 0.4.9 → 0.4.10

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.
data/README.md CHANGED
@@ -1,4 +1,6 @@
1
1
  # PhraseApp #
2
+ [![Code Climate](https://codeclimate.com/github/phrase/phrase.png)](https://codeclimate.com/github/phrase/phrase)
3
+ [![Build Status](https://secure.travis-ci.org/phrase/phrase.png)](http://travis-ci.org/phrase/phrase)
2
4
 
3
5
  [PhraseApp](http://phraseapp.com) makes it easy and fast to localize you mobile app or website.
4
6
 
@@ -64,4 +66,4 @@ We will show you how to build a custom client for our API to push and pull trans
64
66
  ## Further Information ##
65
67
  * [Read the PhraseApp documentation](https://phraseapp.com/docs)
66
68
  * [Get your free PhraseApp trial](https://phraseapp.com/signup)
67
- * [Get in touch with the engineers](https://phraseapp.com/contact)
69
+ * [Get in touch with the engineers](https://phraseapp.com/contact)
data/bin/phrase CHANGED
@@ -1,4 +1,8 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
- require 'phrase/tool'
4
- Phrase::Tool.new(ARGV).run
3
+ if RUBY_VERSION < "1.9"
4
+ puts "Ruby Version #{RUBY_VERSION} is not supported. Please use >= 1.9."
5
+ else
6
+ require 'phrase/tool'
7
+ Phrase::Tool.new(ARGV).run
8
+ end
@@ -163,7 +163,7 @@ private
163
163
  else
164
164
  raise "Invalid Request Method: #{method}"
165
165
  end
166
- response = http_client.request(request)
166
+ response = perform_request_with_retry(request, Phrase::Api::Config.api_max_retries)
167
167
  code = response.code.to_i
168
168
 
169
169
  if (code == 200)
@@ -174,6 +174,22 @@ private
174
174
  raise Phrase::Api::Exceptions::ServerError.new(error_message)
175
175
  end
176
176
  end
177
+
178
+ def perform_request_with_retry(request, retries)
179
+ response = nil
180
+
181
+ retries.times do |i|
182
+ response = http_client.request(request)
183
+ break unless should_retry?(request, response)
184
+ sleep(1 + i + rand * 5)
185
+ end
186
+
187
+ response
188
+ end
189
+
190
+ def should_retry?(request, response)
191
+ request.method.to_s.downcase == METHOD_GET.to_s && response.code.to_i == 502
192
+ end
177
193
 
178
194
  def get_request(endpoint, params={})
179
195
  params.merge!('auth_token' => @auth_token)
@@ -19,4 +19,8 @@ class Phrase::Api::Config
19
19
  def self.api_use_ssl?
20
20
  (ENV.fetch("PHRASE_API_USE_SSL", "1") == "1")
21
21
  end
22
+
23
+ def self.api_max_retries
24
+ ENV.fetch("PHRASE_API_MAX_RETRIES", 3).to_i
25
+ end
22
26
  end
@@ -1,3 +1,3 @@
1
1
  module Phrase
2
- VERSION = "0.4.9"
2
+ VERSION = "0.4.10"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phrase
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.9
4
+ version: 0.4.10
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-07-19 00:00:00.000000000 Z
12
+ date: 2013-07-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: colorize
16
- requirement: &70209041741460 !ruby/object:Gem::Requirement
16
+ requirement: &70295699991700 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70209041741460
24
+ version_requirements: *70295699991700
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: json
27
- requirement: &70209041741000 !ruby/object:Gem::Requirement
27
+ requirement: &70295699991240 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70209041741000
35
+ version_requirements: *70295699991240
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: i18n
38
- requirement: &70209041740540 !ruby/object:Gem::Requirement
38
+ requirement: &70295699990780 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70209041740540
46
+ version_requirements: *70295699990780
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &70209041740100 !ruby/object:Gem::Requirement
49
+ requirement: &70295699990340 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70209041740100
57
+ version_requirements: *70295699990340
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &70209041739580 !ruby/object:Gem::Requirement
60
+ requirement: &70295699989820 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70209041739580
68
+ version_requirements: *70295699989820
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: webmock
71
- requirement: &70209041739080 !ruby/object:Gem::Requirement
71
+ requirement: &70295699989320 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70209041739080
79
+ version_requirements: *70295699989320
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: vcr
82
- requirement: &70209041738420 !ruby/object:Gem::Requirement
82
+ requirement: &70295699988660 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70209041738420
90
+ version_requirements: *70295699988660
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: timecop
93
- requirement: &70209041737620 !ruby/object:Gem::Requirement
93
+ requirement: &70295699987860 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70209041737620
101
+ version_requirements: *70295699987860
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: genspec
104
- requirement: &70209041737200 !ruby/object:Gem::Requirement
104
+ requirement: &70295699987440 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70209041737200
112
+ version_requirements: *70295699987440
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rails
115
- requirement: &70209041736740 !ruby/object:Gem::Requirement
115
+ requirement: &70295699986980 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70209041736740
123
+ version_requirements: *70295699986980
124
124
  description: phrase allows you to edit translations in-place on the page itself. More
125
125
  information at phraseapp.com
126
126
  email: