Merge pull request #14 from mattrayner/mattrayner/update-filtering-to…

…-support-multiple-types

Add the ability to filter nodes with multiple types

.rubocop.yml

@@ -3,22 +3,25 @@ Metrics/LineLength:
   Max: 120
   IgnoredPatterns: ['\A#', '\A([ ]{2}|[ ]{4})#']
 
-Style/SpaceBeforeFirstArg:
+Style/EachWithObject:
+  Enabled: false
+
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 
 Style/BracesAroundHashParameters:
   Enabled: false
 
-Style/IndentHash:
+Layout/IndentHash:
   EnforcedStyle: consistent
 
-Style/AlignHash:
+Layout/AlignHash:
   Severity: fatal
   Enabled: true
   EnforcedHashRocketStyle: table
   EnforcedColonStyle: table
 
-Style/AlignParameters:
+Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
 Style/StringLiterals:
@@ -32,13 +35,13 @@ Style/CollectionMethods:
     detect: 'find'
     find_all: 'select'
 
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: leading
 
 Style/DoubleNegation:
   Enabled: false
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   # When true, allows most uses of extra spacing if the intent is to align
   # with an operator on the previous or next line, not counting empty lines
   # or comment lines.

lib/parliament/ntriple/version.rb

@@ -1,5 +1,5 @@
 module Parliament
   module NTriple
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

lib/parliament/response/ntriple_response.rb

@@ -79,9 +79,16 @@ def filter(*types)
 
         unless types.empty?
           @nodes.each do |node|
-            type_index = node.blank? ? types.index(::Grom::Node::BLANK) : types.index(node.type)
+            node_types = node.blank? ? Array(::Grom::Node::BLANK) : Array(node.type)
 
-            filtered_objects[type_index] << node unless type_index.nil?
+            indexes = node_types.reduce([]) do |memo, type|
+              index = types.index(type)
+              memo << index if index
+
+              memo
+            end
+
+            indexes.each { |index| filtered_objects[index] << node }
           end
         end
 

spec/parliament/response/ntriple_response_spec.rb

@@ -130,6 +130,19 @@
         expect(node.type).to eq('http://id.ukpds.org/schema/Person')
       end
     end
+
+    it 'filters nodes that appear in multiple types' do
+      filtered_response = @response.filter('http://id.ukpds.org/schema/Group', 'http://id.ukpds.org/schema/FormalBody')
+      expect(filtered_response.size).to eq(2)
+
+      filtered_response.each do |filtered_nodes|
+        expect(filtered_nodes.size).to eq(2)
+
+        filtered_nodes.each do |node|
+          expect(node.type).to eq(%w(http://id.ukpds.org/schema/Group http://id.ukpds.org/schema/FormalBody))
+        end
+      end
+    end
   end
 
   describe '#sort_by' do