object-template 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d8da44dc2938f0d1e550a68f8db2bbd036b748
-  data.tar.gz: 523ee826c82b15d1ce165dde2f379ba565c6e4c4
+  metadata.gz: 0fa8ca2bf4796154808248e6699f83e7b563ab1f
+  data.tar.gz: 0981786792b58f0288f5e62ee6a06c4d04764129
 SHA512:
-  metadata.gz: b841e59e678cf59835379afd5378a91c87c1cfd5090c7e41b332f75ee94f1633f4361147da8ced800a7576fddb62ecbd4e7294ead0bedd6930384f8570ff16b2
-  data.tar.gz: b12e0c975089a8315a7e0a2643c36ced151d43d75012553f491786db5596bc822fb188903648ea44a67a51e474cefa6d318631c66bf7b247f6846b1058600cbd
+  metadata.gz: 8778e3da7d5b23710b8e3fda65d67b821f5fcedf315377dafa57fbefeb3e127a2b7a99600912372d7520bf49e250e996591b492233cced0e091fdd464bee2985
+  data.tar.gz: df1183acc120dbd01e2d9054a5ff252a2c0dfb16ed5b76f42418929a575e36a7ffc83627e1c65f7205da90488e026641136b7518f9507dc3ac9def9f62564031

data/lib/object-template.rb

@@ -2,7 +2,7 @@ require 'set'
 
 # Base class for classes of templates used to match somewhat arbitrary objects.
 class ObjectTemplate
-  VERSION = "0.4"
+  VERSION = "0.5"
 
   attr_reader :spec
 
@@ -138,6 +138,7 @@ class PortableObjectTemplate < ObjectTemplate
   CLASS_FOR = {
     "boolean" => BOOLEAN,
     "number"  => Numeric,
+    "integer" => Integer,
     "string"  => String,
     "list"    => Array,
     "map"     => Hash
@@ -146,4 +147,58 @@ class PortableObjectTemplate < ObjectTemplate
   CLASS_FOR.default_proc = proc do |h,k|
     raise ArgumentError, "no known class for matching type #{k.inspect}"
   end
+
+  # Convert a ROT spec into a POT spec (without creating a ROT). Not completely
+  # general: some POTs cannot be represented in this way.
+  def self.spec_from rot_spec
+    case rot_spec
+    when Array
+      rot_spec.map do |col_rot_spec|
+        column_spec_from(col_rot_spec)
+      end
+    when Hash
+      h = {}
+      rot_spec.each do |k, col_rot_spec|
+        h[k] = column_spec_from(col_rot_spec)
+      end
+      h
+    else
+      raise ArgumentError
+    end
+  end
+
+  def self.column_spec_from col_rot_spec
+    case col_rot_spec
+    when nil
+      nil
+
+    when Range
+      range = col_rot_spec
+      raise if range.exclude_end? ##
+      raise unless range.first.kind_of? Numeric ##
+      {type: "number", range: [range.first, range.last]}
+
+    when Module
+      mdl = col_rot_spec
+      class_name,_ = CLASS_FOR.find {|k,v| v == mdl}
+      raise unless class_name
+      {type: class_name}
+
+    when Regexp
+      rx = col_rot_spec
+      {regex: rx.source}
+
+    when MemberMatchingSet
+      set = col_rot_spec
+      if set == BOOLEAN
+        ## awkward API: must reference PortableObjectTemplate::BOOLEAN
+        {type: "boolean"}
+      else
+        {set: set.to_a}
+      end
+
+    else # assume it is a value
+      {value: col_rot_spec}
+    end
+  end
 end

data/test/test-match.rb

@@ -113,6 +113,7 @@ ne3            ["foo"],       [/o{3,}/], [{regex: "o{3,}"}]
 eq3             [true],     [TrueClass], [{type: "boolean"}]
 eq3            [false],    [FalseClass], [{type: "boolean"}]
 eq3               [42],       [Numeric], [{type: "number"}]
+eq3               [42],       [Integer], [{type: "integer"}]
 eq3            ["foo"],        [String], [{type: "string"}]
 eq3          [[1,2,3]],         [Array], [{type: "list"}]
 eq3       [{a:1, b:2}],          [Hash], [{type: "map"}]
@@ -120,6 +121,7 @@ eq3       [{a:1, b:2}],          [Hash], [{type: "map"}]
 ne3             ["42"],     [TrueClass], [{type: "boolean"}]
 ne3                [0],    [FalseClass], [{type: "boolean"}]
 ne3             ["42"],       [Numeric], [{type: "number"}]
+ne3             [42.5],       [Integer], [{type: "integer"}]
 ne3              [123],        [String], [{type: "string"}]
 ne3       [{a:1, b:2}],         [Array], [{type: "list"}]
 ne3          [[1,2,3]],          [Hash], [{type: "map"}]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: object-template
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies: []
 description: Templates for matching objects.
 email: vjoel@users.sourceforge.net
@@ -18,17 +18,17 @@ extra_rdoc_files:
 - README.md
 - COPYING
 files:
-- README.md
 - COPYING
+- README.md
 - Rakefile
-- lib/object-template.rb
-- bench/lib/bench.rb
 - bench/bench-match.rb
+- bench/lib/bench.rb
+- lib/object-template.rb
 - test/lib/assert-threequal.rb
 - test/lib/eq3.rb
-- test/test-match.rb
-- test/test-key-conv.rb
 - test/test-errors.rb
+- test/test-key-conv.rb
+- test/test-match.rb
 homepage: https://github.com/vjoel/object-template
 licenses:
 - BSD
@@ -57,12 +57,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Templates for matching objects
 test_files:
-- test/test-match.rb
 - test/test-key-conv.rb
+- test/test-match.rb
 - test/test-errors.rb
 has_rdoc: