grom 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30c388721c484a79b60eadfee103c5d6165836e2
-  data.tar.gz: dd3b117d015318b54ddd678463caeeef560f2c0e
+  metadata.gz: 52542b678b2915e8fc5e830f489ee9699b999948
+  data.tar.gz: e6b56e67dda74ebbe2a11d52ae3e744a2772ccd3
 SHA512:
-  metadata.gz: 388145c3654b9a45275dfb3df2f81056a644fa553e4134690e8eaf40a8c35bde544287b04a5263b44db2e2b5ecc380bff869db71ebf66b28dda138cc3e2d5f6b
-  data.tar.gz: 52fe1a7b76230d2ed316d7a2856ff6fa586be6a225225ed8cea75a5a2aaaa813dcb173f30737688ebe13d7bebdd547d00e7e2c9c60cae87b5b03eeb2e799eb95
+  metadata.gz: a183be498fafefe24b5df922287f13e68f773d051f21ab6054b77560a75a1f9324b66cbf0951ef04fa15a963d8d5bd74a5bbeddc9d35ec44ef8c1f9d26e7d494
+  data.tar.gz: f0d08051824f1bb73fbabaa089f3379a15c9470958f598f668c011ae0843cc023f8682b069482f23df1136d2b54da630a31ef2c3e2908ec25878b0288abb23f4

data/README.md

@@ -43,6 +43,7 @@ data_stream = StringIO.new(file)
 objects = Grom::Reader.new(data_stream).objects #=> [<#Grom::Node ...>, <#Grom::Node ...>, ...]
 ```
 
+Note that [ntriple][ntriple] data streams cannot contain a predicate named 'type', as this word is reserved for RDF types.
 
 ## Getting Started with Development
 To clone the repository and set up the dependencies, run the following:
@@ -77,7 +78,7 @@ Logo design by [Anna Vámos][anna-vamos].
 
 [ruby]:         https://www.ruby-lang.org/en/
 [bundler]:      http://bundler.io
-[rspec]:        http://rspec.info 
+[rspec]:        http://rspec.info
 [grom-logo]:    https://cdn.rawgit.com/ukparliament/grom/85df4d355313358930cea8aa2fbfc53dd3e4f8d3/docs/logo.svg
 [grom]:         https://github.com/ukparliament/grom
 [pds]:          https://www.parliament.uk/mps-lords-and-offices/offices/bicameral/parliamentary-digital-service/

data/lib/grom/builder.rb

@@ -45,6 +45,8 @@ module Grom
     def link_objects
       @reader.edges_by_subject.each do |subject, predicates|
         predicates.each do |predicate, object_uris|
+          raise NamingError if predicate == 'type'
+
           current_node = @objects_by_subject[subject]
           next if current_node.nil?
 

data/lib/grom/helper.rb

@@ -47,9 +47,10 @@ module Grom
       elsif uri == RDF.type.to_s
         return 'type'
       else
-        uri.to_s.split('/').last
-      end
+        uri_object = URI(uri)
 
+        return uri_object.fragment ? uri_object.fragment : uri_object.path.split('/').last
+      end
     end
   end
 end

data/lib/grom/naming_error.rb

@@ -0,0 +1,8 @@
+module Grom
+  # Namespace for errors.
+  class NamingError < StandardError
+    def initialize
+      super("'type' is reserved for RDF type and cannot be used as a predicate name.")
+    end
+  end
+end

data/lib/grom/reader.rb

@@ -34,7 +34,10 @@ module Grom
 
           predicate = statement.predicate.to_s
 
-          if statement.object.uri? && predicate != RDF.type.to_s
+          object_is_possible_link = statement.object.uri? || statement.object.is_a?(RDF::Node)
+          predicate_is_not_a_type_definition = predicate != RDF.type.to_s
+
+          if object_is_possible_link && predicate_is_not_a_type_definition
             predicate = Grom::Helper.get_id(predicate)
             @edges_by_subject[subject] ||= {}
             @edges_by_subject[subject][predicate] ||= []

data/lib/grom/version.rb

@@ -1,3 +1,3 @@
 module Grom
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/grom.rb

@@ -8,6 +8,8 @@ require_relative 'grom/node'
 require_relative 'grom/helper'
 require_relative 'grom/builder'
 
+require 'grom/naming_error'
+
 # Namespace for graph object mapper that converts n-triple data to Ruby objects.
 # @since 0.1.0
 module Grom

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grom
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -152,6 +152,7 @@ files:
 - lib/grom.rb
 - lib/grom/builder.rb
 - lib/grom/helper.rb
+- lib/grom/naming_error.rb
 - lib/grom/node.rb
 - lib/grom/reader.rb
 - lib/grom/version.rb