oa-graph 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05e95d50b265fbf9d10a4a12c3456ff5ec300e5
-  data.tar.gz: 9aecffab903d3b419196ef93038d1e6a270887f0
+  metadata.gz: c3936395a6626210fe91e9a71feee1c18d771651
+  data.tar.gz: 48b82f2b30d2aa1986a024924e5a189d46bfd096
 SHA512:
-  metadata.gz: 02ce99c8170c9267b34e309897d3ab24fe0bfc957e257262b692644b220906fc50315db491b563d672c8f92c1b0a0bbda392c84706bf6823ca4b71e3ab7a9594
-  data.tar.gz: 193919b828241ef41f63f76059b05297bedb4a70eb4face68c08da10b8d44cdcf42aaf15f5d981153c062fcafff88be9e599300977b34cb6e79c7ee1f47e743e
+  metadata.gz: 1be7a8c58201d1a98736903981059369a4a9f1c19029533e77fcfe67dbac9c035c7219b82835ff07e01ad83bac340ea28174e8808d60a1a314d6dcec86fa4f67
+  data.tar.gz: 6633f12a6587ea7742b54bd358cc41464654c2df01178ce4910c52cefe7643684d1e5e53b3d7ebe5921104ef85d49dc36667288462694d933370636d3e19ff90

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/sul-dlss/oa-graph.svg?branch=master)](https://travis-ci.org/sul-dlss/oa-graph) [![Coverage Status](https://coveralls.io/repos/sul-dlss/oa-graph/badge.png)](https://coveralls.io/r/sul-dlss/oa-graph) [![Dependency Status](https://gemnasium.com/sul-dlss/oa-graph.svg)](https://gemnasium.com/sul-dlss/oa-graph) [![Gem Version](https://badge.fury.io/rb/oa-graph.svg)](http://badge.fury.io/rb/oa-graph)
+[![Build Status](https://travis-ci.org/sul-dlss/oa-graph.svg?branch=master)](https://travis-ci.org/sul-dlss/oa-graph) [![Coverage Status](https://coveralls.io/repos/sul-dlss/oa-graph/badge.svg?branch=master)](https://coveralls.io/r/sul-dlss/oa-graph?branch=master) [![Dependency Status](https://gemnasium.com/sul-dlss/oa-graph.svg)](https://gemnasium.com/sul-dlss/oa-graph) [![Gem Version](https://badge.fury.io/rb/oa-graph.svg)](http://badge.fury.io/rb/oa-graph)
 
 
 # OA::Graph
@@ -23,7 +23,9 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+require 'oa/graph'
+```
 
 ## Contributing
 

data/lib/oa/graph.rb

@@ -16,7 +16,7 @@ module OA
 # Class Methods ----------------------------------------------------------------
 
     # given an RDF::Resource (an RDF::Node or RDF::URI), look for all the
-    # statements with that object  as the subject, and recurse through the graph
+    # statements with that object as the subject, and recurse through the graph
     # to find all descendant statements pertaining to the subject
     # @param subject the RDF object to be used as the subject in the graph
     #   query.  Should be an RDF::Node or RDF::URI
@@ -78,30 +78,17 @@ module OA
     # @return [Array<String>] Array of urls expressing the OA motivated_by
     #   values
     def motivated_by
-      motivations = []
       q = self.class.anno_query.dup
       q << [:s, RDF::Vocab::OA.motivatedBy, :motivated_by]
-      solution = @graph.query q
-      if solution && solution.size > 0
-        solution.each { |res|
-          motivations << res.motivated_by.to_s
-        }
-      end
-      # TODO:  raise exception if none? (validation)
-      motivations
+      # if the motivation object gives junk with .to_s, then the anno is illegal anyway and we're not responsible
+      @graph.query(q).each.collect {|stmt| stmt.motivated_by.to_s}
     end
 
     # @param [RDF::URI] predicate either RDF::Vocab::OA.hasTarget or
     #   RDF::Vocab::OA.hasBody
     # @return [Array<String>] urls for the predicate, as an Array of Strings
     def predicate_urls(predicate)
-      urls = []
-      predicate_solns = @graph.query [nil, predicate, nil]
-      predicate_solns.each { |predicate_stmt|
-        predicate_obj = predicate_stmt.object
-        urls << predicate_obj.to_str.strip if predicate_obj.is_a?(RDF::URI)
-      }
-      urls
+      @graph.query([nil, predicate, nil]).each_object.collect {|o| o.to_str.strip if o.is_a?(RDF::URI) }.compact
     end
 
     # For all bodies that are of type ContentAsText, get the characters as a
@@ -109,16 +96,11 @@ module OA
     # @return [Array<String>] body chars as Strings, in an Array (one element
     #   for each contentAsText body)
     def body_chars
-      result = []
       q = RDF::Query.new
       q << [nil, RDF::Vocab::OA.hasBody, :body]
       q << [:body, RDF.type, RDF::Vocab::CNT.ContentAsText]
       q << [:body, RDF::Vocab::CNT.chars, :body_chars]
-      solns = @graph.query q
-      solns.each { |soln|
-        result << soln.body_chars.value
-      }
-      result
+      @graph.query(q).each.collect {|stmt| stmt.body_chars.value}
     end
 
     # @return [String] The datetime from the annotatedAt property, or nil

data/lib/oa/graph/version.rb

@@ -1,5 +1,5 @@
 module OA
   class Graph
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oa-graph
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
@@ -124,8 +124,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- ndushay@stanford.edu
-- darren.weber@stanford.edu
+- triannon-commits@lists.stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []