bel_parser 1.0.0.alpha.30 → 1.0.0.alpha.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3167ea36acf763ecdd0b9756d9a1a5f1e31d3bd6
-  data.tar.gz: d6ab2ac234c3971af5c19348f379b47f98df2c08
+  metadata.gz: b66c29b979f579e866724c32df259c7e67bee1f0
+  data.tar.gz: 46faa2d6ceaa709dc4e8a75992f6398e64b610dc
 SHA512:
-  metadata.gz: 890d334871e4d755c8e203927620c1f2526f97339efbf8d8fc09ca3635818fdc88796efd7b3d054a6c1705fc1547fb8d8103bf931cb42dbefcc6a0719f62bf29
-  data.tar.gz: 0f81693cf46829b1870886a62754cdc58a16c174e7a1a6b44f8df18100f0bd61127a78d99c1e4d1d0bcb8b62a1172de7888bdbbb599d27b2439230fb4e685dcb
+  metadata.gz: 44b895beb08a3087895296438d3c76f5507450b808868fff4fb325d1d83ad7b7c8a56b15f9bd4176ce4083b4baaaf337d7bca9903ccd122ba5b7fd56501f639d
+  data.tar.gz: 5a7981737684e2f3a0a451c8072d9f8bb532ef66311c057b6a2b07d23c56144ebe15956de8f9ca9b56e19898487e80766508b2c164d7a1e82f156187f7f0185f

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: ruby
 authors:
 - Anthony Bargnesi