postageapp 1.0.24 → 1.2.0

data/test/mailer_helper_methods_test.rb

@@ -1,22 +1,25 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class MailerHelperMethodsTest < Minitest::Test
-  
+class MailerHelperMethodsTest < MiniTest::Test
   def test_mailer_helper_methods
-    request = PostageApp::Request.new(:send_message, {
-      :headers    => { 'from'     => 'sender@test.test',
-                       'subject'  => 'Test Message'},
+    request = PostageApp::Request.new(
+      :send_message,
+      :headers => {
+        'from' => 'sender@test.test',
+        'subject' => 'Test Message'
+      },
       :recipients => 'test@test.test',
-      :content    => {
-        'text/plain'  => 'text content',
-        'text/html'   => 'html content'
+      :content => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
-    })
-    assert_equal ['test@test.test'], request.to
-    assert_equal ['sender@test.test'], request.from
+    )
+
+    assert_equal [ 'test@test.test' ], request.to
+    assert_equal [ 'sender@test.test' ], request.from
     assert_equal 'Test Message', request.subject
+
     assert_match 'html content', request.body
     assert_match 'text content', request.body
   end
-  
-end
+end

data/test/postageapp_test.rb

@@ -1,18 +1,17 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class PostageAppTest < Minitest::Test
-  
+class PostageAppTest < MiniTest::Test
   def test_method_configure
     PostageApp.configure do |config|
-      config.api_key  = 'abcdefg12345'
-      config.host     = 'test.test'
+      config.api_key = 'abcdefg12345'
+      config.host = 'test.test'
     end
-    assert_equal 'abcdefg12345',  PostageApp.configuration.api_key
-    assert_equal 'test.test',     PostageApp.configuration.host
+
+    assert_equal 'abcdefg12345', PostageApp.configuration.api_key
+    assert_equal 'test.test', PostageApp.configuration.host
   end
   
   def test_logger
     assert PostageApp.logger.is_a?(Logger)
   end
-  
-end
+end

data/test/rails_initialization_test.rb

@@ -1,29 +1,29 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-require File.expand_path('../../lib/postageapp/rails/rails', __FILE__)
+require File.expand_path('../lib/postageapp/rails/rails', File.dirname(__FILE__))
 
-class RailsInitializationTest < Minitest::Test
-  
-  include ConstantDefinitions
-  
+class RailsInitializationTest < MiniTest::Test
   def test_initialization
     rails = Module.new do
       def self.version
         '9.9.9'
       end
+
       def self.root
         'RAILS ROOT'
       end
+
       def self.env
         "RAILS ENV"
       end
     end
-    define_constant('Rails', rails)
-    PostageApp::Rails.initialize
-    
-    assert_equal 'Rails 9.9.9', PostageApp.configuration.framework
-    assert_equal 'RAILS ROOT', PostageApp.configuration.project_root
-    assert_equal 'RAILS ENV', PostageApp.configuration.environment
+
+    const_replace(:Rails, rails) do
+      PostageApp::Rails.initialize
+      
+      assert_equal 'Rails 9.9.9', PostageApp.configuration.framework
+      assert_equal 'RAILS ROOT', PostageApp.configuration.project_root
+      assert_equal 'RAILS ENV', PostageApp.configuration.environment
+    end
   end
-  
-end
+end

data/test/request_test.rb

@@ -1,6 +1,6 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class RequestTest < Minitest::Test
+class RequestTest < MiniTest::Test
   def test_method_uid
     request = PostageApp::Request.new('test_method')
 
@@ -14,26 +14,23 @@ class RequestTest < Minitest::Test
   def test_method_url
     request = PostageApp::Request.new('test_method')
 
-    assert_equal 'api.postageapp.com',      request.url.host
-    assert_equal 443,                       request.url.port
+    assert_equal 'api.postageapp.com', request.url.host
+    assert_equal 443, request.url.port
     assert_equal '/v.1.0/test_method.json', request.url.path
   end
   
   def test_method_arguments_to_send
-    request = PostageApp::Request.new('send_message', {
-      'headers'     => {
-        'from'      => 'sender@test.test',
-        'subject'   => 'Test Message'
+    request = PostageApp::Request.new('send_message',
+      'headers' => {
+        'from' => 'sender@test.test',
+        'subject' => 'Test Message'
       },
-      'recipients'  => 'test@test.test',
-      'content'     => {
-        'text/plain'  => 'text content',
-        'text/html'   => 'html content'
+      'recipients' => 'test@test.test',
+      'content' => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
-    })
-
-    assert_equal 'text content', request.text_part
-    assert_equal 'html content', request.html_part
+    )
 
     args = request.arguments_to_send
 
@@ -85,37 +82,40 @@ class RequestTest < Minitest::Test
   def test_send
     mock_successful_send
     
-    request = PostageApp::Request.new('send_message', {
-      'headers'     => {
-        'from'     => 'sender@test.test',
-        'subject'  => 'Test Message'
+    request = PostageApp::Request.new('send_message',
+      'headers' => {
+        'from' => 'sender@test.test',
+        'subject' => 'Test Message'
       },
-      'recipients'  => 'test@test.test',
-      'content'     => {
-        'text/plain'  => 'text content',
-        'text/html'   => 'html content'
+      'recipients' => 'test@test.test',
+      'content' => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
-    })
+    )
+
     response = request.send
+
     assert_equal 'ok', response.status
     assert_equal 'sha1hashuid23456789012345678901234567890', response.uid
-    assert_equal({'message' => { 'id' => 999 }}, response.data)
+    assert_equal({ 'message' => { 'id' => 999 } }, response.data)
   end
   
   def test_send_failure
     mock_failed_send
     
-    request = PostageApp::Request.new('send_message', {
-      'headers'     => {
-        'from'     => 'sender@test.test',
-        'subject'  => 'Test Message'
+    request = PostageApp::Request.new(
+      'send_message',
+      'headers' => {
+        'from' => 'sender@test.test',
+        'subject' => 'Test Message'
       },
-      'recipients'  => 'test@test.test',
-      'content'     => {
-        'text/plain'  => 'text content',
-        'text/html'   => 'html content'
+      'recipients' => 'test@test.test',
+      'content' => {
+        'text/plain' => 'text content',
+        'text/html' => 'html content'
       }
-    })
+    )
 
     response = request.send
 

data/test/response_test.rb

@@ -1,24 +1,26 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', File.dirname(__FILE__))
 
-class ResponseTest < Minitest::Test
-  
+class ResponseTest < MiniTest::Test
   def test_initialization
-    object = stub(:body => {
-      'response' => {
-        'uid'     => 'md5_hash_uid',
-        'status'  => 'ok',
-        'message' => 'api reply message'
-      },
-      'data' => {
-        'key' => 'value'
-      }
-    }.to_json)
+    object = stub(
+      :body => {
+        'response' => {
+          'uid'     => 'md5_hash_uid',
+          'status'  => 'ok',
+          'message' => 'api reply message'
+        },
+        'data' => {
+          'key' => 'value'
+        }
+      }.to_json
+    )
     
     response = PostageApp::Response.new(object)
-    assert_equal 'md5_hash_uid',        response.uid
-    assert_equal 'ok',                  response.status
-    assert_equal 'api reply message',   response.message
-    assert_equal ({'key' => 'value'}),  response.data
+    assert_equal 'md5_hash_uid', response.uid
+    assert_equal 'ok', response.status
+    assert_equal 'api reply message', response.message
+    assert_equal ({'key' => 'value'}), response.data
+    
     assert response.ok?
   end
   
@@ -36,5 +38,4 @@ class ResponseTest < Minitest::Test
       assert true
     end
   end
-  
-end
+end

data/test/travis_test.rb

@@ -0,0 +1,168 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+require File.expand_path('with_environment', File.dirname(__FILE__))
+
+class TravisTest
+  extend WithEnvironment
+
+  ENV_VARIABLE = {
+    :rvm => "RBENV_VERSION",
+    :gemfile => "BUNDLE_GEMFILE"
+  }
+
+  def self.bash_env(env)
+    env.collect do |key, value|
+      variable = ENV_VARIABLE[key]
+
+      variable ? '%s=%s' % [ variable, value ] : nil
+    end.compact.join(' ')
+  end
+
+  def self.env_expanded(env)
+    Hash[
+      env.collect do |key, value|
+        [ ENV_VARIABLE[key], value ]
+      end
+    ]
+  end
+
+  def self.shell_command!(args, env)
+    commands = args.collect do |s|
+      s % env
+    end
+
+    env_expanded(env).each do |key, value|
+      puts 'export %s=%s' % [ key, value ]
+    end
+    puts(commands.join(' && '))
+    
+    with_environment(env_expanded(env)) do
+      result = system(commands.join(' && '))
+
+      yield(result) if (block_given?)
+
+      result
+    end
+  end
+
+  def self.install_versions!
+    travis_test = self.new
+
+    travis_test.matrix.collect do |entry|
+      {
+        :rvm => entry[:rvm]
+      }
+    end.uniq.each do |entry|
+      puts "Ruby %{rvm}" % entry
+
+      shell_command!(
+        [
+          "rbenv install %{version}",
+          "gem install bundler"
+        ],
+        entry
+      )
+    end
+  end
+
+  def self.validate_ruby_versions!
+    travis_test = self.new
+
+    versions = { }
+
+    travis_test.matrix.each do |entry|
+      next if (versions[entry[:rvm]])
+
+      versions[entry[:rvm]] = true
+
+      shell_command!(
+        [
+          "ruby -e 'puts RUBY_VERSION'"
+        ],
+        entry
+      )
+    end
+  end
+
+  def self.gemfile_lock_remove!(path)
+    path = path + '.lock'
+
+    if (File.exist?(path))
+      File.unlink(path)
+    end
+
+  rescue Errno::ENOENT
+    # Already removed for some reason? Ignore.
+  end
+
+  def self.run!
+    travis_test = self.new
+
+    results = { }
+
+    travis_test.matrix.each do |entry|
+      puts "RBENV_VERSION=%{rvm} BUNDLE_GEMFILE=%{gemfile}" % entry
+
+      gemfile_lock_remove!(entry[:gemfile])
+
+      shell_command!(
+        [
+          "bundle install --quiet",
+          "rake test"
+        ],
+        entry
+      ) do |code|
+        results[entry] = code
+      end
+    end
+
+    puts '%-20s %-24s %-6s' % [ 'Ruby', 'Gemfile', 'Status' ]
+    puts '-' * 78
+
+    results.each do |entry, code|
+      puts '%-20s %-24s %-6s' % [
+        entry[:rvm],
+        File.basename(entry[:gemfile]).sub(/\AGemfile\./,''),
+        code
+      ]
+    end
+  end
+
+  def travis_config_path
+    @travis_config_path ||= File.expand_path('../.travis.yml', File.dirname(__FILE__))
+  end
+
+  def travis_config
+    @travis_config ||= YAML.load(File.open(travis_config_path))
+  end
+
+  def gemfiles
+    travis_config['gemfile']
+  end
+
+  def ruby_versions
+    travis_config['rvm']
+  end
+
+  def matrix_exclusions
+    travis_config['matrix']['exclude'].collect do |entry|
+      {
+        :rvm => entry['rvm'],
+        :gemfile => entry['gemfile']
+      }
+    end
+  end
+
+  def matrix
+    ruby_versions.flat_map do |version|
+      gemfiles.collect do |gemfile|
+        {
+          :rvm => version,
+          :gemfile => gemfile
+        }
+      end
+    end - matrix_exclusions
+  end
+end

data/test/with_environment.rb

@@ -0,0 +1,27 @@
+module WithEnvironment
+  def with_environment(env)
+    prev_env = {
+      'PATH' => ENV['PATH']
+    }
+
+    # Remove rbenv version specific paths to restore environment to normal,
+    # non-versioned state.
+    ENV['PATH'] = ENV['PATH'].split(/:/).reject do |path|
+      path.match(%r[/\.rbenv/versions/])
+    end.join(':')
+
+    env.each do |key, value|
+      key = key.to_s
+
+      prev_env[key] = ENV[key]
+      ENV[key] = value
+    end
+
+    yield
+
+  ensure
+    prev_env.each do |key, value|
+      ENV[key] = value
+    end
+  end
+end