grom 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19350b64f144db1c816c5e54d7e669360faa5383
-  data.tar.gz: e1fccaf8a49153330c2439a6e84d1b8882bd5db6
+  metadata.gz: '00868d0d8687f9e5b228550499afda1340b32ddc'
+  data.tar.gz: 5e0c5da043501b4a19311dccef4aa9352690255b
 SHA512:
-  metadata.gz: ad73c0767dc1c616bfb3bdb90f04325c972b2a2907b284d1dd4ba617ffe2ebb2ee07bee354ab2808608090b60e58a95a281651a9b61927768624c680b29ad9f4
-  data.tar.gz: 5329fac467df5faa8958d04519f044ed95c346ca1b9591ba742fe7250a0649ead135d6ed0d210d5371db54293c7ac1df76dd8e83b28a3965a5a8c6c768a7a41a
+  metadata.gz: ddfeacff71067896dbca7393697ea3305ecee0fb92f7826f213fd5f03d4e9dc8e24504248b18ac7466369539c9220a473cebe85388f47bb4fa8664e97b1ac229
+  data.tar.gz: b9890c67a74e83d6026c73b56d6ca4c157e77d3bfc09c9546b3ee6a5b834cab11202c1a7baf6f3c9bbafc55d928c828878e7d9884624c4089350a93615f66132

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.4.1

data/gocd/web1live.yaml

@@ -0,0 +1,30 @@
+pipelines:
+  GEM-grom:
+    group: Dependencies
+    label_template: "${COUNT}"
+    materials:
+      GEM-grom-git:
+        git: https://github.com/ukparliament/grom.git
+        branch: master
+        auto_update: true
+    stages:
+      - deploy:
+          approval: manual
+          jobs:
+            deploy:
+              tasks:
+                - exec:
+                    run_if: passed
+                    command: make
+                    arguments:
+                      - checkout_to_release
+                - exec:
+                    run_if: passed
+                    command: make
+                    arguments:
+                      - deploy_to_release
+
+environments:
+  Web.LIVE:
+    pipelines:
+      - GEM-grom

data/lib/grom/builder.rb

@@ -46,14 +46,34 @@ module Grom
       @reader.edges_by_subject.each do |subject, predicates|
         predicates.each do |predicate, object_uris|
           current_node = @objects_by_subject[subject]
+          next if current_node.nil?
 
           object_uris.each do |object_uri|
             predicate_name_symbol = "@#{predicate}".to_sym
-            object_array = current_node.instance_variable_get(predicate_name_symbol)
-            object_array = [] if object_array.is_a?(String) || object_array.all? { |object| object.is_a?(String) }
-            object_array << @objects_by_subject[object_uri]
 
-            current_node.instance_variable_set(predicate_name_symbol, object_array)
+            # Get the current value (if there is one)
+            current_value = current_node.instance_variable_get(predicate_name_symbol)
+
+            object = current_value
+
+            # If we have stored a string, and there are objects to link, create an empty array
+            current_value_is_string    = current_value.is_a?(String)
+            object_is_array_of_strings = object.all? { |entry| entry.is_a?(String) } if object.is_a?(Array)
+            object_by_uri              = @objects_by_subject[object_uri]
+
+            object = [] if (current_value_is_string || object_is_array_of_strings) && object_by_uri
+
+            # If the above is correct, and we have an array
+            if object.is_a?(Array)
+              # Insert the current value (only if this is a new array (prevents possible duplication),
+              # the current value is a string, and there are no linked objects to insert)
+              object << current_value if object.empty? && current_value_is_string && object_by_uri.nil?
+
+              # Insert linked objects, if there are any
+              object << object_by_uri if object_by_uri
+            end
+
+            current_node.instance_variable_set(predicate_name_symbol, object)
           end
         end
       end

data/lib/grom/version.rb

@@ -1,3 +1,3 @@
 module Grom
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grom
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -147,6 +147,7 @@ files:
 - bin/console
 - bin/setup
 - docs/logo.svg
+- gocd/web1live.yaml
 - grom.gemspec
 - lib/grom.rb
 - lib/grom/builder.rb