predicate 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039636282e90c0f484d6747ca27286890152c280dc9a5c7ba1d3fd21aff575f2'
-  data.tar.gz: 1ccfa7508aee58a1734ecdb8ae1f4bee5c3c1718d284b04051877bb7dc5d94e2
+  metadata.gz: 6adb8570080165285172882eb0c0f8216180efa05a58df348055f9a406fcef24
+  data.tar.gz: 3add1e5ed2a4d728fb92637c8527b8dfeaa2b66f16622a45608aca1d9f079774
 SHA512:
-  metadata.gz: 6470c50519c4675a6caebebf58767d2ff85b0c43e82ea838a0b042a84400c906a00aa84ec8707c3dfcdb548a8622bc31a333da55d4c8260817eef4d1629dd594
-  data.tar.gz: d12feeb814e4e6d5eae9e8fbd5eab71af196bc113ab714e8b2b98583221d79f94b95bb860b681b50999eb1a68b3002c944183a31819860c4d5b7f0f29f4829ba
+  metadata.gz: 8967a78cd1bbee2b0e2666f0fe853743d98c5be4730c3d263ce30d541387b71de37ac1d3e9544d487c92782795fcdeeb116099b741a362b60390b35aa2834e6a
+  data.tar.gz: ed564310b25c229a65824e06d6b37353d326a1dd56b00a6723ad669c4321fa2d4e50d660d5c02b66efbaef695a2063504602e9466c7908b0ebf681943dc28571

data/lib/predicate.rb

@@ -88,6 +88,10 @@ class Predicate
     Predicate.new(expr.qualify(qualifier))
   end
 
+  def unqualify
+    Predicate.new(expr.unqualify)
+  end
+
   def rename(renaming)
     Predicate.new(expr.rename(renaming))
   end

data/lib/predicate/nodes/expr.rb

@@ -77,6 +77,10 @@ class Predicate
       Qualifier.new(qualifier).call(self)
     end
 
+    def unqualify
+      Unqualifier.new.call(self)
+    end
+
     def bind(binding)
       Binder.new(binding).call(self)
     end

data/lib/predicate/processors.rb

@@ -1,4 +1,5 @@
 require_relative "processors/to_s"
 require_relative "processors/renamer"
 require_relative "processors/qualifier"
+require_relative "processors/unqualifier"
 require_relative "processors/binder"

data/lib/predicate/processors/unqualifier.rb

@@ -0,0 +1,17 @@
+class Predicate
+  class Unqualifier < Sexpr::Rewriter
+
+    grammar Grammar
+
+    def on_qualified_identifier(sexpr)
+      [ :identifier, sexpr.last ]
+    end
+
+    def on_native(sexpr)
+      raise NotSupportedError
+    end
+
+    alias :on_missing :copy_and_apply
+
+  end
+end

data/lib/predicate/version.rb

@@ -2,7 +2,7 @@ class Predicate
   module Version
     MAJOR = 2
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/predicate/test_unqualify.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+class Predicate
+  describe Predicate, "unqualify" do
+
+    let(:p){ Predicate }
+
+    subject{ predicate.unqualify }
+
+    context 'when the predicate is not qualified' do
+      let(:predicate){ p.in(:x, [2]) & p.eq(:y, :z) }
+
+      it 'works as expected' do
+        expect(subject).to eql(predicate)
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -122,6 +122,7 @@ files:
 - lib/predicate/processors/qualifier.rb
 - lib/predicate/processors/renamer.rb
 - lib/predicate/processors/to_s.rb
+- lib/predicate/processors/unqualifier.rb
 - lib/predicate/sequel.rb
 - lib/predicate/sequel/to_sequel.rb
 - lib/predicate/version.rb
@@ -182,6 +183,7 @@ files:
 - spec/predicate/test_qualify.rb
 - spec/predicate/test_rename.rb
 - spec/predicate/test_tautology.rb
+- spec/predicate/test_unqualify.rb
 - spec/sequel/test_to_sequel.rb
 - spec/spec_helper.rb
 - spec/test_predicate.rb