predicate 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa56aaf631881d7fa0b83d7d0353e5e1fd10518
-  data.tar.gz: 19cd5e6f8b3e863db2e553ebe57aa41a5431bc7e
+  metadata.gz: d0640cc584c97fcc3284e49a237ed100eafb99b6
+  data.tar.gz: 477609b676466dd9e6a43e36740929e4ab660d81
 SHA512:
-  metadata.gz: 4bf57668af7cacea1d5ff462164bc44437cff7d15f54935550e77aacf24709faf31f94d5c504aea178ab219b8dd50ffa649716d8ee240fd87f024f41ea56159a
-  data.tar.gz: 6dfd2865bad700185ef9360de2ca8718352b77d32ef9c4995f8d486273aaeb815984144ce005fc9b8e6c4890d61018f00d0119af8f3da1619f8f85e4e3b5bc7a
+  metadata.gz: 31a4d9754d7b1c7be5ecc4703cd2b1b6ecfdeab6616e736b3754e276c48468881b79420475d64aa5acf265007daf0fe3309fe3e2cc5fcf69cd6a15f150d67b18
+  data.tar.gz: 142229a63ac9c525b1fa90eaf6689a673db467ffd11b9b26c034d75d752ff93258198eb4030ca167effc75fde6573ab9e2a8ed9e4fc7b4e9e3729ff0a5e12e5a

data/lib/predicate/nodes/expr.rb

@@ -86,6 +86,11 @@ class Predicate
       "->(t){ #{code} }"
     end
 
+    def to_s(scope = nil)
+      ToS.call(self, scope: scope)
+    end
+    alias :inspect :to_s
+
     def to_proc(scope = 't')
       Kernel.eval(to_ruby_code(scope))
     end

data/lib/predicate/processors/to_s.rb

@@ -0,0 +1,90 @@
+class Predicate
+  class ToS < Sexpr::Processor
+
+    def on_tautology(sexpr)
+      "true"
+    end
+
+    def on_contradiction(sexpr)
+      "false"
+    end
+
+    def on_qualified_identifier(sexpr)
+      "#{sexpr.qualifier}.#{sexpr.name}"
+    end
+
+    def on_identifier(sexpr)
+      if s = options[:scope]
+        "#{s}.#{sexpr.last.to_s}"
+      else
+        "@#{sexpr.last.to_s}"
+      end
+    end
+
+    def on_not(sexpr)
+      "not(" << apply(sexpr.last, sexpr) << ")"
+    end
+
+    def on_and(sexpr)
+      sexpr.sexpr_body.map{|term|
+        apply(term, sexpr)
+      }.join(" AND ")
+    end
+
+    def on_or(sexpr)
+      sexpr.sexpr_body.map{|term|
+        apply(term, sexpr)
+      }.join(" OR ")
+    end
+
+    def on_dyadic(sexpr)
+      sexpr.sexpr_body.map{|term|
+        apply(term, sexpr)
+      }.join(" #{sexpr.operator_symbol} ")
+    end
+    alias :on_eq  :on_dyadic
+    alias :on_neq :on_dyadic
+    alias :on_lt  :on_dyadic
+    alias :on_lte :on_dyadic
+    alias :on_gt  :on_dyadic
+    alias :on_gte :on_dyadic
+
+    def on_in(sexpr)
+      "#{apply(sexpr.identifier)} IN #{to_literal(sexpr.values)}"
+    end
+
+    def on_intersect(sexpr)
+      "#{apply(sexpr.identifier)} INTERSECTS #{to_literal(sexpr.values)}"
+    end
+
+    def on_literal(sexpr)
+      to_literal(sexpr.last)
+    end
+
+    def on_native(sexpr)
+      sexpr.last.inspect
+    end
+
+    def on_missing(sexpr)
+      raise "Unimplemented: #{sexpr.first}"
+    end
+
+  protected
+
+    def to_literal(x)
+      case x
+      when Array then "{" << x.map{|y| to_literal(y) }.join(',') << "}"
+      else x.inspect
+      end
+    end
+
+    def apply(sexpr, parent = nil)
+      code = super(sexpr)
+      if parent && (parent.priority >= sexpr.priority)
+        code = "(" << code << ")"
+      end
+      code
+    end
+
+  end
+end

data/lib/predicate/processors.rb

@@ -1,3 +1,4 @@
+require_relative "processors/to_s"
 require_relative "processors/to_ruby_code"
 require_relative "processors/renamer"
 require_relative "processors/qualifier"

data/lib/predicate/version.rb

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

data/lib/predicate.rb

@@ -125,7 +125,10 @@ class Predicate
   def to_ruby_code(scope = "t")
     expr.to_ruby_code(scope)
   end
-  alias :to_s :to_ruby_code
+
+  def to_s(scope = nil)
+    expr.to_s(scope)
+  end
 
   def to_proc
     @proc ||= expr.to_proc("t")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predicate
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -118,6 +118,7 @@ files:
 - lib/predicate/processors/qualifier.rb
 - lib/predicate/processors/renamer.rb
 - lib/predicate/processors/to_ruby_code.rb
+- lib/predicate/processors/to_s.rb
 - lib/predicate/sequel.rb
 - lib/predicate/sequel/to_sequel.rb
 - lib/predicate/version.rb