active_annotations 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52ae7a0a34d21abfc1295d7a5311ed47a6482369
-  data.tar.gz: 4656eff871f1a2e24b3ebf9088565ab24e6c7b06
+SHA256:
+  metadata.gz: 184151d6e940971dc9fcf814c85ee9c96af6b494f21f709922d896dc9e37b5eb
+  data.tar.gz: 99ac263b086301ba4c92b8f7eb2e0cec1aa5b68ea12881ca23a191ecd99b5762
 SHA512:
-  metadata.gz: 3940874d99c750eab2c7831c5c28c6704afb2ace6eb97ed1ad8204520e3616ab26da0bae6e8c7a37fcc58cbe1244f7190b274155c00a3e09f92f980417fa5ac7
-  data.tar.gz: 86368778105c204ca48fb0b99c84c65cad01e45587630b12b738f59b7269f516ac5f467b642fc6bf9ea9a1ad2d13798273cd9671fb97fbf093b07b67eaf5c787
+  metadata.gz: 4ec95f754d4b8a9f8a42bf520a02e186e19a8863480c21060aa68b9f039365289efaa91ffb099a421e79f4fda0b2300726ae25a506f3785f285ff9876c1b99ed
+  data.tar.gz: ec8b26dd0766c3184e001a045427f842c3deca5ee05e84a6227d76bd05424f856c119e3603132b19a38c77c900e04e1cdf65cb5629038e7a1dbe258b2e5d0df3

data/.circleci/config.yml

@@ -0,0 +1,66 @@
+version: 2.1
+orbs:
+  samvera: samvera/circleci-orb@1.0.0
+jobs:
+  bundle_lint_test:
+    parameters:
+      ruby_version:
+        type: string
+      bundler_version:
+        type: string
+        default: 2.0.1
+      rails_version:
+        type: string
+    executor:
+      name: 'samvera/ruby'
+      ruby_version: << parameters.ruby_version >>
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+    steps:
+      - samvera/cached_checkout
+      - run:
+          name: Check for 'master' branch
+          command: |
+              git fetch --all --quiet --prune --prune-tags
+              if [[ -n "$(git branch --all --list master */master)" ]]; then
+                  echo "A branch named 'master' was found. Please remove it."
+                  echo "$(git branch --all --list master */master)"
+              fi
+              [[ -z "$(git branch --all --list master */master)" ]]
+
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+
+      - samvera/engine_cart_generate:
+          cache_key: v1-internal-test-app-{{ checksum "active_annotations.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+
+      - samvera/bundle:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+
+      - samvera/parallel_rspec
+
+workflows:
+  ci:
+    jobs:
+      - bundle_lint_test:
+          name: ruby2-7_rails7-0
+          ruby_version: 2.7.5
+          rails_version: 7.0.2.2
+      - bundle_lint_test:
+          name: ruby2-7_rails6-1
+          ruby_version: 2.7.5
+          rails_version: 6.1.4.6
+      - bundle_lint_test:
+          name: ruby2-7_rails6-0
+          ruby_version: 2.7.5
+          rails_version: 6.0.4.6
+      - bundle_lint_test:
+          name: ruby2-7_rails5-2
+          ruby_version: 2.7.5
+          rails_version: 5.2.6
+      - bundle_lint_test:
+          name: ruby2-6_rails5-2
+          ruby_version: 2.6.9
+          rails_version: 5.2.6

data/Gemfile

@@ -2,6 +2,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_annotations.gemspec
 gemspec
 
+group :test do
+  gem 'rspec_junit_formatter'
+end
+
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 1.0.1
 # engine_cart stanza: 0.10.0
@@ -20,19 +24,20 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks --skip-javascript'
     else
       gem 'rails', ENV['RAILS_VERSION']
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--skip-turbolinks --skip-javascript'
+    end
+    case ENV['RAILS_VERSION']
+    when /^6.0/
+      gem 'sass-rails', '>= 6'
+      gem 'webpacker', '~> 4.0'
+    when /^5.[12]/
+      gem 'sass-rails', '~> 5.0'
+      gem 'sprockets', '~> 3.7'
+      gem 'thor', '~> 0.20'
     end
-  end
-
-  case ENV['RAILS_VERSION']
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
   end
 end
 # END ENGINE_CART BLOCK

data/README.md

@@ -1,7 +1,7 @@
 # ActiveAnnotations
 
 [![Gem Version](https://badge.fury.io/rb/active_annotations.png)](http://badge.fury.io/rb/active_annotations)
-[![Build Status](https://travis-ci.org/avalonmediasystem/active_annotations.svg?branch=master)](https://travis-ci.org/avalonmediasystem/active_annotations)
+[![Build Status](https://circleci.com/gh/avalonmediasystem/active_annotations.svg?style=svg)](https://circleci.com/gh/avalonmediasystem/active_annotations)
 [![Coverage Status](https://coveralls.io/repos/avalonmediasystem/active_annotations/badge.svg?branch=master&service=github)](https://coveralls.io/github/avalonmediasystem/active_annotations?branch=master)
 
 ActiveAnnotations is a gem for modeling simple [OpenAnnotation](http://www.openannotation.org/)-compatible annotations to Rails. It is ActiveRecord compatible, but is backed by an RDF graph that serializes (by default) to [JSON-LD](http://json-ld.org/).

data/active_annotations.gemspec

@@ -19,13 +19,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'rails', '>= 5.2', '< 7.1'
   spec.add_dependency "json-ld"
-  spec.add_dependency "rdf-vocab", "~> 2.1.0"
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "engine_cart", "~> 1.0.1"
+  spec.add_dependency "rdf-vocab", ">= 2.1.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "engine_cart"
   spec.add_development_dependency "faker"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"
 end

data/db/migrate/20160422052041_create_annotations.rb

@@ -1,4 +1,4 @@
-class CreateAnnotations < ActiveRecord::Migration
+class CreateAnnotations < ActiveRecord::Migration[4.2]
   def change
     create_table :annotations do |t|
       t.string :uuid

data/lib/active_annotations/document_loader.rb

@@ -3,7 +3,7 @@ module ActiveAnnotations
     class << self
       def local_document_loader(url, options={}, &block)
         if RDF::URI(url) == RDF::URI(RDFAnnotation::CONTEXT_URI)
-          remote_document = JSON::LD::API::RemoteDocument.new(url, File.read(File.expand_path('../oa.jsonld',__FILE__)))
+          remote_document = JSON::LD::API::RemoteDocument.new(File.read(File.expand_path('../oa.jsonld',__FILE__)), base: url)
           block_given? ? yield(remote_document) : remote_document
         else
           # :nocov:

data/lib/active_annotations/engine.rb

@@ -1,9 +1,5 @@
-if defined?(Rails)
-  module ActiveAnnotations  
-    class Engine < Rails::Engine
-      config.autoload_paths += Dir["#{config.root}/app/models/**/"]
-
-      engine_name 'active_annotations'
-    end
+module ActiveAnnotations
+  class Engine < Rails::Engine
+    engine_name 'active_annotations'
   end
 end

data/lib/active_annotations/rdf_annotation.rb

@@ -8,28 +8,29 @@ require 'rdf/vocab/cnt'
 require 'rdf/vocab/dcmitype'
 require 'rdf/vocab/foaf'
 
-module ActiveAnnotations  
+module ActiveAnnotations
   class RDFAnnotation
     RDF::Vocab::DC = RDF::DC unless defined?(RDF::Vocab::DC)
     RDF::Vocab::FOAF = RDF::FOAF unless defined?(RDF::Vocab::FOAF)
-    
+
     # Support reading legacy properties
     RDF::Vocab::OA.property 'annotatedAt'
     RDF::Vocab::OA.property 'annotatedBy'
-    
+
     attr_reader :graph
     CONTEXT_URI = 'http://www.w3.org/ns/oa.jsonld'
-    
+
     def self.from_jsonld(json)
       content = JSON.parse(json)
       self.new(JSON::LD::API.toRDF(content, documentLoader: DocumentLoader.document_loader))
     end
-    
+
     def to_jsonld(opts={})
       input = JSON.parse(graph.dump :jsonld, standard_prefixes: true, prefixes: { oa: RDF::Vocab::OA.to_iri.value })
       frame = YAML.load(File.read(File.expand_path('../frame.yml',__FILE__)))
-      output = JSON::LD::API.frame(input, frame, omitDefault: true, documentLoader: DocumentLoader.document_loader)
-      output.merge!(output.delete('@graph')[0])
+      output = JSON::LD::API.frame(input, frame, validate: false, omitDefault: true, documentLoader: DocumentLoader.document_loader)
+      graph = output.delete('@graph').try(:first)
+      output.merge!(graph) if graph
       if opts[:pretty_json]
         JSON.pretty_generate output
       else
@@ -45,7 +46,7 @@ module ActiveAnnotations
         @graph << content
       end
     end
-    
+
     def get_value(s, p)
       return nil if s.nil?
       statement = graph.first(subject: s, predicate: p)
@@ -57,17 +58,17 @@ module ActiveAnnotations
         statement.object.value
       end
     end
-    
+
     def set_value(s, p, value)
       return nil if s.nil?
       @graph.delete({ subject: s, predicate: p })
       @graph << RDF::Statement.new(s, p, value) unless value.nil?
     end
-    
+
     def add_statements(*statements)
       statements.each { |statement| @graph << statement }
     end
-    
+
     def add_default_content!
       aid = new_id
       add_statements(
@@ -86,7 +87,7 @@ module ActiveAnnotations
         )
       end
     end
-    
+
     def ensure_target!
       if target_id.nil?
         tid = new_id
@@ -108,7 +109,7 @@ module ActiveAnnotations
         )
       end
     end
-    
+
     def new_id
       RDF::URI.new("urn:uuid:#{SecureRandom.uuid}")
     end
@@ -117,68 +118,68 @@ module ActiveAnnotations
       statement = @graph.first(predicate: RDF.type, object: type)
       statement.nil? ? nil : statement.subject
     end
-    
+
     def annotation_id
       find_id(RDF::Vocab::OA.Annotation)
     end
-    
+
     def body_id
       statement = @graph.first(subject: annotation_id, predicate: RDF::Vocab::OA.hasBody)
       statement.nil? ? nil : statement.object
     end
-    
+
     def target_id
       find_id(RDF::Vocab::OA.SpecificResource)
     end
-    
+
     def selector_id
       find_id(RDF::Vocab::OA.FragmentSelector)
     end
-    
+
     def fragment_value
       graph.first(subject: selector_id, predicate: RDF.value)
     end
-    
+
     def fragment_value=(value)
       ensure_selector!
       set_value(selector_id, RDF.value, value)
     end
-    
+
     def start_time
       value = fragment_value.nil? ? nil : fragment_value.object.value.scan(/^t=(.*)$/).flatten.first.split(/,/)[0]
       Float(value)
     rescue
        value
     end
-    
+
     def start_time=(value)
       self.fragment_value = "t=#{[value, end_time].join(',')}"
     end
-    
+
     def end_time
       value = fragment_value.nil? ? nil : fragment_value.object.value.scan(/^t=(.*)$/).flatten.first.split(/,/)[1]
       Float(value)
     rescue
       value
     end
-    
+
     def end_time=(value)
       self.fragment_value = "t=#{[start_time, value].join(',')}"
     end
-    
+
     def content
       get_value(body_id, RDF::Vocab::CNT.chars)
     end
-    
+
     def content=(value)
       ensure_body!
       set_value(body_id, RDF::Vocab::CNT.chars, value)
     end
-    
+
     def annotated_by
       get_value(annotation_id, RDF::Vocab::DC.creator) || get_value(annotation_id, RDF::Vocab::OA.annotatedBy)
     end
-    
+
     def annotated_by=(value)
       unless annotated_by.nil?
         @graph.delete({ subject: RDF::URI(annotated_by) })
@@ -188,20 +189,20 @@ module ActiveAnnotations
       set_value(annotation_id, RDF::Vocab::DC.creator, value)
       set_value(value, RDF.type, RDF::Vocab::FOAF.Person)
     end
-    
+
     def annotated_at
       get_value(annotation_id, RDF::Vocab::DC.modified) || get_value(annotation_id, RDF::Vocab::OA.annotatedAt)
     end
-    
+
     def annotated_at=(value)
       set_value(annotation_id, RDF::Vocab::DC.modified, value)
     end
-    
+
     def source
       # TODO: Replace this with some way of retrieving the actual source
       get_value(target_id, RDF::Vocab::OA.hasSource)
     end
-    
+
     def source=(value)
       unless target_id.nil?
         statement = @graph.first(subject: target_id, predicate: RDF::Vocab::OA.hasSource)
@@ -216,11 +217,11 @@ module ActiveAnnotations
         )
       end
     end
-    
+
     def label
       get_value(annotation_id, RDF::RDFS.label)
     end
-    
+
     def label=(value)
       set_value(annotation_id, RDF::RDFS.label, value)
     end

data/lib/active_annotations/version.rb

@@ -1,3 +1,3 @@
 module ActiveAnnotations
-  VERSION = "0.2.1"
+  VERSION = "0.4.0"
 end

data/tasks/active_annotations.rake

@@ -5,8 +5,6 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern =  'spec/**/*_spec.rb'
 end
 
-EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
-
 desc "Run test suite"
 task :ci => ['engine_cart:generate'] do
   Rake::Task['spec'].invoke

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: active_annotations
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael B. Klein
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
@@ -28,74 +48,60 @@ dependencies:
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: engine_cart
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +115,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,10 +149,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -182,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: OpenAnnontations + JSON-LD + ActiveRecord

data/.coveralls.yml

@@ -1 +0,0 @@
-repo_token: W7waugqQH8STNmsf9kX0CldGQPeB0A4wM

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.2.5
-  - 2.3.1
-env:
-  global:
-    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  matrix:
-    - RAILS_VERSION='~>4.1.10'
-    - RAILS_VERSION='~>4.2.5'
-
-before_install:
-  - gem install bundler
-  
-notifications:
-  irc: "irc.freenode.org#projectvov"