seatbelt 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c08abe7ab48fe8e3fc676eb5133d7ec3740a1f3
+  data.tar.gz: 586848e2efcbc486e9c3b2b0e070e7cf700aa4b9
+SHA512:
+  metadata.gz: cf5fcac2f269e35a493a5c7a8913e8158f790a5bf1ca43185fe86bc2f392cbb427a0af40417b0609bae78bd8e95c8d927611e6dbebeca00a9690e707bc119051
+  data.tar.gz: ad23351169ea72a4324305241327650fbcec44f241dea7460e7e5ccff46867adabcd3d7445f14d983d0d4978d38f15bc2ed35aeb349fdff52de1eaa6723498f0

data/.travis.yml

@@ -1,9 +1,27 @@
 language: ruby
+
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode # JRuby in 1.8 mode
+  - 2.0.0
+  # - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx-2.2.1
+
+gemfile:
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2.2.1
+    - rvm: jruby-19mode
+  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: jruby-19mode, gemfile: gemfiles/rails_3.2.gemfile }
+    - { rvm: jruby-19mode, gemfile: gemfiles/rails_4.0.gemfile }
+    - { rvm: rbx-2.2.1, gemfile: gemfiles/rails_3.2.gemfile }
+    - { rvm: rbx-2.2.1, gemfile: gemfiles/rails_4.0.gemfile }

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 0.2.0
+
+ * added support for Rails 4 (thanks to [@clod81](https://github.com/clod81))
+
+## 0.1.2
+
+  * added assert_content_type
+
 ## 0.1.1
 
   * assert_mail subject now support regular explicitly (not implicitly anymore)

data/Gemfile

@@ -1,4 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+
+gem 'rubysl',                           :platforms => :rbx
+gem "jruby-openssl",                    :platforms => :jruby
+gem "rails", "4.0.2"
 
-# Specify your gem's dependencies in seatbelt.gemspec
 gemspec

data/README.md

@@ -1,6 +1,12 @@
-# Seatbelt [![Build Status](https://secure.travis-ci.org/alto/seatbelt.png)](http://travis-ci.org/alto/seatbelt)
-
-Provide a number of custom assertions for Ruby and Ruby on Rails
+# Seatbelt [![Build Status](https://secure.travis-ci.org/alto/seatbelt.png)](http://travis-ci.org/alto/seatbelt) [![Code Climate](https://codeclimate.com/badge.png)](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/), and
+[1.9.3](http://ruby-doc.org/core-1.9.3/).
+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).
 
 ## Installation
 

data/gemfiles/rails_3.2.gemfile

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

data/gemfiles/rails_4.0.gemfile

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

data/lib/seatbelt/assert_content_type.rb

@@ -0,0 +1,48 @@
+module Seatbelt
+  module AssertContentType
+
+    SUPPORTED_MIME_TYPES = {
+      'html'              => 'text/html',
+      'xhtml'             => 'text/html',
+      'text'              => 'text/plain',
+      'txt'               => 'text/plain',
+      'js'                => 'text/javascript',
+      'css'               => 'text/css',
+      'ics'               => 'text/calendar',
+      'csv'               => 'text/csv',
+      'xml'               => 'application/xml',
+      'rss'               => 'application/rss+xml',
+      'atom'              => 'application/atom+xml',
+      'yaml'              => 'application/x-yaml',
+      'multipart_form'    => 'multipart/form-data',
+      'url_encoded_form'  => 'application/x-www-form-urlencoded',
+      'json'              => 'application/json',
+      'pdf'               => 'application/pdf',
+      'xls'               => 'application/vnd.ms-excel'
+    }
+
+    def assert_content_type(content_type, header=nil)
+      header = @response.headers["Content-Type"] if header.nil? && @response
+      if header
+        # assert_match /application\/vnd.ms-excel/, @response.header["Content-Type"]
+        assert_match matcher_for(content_type), header
+      else
+        assert false, "nothing to match against!"
+      end
+    end
+
+  private
+
+  def matcher_for(content_type)
+    case content_type
+    when Regexp
+      content_type
+    when String
+      Regexp.new((SUPPORTED_MIME_TYPES[content_type] || content_type).gsub('+', '\\\+'))
+    else
+      raise "type unknown: #{content_type}"
+    end
+  end
+
+  end
+end

data/lib/seatbelt/assert_json.rb

@@ -27,26 +27,14 @@ module Seatbelt
       def has(*args, &block)
         arg = args.shift
         token = @decoded_json.is_a?(Array) ? @decoded_json.shift : @decoded_json
+
         case token
         when Hash
-          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
+          has_hash(token, arg, args)
         when Array
-          raise_error("element #{arg} not found") if token != arg
+          has_array(token, arg)
         when String
-          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
+          has_string(token, arg)
         when NilClass
           raise_error("no element left")
         else
@@ -77,20 +65,41 @@ module Seatbelt
       end
       alias not_element has_not
 
-      private
+    private
 
-        def raise_error(message)
-          if Object.const_defined?(:MiniTest)
-            raise MiniTest::Assertion.new(message)
+      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 Test::Unit::AssertionFailedError.new(message)
+            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
-
-class Test::Unit::TestCase
-  include Seatbelt::AssertJson
-end

data/lib/seatbelt/assert_mail.rb

@@ -22,33 +22,53 @@ module Seatbelt
     end
 
     def got_mail?(mail, options={})
-      return false if options[:to]      && !mail.to.include?(options[:to])
-      return false if options[:from]    && !mail.from.include?(options[:from])
+      return false if unexpected_recipient?(mail, options)
+      return false if unexpected_sender?(mail, options)
+      return false if unexpected_subject?(mail, options)
+      return false if unexpected_copy?(mail, options)
+      return false if unexpected_blind_copy?(mail, options)
+      return false if unexpected_body?(mail, options)
+      true
+    end
+
+    def unexpected_recipient?(mail, options)
+      options[:to] && !mail.to.include?(options[:to])
+    end
 
+    def unexpected_sender?(mail, options)
+      options[:from] && !mail.from.include?(options[:from])
+    end
+
+    def unexpected_subject?(mail, options)
       case options[:subject]
       when String
-        return false if mail.subject != options[:subject]
+        mail.subject != options[:subject]
       when Regexp
-        return false if mail.subject !~ /#{options[:subject]}/
+        mail.subject !~ /#{options[:subject]}/
+      else
+        false
       end
+    end
 
-      return false if options[:cc]      && !mail.cc.include?(options[:cc])
-      return false if options[:bcc]     && !mail.bcc.include?(options[:bcc])
+    def unexpected_copy?(mail, options)
+      options[:cc] && !mail.cc.include?(options[:cc])
+    end
+
+    def unexpected_blind_copy?(mail, options)
+      options[:bcc] && !mail.bcc.include?(options[:bcc])
+    end
+
+    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}"
-            return false
+            return true
           end
         end
       end
-      true
+      false
     end
 
   end
 end
-if Object.const_defined?(:ActionMailer)
-  class Test::Unit::TestCase
-    include Seatbelt::AssertMail
-  end
-end

data/lib/seatbelt/version.rb

@@ -1,3 +1,3 @@
 module Seatbelt
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/seatbelt.rb

@@ -1,7 +1,20 @@
 require "seatbelt/version"
 require 'seatbelt/assert_json'
 require 'seatbelt/assert_mail'
+require 'seatbelt/assert_content_type'
 
-# module Seatbelt
-#   # Your code goes here...
-# end
+if defined?(Test)
+  class Test::Unit::TestCase
+    include Seatbelt::AssertContentType if defined?(ActionController)
+    include Seatbelt::AssertJson
+    include Seatbelt::AssertMail if defined?(ActionMailer)
+  end
+end
+
+if defined?(Minitest)
+  class Minitest::Unit::TestCase
+    include Seatbelt::AssertContentType if defined?(ActionController)
+    include Seatbelt::AssertJson
+    include Seatbelt::AssertMail if defined?(ActionMailer)
+  end
+end

data/seatbelt.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |gem|
   gem.version       = Seatbelt::VERSION
 
   gem.add_dependency 'multi_json'
+
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'activesupport'
-  gem.add_development_dependency 'actionmailer'
+  gem.add_development_dependency 'minitest', '4.7.5'
+  gem.add_development_dependency 'turn'
   gem.add_development_dependency 'travis-lint'
   gem.add_development_dependency 'json'
-  # gem.add_development_dependency 'ruby-debug'
+  gem.add_development_dependency 'mocha'
+  # gem.add_development_dependency 'debugger'
+
 end

data/test/assert_content_type_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class Seatbelt::AssertContentTypeTest < Minitest::Unit::TestCase
+  include Seatbelt::AssertContentType
+
+  def test_assert_content_type_short
+    Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES.each do |short, long|
+      @response = stub('Response', :headers => {'Content-Type' => "#{long}; charset=utf-8"})
+      assert_content_type short
+    end
+  end
+
+  def test_assert_content_type_short_crosscheck
+    Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES.keys.each do |short|
+      @response = stub('Response', :headers => {'Content-Type' => "#{wrong_long_for_short(short)}; charset=utf-8"})
+      assert_assertion_fails do
+        assert_content_type short
+      end
+    end
+  end
+
+  def test_assert_content_type_long
+    Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES.each do |short, long|
+      @response = stub('Response', :headers => {'Content-Type' => "#{long}; charset=utf-8"})
+      assert_content_type long
+    end
+  end
+
+  def test_assert_content_type_long_crosscheck
+    Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES.each do |short, long|
+      @response = stub('Response', :headers => {'Content-Type' => "#{wrong_long_for_short(short)}; charset=utf-8"})
+      assert_assertion_fails do
+        assert_content_type long
+      end
+    end
+  end
+
+private
+
+  def wrong_long_for_short(short)
+    Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES.values.select do |long|
+      long != Seatbelt::AssertContentType::SUPPORTED_MIME_TYPES[short]
+    end.sort_by { rand }.first
+  end
+
+end

data/test/assert_json_old_dsl_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
-class Seatbelt::AssertJsonTest < Test::Unit::TestCase
+class Seatbelt::AssertJsonTest < Minitest::Unit::TestCase
   include Seatbelt::AssertJson
 
   # def test_string

data/test/assert_json_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Seatbelt::AssertJsonNewDslTest < Test::Unit::TestCase
+class Seatbelt::AssertJsonNewDslTest < Minitest::Unit::TestCase
   include Seatbelt::AssertJson
 
   # def test_string

data/test/assert_mail_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Seatbelt::AssertMailTest < Test::Unit::TestCase
+class Seatbelt::AssertMailTest < Minitest::Unit::TestCase
 
   def test_assert_mail
     Mailer.test.deliver

data/test/test_helper.rb

@@ -1,8 +1,9 @@
-require 'rubygems'
-require 'test/unit'
+require 'minitest/autorun'
+require 'turn/autorun'
 require 'active_support'
 require 'action_mailer'
 require 'json'
+require 'mocha/setup'
 
 $:.push File.expand_path("../../lib", __FILE__)
 require File.dirname(__FILE__) + '/../lib/seatbelt.rb'
@@ -10,7 +11,10 @@ require File.dirname(__FILE__) + '/../lib/seatbelt.rb'
 # Requiring custom spec helpers
 Dir[File.dirname(__FILE__) + "/helpers/**/*.rb"].sort.each { |f| require File.expand_path(f) }
 
-class Test::Unit::TestCase
+
+Turn.config.format = :dot
+
+class Minitest::Unit::TestCase
   def assert_assertion_fails(&block)
     if Object.const_defined?(:MiniTest)
       assert_raises(MiniTest::Assertion, &block)

metadata

@@ -1,82 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: seatbelt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Thorsten Böttger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70193217097980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70193217097980
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70193217096920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193217096920
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &70193217096460 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
   type: :development
   prerelease: false
-  version_requirements: *70193217096460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.5
 - !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: &70193217096000 !ruby/object:Gem::Requirement
-    none: false
+  name: turn
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193217096000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: travis-lint
-  requirement: &70193217095560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193217095560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70193217095120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70193217095120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Goal is to provide custom, high quality and high level assertions for
   Ruby and Ruby on Rails
 email:
@@ -92,11 +123,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.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
+- test/assert_content_type_test.rb
 - test/assert_json_old_dsl_test.rb
 - test/assert_json_test.rb
 - test/assert_mail_test.rb
@@ -105,29 +140,29 @@ files:
 homepage: http://github.com/alto/seatbelt
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provide custom assertions for Ruby and Ruby on Rails
 test_files:
+- test/assert_content_type_test.rb
 - test/assert_json_old_dsl_test.rb
 - test/assert_json_test.rb
 - test/assert_mail_test.rb