howitzer 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a374cf3c69c1e057678dfed76d2a45df4fe72091
-  data.tar.gz: 57021f22549c5393fb74e74e25bf26a24454d54a
+  metadata.gz: 822093c8e01134d6819f07781fcfc9533ec21191
+  data.tar.gz: b6081c2e41b5c78b2c6cdbdb31e088021c9b1cad
 SHA512:
-  metadata.gz: 39064d9e1cc0c11e8134c8a30cc99ae5d3053c4f2a5ae2be5eed12afc5b95882a560ee43fbeb0000297f8c8470837b11121205b459aedffeb612c60f5ccefcbf
-  data.tar.gz: 6fc24bf0d0e100eaad09e3965a291ab0e12b0a39cf47d7b4284f443d5cdfc8975bc985dd2e660471db39b6e542116874e11d9d7ce41c1e097f0eddde9bae99b3
+  metadata.gz: 1374d0e20e3ffeeb0ac2feb61680b1edfef288cb56554b624adf2307e9f27b264111047692393ea117c4f60aebc4cd3fcdfab0810abaabeed1dd3b680063f779
+  data.tar.gz: 63bf664720ec9d50af9b3d0118dae1f7669ae4f0c47de50a589675fa86e3787528f95a33b06f77e0bb8b40c307c0858c2594f027dd4b135c009b08c7e35a0ce7

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
+before_install:
+  - gem install bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.6
-  - 2.2.0
-  - 2.2.1
-  - 2.2.2
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1

data/CHANGELOG.md

@@ -1,9 +1,15 @@
-## [In git](https://github.com/strongqa/howitzer/compare/v1.1.0...master)
+## [In git](https://github.com/strongqa/howitzer/compare/v1.1.1...master)
 
 ### New Features
 
 ### Bugfixes
 
+## [v1.1.1](https://github.com/strongqa/howitzer/compare/v1.1.0...v1.1.1)
+
+### Bugfixes
+- fixed problem with Mailgun
+- fixed problems with gems
+
 ## [v1.1.0](https://github.com/strongqa/howitzer/compare/v1.0.2...v1.1.0)
 
 ### New Features
@@ -67,7 +73,7 @@ It is major release, so there are many new features, refactoring, unit tests, co
 
 ### Bugfixes
 
-* Fixed problem with dependencies 
+* Fixed problem with dependencies
 
 ## [v0.0.1](https://github.com/strongqa/howitzer/tree/v0.0.1)
 

data/Gemfile

@@ -4,4 +4,4 @@ group :test do
   gem 'coveralls', require: false
   gem 'simplecov', require: false
 end
-gemspec
+gemspec

data/howitzer.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
 
   gem.add_runtime_dependency 'nokogiri', '~> 1.6' if gem.platform.to_s =~ /mswin|mingw/
+  gem.add_runtime_dependency 'rack', '~> 1.0'
+  gem.add_runtime_dependency 'tins', '1.6.0'
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'gli'
   gem.add_runtime_dependency 'syntax'
@@ -28,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'repeater'
   gem.add_runtime_dependency 'launchy'
   gem.add_runtime_dependency 'log4r', '~>1.1.10'
-  gem.add_runtime_dependency 'rest-client'
+  gem.add_runtime_dependency 'rest-client', '~>1.8'
   gem.add_runtime_dependency 'poltergeist'
   gem.add_runtime_dependency 'rawler'
   gem.add_runtime_dependency 'capybara'

data/lib/howitzer/capybara/settings.rb

@@ -325,7 +325,7 @@ module Capybara
     Capybara.run_server = false
     Capybara.app_host = ''
     Capybara.asset_host = app_base_url
-    Capybara.default_wait_time = settings.timeout_small
+    Capybara.default_max_wait_time = settings.timeout_small
     Capybara.ignore_hidden_elements = true
     Capybara.visible_text_only = true
     Capybara.match = :one
@@ -340,4 +340,4 @@ end
 
 # @deprecated
 #
-CapybaraSettings = Capybara::Settings
+CapybaraSettings = Capybara::Settings

data/lib/howitzer/email.rb

@@ -46,7 +46,7 @@ class Email
         hash['message']['recipients'].first == recipient && hash['message']['headers']['subject'] == subject
       end
       if event
-        message = Mailgun::Connector.instance.client.get("domains/#{Mailgun::Connector.instance.domain}/messages/#{event['storage']['key']}").to_h
+        message = Mailgun::Connector.instance.client.get_url(event['storage']['url']).to_h
       else
         raise Howitzer::EmailNotFoundError.new('Message not received yet, retry...')
       end
@@ -131,4 +131,4 @@ class Email
     end
     files
   end
-end
+end

data/lib/howitzer/mailgun/client.rb

@@ -10,9 +10,11 @@ module Mailgun
   # of communicating with our API.
 
   class Client
+    attr_reader :api_key
 
-    def initialize(api_key, api_host="api.mailgun.net", api_version="v2", ssl=true)
+    def initialize(api_key, api_host="api.mailgun.net", api_version="v3", ssl=true)
       endpoint = endpoint_generator(api_host, api_version, ssl)
+      @api_key = api_key
       @http_client = RestClient::Resource.new(endpoint,
                                               :user => "api",
                                               :password => api_key,
@@ -36,6 +38,21 @@ module Mailgun
       log.error Howitzer::CommunicationError, e.message
     end
 
+    def get_url(url, params=nil, accept="*/*")
+      response = ::RestClient::Request.execute(
+        method: :get,
+        url: url,
+        user: 'api',
+        password: api_key,
+        user_agent: 'mailgun-sdk-ruby',
+        accept: accept,
+        params: params
+      )
+      Response.new(response)
+    rescue => e
+      log.error Howitzer::CommunicationError, e.message
+    end
+
     private
 
     def endpoint_generator(api_host, api_version, ssl)

data/lib/howitzer/version.rb

@@ -1,3 +1,3 @@
 module Howitzer
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/unit/lib/capybara/settings_spec.rb

@@ -174,19 +174,6 @@ RSpec.describe 'Capybara::Settings' do
         end
       end
 
-      context "and opera browser" do
-        before do
-          allow(Capybara::Settings).to receive(:ie_browser?).and_return(false)
-          allow(Capybara::Settings).to receive(:ff_browser?).and_return(false)
-          allow(Capybara::Settings).to receive(:chrome_browser?).and_return(false)
-          allow(Capybara::Settings).to receive(:opera_browser?).and_return(true)
-        end
-        it do
-          expect(subject.call).to be_an_instance_of(Capybara::Selenium::Driver)
-          expect(subject.call.options[:desired_capabilities][:browser_name]).to eq('opera')
-        end
-      end
-
       context "and safari browser" do
         before do
           allow(Capybara::Settings).to receive(:ie_browser?).and_return(false)
@@ -451,4 +438,4 @@ RSpec.describe 'Capybara::Settings' do
       it { is_expected.to eq('') }
     end
   end
-end
+end

data/spec/unit/lib/email_spec.rb

@@ -44,10 +44,23 @@ RSpec.describe 'Email' do
     let(:events) { double(to_h: {'items' => [event]}) }
     subject { Email.find(recipient, message_subject) }
     context 'when message is found' do
-      let(:event) { {'message' => {'recipients' => [recipient], 'headers' => {'subject' => message_subject} }, 'storage' => {'key' => '1234567890'} } }
+      let(:url) { 'https://mailgun.com/domains/mailgun@test.domain/messages/1234567890' }
+      let(:event) do
+        {
+          'message' => {
+            'recipients' => [recipient],
+            'headers' => {
+              'subject' => message_subject
+            }
+          },
+          'storage' => {
+            'url' => url
+          }
+        }
+      end
       before do
         allow(Mailgun::Connector.instance.client).to receive(:get).with('mailgun@test.domain/events', event: 'stored').ordered.once {events}
-        allow(Mailgun::Connector.instance.client).to receive(:get).with('domains/mailgun@test.domain/messages/1234567890').ordered.once { mailgun_message }
+        allow(Mailgun::Connector.instance.client).to receive(:get_url).with(url).ordered.once { mailgun_message }
       end
       it do
         expect(Email).to receive(:new).with(message).once
@@ -126,4 +139,4 @@ RSpec.describe 'Email' do
       end
     end
   end
-end
+end

data/spec/unit/lib/mailgun/response_spec.rb

@@ -19,11 +19,10 @@ RSpec.describe Mailgun::Response do
       it { is_expected.to eq({'foo' => 'bar'})}
     end
     context 'when impossible parse body' do
-      let(:body) { '123' }
+      let(:body) { "123" }
       it do
-        expect(log).to receive(:error).with(Howitzer::ParseError, "757: unexpected token at '123'").once.and_call_original
         expect { subject }.to raise_error(Howitzer::ParseError)
       end
     end
   end
-end
+end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: howitzer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Roman Parashchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +168,16 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -425,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby based framework for acceptance testing
@@ -470,4 +498,3 @@ test_files:
 - spec/unit/lib/utils/page_validator_spec.rb
 - spec/unit/lib/web_page_spec.rb
 - spec/unit/version_spec.rb
-has_rdoc: