ocean-rails 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd71974843be7814eb5525a922476eb6ef8fe0f
-  data.tar.gz: 2a7a085c80e739c5e6f086d8ecf1d16a665c11ba
+  metadata.gz: 9b1ebefcaefe0c03253d9b06bda0853e2e989aee
+  data.tar.gz: a1403dc8927f967419e22cf7007893a0fbeff4be
 SHA512:
-  metadata.gz: d5fd03559ce4ae215d0a381da478cbdd1a5010439442013257b5c6283b16d0a581778a54470171a0144d0a3582ebc16aa5e526da77a03c3601d64630b83dfa62
-  data.tar.gz: c549619b11f6e6178d43fe01509f2b980dcb44437c8aa5893ad4c3c2a71c71ca7370f5859a50ce96a870313d77f6162423382c7af90822a75cc9a83552e4b46f
+  metadata.gz: 4eca93e9da87b0baad368541f08d7c9673fd9bc59ada298be8c3e0a0b8a83322b0b11df9f5f3d0d09041541abf380d93efae65772f64b3d84346a6b1cfb0c8fe
+  data.tar.gz: 5b44ae5a565e4aa376c2f07b01500479ad7f01f43d57a3840efae99f38678416a287e102754dbc121b859b26f8b0304a610759ff28a1bfa9412042f97976d7c4

data/lib/ocean/api.rb

@@ -160,8 +160,8 @@ class Api
   # 30, etc. To disable waiting between retries entirely, set +backoff_time+ to zero.
   #
   def self.request(url, http_method, args: nil, headers: {}, body: nil,
-                   credentials: nil,
-                   x_api_token: headers['X-API-Token'], 
+                   credentials: nil,                       #Api.credentials,
+                   x_api_token: headers['X-API-Token'],# || Api.service_token, 
                    reauthentication: true,
                    ssl_verifypeer: true, ssl_verifyhost: 2,
                    retries: 0, backoff_time: 1, backoff_rate: 0.9, backoff_max: 30,
@@ -337,13 +337,13 @@ class Api
                      plaintext: nil, html: nil,
                      plaintext_url: nil, html_url: nil, substitutions: nil)
     Api.request "#{INTERNAL_OCEAN_API_URL}/v1/mails", :post, 
-    x_api_token: Api.service_token,
-    body: {
-      from: from, to: to, subject: subject, 
-      plaintext: plaintext, html: html,
-      plaintext_url: plaintext_url, html_url: html_url, 
-      substitutions: substitutions
-    }.to_json
+      x_api_token: Api.service_token, credentials: Api.credentials,
+      body: {
+        from: from, to: to, subject: subject, 
+        plaintext: plaintext, html: html,
+        plaintext_url: plaintext_url, html_url: html_url, 
+        substitutions: substitutions
+      }.to_json
   end
 
 
@@ -355,17 +355,6 @@ class Api
   end
 
 
-
-  #
-  # Given that this service has authenticated successfully with the Auth service,
-  # returns the token returned as part of the authentication response.
-  # NB: This method is deprecated.
-  #
-  def self.token
-    ActiveSupport::Deprecation.warn "Api.token is deprecated, use Api.service_token instead and skip the explicit call to Api.authenticate.", caller
-    service_token
-  end
-
   #
   # This method returns the current token. If no current token has been obtained,
   # authenticates.
@@ -391,7 +380,7 @@ class Api
   #
   def self.authenticate(username=API_USER, password=API_PASSWORD)
     response = Api.post(:auth, "/authentications", nil, 
-                               {'X-API-Authenticate' => encode_credentials(username, password)})
+                               {'X-API-Authenticate' => credentials(username, password)})
     case response.status
     when 201
       token = response.body['authentication']['token']
@@ -419,6 +408,11 @@ class Api
   # credentials so that they're not immediately apparent when reading logs.
   #
   def self.encode_credentials(username=nil, password=nil)
+    ActiveSupport::Deprecation.warn "Api.encode_credentials is deprecated, use Api.credentials instead", caller
+    credentials username, password
+  end
+  
+  def self.credentials(username=nil, password=nil)
     raise "Only specifying the username is not allowed" if username && !password
     username ||= API_USER
     password ||= API_PASSWORD

data/lib/ocean/api_remote_resource.rb

@@ -177,7 +177,7 @@ class Api
 
 
     def self._retrieve(rr)
-      if rr.credentials.present? && rr.credentials != Api.encode_credentials(API_USER, API_PASSWORD)
+      if rr.credentials.present? && rr.credentials != Api.credentials(API_USER, API_PASSWORD)
         credentials = rr.credentials
         token = rr.x_api_token
       else

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "3.6.0"
+  VERSION = "3.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus