msfl_visitors 1.1.0.dev1 → 1.1.0.dev2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae62acf6b12fb294d8010a5edfb6a931e8a1d117
-  data.tar.gz: f442b027daf2a25c48743d9b3b427d779fc4e921
+  metadata.gz: 45becd6e90f826ce123e6f4c5ee389e37c4f3337
+  data.tar.gz: 87baa18d96cba72ef39deecf22447ecb7a7c30f3
 SHA512:
-  metadata.gz: 0e93bd8a1a9d1071f4a9bb280fbc5b9293c7b5c4912130bdf8d1f58dc9b6895f597a50f9e346ba5c2824fcef0516fd1b26c065e47b38792979cbfb195ef26f65
-  data.tar.gz: c3e2d39332b9f1fefd8536121e682b09865014837cf38d0638fe6397c4f77540b7b50755fbb24edc89d84477e5100ef6bd40f3308bcd0140b9b2c7712de9162a
+  metadata.gz: cf1b9343cdf9a64ad46c916b36c37d5eb06c8cb43cb224329194722ad7af915e5e0069ce126004c68c4e46cdcd3e437dd0bcaf100986e5855ffe74a874a083dd
+  data.tar.gz: c034ae9ca6db09fdc7ebc67387a61903e08de3cc8b84e1de735bd0607ac20a3b2688a029203bbd2ce16202ef48b05d51b4be0332e114f6b00c34e11045a0aa49

data/lib/msfl_visitors/nodes/and.rb

@@ -1,7 +1,22 @@
 require_relative 'iterator'
+require_relative 'value'
 module MSFLVisitors
   module Nodes
     class And < Iterator
+
+      def initialize(set)
+        super
+        unless valid_set_children?
+          fail ArgumentError, "Members of child Set node of And node must be expressions, not values, only containment Set nodes have values as children."
+        end
+      end
+
+    private
+      def valid_set_children?
+        set.each do |child|
+          return false if child.is_a?(Value)
+        end
+      end
     end
   end
 end

data/msfl_visitors.gemspec

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

data/spec/msfl_visitors/nodes/and_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe MSFLVisitors::Nodes::And do
+
+  context "when creating an instance of #{described_class}" do
+
+    subject { described_class.new node }
+
+    context "when passed as Set node as the argument to the constructor" do
+
+      let(:node) { MSFLVisitors::Nodes::Set.new [MSFLVisitors::Nodes::Number.new(1)] }
+
+      context "when the Set contains any nodes which inherit from Value" do
+
+        it "raises an ArgumentError" do
+          expect { subject }.to raise_error ArgumentError
+        end
+      end
+    end
+  end
+end

data/spec/{parsers → msfl_visitors/parsers}/msfl_parser_spec.rb

@@ -196,10 +196,14 @@ describe MSFLVisitors::Parsers::MSFLParser do
 
       describe "parsing an and filter" do
 
-        let(:filter) { { and: set_of_values } }
+        let(:filter) { { and: MSFL::Types::Set.new([{ value: 1000 }]) } }
 
         let(:and_node) { MSFLVisitors::Nodes::And.new set_node }
 
+        let(:set_node) { MSFLVisitors::Nodes::Set.new filter_node }
+
+        let(:filter_node) { MSFLVisitors::Nodes::Filter.new(MSFLVisitors::Nodes::Equal.new left, right) }
+
         it "is the expected And node" do
           expect(subject).to eq expected_node.call(and_node)
         end

data/spec/msfl_visitors/visitor_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe MSFLVisitors::Visitor do
+
+  context "when creating an instance of #{described_class}" do
+
+    subject { described_class.new }
+
+    it "sets the mode to term" do
+      subject
+      expect(subject.send(:mode)).to eq :term
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: msfl_visitors
 version: !ruby/object:Gem::Version
-  version: 1.1.0.dev1
+  version: 1.1.0.dev2
 platform: ruby
 authors:
 - Courtland Caldwell
@@ -149,11 +149,13 @@ files:
 - lib/msfl_visitors/visitor.rb
 - msfl_visitors.gemspec
 - simplecov_custom_profiles.rb
+- spec/msfl_visitors/nodes/and_spec.rb
+- spec/msfl_visitors/nodes/iterator_spec.rb
+- spec/msfl_visitors/parsers/msfl_parser_spec.rb
+- spec/msfl_visitors/visitor_spec.rb
+- spec/msfl_visitors/visitors/chewy_term_filter_spec.rb
 - spec/msfl_visitors_spec.rb
-- spec/nodes/iterator_spec.rb
-- spec/parsers/msfl_parser_spec.rb
 - spec/spec_helper.rb
-- spec/visitors/chewy_term_filter_spec.rb
 homepage: https://github.com/Referly/msfl_visitors
 licenses:
 - MIT
@@ -179,9 +181,11 @@ signing_key:
 specification_version: 4
 summary: Convert MSFL to other forms
 test_files:
+- spec/msfl_visitors/nodes/and_spec.rb
+- spec/msfl_visitors/nodes/iterator_spec.rb
+- spec/msfl_visitors/parsers/msfl_parser_spec.rb
+- spec/msfl_visitors/visitor_spec.rb
+- spec/msfl_visitors/visitors/chewy_term_filter_spec.rb
 - spec/msfl_visitors_spec.rb
-- spec/nodes/iterator_spec.rb
-- spec/parsers/msfl_parser_spec.rb
 - spec/spec_helper.rb
-- spec/visitors/chewy_term_filter_spec.rb
 has_rdoc: