mailosaur 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec06119b13b80148c1afc565e3aa3645d3784c2aec0772da7d2d43443b37cc18
-  data.tar.gz: d2fc23557ffab91c12b3bad70942212395f0d16beaf00feecf5f8914a8d77635
+  metadata.gz: aac97d5c2ae2635b48b73c675fa343d12e1048360d61fe3f89306bd934fe6c9d
+  data.tar.gz: a75707fa35b710fa3821104869d703e719795bda7a6fe4ed78cb72af6568f171
 SHA512:
-  metadata.gz: 8c1212d6c8b230bb1944cd8066fd3498278206ddaae60c44844fc531ec11ddf9a6b800a34ce55403190f0fe873b51ffe30925904e4d7dd580ed7854ea18c2cf7
-  data.tar.gz: 6497b4bb404036491fe89bb5a3fb1e2c6ea81ae8e339e0ed986c69c0286a3852ffd535e97446c95a7ee765481782693c7d5a7ab69a78fb1f4b7a89400f516bca
+  metadata.gz: 71d83efaa73bfa3ea131aa1538381ffe252c7c16cd6ddd3816926b1ade5fb3346c985c9f62964ddd9c87308e5d1beed3602049f6e968bda7cc2b6bc63fd31f63
+  data.tar.gz: 9c44bbc6f312cac44669240d04c034e3275719592c3fdd239e03587949fbd2afc5895870dcffde396ca909ca56523661ba4e9102109a159579475745638a4d84

data/README.md

@@ -27,6 +27,15 @@ export MAILOSAUR_SERVER=server_id
 bundle exec rake test
 ```
 
+## Linting code
+
+Simply run Rubocop:
+
+```
+bundle install
+bundle exec rubocop
+```
+
 ## Contacting us
 
 You can get us at [support@mailosaur.com](mailto:support@mailosaur.com)

data/lib/Mailosaur/analysis.rb

@@ -1,6 +1,5 @@
 module Mailosaur
   class Analysis
-
     #
     # Creates and initializes a new instance of the Analysis class.
     # @param conn client connection.

data/lib/Mailosaur/files.rb

@@ -1,6 +1,5 @@
 module Mailosaur
   class Files
-
     #
     # Creates and initializes a new instance of the Files class.
     # @param client connection.

data/lib/Mailosaur/messages.rb

@@ -1,6 +1,5 @@
 module Mailosaur
   class Messages
-
     #
     # Creates and initializes a new instance of the Messages class.
     # @param client connection.
@@ -28,16 +27,13 @@ module Mailosaur
     #
     # @return [Message] operation results.
     #
-    def get(server, criteria, timeout:10000, received_after:DateTime.now - (1.0/24))
+    def get(server, criteria, timeout: 10_000, received_after: DateTime.now - (1.0 / 24))
       # Defaults timeout to 10s, receivedAfter to 1h
-      if server.length > 8
-        raise Mailosaur::MailosaurError.new('Use get_by_id to retrieve a message using its identifier', nil)
-      end
+      raise Mailosaur::MailosaurError.new('Use get_by_id to retrieve a message using its identifier', nil) if server.length > 8
 
-      result = search(server, criteria, timeout:timeout, received_after:received_after)
-      return get_by_id(result.items[0].id)
+      result = search(server, criteria, timeout: timeout, received_after: received_after)
+      get_by_id(result.items[0].id)
     end
-    
 
     #
     # Retrieve a message
@@ -97,7 +93,7 @@ module Mailosaur
     #
     # @return [MessageListResult] operation results.
     #
-    def list(server, page:nil, items_per_page:nil)
+    def list(server, page: nil, items_per_page: nil)
       url = 'api/messages?server=' + server
       url += page ? '&page=' + page : ''
       url += items_per_page ? '&itemsPerPage=' + items_per_page : ''
@@ -155,7 +151,7 @@ module Mailosaur
     #
     # @return [MessageListResult] operation results.
     #
-    def search(server, criteria, page:nil, items_per_page:nil, timeout:nil, received_after:nil)
+    def search(server, criteria, page: nil, items_per_page: nil, timeout: nil, received_after: nil) # rubocop:disable all
       url = 'api/messages/search?server=' + server
       url += page ? '&page=' + page.to_s : ''
       url += items_per_page ? '&itemsPerPage=' + items_per_page.to_s : ''
@@ -169,20 +165,16 @@ module Mailosaur
         
         unless response.status == 200
           error_model = JSON.load(response.body)
-          mailosaur_error = Mailosaur::MailosaurError.new('Operation returned an invalid status code \'' + response.status.to_s + '\'', error_model)
+          mailosaur_error = Mailosaur::MailosaurError.new('Operation returned an invalid status code \'' + response.status.to_s + '\'', error_model) # rubocop:disable Metrics/LineLength
           raise mailosaur_error
         end
 
         model = JSON.load(response.body)
-        if timeout.to_i == 0 || model['items'].length != 0
-          return Mailosaur::Models::MessageListResult.new(model)
-        end
+        return Mailosaur::Models::MessageListResult.new(model) if timeout.to_i.zero? || !model['items'].empty?
 
-        delay_pattern = (response.headers['x-ms-delay'] || '1000').split(',').map{ |x| x.to_i }
+        delay_pattern = (response.headers['x-ms-delay'] || '1000').split(',').map(&:to_i)
         
-        delay = poll_count >= delay_pattern.length ? 
-          delay_pattern[delay_pattern.length - 1] : 
-          delay_pattern[poll_count]
+        delay = poll_count >= delay_pattern.length ? delay_pattern[delay_pattern.length - 1] : delay_pattern[poll_count]
           
         poll_count += 1
 
@@ -191,7 +183,7 @@ module Mailosaur
           raise Mailosaur::MailosaurError.new('No matching messages were found in time', nil)
         end
 
-        sleep (delay / 1000)
+        sleep(delay / 1000)
       end
     end
   end

data/lib/Mailosaur/models/base_model.rb

@@ -3,10 +3,10 @@ module Mailosaur
       class BaseModel
         def to_json
             hash = {}
-            self.instance_variables.each do |var|
+            instance_variables.each do |var|
               key = var.to_s.delete('@').split('_').collect(&:capitalize).join
               key = key[0].downcase + key[1..-1]
-              hash[key] = self.instance_variable_get var
+              hash[key] = instance_variable_get var
             end
             hash.to_json
         end

data/lib/Mailosaur/servers.rb

@@ -1,6 +1,5 @@
 module Mailosaur
   class Servers
-
     #
     # Creates and initializes a new instance of the Servers class.
     # @param client connection.
@@ -20,7 +19,7 @@ module Mailosaur
     #
     # @return [ServerListResult] operation results.
     #
-    def list()
+    def list
       response = conn.get 'api/servers'
       
       unless response.status == 200

data/lib/Mailosaur/version.rb

@@ -1,3 +1,3 @@
 module Mailosaur
-    VERSION = '6.0.0'
+    VERSION = '6.0.1'
 end

data/lib/mailosaur.rb

@@ -57,9 +57,9 @@ module Mailosaur
     #
     def initialize(api_key, base_url)
       conn = Faraday.new(base_url || 'https://mailosaur.com/', {
-        :headers => {
-          :content_type => 'application/json; charset=utf-8',
-          :user_agent => 'mailosaur-ruby/' + Mailosaur::VERSION
+        headers: {
+          content_type: 'application/json; charset=utf-8',
+          user_agent: 'mailosaur-ruby/' + Mailosaur::VERSION
         }
       })
 

metadata

@@ -1,95 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: mailosaur
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Mailosaur Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.5
     - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.5
     - - "<="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
     - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 10.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
-  name: mail
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 12.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.65.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.65.0
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +191,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Ruby client library for Mailosaur