smerge 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26dd9d275e84f9b95f4bdcf5d40a83b874435371
-  data.tar.gz: 89d15861537a97ab06da286556bbd44dde35a4a7
+  metadata.gz: 1732cab9c4a4271972f13e67765bb107cbea5654
+  data.tar.gz: 2d1465d5b8ad029ebcd7ce783ccc1f258739cabe
 SHA512:
-  metadata.gz: 56c5f01a5934eef211a6ca13a5ff63a931ebd172aa817d15881722840a19fc91c4f382867e618c2ff640f140dd5eabd833418c8ba0d531bbee295cda56fbb1d2
-  data.tar.gz: ab7bd25ce1152fdb64209153ce9f276e7f965424fae52c454ba25c0c9ff272dfb6f45475c0f832635b6cb404d428b6d81bcd721d8ece423294fa828895986c31
+  metadata.gz: 7667abbaa6ada1b0df23ad3e4b9fff88ed00d41ab2b266b5b0e761752b0bea9e728b29bc554b88c4cb7c3d569ffa709a8c86c1827199031fd8d6a657693c431b
+  data.tar.gz: f80c5c13b4c5660c029fa2b811421a0fb484410bc5380e0ce7bb564f314835d8c85c00677f0fa9e6c3425f8a58471f2280319bf1001df8db89db8c06efee0534

data/lib/smerge/config.rb

@@ -1,4 +1,4 @@
-require 'smerge/models/rule'
+require 'smerge/rule'
 
 module Smerge
   class Config

data/lib/smerge/engine.rb

@@ -1,5 +1,7 @@
 module Smerge
   class Engine
+    using Matchers
+
     def initialize(rules)
       @rules = rules
     end
@@ -7,10 +9,10 @@ module Smerge
     def call(left, right)
       @rules.each do |rule|
         next unless rule.match(left, right)
-        return rule.execute(left, right)
+        return rule.call(left, right)
       end
 
-      nil
+      right
     end
   end
 end

data/lib/smerge/matchers/regexp.rb

@@ -0,0 +1,13 @@
+module Smerge
+  module Matchers
+    refine Regexp do
+      alias_method :match_string, :match
+
+      def match(obj)
+        match_string(obj)
+      rescue TypeError => _
+        false
+      end
+    end
+  end
+end

data/lib/smerge/{models/rule.rb → rule.rb}

@@ -1,5 +1,6 @@
 require 'smerge/matchers/class'
 require 'smerge/matchers/object'
+require 'smerge/matchers/regexp'
 
 module Smerge
   class Rule
@@ -20,8 +21,8 @@ module Smerge
         self.right.match(right)
     end
 
-    def execute(left, right)
-      block.call(left, right)
+    def call(left, right)
+      self.block.call(left, right)
     end
   end
 end

data/lib/smerge/setup.rb

@@ -2,10 +2,6 @@ require 'smerge'
 using Smerge::Local
 
 Smerge.setup do |c|
-  c.rule Object, Object do |left, right|
-    right
-  end
-
   c.rule Object, nil do |left, right|
     left
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smerge
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Ben Thorner
@@ -23,7 +23,8 @@ files:
 - lib/smerge/imports/local.rb
 - lib/smerge/matchers/class.rb
 - lib/smerge/matchers/object.rb
-- lib/smerge/models/rule.rb
+- lib/smerge/matchers/regexp.rb
+- lib/smerge/rule.rb
 - lib/smerge/setup.rb
 homepage: https://github.com/benthorner/smerge
 licenses: