msfl_visitors 0.1.0.rc1 → 0.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2156e94f555e526308eabb17c416c12883081b18
-  data.tar.gz: 210369d1ba7954ad0132d189e8c0976845ca294a
+  metadata.gz: c0e61b7239950114bedf1b804c6447f5aa2527ae
+  data.tar.gz: 5faa08969fb85e6ea551cdc358cfa48f43e3a260
 SHA512:
-  metadata.gz: 88dbf7a0b57600f139098d0a334f25d3b3404b9ebf8299d6fb97cda1e6c15db510f34fb62c0f4b2f098bb349dd1071b7ecef6e9b1ab9c2d71ffe71e3e729740f
-  data.tar.gz: 11c609cbf7a04bd5a4fd2248e49b956384af7d758399d2ad1a3c9601fd192b9ef8062715625ff2064c1149be82a9de40fefbd1279ee031bc86aa396630f74279
+  metadata.gz: 982a97170e02f732d4b3fa12d0e362e54256ba6c729efa149e71f166b55df0750f41b631756b905b991892d8c156e10db29346d1aaba4de5f97e4df79f5bcd13
+  data.tar.gz: 6d1683a3a037a3ed7c4fe3107248e5877ffdc8be2e8426821d83b74fa004d1b304b5aa43ba7f8ed9dd69b8261d21c031ae0941b9f9724362f0f0f395ea0ee050

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

@@ -0,0 +1,12 @@
+module MSFLVisitors
+  module Collectors
+    module Chewy
+      class TermFilter < String
+
+        def <<(obj)
+          super(obj.to_s)
+        end
+      end
+    end
+  end
+end

data/lib/msfl_visitors/collectors.rb

@@ -0,0 +1 @@
+require_relative 'collectors/chewy/term_filter'

data/lib/msfl_visitors/nodes/and.rb

@@ -5,14 +5,14 @@ module MSFLVisitors
 
       def accept(visitor)
         nodes = Array.new
-        if items.count > 1
-          items.each do |item|
+        if set.count > 1
+          set.each do |item|
             nodes << MSFLVisitors::Nodes::Grouping::Grouping.new(item)
             nodes << BinaryAnd.new
           end
           nodes.pop
-        elsif items.count == 1
-          nodes << items.first
+        elsif set.count == 1
+          nodes << set.first
         end
 
         nodes.each do |node|

data/lib/msfl_visitors/nodes/iterator.rb

@@ -3,15 +3,16 @@ module MSFLVisitors
   module Nodes
     class Iterator < Base
 
-      attr_accessor :items
+      attr_accessor :set
 
-      def initialize(nodes)
-        self.items = nodes
+      # @param set [MSFLVisitors::Nodes::Set::Set] a set node that allows its elements to be iterated over
+      def initialize(set)
+        self.set = set
       end
 
       def ==(other)
         self.class == other.class &&
-            items == other.items
+            set == other.set
       end
     end
   end

data/lib/msfl_visitors/nodes/set/set.rb

@@ -4,8 +4,12 @@ module MSFLVisitors
     module Set
       class Set < Base
 
+        extend Forwardable
+
         attr_accessor :contents
 
+        def_delegators :contents, :count, :first, :each
+
         def accept(visitor)
           nodes = Array.new
           nodes << Open.new

data/lib/msfl_visitors.rb

@@ -3,6 +3,7 @@ require_relative 'msfl_visitors/nodes'
 require_relative 'msfl_visitors/visitor'
 require_relative 'msfl_visitors/renderers/chewy/term_filter'
 require_relative 'msfl_visitors/parsers/msfl_parser'
+require_relative 'msfl_visitors/collectors'
 
 module MSFLVisitors
 end

data/msfl_visitors.gemspec

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

data/spec/parsers/msfl_parser_spec.rb

@@ -128,6 +128,55 @@ describe MSFLVisitors::Parsers::MSFLParser do
         it "is the expected And node" do
           expect(subject).to eq expected_node.call(and_node)
         end
+
+        context "when it contains a containment filter" do
+
+          let(:makes) { MSFL::Types::Set.new(["Honda", "Chevy", "Volvo"]) }
+
+          let(:containment_filter) { { make: { in: makes } } }
+
+          let(:gte_filter) { { value: { gte: one_thousand } } }
+
+          let(:and_set) { MSFL::Types::Set.new([containment_filter, gte_filter]) }
+
+          let(:filter) { { and: and_set } }
+
+          let(:and_node) do
+            MSFLVisitors::Nodes::And.new(
+              MSFLVisitors::Nodes::Set::Set.new(
+                [
+                  MSFLVisitors::Nodes::Filter.new(
+                    [
+                      MSFLVisitors::Nodes::Containment.new(
+                        MSFLVisitors::Nodes::Field.new(:make),
+                        MSFLVisitors::Nodes::Set::Set.new(
+                          [
+                            MSFLVisitors::Nodes::Word.new("Honda"),
+                            MSFLVisitors::Nodes::Word.new("Chevy"),
+                            MSFLVisitors::Nodes::Word.new("Volvo")
+                          ]
+                        )
+                      )
+                    ]
+                  ),
+                  MSFLVisitors::Nodes::Filter.new(
+                    [
+                      MSFLVisitors::Nodes::GreaterThanEqual.new(
+                        MSFLVisitors::Nodes::Field.new(:value),
+                        MSFLVisitors::Nodes::Number.new(one_thousand)
+                      )
+                    ]
+                  )
+                ]
+              )
+            )
+          end
+
+          it "is the expected And node" do
+            expect(subject).to eq expected_node.call(and_node)
+          end
+
+        end
       end
 
       context "when the filter contains an unsupported type" do

data/spec/visitors/chewy_term_filter_spec.rb

@@ -4,7 +4,7 @@ describe MSFLVisitors::Visitor do
 
   let(:node) { fail ArgumentError, "You must define the node variable in each scope." }
 
-  let(:collector) { String.new }
+  let(:collector) { MSFLVisitors::Collectors::Chewy::TermFilter.new  }
 
   let(:renderer) { MSFLVisitors::Renderers::Chewy::TermFilter.new }
 
@@ -153,6 +153,44 @@ describe MSFLVisitors::Visitor do
           expect(result).to eq '( first_field == "first_word" ) & ( second_field == "second_word" ) & ( third_field == "third_word" )'
         end
       end
+
+      context "when one of the node's items is a containment node" do
+
+        let(:node) do
+          MSFLVisitors::Nodes::And.new(
+              MSFLVisitors::Nodes::Set::Set.new(
+                  [
+                      MSFLVisitors::Nodes::Filter.new(
+                          [
+                              MSFLVisitors::Nodes::Containment.new(
+                                  MSFLVisitors::Nodes::Field.new(:make),
+                                  MSFLVisitors::Nodes::Set::Set.new(
+                                      [
+                                          MSFLVisitors::Nodes::Word.new("Honda"),
+                                          MSFLVisitors::Nodes::Word.new("Chevy"),
+                                          MSFLVisitors::Nodes::Word.new("Volvo")
+                                      ]
+                                  )
+                              )
+                          ]
+                      ),
+                      MSFLVisitors::Nodes::Filter.new(
+                          [
+                              MSFLVisitors::Nodes::GreaterThanEqual.new(
+                                  MSFLVisitors::Nodes::Field.new(:value),
+                                  MSFLVisitors::Nodes::Number.new(1000)
+                              )
+                          ]
+                      )
+                  ]
+              )
+          )
+        end
+
+        it "returns: '( make == [ \"Honda\", \"Chevy\", \"Volvo\" ] ) & ( value >= 1000 )'" do
+          expect(result).to eq '( make == [ "Honda", "Chevy", "Volvo" ] ) & ( value >= 1000 )'
+        end
+      end
     end
 
     describe "value nodes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc1
+  version: 0.1.0.rc2
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -14,90 +14,90 @@ dependencies:
   name: msfl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Visitor pattern approach to converting MSFL to other forms.
@@ -106,7 +106,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -115,6 +115,8 @@ files:
 - circle.yml
 - lib/msfl_visitors.rb
 - lib/msfl_visitors/ast.rb
+- lib/msfl_visitors/collectors.rb
+- lib/msfl_visitors/collectors/chewy/term_filter.rb
 - lib/msfl_visitors/nodes.rb
 - lib/msfl_visitors/nodes/and.rb
 - lib/msfl_visitors/nodes/base.rb
@@ -167,17 +169,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Convert MSFL to other forms