seatbelt 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b432a1876ac0af308c81961c8a7bf8f917cd12ce
-  data.tar.gz: ba90186340d96bd9af93aafa527d4e01b39ea587
+  metadata.gz: 75abded8d89e147f457755b7fe7be161a0cb195e
+  data.tar.gz: 899c5958c9befb0313f5aade6da73c82fd321bf1
 SHA512:
-  metadata.gz: c1618255ffc44a0ea50d76a28c98e1fa8c5d177bbea5f4275b6bb1c28548e61f743d4abaf59d1609ddbaa6e734f989f8bee2d0abe7fc0ac822b2fe0f37fd01d5
-  data.tar.gz: 5f511fa0bf35717cdd82dac728ff2dda955329bb79fe7e62afe0b848ecb13107b75f572d222e69506fa751f9f7341e3da78b32931a41cf91c7377cd315f8001b
+  metadata.gz: 30dfbd2f4392fc3e7372f12197120dbe905c090ca9019b67aab5cb868c02a0dd2145d3a8e8333dca3c3c1ceea90f83253c794da1432ff613766821036804fab9
+  data.tar.gz: 77ae5490f7ca72ba12edea4d508b3b8589687e1b32232649a7034c1d17aec69c11fe34b948e9322db9316971b71708eff84647c33d2f985208a4b0e801a0eaf8

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.3
   # - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-2.2.1
@@ -14,33 +13,33 @@ gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
 
 matrix:
   allow_failures:
     - rvm: rbx-2.2.1
     - rvm: jruby-19mode
+    - gemfile: gemfiles/rails_3.2.gemfile
   exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.0.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_4.0.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails_4.1.gemfile
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails_4.1.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.2.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_4.0.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rails_4.2.gemfile
     - rvm: rbx-2.2.1
       gemfile: gemfiles/rails_3.2.gemfile
     - rvm: rbx-2.2.1
       gemfile: gemfiles/rails_4.0.gemfile
     - rvm: rbx-2.2.1
       gemfile: gemfiles/rails_4.1.gemfile
+    - rvm: rbx-2.2.1
+      gemfile: gemfiles/rails_4.2.gemfile

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.5.0
+
+ * fix issue with encoding for latest _mail_ gem version (`2.6.4`)
+ * drop support for Ruby version 1.8.7 and 1.9.2
+ * re-use assert_json code from the assert_json gem
+
 ## 0.4.0
 
  * supporting `refute_mail` now as well (minitest style) (see [issue #4](https://github.com/alto/seatbelt/pull/4)), thanks to [@jch](https://github.com/jch)

data/Gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
-gem "rails", "4.1.0"
+gem "rails", '~> 4'
 
 gemspec

data/README.md

@@ -1,18 +1,13 @@
 # Seatbelt
 
-[![Build Status](https://secure.travis-ci.org/alto/seatbelt.png)](http://travis-ci.org/alto/seatbelt)
-[![Code Climate](https://codeclimate.com/github/alto/seatbelt.png)](https://codeclimate.com/github/alto/seatbelt)
-[![Coverage Status](https://coveralls.io/repos/aasm/aasm/badge.png?branch=master)](https://coveralls.io/r/aasm/aasm)
+[![Build Status](https://travis-ci.org/alto/seatbelt.svg?branch=master)](https://travis-ci.org/alto/seatbelt)
+[![Code Climate](https://codeclimate.com/github/alto/seatbelt/badges/gpa.svg)](https://codeclimate.com/github/alto/seatbelt)
 
 Seatbelt provides a number of custom, high-level assertions for Ruby and Ruby on Rails. The assertions work well with Ruby
-[1.8.7](http://ruby-doc.org/core-1.8.7/),
-[1.9.2](http://ruby-doc.org/core-1.9.2/),
 [1.9.3](http://ruby-doc.org/core-1.9.3/),
-[2.0.0](http://ruby-doc.org/core-2.0.0/) and
-[2.1.0](http://ruby-doc.org/core-2.1.0/).
-This includes compatibility with
-[test/unit](http://ruby-doc.org/stdlib-1.8.7/libdoc/test/unit/rdoc/index.html) and
-[minitest](http://ruby-doc.org/stdlib-1.9.3/libdoc/minitest/unit/rdoc/index.html).
+[2.0.0](http://ruby-doc.org/core-2.0.0/),
+[2.0.0](http://ruby-doc.org/core-2.1.0/) and
+[2.1.0](http://ruby-doc.org/core-2.2.0/).
 
 ## Installation
 
@@ -36,7 +31,7 @@ Test your [JSON](http://www.json.org/) strings
 
 ```ruby
 class MyActionTest < ActionController::TestCase
-  include Seatbelt::AssertJson
+  include AssertJson
 
   def test_my_action
     get :my_action, :format => 'json'
@@ -109,7 +104,7 @@ end
 
 ## Changelog ##
 
-Look at the [CHANGELOG](https://github.com/xing/assert_json/blob/master/CHANGELOG.md) for details.
+Look at the [CHANGELOG](https://github.com/alto/seatbelt/blob/master/CHANGELOG.md) for details.
 
 ## Authors ##
 

data/gemfiles/rails_3.2.gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
-gem "rails", "3.2.16"
+gem "rails", "~>3"
 
 gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
-gem "rails", "4.0.2"
+gem "rails", "~>4.0"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gem 'rubysl',                           :platforms => :rbx
 gem "jruby-openssl",                    :platforms => :jruby
-gem "rails", "4.1.0"
+gem "rails", "~>4.1"
 
 gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem 'rubysl',                           :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "rails", "~>4.2"
+
+gemspec :path => "../"

data/lib/seatbelt.rb

@@ -1,12 +1,12 @@
 require "seatbelt/version"
-require 'seatbelt/assert_json'
+require 'assert_json'
 require 'seatbelt/assert_mail'
 require 'seatbelt/assert_content_type'
 
 if defined?(Test)
   class Test::Unit::TestCase
     include Seatbelt::AssertContentType if defined?(ActionController)
-    include Seatbelt::AssertJson
+    include AssertJson
     include Seatbelt::AssertMail if defined?(ActionMailer)
   end
 end
@@ -15,13 +15,13 @@ if defined?(Minitest)
   if Minitest::Unit::VERSION[0].to_i < 5
     class Minitest::Unit::TestCase
       include Seatbelt::AssertContentType if defined?(ActionController)
-      include Seatbelt::AssertJson
+      include AssertJson
       include Seatbelt::AssertMail if defined?(ActionMailer)
     end
   else
     class Minitest::Test
       include Seatbelt::AssertContentType if defined?(ActionController)
-      include Seatbelt::AssertJson
+      include AssertJson
       include Seatbelt::AssertMail if defined?(ActionMailer)
     end
   end

data/lib/seatbelt/assert_mail.rb

@@ -62,8 +62,8 @@ module Seatbelt
     def unexpected_body?(mail, options)
       if options[:body]
         Array(options[:body]).each do |element|
-          if !mail.body.encoded.match(element)
-            # puts "#{element} not found in body: #{mail.body.encoded}"
+          if !mail.body.match(element)
+            # puts "#{element} not found in body: #{mail.body}"
             return true
           end
         end

data/lib/seatbelt/version.rb

@@ -1,3 +1,3 @@
 module Seatbelt
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/seatbelt.gemspec

@@ -16,11 +16,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Seatbelt::VERSION
 
-  gem.add_dependency 'multi_json'
+  gem.add_dependency 'assert_json'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'minitest'
-  # gem.add_development_dependency 'turn'
+  gem.add_development_dependency 'maxitest'
   gem.add_development_dependency 'travis-lint'
   gem.add_development_dependency 'json'
   gem.add_development_dependency 'mocha'

data/test/assert_json_old_dsl_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
 class Seatbelt::AssertJsonTest < Minitest::Test
-  include Seatbelt::AssertJson
+  include AssertJson
 
   # def test_string
   #   assert_json '"key"' do |json|

data/test/assert_json_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class Seatbelt::AssertJsonNewDslTest < Minitest::Test
-  include Seatbelt::AssertJson
+  include AssertJson
 
   # def test_string
   #   assert_json '"key"' do

data/test/assert_mail_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class Seatbelt::AssertMailTest < Minitest::Test
 
   def test_assert_mail
-    Mailer.test.deliver
+    deliver
 
     assert_mail :to => 'test@seatbelt.co.nz'
     assert_mail :cc => 'cc@seatbelt.co.nz'
@@ -18,7 +18,7 @@ class Seatbelt::AssertMailTest < Minitest::Test
     assert_mail :to => 'test@seatbelt.co.nz', :subject => /subject/, :body => 'body'
   end
   def test_assert_mail_crosscheck
-    Mailer.test.deliver
+    deliver
 
     assert_assertion_fails { assert_mail :to => 'unknown@seatbelt.co.nz' }
     assert_assertion_fails { assert_mail :cc => 'unknown@seatbelt.co.nz' }
@@ -30,8 +30,8 @@ class Seatbelt::AssertMailTest < Minitest::Test
   end
 
   def test_assert_mail_with_multiple_mails
-    Mailer.test.deliver
-    Mailer.test(:to => 'another@seatbelt.co.nz').deliver
+    deliver
+    deliver :to => 'another@seatbelt.co.nz'
 
     assert_mail :to => 'test@seatbelt.co.nz'
     assert_mail :to => 'another@seatbelt.co.nz'
@@ -39,13 +39,13 @@ class Seatbelt::AssertMailTest < Minitest::Test
 
   def test_assert_mail_with_block
     assert_mail :to => 'test@seatbelt.co.nz', :subject => /subject/, :body => 'body' do
-      Mailer.test.deliver
+      deliver
     end
   end
   def test_assert_mail_with_block_crosscheck
     assert_assertion_fails do
       assert_mail :to => 'unknown@seatbelt.co.nz' do
-        Mailer.test.deliver
+        deliver
       end
     end
   end
@@ -59,22 +59,28 @@ class Seatbelt::AssertMailTest < Minitest::Test
     refute_mail { 3 }
 
     assert_no_mail :to => 'another@seatbelt.co.nz' do
-      Mailer.test.deliver
+      deliver
     end
     assert_no_mail :subject => 'my other subject' do
-      Mailer.test.deliver
+      deliver
     end
     assert_no_mail :body => 'my other body text' do
-      Mailer.test.deliver
+      deliver
     end
   end
 
   def test_assert_no_mail_crosscheck
     assert_assertion_fails do
       assert_no_mail :to => 'test@seatbelt.co.nz' do
-        Mailer.test.deliver
+        deliver
       end
     end
   end
 
+  private
+
+  def deliver(*args)
+    ActionMailer::VERSION::MAJOR > 3 ? Mailer.test(*args).deliver_now : Mailer.test(*args).deliver
+  end
+
 end

data/test/test_helper.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-# require 'turn/autorun'
+require 'maxitest/autorun'
 require 'active_support'
 require 'action_mailer'
 require 'json'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: seatbelt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Thorsten Böttger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: assert_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: maxitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,9 +112,9 @@ files:
 - gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/seatbelt.rb
 - lib/seatbelt/assert_content_type.rb
-- lib/seatbelt/assert_json.rb
 - lib/seatbelt/assert_mail.rb
 - lib/seatbelt/version.rb
 - seatbelt.gemspec
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provide custom assertions for Ruby and Ruby on Rails

data/lib/seatbelt/assert_json.rb

@@ -1,105 +0,0 @@
-require 'multi_json'
-module Seatbelt
-  module AssertJson
-
-    def assert_json(json_string, &block)
-      if block_given?
-        @json = AssertJson::Json.new(json_string)
-        # json.instance_exec(json, &block)
-        yield @json
-      end
-    end
-
-    def has(*args, &block)
-      @json.has(*args, &block)
-    end
-
-    def has_not(*args, &block)
-      @json.has_not(*args, &block)
-    end
-
-    class Json
-
-      def initialize(json_string)
-        @decoded_json = MultiJson.decode(json_string)
-      end
-
-      def has(*args, &block)
-        arg = args.shift
-        token = @decoded_json.is_a?(Array) ? @decoded_json.shift : @decoded_json
-
-        case token
-        when Hash
-          has_hash(token, arg, args)
-        when Array
-          has_array(token, arg)
-        when String
-          has_string(token, arg)
-        when NilClass
-          raise_error("no element left")
-        else
-          flunk
-        end
-
-        if block_given?
-          begin
-            in_scope, @decoded_json = @decoded_json, token.is_a?(Hash) ? token[arg] : token
-            yield
-          ensure
-            @decoded_json = in_scope
-          end
-        end
-
-      end
-      alias element has
-
-      def has_not(*args, &block)
-        arg = args.shift
-        token = @decoded_json
-        case token
-        when Array
-          raise_error("element #{arg} found, but not expected") if token.include?(arg)
-        else
-          raise_error("element #{arg} found, but not expected") if token.keys.include?(arg)
-        end
-      end
-      alias not_element has_not
-
-    private
-
-      def raise_error(message)
-        if Object.const_defined?(:MiniTest)
-          raise MiniTest::Assertion.new(message)
-        else
-          raise Test::Unit::AssertionFailedError.new(message)
-        end
-      end
-
-      def has_hash(token, arg, args)
-        raise_error("element #{arg} not found") unless token.keys.include?(arg)
-        if second_arg = args.shift
-          case second_arg
-          when Regexp
-            raise_error("element #{token[arg].inspect} does not match #{second_arg.inspect}") if second_arg !~ token[arg]
-          else
-            raise_error("element #{token[arg].inspect} does not match #{second_arg.inspect}") if second_arg != token[arg]
-          end
-        end
-      end
-
-      def has_array(token, arg)
-        raise_error("element #{arg} not found") if token != arg
-      end
-
-      def has_string(token, arg)
-        case arg
-        when Regexp
-          raise_error("element #{arg.inspect} not found") if token !~ arg
-        else
-          raise_error("element #{arg.inspect} not found") if token != arg
-        end
-      end
-
-    end
-  end
-end