object-template 0.7 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b73996b9c7fc5ffc66469ea21da8612d85cfc0ca
-  data.tar.gz: 6982a85aa7cb5f4ef27b1d3d07e219cbf39cbacd
+  metadata.gz: 5bc6ab2eb7270d6d725ee9f0e37d6ff2ad31789d
+  data.tar.gz: d20466007e0d8895d6d97184cde46729b4c17d02
 SHA512:
-  metadata.gz: df96bc58a7d309b763ef03f7fc3c4742593a5692b5fdb5acdf7704f53b00f476fdf4c1c3f90cca9f308c92d377a0f6a28889b4815b134c2db83da87bbc821e26
-  data.tar.gz: 0874436e5f11014864e032d99c67d731f21d665d6e7cc635f2f16bf585f28189a6c2aeb3599e6876ade7bfd130659501258c78e5249412f667e0c099c3ee7648
+  metadata.gz: c40640688e71dabf0dcb8374d036ec9aa4c8f41c5c997c2f850f58d2437fce8eba4cf25c0e41dd6bbc26aa18cb6954efdd1e586fd2c773f4216167f4547884e9
+  data.tar.gz: e30e5141b82b1d2dbeb846efa765566bb331741f59f9bfc75f934ee9b4305ce54c426d2e70497cf68c66293fe517487c1fd22d63e3fbca70344c353eb04e7727

data/lib/object-template.rb

@@ -2,9 +2,9 @@ require 'set'
 
 # Base class for classes of templates used to match somewhat arbitrary objects.
 class ObjectTemplate
-  VERSION = "0.7"
+  VERSION = "0.8"
 
-  attr_reader :spec
+  attr_reader :spec, :key_converter
 
   # A set implementation that treats the matching operator (===) as membership.
   # Used internally by PortableObjectTemplate, but can also be used in
@@ -15,7 +15,7 @@ class ObjectTemplate
 
   # The key_converter is for matching objects that, for example, have had symbol
   # keys serialized to strings. Using a converter that round-trips through the
-  # same serialializer, symbols in keys will match strings. However, symbols in
+  # same serializer, symbols in keys will match strings. However, symbols in
   # values will not.
   def initialize spec, key_converter = nil
     unless spec.respond_to? :size and spec.respond_to? :each
@@ -24,18 +24,19 @@ class ObjectTemplate
 
     @spec = spec
     @size = spec.size
+    @key_converter = key_converter
     @matchers = []
     
     if spec.respond_to? :to_hash # assume hash-like
       @shibboleth = :to_hash
       spec.each do |k, v|
-        kc = key_converter ? key_converter[k=>nil].keys[0] : k
-          # Note: cannot use key_converter[v] because v may have class, regex,
-          # or other non-serializable object.
+        if key_converter
+          k = key_converter[k => nil].keys[0]
           # Note: the [k=>nil].keys[0] is needed instead of just [k]
           # because the key_converter might not convert values, only keys.
           # We do not assume that k is a scalar.
-        fill_matchers kc, v
+        end
+        fill_matchers k, v
       end
 
     else # assume array-like
@@ -93,6 +94,9 @@ end
 # classes, regexes, ranges, and so on, in addition to single values.
 class RubyObjectTemplate < ObjectTemplate
   def fill_matchers k, v  # :nodoc:
+    if key_converter
+      (v = key_converter[v]) rescue nil # error means templating object
+    end
     @matchers << [k, v]
   end
 end
@@ -116,6 +120,9 @@ class PortableObjectTemplate < ObjectTemplate
       v.each do |kk, vv|
         case kk
         when :value, "value"
+          if key_converter
+            (vv = key_converter[vv]) rescue nil # error means templating object
+          end
           @matchers << [k, vv]
         when :set, "set"
           @matchers << [k, MemberMatchingSet.new(vv)]

data/test/test-key-conv.rb

@@ -4,41 +4,90 @@ require 'minitest/autorun'
 require 'object-template'
 require 'assert-threequal'
 
-class TestKeyConv < Minitest::Test
-  include AssertThreequal
-
-  POT = PortableObjectTemplate
-  ROT = RubyObjectTemplate
-
-  def test_match_converted_key
-    assert_threequal(
-      POT.new(
-        {foo: {value: 1}},
-          proc {|x| Symbol === x ? x.to_s : x}),
-        {"foo" => 1}
-    )
-
-    assert_threequal(
-      ROT.new(
-        {foo: 1},
-          proc {|x| Symbol === x ? x.to_s : x}),
-        {"foo" => 1}
-    )
-  end
+begin
+  require 'msgpack'
+rescue LoadError
+  $stderr.puts "skipping TestKeyConv: msgpack lib not available"
+else
+
+  class TestKeyConv < Minitest::Test
+    include AssertThreequal
+
+    POT = PortableObjectTemplate
+    ROT = RubyObjectTemplate
+
+    CK_STR = proc {|x|
+      MessagePack.load(
+        MessagePack.dump(x))}
+    CK_SYM = proc {|x|
+      MessagePack.load(
+        MessagePack.dump(x), symbolize_keys: true)}
+
+    def test_match_converted_key
+      assert_threequal(
+        POT.new(
+          {foo: {value: {bar: 1}}}, CK_STR),
+          {"foo" => {"bar" => 1}}
+      )
+
+      assert_threequal(
+        POT.new(
+          {foo: {value: {"bar" => 1}}}, CK_STR),
+          {"foo" => {"bar" => 1}}
+      )
+
+      assert_threequal(
+        ROT.new(
+          {foo: {bar: 1}}, CK_STR),
+          {"foo" => {"bar" => 1}}
+      )
 
-  def test_not_match_unconverted_key
-    assert_not_threequal(
-      POT.new(
-        {foo: {value: 1}},
-          proc {|x| x}),
-        {"foo" => 1}
-    )
-
-    assert_not_threequal(
-      ROT.new(
-        {foo: 1},
-          proc {|x| x}),
-        {"foo" => 1}
-    )
+      assert_threequal(
+        ROT.new(
+          {"foo" => {"bar" => 1}}, CK_STR),
+          {"foo" => {"bar" => 1}}
+      )
+
+      assert_threequal(
+        POT.new(
+          {foo: {value: {bar: 1}}}, CK_SYM),
+          {foo: {bar: 1}}
+      )
+
+      assert_threequal(
+        POT.new(
+          {foo: {value: {"bar" => 1}}}, CK_SYM),
+          {foo: {bar: 1}}
+      )
+
+      assert_threequal(
+        ROT.new(
+          {foo: {bar: 1}}, CK_SYM),
+          {foo: {bar: 1}}
+      )
+
+      assert_threequal(
+        ROT.new(
+          {"foo" => {"bar" => 1}}, CK_SYM),
+          {foo: {bar: 1}}
+      )
+    end
+
+    def test_not_match_unconverted_key
+      assert_not_threequal(
+        POT.new(
+          {foo: {value: 1}},
+            proc {|x| x}),
+          {"foo" => 1}
+      )
+
+      assert_not_threequal(
+        ROT.new(
+          {foo: 1},
+            proc {|x| x}),
+          {"foo" => 1}
+      )
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object-template
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '0.8'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies: []
 description: Templates for matching objects.
 email: vjoel@users.sourceforge.net