speckle 0.1.13 → 0.1.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGY0ZTgyOTljZjAxYzIxYmNlZjgxMzI2YjFkZjI1MDJjYWUwMTQxZg==
+    NmEwMDlhYjVmMzYyMmI3NThhNGU3NzRiYjA5ZDM3ZmE2NDU5ZTIwYQ==
   data.tar.gz: !binary |-
-    NjNmMDBjMWQwMGIyNzgyNzVmZDE2NzRkN2JlYjFhNmMyZWMzNmM0YQ==
+    NjQ4OTFjNDU1MGI3OWU0N2I1NGI4ODc3NDBmZmZkMTYyYmM3OGNiNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MmY5MTYyZjFiYjFiMTExMWY0MzFmMWJkYzhjMTIxOGRlMTU3MWJlNmNlMzYx
-    ZDZjZTllNWJiMWI1ODk1MmY1MGNkYjRiY2NiZWYxNTA0NzczZTFkMDcyNGQw
-    NzQ5MzYzNDdlZTM2NGY3NjM0NjU3MTI2MmNmOGZjY2M5MzdmN2E=
+    ZjU3NWJjZjE3NmY5MWMzNGYwYTJjNGEzOTU0ZDgzNWM3OGZiZjEzYjY3MGU0
+    MjBmYjFmMTgyOWM1YjQxNTIzNDM5ZTE0MjU0N2I2ZWEwMjUwYTdhNjk4MzQz
+    ZGY1MDY1ZGJlOTJiMTNjMWQ5M2FkOTlkZTBkNDA2ZjM3MmNkNTU=
   data.tar.gz: !binary |-
-    ZjljYjNjYTc4NDU2NWUwZDkzMGI3NWFmMTg0YTA0YWNlMTcyZDRlMTYwZmEy
-    YTA2MGJhNjM2ZTBlNzI2OGZhNTZiYTczNTQxYzU0NGZmMzIyZTZkMzFlMjcw
-    NTY2MWY2MzUyOTFiMjU5MTBlNTFmMzUxOTZlZjFjYWFkYzFiODE=
+    NTMzYzdkNmJhZjNjNjdjN2I0NmZlMWVkNjY3NGU3MzgxNmYxMTkwNzg3MjFk
+    YWM0ZDk5NmEzNjBkMjg0MmEwNWZkOGI1MWIzMTkyODg1MWI4ODA5YTI3YTFi
+    YTg0ZDI0N2FkODlkZmRiNzk0ZWJhMmVjMGIyMzVkZmVlYTk0NzQ=

data/lib/matchers/equality_matcher.riml

@@ -1,13 +1,76 @@
 class EqualityMatcher
+  def initialize
+    types = []
+    add(types, 'Number')
+    add(types, 'String')
+    add(types, 'Funcref')
+    add(types, 'List')
+    add(types, 'Dictionary')
+    add(types, 'Float')
+
+    self.types = types
+  end
+
   defm match(expected, actual)
-    return actual == expected
+    self.type_mismatch = false
+
+    type_expected = type(expected)
+    type_actual = type(actual)
+
+    if type_expected != type_actual
+      self.type_mismatch = true
+      return false
+    end
+
+    return expected == actual
   end
 
   defm failure_message_for_match(expected, actual)
-    return "expected “#{actual}” to equal “#{expected}”"
+    if self.type_mismatch
+      return self.type_mismatch_message(expected, actual)
+    end
+
+    expected_str = self.stringify(expected)
+    actual_str = self.stringify(actual)
+
+    return "expected “#{actual_str}” to equal “#{expected_str}”"
   end
 
   defm failure_message_for_mismatch(expected, actual)
-    return "expected “#{actual}” to not equal “#{expected}”"
+    if self.type_mismatch
+      return self.type_mismatch_message(expected, actual)
+    end
+
+    expected_str = self.stringify(expected)
+    actual_str = self.stringify(actual)
+
+    return "expected “#{actual_str}” to not equal “#{expected_str}”"
   end
+
+  defm type_mismatch_message(expected, actual)
+    actual_type = self.typeof(actual)
+    expected_type = self.typeof(expected)
+
+    return "type mismatch, actual(#{string(actual)}) is “#{actual_type}”, expected(#{string(expected)}) is “#{expected_type}”"
+  end
+
+  " helpers "
+  defm typeof(variable)
+    return self.type_to_str(type(variable))
+  end
+
+  defm type_to_str(num)
+    return self.types[num]
+  end
+
+  defm stringify(value)
+    value_type = type(value)
+
+    if value_type == type('') || value_type == type(1)
+      return value
+    else
+      return string(value)
+    end
+  end
+
 end

data/lib/speckle/version.rb

@@ -1,3 +1,3 @@
 module Speckle
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/spec/matchers/equality_matcher_spec.riml

@@ -28,4 +28,34 @@ class EqualityMatcherSpec
   defm it_can_check_inequality_with_alias_neq
     expect('foo').to_neq('bar')
   end
+
+  defm verify_type_mismatch(a, b)
+    try
+      expect(a).to_equal(b)
+      caught_error = false
+    catch /type mismatch/
+      ""get_logger().info(v:exception)
+      caught_error = true
+    end
+
+    expect(caught_error).to_be_true()
+  end
+
+  defm it_can_report_type_mismatch
+    self.verify_type_mismatch(100, 'one hundred')
+    self.verify_type_mismatch(1, '1')
+    self.verify_type_mismatch(0, '0')
+    self.verify_type_mismatch({}, [])
+    self.verify_type_mismatch({}, 'foo')
+  end
+
+  defm it_can_check_equality_of_lists
+    expect(['a', 'b']).to_not_equal(['a', 'b', 'c'])
+    expect(['a', 'b']).to_equal(['a', 'b'])
+  end
+
+  defm it_can_check_equality_of_dicts
+    expect({'foo': 10}).to_not_equal({'bar': 20})
+    expect({'foo': { 'bar': 10 }}).to_equal({'foo': { 'bar': 10 }})
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: speckle
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Darshan Sawardekar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riml