proxy_pac_rb 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6882f46bded8f3ff2ad971b2b6eb2c4cfe6458e
-  data.tar.gz: 99a114959d3e42f3e242263e6a7627bbc8e0baf9
+  metadata.gz: 984f1322c0f74a01b683e103e254f7b4213d90c7
+  data.tar.gz: 825d18e0d3704e069255de8914572c2d1f36c73d
 SHA512:
-  metadata.gz: 70409e443bbbec0e96e33eea57b8d72406314fef6515d8e65f3f87920f64771cca71c3083367ef3c94e1b0674691c2bfe7f7c7f94ce2adf6cdb1f99d6170a6ef
-  data.tar.gz: c894044358c10a244165a0d8e5eb3f628758171198669cbbe940a4458278ef2fc16be95b0600f6e5436c19c54b55a3f69b2ccae2e1462671c6c405aea146cd4c
+  metadata.gz: d99f14756f8b5cad760498fde69ee96539639629d3d605fdf1865d4c00a8a30f438a20acd866e5bedc35cbfbadd9c80698fcb4684b16f474ec5327546dc4a9e8
+  data.tar.gz: 3f03f403d55172446e1ebeffda6294165fe94b36659fb704a34d8554fd6109d2b8f1bafeedaffbe0ee705fcbafc1f36106d16f83937d7fb2cc5ff1d73a3e3cfe

data/lib/proxy_pac_rb/rspec/matchers/base_matcher.rb

@@ -0,0 +1,179 @@
+module ProxyPacRb
+  module RSpecMatchers
+    # @api private
+    #
+    # Used _internally_ as a base class for matchers that ship with
+    # rspec-expectations and rspec-rails.
+    #
+    # ### Warning:
+    #
+    # This class is for internal use, and subject to change without notice.  We
+    # strongly recommend that you do not base your custom matchers on this
+    # class. If/when this changes, we will announce it and remove this warning.
+    class BaseMatcher
+      include RSpec::Matchers::Composable
+
+      # @api private
+      # Used to detect when no arg is passed to `initialize`.
+      # `nil` cannot be used because it's a valid value to pass.
+      UNDEFINED = Object.new.freeze
+
+      # @private
+      attr_reader :actual, :expected, :rescued_exception
+
+      def initialize(expected=UNDEFINED)
+        @expected = expected unless UNDEFINED.equal?(expected)
+      end
+
+      # @api private
+      # Indicates if the match is successful. Delegates to `match`, which
+      # should be defined on a subclass. Takes care of consistently
+      # initializing the `actual` attribute.
+      def matches?(actual)
+        @actual = actual
+        match(expected, actual)
+      end
+
+      # @api private
+      # Used to wrap a block of code that will indicate failure by
+      # raising one of the named exceptions.
+      #
+      # This is used by rspec-rails for some of its matchers that
+      # wrap rails' assertions.
+      def match_unless_raises(*exceptions)
+        exceptions.unshift Exception if exceptions.empty?
+        begin
+          yield
+          true
+        rescue *exceptions => @rescued_exception
+          false
+        end
+      end
+
+      # @api private
+      # Generates a description using {EnglishPhrasing}.
+      # @return [String]
+      def description
+        desc = EnglishPhrasing.split_words(self.class.matcher_name)
+        desc << EnglishPhrasing.list(@expected) if defined?(@expected)
+        desc
+      end
+
+      # @api private
+      # Matchers are not diffable by default. Override this to make your
+      # subclass diffable.
+      def diffable?
+        false
+      end
+
+      # @api private
+      # Most matchers are value matchers (i.e. meant to work with `expect(value)`)
+      # rather than block matchers (i.e. meant to work with `expect { }`), so
+      # this defaults to false. Block matchers must override this to return true.
+      def supports_block_expectations?
+        false
+      end
+
+      # @api private
+      def expects_call_stack_jump?
+        false
+      end
+
+      # @private
+      def expected_formatted
+        RSpec::Support::ObjectInspector.inspect(@expected)
+      end
+
+      # @private
+      def actual_formatted
+        RSpec::Support::ObjectInspector.inspect(@actual)
+      end
+
+      # @private
+      def self.matcher_name
+        @matcher_name ||= underscore(name.split("::").last)
+      end
+
+      # @private
+      # Borrowed from ActiveSupport.
+      def self.underscore(camel_cased_word)
+        word = camel_cased_word.to_s.dup
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
+      private_class_method :underscore
+
+      private
+
+      def assert_ivars(*expected_ivars)
+        return unless (expected_ivars - present_ivars).any?
+        ivar_list = EnglishPhrasing.list(expected_ivars)
+        raise "#{self.class.name} needs to supply#{ivar_list}"
+      end
+
+      if RUBY_VERSION.to_f < 1.9
+        # :nocov:
+        def present_ivars
+          instance_variables.map { |v| v.to_sym }
+        end
+        # :nocov:
+      else
+        alias present_ivars instance_variables
+      end
+
+      # @private
+      module HashFormatting
+        # `{ :a => 5, :b => 2 }.inspect` produces:
+        #
+        #     {:a=>5, :b=>2}
+        #
+        # ...but it looks much better as:
+        #
+        #     {:a => 5, :b => 2}
+        #
+        # This is idempotent and safe to run on a string multiple times.
+        def improve_hash_formatting(inspect_string)
+          inspect_string.gsub(/(\S)=>(\S)/, '\1 => \2')
+        end
+        module_function :improve_hash_formatting
+      end
+
+      include HashFormatting
+
+      # @api private
+      # Provides default implementations of failure messages, based on the `description`.
+      module DefaultFailureMessages
+        # @api private
+        # Provides a good generic failure message. Based on `description`.
+        # When subclassing, if you are not satisfied with this failure message
+        # you often only need to override `description`.
+        # @return [String]
+        def failure_message
+          "expected #{description_of @actual} to #{description}"
+        end
+
+        # @api private
+        # Provides a good generic negative failure message. Based on `description`.
+        # When subclassing, if you are not satisfied with this failure message
+        # you often only need to override `description`.
+        # @return [String]
+        def failure_message_when_negated
+          "expected #{description_of @actual} not to #{description}"
+        end
+
+        # @private
+        def self.has_default_failure_messages?(matcher)
+          matcher.method(:failure_message).owner == self &&
+            matcher.method(:failure_message_when_negated).owner == self
+        rescue NameError
+          false
+        end
+      end
+
+      include DefaultFailureMessages
+    end
+  end
+end

data/lib/proxy_pac_rb/rspec/matchers/proxy.rb

@@ -1,27 +1,81 @@
 require 'proxy_pac_rb'
 
-RSpec::Matchers.define :be_the_same_proxy_pac_file do |expected|
-  define_method :loader do
-    ProxyPacRb::ProxyPacLoader.new
-  end
+module ProxyPacRb
+  module RSpecMatchers
+    class BeTheSameProxyPacFile < BaseMatcher
+      def initialize(expected)
+        @file_a = begin
+                      file = ProxyPacRb::ProxyPacFile.new(source: expected)
+                      loader.load(file)
 
-  match do |actual|
-    @file_a = ProxyPacRb::ProxyPacFile.new(source: actual)
-    loader.load(@file_a)
+                      file
+                    end
 
-    @file_b = ProxyPacRb::ProxyPacFile.new(source: expected)
-    loader.load(@file_b)
+        @expected = @file_a.content
+      end
 
-    @file_a == @file_b
-  end
+      def matches?(actual)
+        @file_b = begin
+                    file = ProxyPacRb::ProxyPacFile.new(source: actual)
+                    loader.load(file)
+
+                    file
+                  end
+
+        @actual = @file_b.content
+
+        values_match?(@expected, @actual)
+      end
 
-  diffable
+      def diffable?
+        true
+      end
 
-  failure_message do
-    format(%(expected that proxy.pac "%s" is equal to proxy.pac "%s", but it is not equal.), @file_a.source.truncate(30), @file_b.source.truncate(30))
+      def failure_message
+        format(%(expected that proxy.pac "%s" is equal to proxy.pac "%s", but it is not.), @file_a.source.truncate(30), @file_b.source.truncate(30))
+      end
+
+      def failure_message_when_negated
+        format(%(expected that proxy.pac "%s" is not equal to proxy.pac "%s", but it is the same.), @file_a.source.truncate(30), @file_b.source.truncate(30))
+      end
+
+      private
+
+      def loader
+        @loader ||= ProxyPacRb::ProxyPacLoader.new
+      end
+    end
   end
+end
 
-  failure_message_when_negated do
-    format(%(expected that proxy.pac "%s" is not equal to proxy.pac "%s", but it is equal.), @file_a.source.truncate(30), @file_b.source.truncate(30))
+module RSpec
+  module Matchers
+    def be_the_same_proxy_pac_file(expected)
+      ProxyPacLoader::RSpecMatchers::BeTheSameProxyPacFile.new(expected)
+    end
   end
 end
+
+# RSpec::Matchers.define :be_the_same_proxy_pac_file do |expected|
+#   def loader
+#     @loader ||= ProxyPacRb::ProxyPacLoader.new
+#   end
+# 
+#   match do |actual|
+# 
+#     @file_b = begin
+#                 file = ProxyPacRb::ProxyPacFile.new(source: expected)
+#                 loader.load(file)
+# 
+#                 file
+#               end
+# 
+#     @actual = @file_a.content
+#     @expected = @file_b.content
+# 
+#     binding.pry
+# 
+#     values_match?(@expected, @actual)
+#   end
+# 
+# end

data/lib/proxy_pac_rb/rspec/matchers/url.rb

@@ -2,14 +2,17 @@ require 'proxy_pac_rb'
 
 RSpec::Matchers.define :be_downloaded_via do |expected|
   match do |actual|
-    proxy_pac.find(actual) == expected
+    @old_actual = actual
+    @actual = proxy_pac.find(actual).to_s
+
+    @actual == expected
   end
 
   failure_message do |actual|
-    format(%(expected that url "%s" is downloaded via "%s", but it is downloaded via "%s".), actual, expected, proxy_pac.find(actual))
+    format(%(expected that url "%s" is downloaded via "%s", but it is downloaded via "%s".), @old_actual, expected, @actual)
   end
 
   failure_message_when_negated do |actual|
-    format(%(expected that url "%s" is not downloaded via "%s", but it is downloaded via "%s".), actual, expected, proxy_pac.find(actual))
+    format(%(expected that url "%s" is not downloaded via "%s", but it is downloaded via "%s".), @old_actual, expected, @actual)
   end
 end

data/lib/proxy_pac_rb/rspec.rb

@@ -1,6 +1,7 @@
 require 'proxy_pac_rb'
 require 'rspec'
 
+require 'proxy_pac_rb/rspec/matchers/base_matcher'
 require 'proxy_pac_rb/rspec/helpers'
 ProxyPacRb.require_file_matching_pattern('rspec/matchers/*.rb')
 ProxyPacRb.require_file_matching_pattern('rspec/shared_examples/*.rb')

data/lib/proxy_pac_rb/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # ProxyPacRb
 module ProxyPacRb
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/spec/rspec/compare_proxy_pac_files_spec.rb

@@ -26,14 +26,25 @@ RSpec.describe 'Compare to proxy.pac-files', type: :proxy_pac do
     EOS
   end
 
-  context 'when file "a" is already a ProxyPacFile' do
+  context 'when expected is a ProxyPacFile' do
     it { expect(proxy_pac).to be_the_same_proxy_pac_file file_b }
   end
 
-  context 'when file "b" is already a ProxyPacFile' do
+  context 'when actual a ProxyPacFile and' do
     it { expect(file_b).to be_the_same_proxy_pac_file proxy_pac }
   end
 
+  context 'when both are ProxyPacFile' do
+    let(:already_proxy_pac) { ProxyPacFile.new(source: file_b) }
+
+    before :each do
+      loader = ProxyPacRb::ProxyPacLoader.new
+      loader.load(already_proxy_pac)
+    end
+
+    it { expect(already_proxy_pac).to be_the_same_proxy_pac_file proxy_pac }
+  end
+
   context 'when file "a" and file "b" are strings' do
     context 'when both are eqal' do
       it { expect(file_a).to be_the_same_proxy_pac_file file_b }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxy_pac_rb
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dennis Günnewig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -153,6 +153,7 @@ files:
 - lib/proxy_pac_rb/rspec/helpers.rb
 - lib/proxy_pac_rb/rspec/helpers/.keep
 - lib/proxy_pac_rb/rspec/matchers/.keep
+- lib/proxy_pac_rb/rspec/matchers/base_matcher.rb
 - lib/proxy_pac_rb/rspec/matchers/proxy.rb
 - lib/proxy_pac_rb/rspec/matchers/url.rb
 - lib/proxy_pac_rb/rspec/shared_contexts/.keep