msfl_visitors 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8470b08c4ddad65f93e4390940322df02fd8ab
-  data.tar.gz: e830bfd417c1f08f6d9e0debc700de26a7db5824
+  metadata.gz: daf42029b9bfc45fc7203e2c07543dbbc069b3d5
+  data.tar.gz: 361efbee8a9055be3acec9862b9723630a9d8da8
 SHA512:
-  metadata.gz: 1312268041b0d2fd0544a39691269f3cf804c400d9fcf79bf02179db7233727213fa6b7de572363ad74804327d6241efcfaa834fe7f2bccb6d9adb119c8155ab
-  data.tar.gz: 7aaa3e770f248415ec6d74bc791beccd8eb5b20c3cb6d8b5c72be56b46abb7955b22eaee9927507ab832018f9b3a9c22be018b86a42261f8501a67029b18fe65
+  metadata.gz: 01f65645a30000fba50046a1200339561ec8da9d645202db7cb3ec3e8887f072e62e079aad75dffaaa198e4f6aac8c13edc394766c7f3ffe68e2c8b3fc171f60
+  data.tar.gz: 68a70c23d76380d4ceb58db76672c1fe34bb9d0969a42205cfa8570a9f5f1c51325694dd9eb4861125940be008d5f8f05e49ba015f991381f14aa8df25050634

data/.gitignore

@@ -17,4 +17,7 @@
 
 ## Gemfile for development
 #Gemfile
-#Gemfile.lock
+#Gemfile.lock
+
+## Stupid OSX cruft
+.DS_Store

data/lib/msfl_visitors.rb

@@ -1,7 +1,8 @@
 require_relative 'msfl_visitors/ast'
-require_relative 'msfl_visitors/visitors/base'
 require_relative 'msfl_visitors/nodes'
-require_relative 'msfl_visitors/visitors/chewy_term_filter'
+require_relative 'msfl_visitors/visitor'
+require_relative 'msfl_visitors/renderers/chewy/term_filter'
 require_relative 'msfl_visitors/parsers/msfl_parser'
+
 module MSFLVisitors
 end

data/lib/msfl_visitors/ast.rb

@@ -4,7 +4,7 @@ module MSFLVisitors
     attr_accessor :root
 
     def initialize(msfl)
-      self.root = MSFLVisitors::Parsers::MSFLParser.new.parse msfl
+      self.root = MSFLVisitors::Parsers::MSFLParser.parse msfl
     end
 
     # Use this method to walk the AST with a particular visitor

data/lib/msfl_visitors/nodes/date_time.rb

@@ -1,7 +1,7 @@
 require_relative 'range_value'
 module MSFLVisitors
   module Nodes
-    class DateTime < RangeValue
+    class DateTime < Date
     end
   end
 end

data/lib/msfl_visitors/parsers/msfl_parser.rb

@@ -39,7 +39,7 @@ module MSFLVisitors
       end
 
       def parse_Set(obj, lhs = false)
-        fail NoMethodError, "#parse_Set is not yet implemented."
+
       end
 
       def hash_dispatch(key, value, lhs = false)

data/lib/msfl_visitors/renderers/chewy/term_filter.rb

@@ -0,0 +1,42 @@
+module MSFLVisitors
+  module Renderers
+    module Chewy
+      class TermFilter
+        BINARY_OPERATORS = {
+          Nodes::And              => ' & ',
+          Nodes::GreaterThan      => ' > ',
+          Nodes::LessThan         => ' < ',
+          Nodes::GreaterThanEqual => ' >= ',
+          Nodes::LessThanEqual    => ' <= ',
+          Nodes::Equal            => ' == ',
+        }
+
+        def render(node)
+          case node
+
+          when Nodes::Comparison, Nodes::And
+            BINARY_OPERATORS[node.class]
+
+          when Nodes::Date, Nodes::Time
+            node.value.iso8601
+
+          when Nodes::Boolean, Nodes::Number
+            node.value
+
+          when Nodes::Word
+            node.value.to_s
+
+          when Nodes::Grouping::Close
+            ' )'
+
+          when Nodes::Grouping::Open
+            '( '
+
+          else
+            fail ArgumentError.new("Unrecognized node type: #{node.class}")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/msfl_visitors/visitor.rb

@@ -0,0 +1,16 @@
+module MSFLVisitors
+  class Visitor
+    def initialize(collector, renderer)
+      @collector = collector
+      @renderer = renderer
+    end
+
+    def visit(obj)
+      collector << renderer.render(obj)
+    end
+
+    private
+
+    attr_reader :collector, :renderer
+  end
+end

data/msfl_visitors.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'msfl_visitors'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = '2015-05-01'
   s.summary     = "Convert MSFL to other forms"
   s.description = "Visitor pattern approach to converting MSFL to other forms."

data/spec/visitors/chewy_term_filter_spec.rb

@@ -0,0 +1,175 @@
+require 'spec_helper'
+
+describe MSFLVisitors::Visitor do
+
+  let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
+
+  let(:collector) { String.new }
+
+  let(:renderer) { MSFLVisitors::Renderers::Chewy::TermFilter.new }
+
+  let(:visitor) { described_class.new collector, renderer }
+
+  let(:left) { MSFLVisitors::Nodes::Word.new "lhs" }
+
+  let(:right) { MSFLVisitors::Nodes::Word.new "rhs" }
+
+  subject(:result) { node.accept visitor }
+
+  context "when visiting" do
+
+    describe "an Equal node" do
+
+      let(:node) { MSFLVisitors::Nodes::Equal.new left, right }
+
+      it "results in: 'left == right'" do
+        expect(result).to eq "lhs == rhs"
+      end
+    end
+
+    describe "a GreaterThan node" do
+
+      let(:node) { MSFLVisitors::Nodes::GreaterThan.new left, right }
+
+      it "returns: 'left > right'" do
+        expect(result).to eq "lhs > rhs"
+      end
+    end
+
+    describe "a GreaterThanEqual node" do
+
+      let(:node) { MSFLVisitors::Nodes::GreaterThanEqual.new left, right }
+
+      it "returns: 'left >= right'" do
+        expect(result).to eq "lhs >= rhs"
+      end
+    end
+
+    describe "a LessThan node" do
+
+      let(:node) { MSFLVisitors::Nodes::LessThan.new left, right }
+
+      it "returns: 'left < right'" do
+        expect(result).to eq "lhs < rhs"
+      end
+    end
+
+    describe "a LessThanEqual node" do
+
+      let(:node) { MSFLVisitors::Nodes::LessThanEqual.new left, right }
+
+      it "returns: 'left <= right'" do
+        expect(result).to eq "lhs <= rhs"
+      end
+    end
+
+    describe "an And node" do
+
+      let(:node) { MSFLVisitors::Nodes::And.new left, right }
+
+      it "returns: '( left ) & ( right )'" do
+        expect(result).to eq "( lhs ) & ( rhs )"
+      end
+    end
+
+    describe "value nodes" do
+      describe "a Boolean node" do
+
+        let(:collector) { Array.new }
+
+        let(:node) { MSFLVisitors::Nodes::Boolean.new value }
+
+        subject(:result) { node.accept(visitor).first }
+
+        context "with a value of true" do
+
+          let(:value) { true }
+
+          it "returns: true" do
+            expect(result).to be true
+          end
+        end
+
+        context "with a value of false" do
+
+          let(:value) { false }
+
+          it "returns: false" do
+            expect(result).to be false
+          end
+        end
+      end
+
+      describe "a Word node" do
+
+        let(:word) { "node_content" }
+
+        let(:node) { MSFLVisitors::Nodes::Word.new word }
+
+        it "is a literal string" do
+          expect(result).to eq word
+        end
+      end
+    end
+
+    describe "range value nodes" do
+
+      let(:collector) { Array.new }
+
+      subject(:result) { node.accept(visitor).first }
+
+      describe "a Date node" do
+
+        let(:today) { Date.today }
+
+        let(:node) { MSFLVisitors::Nodes::Date.new today }
+
+        it "returns: the date using iso8601 formatting" do
+          expect(result).to eq today.iso8601
+        end
+      end
+
+      describe "a Time node" do
+
+        let(:now) { Time.now }
+
+        let(:node) { MSFLVisitors::Nodes::Time.new now }
+
+        it "returns: the time using iso8601 formatting" do
+          expect(result).to eq now.iso8601
+        end
+      end
+
+      describe "a DateTime node" do
+
+        let(:now) { DateTime.now }
+
+        let(:node) { MSFLVisitors::Nodes::DateTime.new now }
+
+        it "returns: the date and time using iso8601 formatting" do
+          expect(result).to eq now.iso8601
+        end
+      end
+
+      describe "a Number node" do
+
+        let(:number) { 123 }
+
+        let(:node) { MSFLVisitors::Nodes::Number.new number }
+
+        it "returns: the number" do
+          expect(result).to eq number
+        end
+
+        context "when the number is a float" do
+
+          let(:number) { 123.456 }
+
+          it "returns: the number with the same precision" do
+            expect(result).to eq number
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -139,16 +139,13 @@ files:
 - lib/msfl_visitors/nodes/value.rb
 - lib/msfl_visitors/nodes/word.rb
 - lib/msfl_visitors/parsers/msfl_parser.rb
-- lib/msfl_visitors/visitors/base.rb
-- lib/msfl_visitors/visitors/chewy_term_filter.rb
+- lib/msfl_visitors/renderers/chewy/term_filter.rb
+- lib/msfl_visitors/visitor.rb
 - msfl_visitors.gemspec
 - simplecov_custom_profiles.rb
 - spec/parsers/parse_msfl_spec.rb
 - spec/spec_helper.rb
-- spec/visitors/chewy_term_filter/visit_binary_spec.rb
-- spec/visitors/chewy_term_filter/visit_comparison_spec.rb
-- spec/visitors/chewy_term_filter/visit_range_value_spec.rb
-- spec/visitors/chewy_term_filter/visit_value_spec.rb
+- spec/visitors/chewy_term_filter_spec.rb
 homepage: https://github.com/Referly/msfl_visitors
 licenses:
 - MIT
@@ -176,8 +173,5 @@ summary: Convert MSFL to other forms
 test_files:
 - spec/parsers/parse_msfl_spec.rb
 - spec/spec_helper.rb
-- spec/visitors/chewy_term_filter/visit_binary_spec.rb
-- spec/visitors/chewy_term_filter/visit_comparison_spec.rb
-- spec/visitors/chewy_term_filter/visit_range_value_spec.rb
-- spec/visitors/chewy_term_filter/visit_value_spec.rb
+- spec/visitors/chewy_term_filter_spec.rb
 has_rdoc: 

data/lib/msfl_visitors/visitors/base.rb

@@ -1,15 +0,0 @@
-module MSFLVisitors
-  module Visitors
-    class Base
-      attr_accessor :collector
-
-      def visit(obj)
-        send("visit_#{obj.class.to_s.gsub('::', '_')}", obj, collector)
-      end
-
-      def initialize(collector)
-        self.collector = collector
-      end
-    end
-  end
-end

data/lib/msfl_visitors/visitors/chewy_term_filter.rb

@@ -1,70 +0,0 @@
-module MSFLVisitors
-  module Visitors
-    class ChewyTermFilter < Base
-
-      # Instead of using string interpolation only supported operators are enabled
-      BINARY_OPERATORS = { eq: "==", gt: ">", gte: ">=", lt: "<", lte: "<=", and: "&" }
-
-      def visit_MSFLVisitors_Nodes_And(obj, collector)
-        binary_helper :and, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_Boolean(obj, collector)
-        collector << obj.value
-      end
-
-      def visit_MSFLVisitors_Nodes_Date(obj, collector)
-        collector << obj.value.iso8601
-      end
-
-      def visit_MSFLVisitors_Nodes_DateTime(obj, collector)
-        collector << obj.value.iso8601
-      end
-
-      def visit_MSFLVisitors_Nodes_Equal(obj, collector)
-        binary_helper :eq, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_GreaterThan(obj, collector)
-        binary_helper :gt, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_GreaterThanEqual(obj, collector)
-        binary_helper :gte, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_Grouping_Close(obj, collector)
-        collector << " )"
-      end
-
-      def visit_MSFLVisitors_Nodes_Grouping_Open(obj, collector)
-        collector << "( "
-      end
-
-      def visit_MSFLVisitors_Nodes_LessThan(obj, collector)
-        binary_helper :lt, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_LessThanEqual(obj, collector)
-        binary_helper :lte, collector
-      end
-
-      def visit_MSFLVisitors_Nodes_Number(obj, collector)
-        collector << obj.value
-      end
-
-      def visit_MSFLVisitors_Nodes_Time(obj, collector)
-        collector << obj.value.iso8601
-      end
-
-      def visit_MSFLVisitors_Nodes_Word(obj, collector)
-        collector << "#{obj.value.to_s}"
-      end
-
-    private
-      def binary_helper(operator, collector)
-        collector << " #{BINARY_OPERATORS.fetch(operator.to_sym)} "
-      end
-    end
-  end
-end

data/spec/visitors/chewy_term_filter/visit_binary_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe MSFLVisitors::Visitors::ChewyTermFilter do
-
-  subject { node.accept visitor }
-
-  let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
-
-  let(:visitor) { described_class.new collector }
-
-  let(:collector) { String.new }
-
-  let(:left) { MSFLVisitors::Nodes::Word.new "lhs" }
-
-  let(:right) { MSFLVisitors::Nodes::Word.new "rhs" }
-
-  describe "visiting an And node" do
-
-    let(:node) { MSFLVisitors::Nodes::And.new left, right }
-
-    it "matches ( left ) & ( right )" do
-      expect(subject).to match "( lhs ) & ( rhs )"
-    end
-  end
-
-end

data/spec/visitors/chewy_term_filter/visit_comparison_spec.rb

@@ -1,61 +0,0 @@
-require 'spec_helper'
-
-describe MSFLVisitors::Visitors::ChewyTermFilter do
-
-  subject { node.accept visitor }
-
-  let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
-
-  let(:visitor) { described_class.new collector }
-
-  let(:collector) { String.new }
-
-  let(:left) { MSFLVisitors::Nodes::Word.new "lhs" }
-
-  let(:right) { MSFLVisitors::Nodes::Word.new "rhs" }
-
-  describe "visiting an Equal node" do
-
-    let(:node) { MSFLVisitors::Nodes::Equal.new left, right }
-
-    it "matches left == right" do
-      expect(subject).to match "lhs == rhs"
-    end
-  end
-
-  describe "visiting a GreaterThan node" do
-
-    let(:node) { MSFLVisitors::Nodes::GreaterThan.new left, right }
-
-    it "matches left > right" do
-      expect(subject).to match "lhs > rhs"
-    end
-  end
-
-  describe "visiting a GreaterThanEqual node" do
-
-    let(:node) { MSFLVisitors::Nodes::GreaterThanEqual.new left, right }
-
-    it "matches left >= right" do
-      expect(subject).to match "lhs >= rhs"
-    end
-  end
-
-  describe "visiting a LessThan node" do
-
-    let(:node) { MSFLVisitors::Nodes::LessThan.new left, right }
-
-    it "matches left < right" do
-      expect(subject).to match "lhs < rhs"
-    end
-  end
-
-  describe "visiting a LessThanEqual node" do
-
-    let(:node) { MSFLVisitors::Nodes::LessThanEqual.new left, right }
-
-    it "matches left <= right" do
-      expect(subject).to match "lhs <= rhs"
-    end
-  end
-end

data/spec/visitors/chewy_term_filter/visit_range_value_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe MSFLVisitors::Visitors::ChewyTermFilter do
-
-  subject { node.accept visitor }
-
-  let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
-
-  let(:visitor) { described_class.new collector }
-
-  let(:collector) { Array.new }
-
-  describe "visiting a Date node" do
-
-    let(:node) { MSFLVisitors::Nodes::Date.new Date.today }
-
-    it "is today's date using iso8601 formatting" do
-      expect(subject.first).to eq Date.today.iso8601
-    end
-  end
-
-  describe "visiting a DateTime node" do
-
-    let(:now) { DateTime.now }
-
-    let(:node) { MSFLVisitors::Nodes::DateTime.new now }
-
-    it "is the current date and time using iso8601 formatting" do
-      expect(subject.first).to eq now.iso8601
-    end
-  end
-
-  describe "visiting a Number node" do
-
-    let(:node) { MSFLVisitors::Nodes::Number.new number }
-
-    let(:number) { 123 }
-
-    it "is the number" do
-      expect(subject.first).to eq number
-    end
-
-    context "when the number is a float" do
-
-      let(:number) { 123.456 }
-
-      it "is the number with the same precision" do
-        expect(subject.first).to eq number
-      end
-    end
-  end
-
-  describe "visiting a Time node" do
-
-    let(:node) { MSFLVisitors::Nodes::Time.new current_time }
-
-    let(:current_time) { Time.now }
-
-    it "is the current time using iso8601 formatting" do
-      expect(subject.first).to eq current_time.iso8601
-    end
-  end
-end

data/spec/visitors/chewy_term_filter/visit_value_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe MSFLVisitors::Visitors::ChewyTermFilter do
-
-  subject { node.accept visitor }
-
-  let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
-
-  let(:visitor) { described_class.new collector }
-
-  let(:collector) { Array.new }
-
-  describe "visiting a Boolean node" do
-
-    let(:node) { MSFLVisitors::Nodes::Boolean.new value }
-
-    context "when the node has a value of true" do
-
-      let(:value) { true }
-
-      it "is true" do
-        expect(subject.first).to be true
-      end
-    end
-
-    context "when the node has a value of false" do
-
-      let(:value) { false }
-
-      it "is false" do
-        expect(subject.first).to be false
-      end
-    end
-  end
-
-  describe "visiting a Word node" do
-
-    let(:node) { MSFLVisitors::Nodes::Word.new "node_content" }
-
-    it "is a literal string" do
-      expect(subject.first).to match /node_content/
-    end
-  end
-end