piglet 0.2.2 → 0.2.3

data/lib/piglet/field/field.rb

@@ -4,7 +4,7 @@ module Piglet
       SYMBOLIC_OPERATORS = [:==, :>, :<, :>=, :<=, :%, :+, :-, :*, :/]
       FUNCTIONS = [:avg, :count, :max, :min, :size, :sum, :tokenize]
 
-      attr_reader :name, :type, :operator
+      attr_reader :name, :type
     
       FUNCTIONS.each do |fun|
         define_method(fun) do

data/lib/piglet/field/infix_expression.rb

@@ -2,6 +2,8 @@ module Piglet
   module Field
     class InfixExpression # :nodoc:
       include Field
+      
+      attr_reader :operator
     
       def initialize(operator, left_expression, right_expression, options=nil)
         options ||= {}

data/lib/piglet/field/prefix_expression.rb

@@ -2,6 +2,8 @@ module Piglet
   module Field
     class PrefixExpression # :nodoc:
       include Field
+      
+      attr_reader :operator
     
       def initialize(operator, expression, space_between=true, options=nil)
         options ||= {}
@@ -10,7 +12,7 @@ module Piglet
       end
     
       def simple?
-        true
+        false
       end
     
       def to_s

data/lib/piglet.rb

@@ -1,6 +1,6 @@
 # :main: README.rdoc
 module Piglet # :nodoc:
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
   
   class PigletError < StandardError; end
   class NotSupportedError < PigletError; end

data/spec/piglet_spec.rb

@@ -395,6 +395,13 @@ describe Piglet do
   end
 
   context 'field expressions' do
+    it 'parenthesizes expressions with different operators' do
+      output = @interpreter.to_pig_latin do
+        store(load('in').filter { |r| r.x.and(r.y.or(r.z)).and(r.w) }, 'out')
+      end
+      output.should include('x AND (y OR z) AND w')
+    end
+    
     it 'doesn\'t parenthesizes expressions with the same operator' do
       output = @interpreter.to_pig_latin do
         store(load('in').filter { |r| r.x.and(r.y.and(r.z)).and(r.w) }, 'out')
@@ -402,11 +409,25 @@ describe Piglet do
       output.should include('x AND y AND z AND w')
     end
 
-    it 'parenthesizes expressions with different operators' do
+    it 'doesn\'t parenthesize function calls' do
       output = @interpreter.to_pig_latin do
-        store(load('in').filter { |r| r.x.and(r.y.or(r.z)).and(r.w) }, 'out')
+        store(load('in').foreach { |r| [r.x.max + r.y.min] }, 'out')
       end
-      output.should include('x AND (y OR z) AND w')
+      output.should include('MAX(x) + MIN(y)')
+    end
+
+    it 'doesn\'t parenthesize a suffix expression followed by an infix expression' do
+      output = @interpreter.to_pig_latin do
+        store(load('in').foreach { |r| [r.x.null?.or(r.y)] }, 'out')
+      end
+      output.should include('x is null OR y')
+    end
+
+    it 'parenthesizes a prefix expression followed by an infix expression' do
+      output = @interpreter.to_pig_latin do
+        store(load('in').foreach { |r| [r.x.not.and(r.y)] }, 'out')
+      end
+      output.should include('(NOT x) AND y')
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: piglet
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Theo Hultberg