ballast 2.2.3 → 2.2.4

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Wed Mar  9 10:37:56 2016 by
+  Generated on Tue Mar 29 10:52:51 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.3.0).
 </div>

data/lib/ballast.rb

@@ -48,8 +48,6 @@ module Ballast
     end
   end
 
-  private
-
   # :nodoc:
   def self.run_in_thread(&block)
     EM::Synchrony.defer do

data/lib/ballast/concerns/ajax_handling.rb

@@ -58,14 +58,14 @@ module Ballast
       # @param configuration [Hash|NilClass] An hash of agent and list of paths to include.
       def generate_robots_txt(configuration = nil)
         configuration ||= {"*" => "/"}
-        rv = configuration.reduce([]) { |accu, (agent, paths)|
+        rv = configuration.reduce([]) do |accu, (agent, paths)|
           paths = paths.ensure_array.map { |e| "Disallow: #{e}" }
 
           accu << "User-agent: #{agent}\n#{paths.join("\n")}"
           accu
-        }.join("\n\n")
+        end
 
-        render(text: rv, content_type: "text/plain")
+        render(text: rv.join("\n\n"), content_type: "text/plain")
       end
       alias_method :disallow_robots, :generate_robots_txt
     end

data/lib/ballast/concerns/common.rb

@@ -85,7 +85,7 @@ module Ballast
       # @param message [String|NilClass] A message for authentication errors.
       # @param authenticator [Proc] A block to verify if authentication is valid.
       def authenticate_user(area: nil, title: nil, message: nil, &authenticator)
-        return if authenticate_with_http_basic { |username, password| authenticator.call(username, password) }
+        return if authenticate_with_http_basic(&authenticator)
 
         area ||= "Private Area"
         title ||= "Authentication required."

data/lib/ballast/configuration.rb

@@ -44,7 +44,9 @@ module Ballast
 
     # :nodoc:
     def load_section(root, section)
-      YAML.load_file("#{root}/config/#{section}.yml") rescue {}
+      YAML.load_file("#{root}/config/#{section}.yml")
+    rescue
+      {}
     end
   end
 end

data/lib/ballast/emoji.rb

@@ -42,10 +42,10 @@ module Ballast
         keys_method = :markup unless keys_method && tester.respond_to?(keys_method)
         values_method = :html unless values_method && tester.respond_to?(values_method)
 
-        ::Emoji.all.reduce({}) { |accu, icon|
+        ::Emoji.all.reduce({}) do |accu, icon|
           accu[invoke(icon, keys_method, options)] = invoke(icon, values_method, options)
           accu
-        }
+        end
       end
 
       # Returns the URL mapper for the emojis.

data/lib/ballast/service.rb

@@ -65,13 +65,13 @@ module Ballast
       # @return [AjaxResponse] The AJAX response, which will include only the first error.
       def as_ajax_response(transport = nil)
         status, error_message =
-            if successful?
-              [:ok, nil]
-            elsif error.is_a?(Hash)
-              [error[:status], error[:error]]
-            else
-              [:unknown, error]
-            end
+          if successful?
+            [:ok, nil]
+          elsif error.is_a?(Hash)
+            [error[:status], error[:error]]
+          else
+            [:unknown, error]
+          end
 
         AjaxResponse.new(status: status, data: data, error: error_message, transport: transport)
       end
@@ -98,7 +98,7 @@ module Ballast
     # Marks the failure of the operation.
     #
     # @param details [Object] The error(s) occurred.
-    def self.fail!(details, on_validation: false)
+    def self.fail!(details)
       raise(Errors::Failure, details)
     end
 

data/lib/ballast/version.rb

@@ -16,7 +16,7 @@ module Ballast
     MINOR = 2
 
     # The patch version.
-    PATCH = 3
+    PATCH = 4
 
     # The current version of ballast.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/ballast/concerns/common_spec.rb

@@ -11,7 +11,7 @@ describe Ballast::Concerns::Common do
   end
 
   class CommonMockService < Ballast::Service
-    def perform(params: params)
+    def perform(params: {})
       "OK"
     end
 

data/spec/ballast/configuration_spec.rb

@@ -45,16 +45,18 @@ describe Ballast::Configuration do
       before(:example) do
         expect(YAML).to receive(:load_file).with("ROOT/config/section_a.yml").and_return({"ENV" => {a: {b: 1}}, "OTHER" => {aa: 3}})
         expect(YAML).to receive(:load_file).with("ROOT/config/section-b.yml").and_return({"ENV" => {c: {d: 2}}, "OTHER" => {cc: 4}})
+        expect(YAML).to receive(:load_file).with("ROOT/config/section-c.yml").at_most(1).and_call_original
       end
 
       it "should load a list of sections" do
-        Ballast::Configuration.new("section_a", "section-b", root: "ROOT", environment: "ENV")
+        Ballast::Configuration.new("section_a", "section-b", "section-c", root: "ROOT", environment: "ENV")
       end
 
-      it "should only load specific environment" do
-        subject = Ballast::Configuration.new("section_a", "section-b", root: "ROOT", environment: "ENV")
+      it "should only load specific environment and fallback for missing files" do
+        subject = Ballast::Configuration.new("section_a", "section-b", "section-c", root: "ROOT", environment: "ENV")
         expect(subject["section_a"].keys).to eq(["a"])
         expect(subject["section_b"].keys).to eq(["c"])
+        expect(subject["section_c"].keys).to eq([])
       end
     end
 

data/spec/ballast/service_spec.rb

@@ -134,11 +134,23 @@ describe Ballast::Service do
     it "should raise a failure" do
       expect { DummyService.new.fail!("DETAILS") }.to raise_error(Ballast::Errors::Failure)
     end
+
+    it "should accept status and error keywords" do
+      expect { DummyService.new.fail!(status: "STATUS", error: "ERROR") }.to raise_error(Ballast::Errors::Failure) do |error|
+        expect(error.details).to eq({status: "STATUS", error: "ERROR"})
+      end
+    end
   end
 
   describe "#fail_validation!" do
     it "should raise a validation failure" do
       expect { DummyService.new.fail_validation!("DETAILS") }.to raise_error(Ballast::Errors::ValidationFailure)
     end
+
+    it "should accept status and error keywords" do
+      expect { DummyService.new.fail_validation!(status: "STATUS", error: "ERROR") }.to raise_error(Ballast::Errors::ValidationFailure) do |error|
+        expect(error.details).to eq({status: "STATUS", error: "ERROR"})
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -4,4 +4,21 @@
 #
 
 require "bundler/setup"
-require File.dirname(__FILE__) + "/../lib/ballast"
+
+if ENV["COVERAGE"]
+  require "simplecov"
+  require "coveralls"
+
+  Coveralls.wear! if ENV["CI"]
+
+  SimpleCov.start do
+    root = Pathname.new(File.dirname(__FILE__)) + ".."
+
+    add_filter do |src_file|
+      path = Pathname.new(src_file.filename).relative_path_from(root).to_s
+      path !~ /^lib/
+    end
+  end
+end
+
+require File.dirname(__FILE__) + "/../lib/ballast"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ballast
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -159,7 +159,6 @@ files:
 - spec/ballast/request_domain_matcher_spec.rb
 - spec/ballast/service_spec.rb
 - spec/ballast_spec.rb
-- spec/coverage_helper.rb
 - spec/spec_helper.rb
 homepage: http://sw.cowtech.it/ballast
 licenses:
@@ -173,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -198,6 +197,5 @@ test_files:
 - spec/ballast/request_domain_matcher_spec.rb
 - spec/ballast/service_spec.rb
 - spec/ballast_spec.rb
-- spec/coverage_helper.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/coverage_helper.rb

@@ -1,19 +0,0 @@
-#
-# This file is part of the ballast gem. Copyright (C) 2013 and above Shogun <shogun@cowtech.it>.
-# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
-#
-
-require "pathname"
-require "simplecov"  
-require "coveralls"
-
-Coveralls.wear! if ENV["CI"] || ENV["JENKINS_URL"] # Do not load outside Travis
-
-SimpleCov.start do
-  root = Pathname.new(File.dirname(__FILE__)) + ".."
-
-  add_filter do |src_file|
-    path = Pathname.new(src_file.filename).relative_path_from(root).to_s
-    path !~ /^lib/
-  end
-end