tarka_matchers 0.0.53 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94ee7c5c4c8cdcd352e709eceb8c04255ba3b2e
-  data.tar.gz: fc1bd0779f56e6533d9041afc97a04ba894b84d4
+  metadata.gz: 70047a83a548ae7bd61dbd9d87de255dff51f825
+  data.tar.gz: 1b1c202a40f6bf8c4108bf579f2ce0c9b0d05483
 SHA512:
-  metadata.gz: 78e09d10294d6d0246ca329c175216bc2c36b959e14c3cad418df1e9434749f40e4e960dc546bff206bd1629f2961f292c67d88fa90a6b94aa575f01a80b2a7b
-  data.tar.gz: aea692bd67bdcd52e582bfdbad2689913c2b5dca320e6069ff93dee2207731ff6e447696160d36507a83d25471d0e3d1bb187b541d83d06663dbbdb6568161e7
+  metadata.gz: 27031c8ee5173fe8697dacc17e38a8b909d237f18634f3d60a194addb727e759e1af105542e709e50db33b34e7740cf9cf7e57c8d0d42314516a88edba9d305b
+  data.tar.gz: cc4b0e6e0de7ad61db3e2d1971b3ad15314668362608f363b5a55074af74b467865d6abd9b782996abd4bc073934f6213822947c0f31ab0f218b90158b399812

data/lib/tarka_matchers/formatters.rb

@@ -0,0 +1,2 @@
+require 'tarka_matchers/formatters/difference'
+require 'tarka_matchers/formatters/selected'

data/lib/tarka_matchers/formatters/difference.rb

@@ -5,6 +5,8 @@ module TarkaMatchers
 			include Styles
 
 			def self.difference expected, actual
+				expected = expected.to_s
+				actual = actual.to_s
 				expected_line = "#{GREEN_F}Expected: #{BLACK_ON_GREEN}#{expected}#{RESET}"
 				expected_length = expected.length
 				actual_length = actual.length
@@ -32,7 +34,6 @@ module TarkaMatchers
 						actual_line << "#{BLACK_ON_GREEN}#{a}"
 					end
 				end
-
 				identical = ((correct.to_f/longest_length) * 100).round 3
 				"\n\n#{expected_line}#{actual_line}#{RESET}#{RED_F} - #{identical}% identical#{RESET}" 
 			end	

data/lib/tarka_matchers/formatters/selected.rb

@@ -4,13 +4,16 @@ module TarkaMatchers
 		class Selected
 			include Styles
 			def self.selected original, selected
-				indexes = []
-				selected.each_slice(2){ |si,ei| indexes << (si..ei).to_a }
+				indexes, actual_boundaries = [], []
+				selected.each_slice(2) do |si,ei| 
+					indexes << (si..ei).to_a
+					actual_boundaries  << [si,ei]
+				end
 				indexes.flatten!
+				actual_boundaries.flatten!
 
 				original_line = "#{GREEN_F}Original: #{BLACK_ON_GREEN}#{original}#{RESET}"
 				selected_line = "\n#{RESET}#{RED_F}Selected: "
-				
 				selects = 0
 				original.split('').each_with_index do |v,i|
 					if indexes.include? i
@@ -22,7 +25,7 @@ module TarkaMatchers
 				end
 
 				matched = ((selects.to_f/original.length) * 100).round 3
-				"\n\n#{original_line}#{selected_line}#{RESET}#{RED_F} - #{matched}% matched#{RESET}" 
+				"\n\n#{original_line}#{selected_line}#{RESET}#{RED_F} - #{matched}% matched.\n#{RED_F}Bounds:   #{actual_boundaries}\n#{WHITE_F}Formatter: #{self.name}#{RESET}" 
 			end
 		end
 	end

data/lib/tarka_matchers/formatters/styles.rb

@@ -3,6 +3,7 @@ module TarkaMatchers
 		module Styles		
 			RED_F = "\e[31m"
 			YELLOW_F = "\e[33m"
+			WHITE_F = "\e[37m"
 			GREEN_F = "\e[32m"
 			L_GREEN_F = "\e[92m"
 			RESET =	"\e[0m"

data/lib/tarka_matchers/helpers/expectation/common.rb

@@ -4,15 +4,6 @@ module TarkaMatchers
 			module Common
 				SGR = /\\e\[(?:10[0-7]|0{1,2}\d|0{0,1}\d\d|\d)m/
 				NEWLINE = /\\n/
-				def keep_sgrs
-					@keep_sgrs = true
-					self
-				end
-
-				def keep_newlines
-					@keep_newlines = true
-					self
-				end
 
 				def clean! string
 					string.gsub!(SGR,'') unless @keep_sgrs

data/lib/tarka_matchers/helpers/utility.rb

@@ -0,0 +1,71 @@
+require 'tarka_matchers/formatters'
+module TarkaMatchers
+	module Helpers
+		module Utility
+			attr_reader :description, :failure_message, :failure_message_when_negated
+			
+			def difference expected=@expected, actual=@actual
+				TarkaMatchers::Formatters::Difference.difference(expected,actual)
+			end
+
+			def selected expected=@expected, actual=@actual
+				TarkaMatchers::Formatters::Selected.selected(expected,actual)
+			end
+
+			def pass_default message='pass'
+				@description = message
+				negated_default
+				fail_default
+			end
+
+			def negated_default message=nil
+				@failure_message_when_negated = message || "did #{@description}"
+			end
+
+			def fail_default option=nil
+				append, message = nil
+
+				if option == nil
+					append = difference
+				elsif option.is_a? String
+					message = option
+				elsif option.is_a? Hash
+					k = option.first[0]
+					v = option.first[1]
+					case k
+					when :append
+						if v.is_a? String
+							append = v
+						elsif v.is_a? Symbol
+							case v
+							when :difference
+								append = difference
+							when :selected
+								append = selected
+							end
+						else
+							append = difference
+						end
+					when :just
+						message = v
+					end
+				end
+
+				@failure_message = message || "failed to #{@description}#{append}"
+			end
+
+			def pass_with_message message=nil
+				@description = message if message
+				true
+			end
+
+			def fail_with_message message=nil
+				@failure_message = message if message
+				false
+			end
+
+			alias_method :pass, :pass_with_message
+			alias_method :fail, :fail_with_message
+		end
+	end
+end

data/lib/tarka_matchers/matchers/class/have_an_instance_variable_of.rb

@@ -1,4 +1,5 @@
 require 'tarka_matchers/helpers/expectation/result'
+require 'tarka_matchers/helpers/utility'
 require 'tarka_matchers/formatters/difference'
 module TarkaMatchers
 	module Matchers
@@ -7,7 +8,8 @@ module TarkaMatchers
 				HaveAnInstanceVariableOf.new instance_name
 			end
 
-			class HaveAnInstanceVariableOf
+			class HaveAnInstanceVariableOf 
+				include TarkaMatchers::Helpers::Utility
 				def initialize instance_name
 					@instance_name = instance_name
 				end
@@ -19,20 +21,12 @@ module TarkaMatchers
 				
 				def matches? actual
 					@actual = actual.instance_variable_get(@instance_name)
+					pass_default "contain an instance variable called, '#{@instance_name}', that equals '#{@expected}'."
+					negated_default
+					fail_default append: "#{TarkaMatchers::Formatters::Difference.difference(@expected,@actual)}"
+					fail_with_message "failed to contain an instance variable called '#{@instance_name}'. It does not exist inside the class." unless actual.instance_variable_defined?(@instance_name)
 					@actual == @expected
 				end
-
-				def description
-					"contain an instance variable called, '#{@instance_name}', that equals '#{@expected}'."
-				end
-
-				def failure_message
-					"failed to #{description}\n#{TarkaMatchers::Formatters::Difference.difference(@expected,@actual)}"
-				end
-
-				def failure_message_when_negated
-					"did #{description}"
-				end
 			end
 		end
 	end

data/lib/tarka_matchers/matchers/regex/match_sections.rb

@@ -1,4 +1,5 @@
 require 'tarka_matchers/helpers/string/sgr/styled_capture'
+require 'tarka_matchers/helpers/utility'
 require 'tarka_matchers/formatters/selected'
 module TarkaMatchers
 	module Matchers
@@ -8,9 +9,10 @@ module TarkaMatchers
 			end
 
 			class MatchSections
-				attr_reader :failure_message,:description
+				include TarkaMatchers::Helpers::Utility 
 				def initialize expected
 					@expected = expected
+					@li = @expected.length
 				end
 				
 				def when_used_on string
@@ -25,53 +27,60 @@ module TarkaMatchers
 					
 					if integers || strings
 						@matches = indexes = Helpers::SGR::StyledCapture.indexes_of(@string, @actual)
-						pass_with_message
-						fail_with_message
+						pass_default "contain the pattern, '#{@actual}' at positions #{indexes_list}" 
+						fail_default "The string, '#{@string}', does not contain the pattern, '#{@actual}':#{selected(@string, @matches.map{ |v| [v[0], v[2]] }.flatten)}"
+
 						if indexes.empty?
 							fail_with_message
 						else
 							if strings
 								extracts = @matches.map{ |v| v[1] }.flatten
-								pass_with_message
+								if @expected == extracts
+									pass_with_message "contain the pattern, '#{@actual}' and match: #{extracts_list}"
+								else
+									fail
+								end
 							else
 								indexes = @matches.map{ |v| [v[0], v[2]] }.flatten
 								if @expected.count.odd?
-									fail_with_message "The indexes provided, '#{@expected}', are of an odd number. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}'."
+									fail_with_message "The indexes provided, '#{@expected}', are of an odd number. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}'"
 								elsif @expected.count < indexes.count
-									fail_with_message "The index pairs provided, '#{@expected}', are less than the number of matches found in the string. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}'."
+									fail_with_message "The index pairs provided, '#{@expected}', are less than the number of matches found in the string. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}':#{selected(@string, @matches.map{ |v| [v[0], v[2]] }.flatten)}"
 								elsif @expected.count > indexes.count
-									fail_with_message "The index pairs provided, '#{@expected}', are more than the number of matches found in the string. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}'."
+									fail_with_message "The index pairs provided, '#{@expected}', are more than the number of matches found in the string. Please provide the start and end index pairs of all sections of '#{@string}' that should be selected by '#{@actual}':#{selected(@string, @matches.map{ |v| [v[0], v[2]] }.flatten)}"
 								elsif @expected == indexes
-									pass_with_message
-								else
-									fail_with_message
+									pass_with_message "contain the pattern, '#{@actual}' at positions #{indexes_list}"
+								elsif @expected != indexes
+									fail
 								end
 							end
 						end
 					else
-						fail_with_message "Provided a wrongly formatted argument to 'match_sections'. 'match_sections' expects an argument sequence consisting exclusively of either the start and end indexes of all expected sections of the provided string selected by the match, or an example of the actual text that is selected."	
+						fail_with_message "Provided a wrongly formatted argument to 'match_sections'. 'match_sections' expects an argument sequence consisting exclusively of either the start and end indexes of all expected sections of the provided string selected by the match, or an example of the actual text that is selected"	
 					end
 				end
 
-				def pass_with_message message="contain the pattern, '#{@actual}' at positions #{indexes_list}." 
-					@description = message
-					true
-				end	
-
-				def fail_with_message message="The string, '#{@string}', does not contain the pattern, '#{@actual}':#{TarkaMatchers::Formatters::Selected.selected(@string, @matches.map{ |v| [v[0], v[2]] }.flatten)}"
-					@failure_message = message
-					false
-				end
-
 				def indexes_list
 					list = ''
-					li = @expected.length
 					@expected.each_with_index do |v,i|
 						if i.even?
 							divider = ' to '
-						elsif i == li - 3
+						elsif i == @li - 3
+							divider = ' and '
+						elsif i != @li - 1
+							divider = ','
+						end
+						list << "'#{v}'#{divider}"
+					end
+					list
+				end
+
+				def extracts_list
+					list = ''
+					@expected.each_with_index do |v,i|
+						if i == @li - 2
 							divider = ' and '
-						elsif i != li - 1
+						elsif i != @li - 1
 							divider = ','
 						end
 						list << "'#{v}'#{divider}"

data/lib/tarka_matchers/utility.rb

@@ -0,0 +1 @@
+require 'tarka_matchers/helpers/utility'

data/lib/tarka_matchers/version.rb

@@ -1,3 +1,3 @@
 module TarkaMatchers
-  VERSION = '0.0.53'
+  VERSION = '0.0.54'
 end

data/tarka_matchers.gemspec

@@ -30,6 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'the_great_escape'
 	spec.add_development_dependency 'rake', '~> 10.0'
-	spec.add_development_dependency 'rspec-given'
 	spec.add_development_dependency 'faker'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tarka_matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.0.54
 platform: ruby
 authors:
 - jaytarka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-given
-  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'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +132,7 @@ files:
 - lib/tarka_matchers/commands/calibrate.rb
 - lib/tarka_matchers/commands/install.rb
 - lib/tarka_matchers/expectation_matchers.rb
+- lib/tarka_matchers/formatters.rb
 - lib/tarka_matchers/formatters/difference.rb
 - lib/tarka_matchers/formatters/selected.rb
 - lib/tarka_matchers/formatters/styles.rb
@@ -156,6 +143,7 @@ files:
 - lib/tarka_matchers/helpers/string/sgr/sgr_codes.rb
 - lib/tarka_matchers/helpers/string/sgr/sgr_sequences/xterm.txt
 - lib/tarka_matchers/helpers/string/sgr/styled_capture.rb
+- lib/tarka_matchers/helpers/utility.rb
 - lib/tarka_matchers/matchers/class/have_an_instance_variable_of.rb
 - lib/tarka_matchers/matchers/expectation/fail.rb
 - lib/tarka_matchers/matchers/expectation/have_a_description_of.rb
@@ -166,10 +154,12 @@ files:
 - lib/tarka_matchers/matchers/rails/action_dispatch/be_named_as.rb
 - lib/tarka_matchers/matchers/regex/match_sections.rb
 - lib/tarka_matchers/matchers/string/sgr/be_red.rb
+- lib/tarka_matchers/matchers/string/t_equal.rb
 - lib/tarka_matchers/rails_matchers.rb
 - lib/tarka_matchers/regex_matchers.rb
 - lib/tarka_matchers/ruby_matchers.rb
 - lib/tarka_matchers/sgr_matchers.rb
+- lib/tarka_matchers/utility.rb
 - lib/tarka_matchers/version.rb
 - tarka_matchers.gemspec
 homepage: https://github.com/jaytarka/tarka_matchers