bel_parser 1.0.0.alpha.30-java → 1.0.0.alpha.31-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3d560aba5aa2f79f840d9b53b44c381e94ee7d
-  data.tar.gz: 4cddb86997108e3991136e2a86543e7fbbed2579
+  metadata.gz: fa04261c4ab5fb7567aa559b39547ce55587533b
+  data.tar.gz: 40cb25e2563b4e0e58c1ab45859c176a4dd7ac2e
 SHA512:
-  metadata.gz: adba0d6d5c1a2e779daf6d2b2b167f7990d43e31d0eb193afdad61c36ff4ba007082d5bef1f4981b723b3135266284fe0913b08e22649c3a2387660e1e902305
-  data.tar.gz: 95c9121edaf26dffbb44929c1d4ff2b85849143ee070ed3df1cbebd3c06f1a77b8eeedee6248f22ed0f66ca01c7e148b73978cd65fc770dcf07bb5b7e65cdbae
+  metadata.gz: 761629499e9952307150811a2f6a3339913c6341f0fd74b52cabde34db19212f06d64ddf18d7e9cec6f55b42864804358699c142ed66373f2f649f1c7cb4df8a
+  data.tar.gz: f445020c91a30361c321b8ae470642e77572dfab288b2cfe5697fbb5b1c7fa2ede02dff7cedf4aaf49656a7ad35818b18ca2e195856438b482cb3dc704e70fd2

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha.30
+1.0.0.alpha.31

data/lib/bel_parser/expression/model/parameter.rb

@@ -8,7 +8,7 @@ module BELParser
         include BELParser::Quoting
         include Comparable
 
-        attr_accessor :namespace, :value
+        attr_reader :namespace, :value
 
         def initialize(namespace, value)
           raise(ArgumentError, 'value is nil') unless value
@@ -21,6 +21,22 @@ module BELParser
           @value     = value
         end
 
+        def namespace=(namespace)
+          unless namespace.nil? || namespace.is_a?(Namespace)
+            raise(
+              ArgumentError,
+              "namespace: expected nil or Namespace, actual #{namespace.class}")
+          end
+
+          @namespace = namespace
+        end
+
+        def value=(value)
+          raise(ArgumentError, 'value is nil') unless value
+
+          @value = value
+        end
+
         def encoding
           nsv = @namespace[@value]
           return nil unless nsv
@@ -72,7 +88,7 @@ module BELParser
           namespace =
             if prefix.identifier
               keyword = prefix.identifier.string_literal
-              namespace_hash[keyword]
+              Namespace.new(keyword, namespace_hash[keyword])
             else
               nil
             end

data/lib/bel_parser/expression/model/statement.rb

@@ -44,7 +44,6 @@ module BELParser
           @comment      = comment
 
           if @relationship && !@object
-            require 'pry'; binding.pry
             raise(
               ArgumentError,
               "object must be set when specifying a relationship")

data/lib/bel_parser/expression/model/term.rb

@@ -6,19 +6,36 @@ module BELParser
       class Term
         include Comparable
 
-        attr_accessor :function, :arguments
+        attr_reader :function, :arguments
 
         def initialize(function, *arguments)
+          self.function  = function
+          self.arguments = arguments
+        end
+
+        def function=(function)
           unless function && function.is_a?(BELParser::Language::Function)
             raise(
               ArgumentError,
               %(function: expected Function, actual #{function.class}))
           end
           @function  = function
-          @arguments = (arguments ||= []).flatten
         end
 
-        def <<(item)
+        def arguments=(*args)
+          args    = (args ||= []).flatten
+          invalid = args.any?(&method(:invalid_argument?))
+          raise(
+            ArgumentError,
+            'args must be Parameter or Term objects') if invalid
+
+          @arguments = args
+        end
+
+        def <<(arg)
+            raise(
+              ArgumentError,
+              'argument must be Parameter or Term') if invalid_argument?(arg)
           @arguments << item
         end
 
@@ -47,6 +64,13 @@ module BELParser
             nil
           end
         end
+
+        private
+
+        def invalid_argument?(arg)
+          !arg.is_a?(BELParser::Expression::Model::Parameter) &&
+            !arg.is_a?(BELParser::Expression::Model::Term)
+        end
       end
 
       module Converters
@@ -90,4 +114,3 @@ module BELParser
     end
   end
 end
-

data/lib/bel_parser/expression/parser.rb

@@ -65,10 +65,12 @@ module BELParser
       def parse
         case @input
         when ::String # conflicts with ...AST::String
+          results = parse_string(@input, @filter)
+          return nil if results.nil?
           convert_ast(
             @spec,
             @namespaces,
-            parse_string(@input, @filter).first)
+            results.first)
         when Array
           convert_multiple(
             parse_array(@input, @filter),

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bel_parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.30
+  version: 1.0.0.alpha.31
 platform: java
 authors:
 - Anthony Bargnesi