grom 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6ee092d9341867b4a7c60014c733292c40f33f
-  data.tar.gz: 167e881cfc3acc879bc51e0bf1255f2c1542792a
+  metadata.gz: 20f616b442b532519b292aaec26616dcf076bfea
+  data.tar.gz: 0f26bb9b60fcd19b61c52ec37cb863eb3447411c
 SHA512:
-  metadata.gz: eaaf26838e5222504705553b973434d8e8bafebe5f03dee38723c4ee4256cb89141949bffd14159a9b65cf5c7b269712df1f92737a6cc946197420f7bd3be70f
-  data.tar.gz: 5e6eb3ed1f02e9a0b72d23ab7b0a5b0cefb7a231f1d154dd4853234f94feff507335cdf38bcbd62d8dce1f81ba1ed9b42e7bb7bbf387f70d5c3aeb40065358d0
+  metadata.gz: c101a727c6c84c3c579bc2e13eb6c1455b64949bb9ff9cd49b0e1af6b760831e28cfc9994be07a5ba95e2d41d64c2683eff7e51a80301490b27752a2a85cc5a4
+  data.tar.gz: 17b55727718efbcb37c0fb98eaca5caa2719192b58221183d992340d3e9ec078561ac03a125caa06bee1e31db31647937654e901daa66e5f2d92b893c12f99df

data/.hound.yml

@@ -0,0 +1,4 @@
+ruby:
+  config_file: .rubocop.yml
+
+fail_on_violations: true

data/.travis.yml

@@ -0,0 +1,2 @@
+sudo: false
+language: ruby

data/grom.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rdf'
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'rdf', '2.2.3'
+  spec.add_dependency 'activesupport', '5.0.1'
 
   # the below are test dependencies
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-nav'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop', '~> 0.47'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-nav', '~> 0.2'
+  spec.add_development_dependency 'simplecov', '~> 0.13'
 end

data/lib/grom/builder.rb

@@ -21,45 +21,35 @@ module Grom
 
     def build_objects_by_subject
       initialize_objects_hashes
-      @reader.subjects_by_type.each do |_type, subjects|
-        subjects.each do |subject|
-          begin
-            object = Grom::Node.new(@reader.statements_by_subject[subject])
-            @objects_by_subject[subject] = object
-            @objects << object
-          rescue NoMethodError
-            p 'No statements passed to Grom::Node.new'
-            super
-          end
-        end
+      @reader.statements_by_subject.each do |subject, statements|
+        object = Grom::Node.new(statements)
+        @objects_by_subject[subject] = object
+        @objects << object
       end
 
       self
     end
 
     def link_objects
-      @reader.connections_by_subject.each do |subject, connections|
-        current_node = @objects_by_subject[subject]
-        connections.each do |connection_subject|
-          begin
-            connection_node = @objects_by_subject[connection_subject]
-            current_node_type = Grom::Helper.get_id(current_node.type)
-            connector_name_symbol = Grom::Helper.pluralize_instance_variable_symbol(current_node_type)
+      @reader.edges_by_subject.each do |subject, predicates|
+        predicates.each do |predicate, object_uris|
+          current_node = @objects_by_subject[subject]
 
-            connected_object_array = connection_node.instance_variable_get(connector_name_symbol)
-            connected_object_array = [] if connected_object_array.nil?
-            connected_object_array << current_node
+          object_uris.each do |object_uri|
 
-            connection_node.instance_variable_set(connector_name_symbol, connected_object_array)
-          rescue NoMethodError
-            p 'No type for current node'
-            super
+            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 << @objects_by_subject[object_uri]
+            
+            current_node.instance_variable_set(predicate_name_symbol, object_array)
+
+            # TODO: Not sure about the above conditional
           end
         end
       end
 
       self
     end
-
   end
 end

data/lib/grom/reader.rb

@@ -2,7 +2,7 @@ require 'pry'
 
 module Grom
   class Reader
-    attr_reader :data, :statements_by_subject, :subjects_by_type, :connections_by_subject, :objects
+    attr_reader :data, :statements_by_subject, :subjects_by_type, :edges_by_subject, :objects
 
     def initialize(data)
       @data = data
@@ -15,8 +15,9 @@ module Grom
     def read_data
       # Reset all our hashes just in case
       @statements_by_subject  = {}
-      @subjects_by_type       = {}
-      @connections_by_subject = {}
+
+      # TODO: Find a better name for this hash!
+      @edges_by_subject = {}
 
       RDF::NTriples::Reader.new(@data) do |reader|
         reader.each_statement do |statement|
@@ -27,12 +28,11 @@ module Grom
 
           predicate = statement.predicate.to_s
 
-          if predicate == RDF.type.to_s
-            Grom::Helper.lazy_array_insert(@subjects_by_type, Grom::Helper.get_id(statement.object), subject)
-          end
-
           if (statement.object =~ URI.regexp) == 0 && predicate != RDF.type.to_s
-            Grom::Helper.lazy_array_insert(@connections_by_subject, subject, statement.object.to_s)
+            predicate = Grom::Helper.get_id(predicate)
+            @edges_by_subject[subject] ||= {}
+            @edges_by_subject[subject][predicate] ||= []
+            @edges_by_subject[subject][predicate] << statement.object.to_s
           end
         end
       end

data/lib/grom/version.rb

@@ -1,3 +1,3 @@
 module Grom
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rebecca Appleyard
@@ -10,36 +10,36 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,58 +86,58 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.47'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 description: Grom is a Graph Object Mapper
 email:
 - rklappleyard@gmail.com
@@ -148,9 +148,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Grom is a Graph Object Mapper