annotations2triannon 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe88e8ee09cde6c32dd18f7a6165576ce6ccc55d
-  data.tar.gz: abab22fb8d824bdf720a9b1f3df1c3b50d3a9408
+  metadata.gz: bf8a8db6a0fce3d99033b5a6f5c06c48debc16ce
+  data.tar.gz: e76a1f81fc653fad3e592fe7696a490aa288ddf0
 SHA512:
-  metadata.gz: 13d06ed9903a01134c22f32d15a4f66e0cdd53cf0a1023270b7c6a2696d37f505e3c7cbdd8a4d1579d7a6e5bcfe9ecf7bf9a51213ca99cf22ccd669e1a1f8441
-  data.tar.gz: cf0004e46eae1f7c8339e7ecf9608a6d30db70747dc72b09ef81cf199f695c0730ebe71cea987d6576b21f8b73d132ff75aa82471e00badf4277885b8c6f5d6b
+  metadata.gz: d4f8be59545e4488c5afbad2110d607780220a605979f07e50a3665a9aeeacee70b1d97a2e27afd6e1f4c59c920b7df8657f86e39703a93d1b30a769ca52236b
+  data.tar.gz: c9cb96aa7143d99a650fe8e0d3fd8e93ba74b982807c349dbeea599eb6a2cfa03dd9fbce2838efce347217234bf7b8eb9c793e8dda2e140b905f94c73152810f

data/annotations2triannon.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'annotations2triannon'
-  s.version     = '0.2.2'
+  s.version     = '0.3.0'
   s.licenses    = ['Apache-2.0']
   s.platform    = Gem::Platform::RUBY
 
@@ -30,9 +30,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client'
   s.add_dependency 'rest-client-components'
   s.add_dependency 'rack-cache'
-  # Concurrent HTTP requests
-  s.add_dependency 'parallel'
-  s.add_dependency 'ruby-progressbar'
   # dalli is a memcached ruby client
   s.add_dependency 'dalli'
   # Use pry for console and debug config

data/bin/dms.rb

@@ -178,8 +178,7 @@ text_annotations.each_pair do |m,anno_lists|
   anno_lists.each_pair do |anno_list_uri, anno_list|
     puts "Posting:\t#{anno_list_uri}\t=> #{anno_list.length}"
     anno_tracking[m][anno_list_uri] = []
-    # Allow Parallel to automatically determine the optimal concurrency model.
-    Parallel.each(anno_list, :progress => 'Annotations: ') do |oa|
+    anno_list.each do |oa|
       response = tc.post_annotation(oa.to_jsonld_oa)
       # parse the response into an RDF::Graph
       graph = tc.response2graph(response)
@@ -191,8 +190,11 @@ text_annotations.each_pair do |m,anno_lists|
           chars: oa.body_contentChars.first
         }
         anno_tracking[m][anno_list_uri].push(anno_data)
+      else
+        CONFIG.logger.error("FAILURE to POST #{oa.id}")
       end
     end
+    anno_tracking_save(anno_tracking)
   end
 end
 anno_tracking_save(anno_tracking)

data/lib/annotations2triannon/open_annotation.rb

@@ -27,10 +27,7 @@ module Annotations2triannon
       else
         @graph = graph
         raise ArgumentError, 'graph must be an open annotation' unless is_annotation?
-        if id.nil?
-          @id = get_id
-        else
-        end
+        id.nil? ? @id = get_id : @id = id
       end
     end
 

data/lib/requires.rb

@@ -39,9 +39,6 @@ require 'addressable/uri'
 require 'json'
 require 'uuid'
 
-require 'ruby-progressbar'
-require 'parallel'
-
 require 'linkeddata'
 require_relative 'rdf/vocab/sc.rb'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: annotations2triannon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Darren Weber
@@ -136,34 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement