active_annotations 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355f86d0f2d32d10bcfedc91df427f21870de457
-  data.tar.gz: e63e3874afdd33b7c85e5d20011cf8ec7cad5d97
+  metadata.gz: 52ae7a0a34d21abfc1295d7a5311ed47a6482369
+  data.tar.gz: 4656eff871f1a2e24b3ebf9088565ab24e6c7b06
 SHA512:
-  metadata.gz: 8378e0252e6b6431f3871c8a8a949a289ec64580f81d5beb391ad446a3d07c3f36fea9d0d4a52a28cea2b0782e7d072e0c1d0c23ba11ecc5dff084d932b50c89
-  data.tar.gz: 079841e779a5ae75c668c0cf004a02e31830960d2652e16724695db19e32f9113dafe5f1c488c025ed2b2c1e6b19452cb673eaa7ba331826bf7a53e5f6349c87
+  metadata.gz: 3940874d99c750eab2c7831c5c28c6704afb2ace6eb97ed1ad8204520e3616ab26da0bae6e8c7a37fcc58cbe1244f7190b274155c00a3e09f92f980417fa5ac7
+  data.tar.gz: 86368778105c204ca48fb0b99c84c65cad01e45587630b12b738f59b7269f516ac5f467b642fc6bf9ea9a1ad2d13798273cd9671fb97fbf093b07b67eaf5c787

data/.travis.yml

@@ -1,16 +1,14 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.1
-  - 2.2
+  - 2.2.5
+  - 2.3.1
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
-    - RAILS_VERSION='~>4.1.10' RDF_GEM_VERSION='~>1.1.0'
-    - RAILS_VERSION='~>4.1.10' RDF_GEM_VERSION='~>2.0.0'
-    - RAILS_VERSION='~>4.2.5' RDF_GEM_VERSION='~>1.1.0'
-    - RAILS_VERSION='~>4.2.5' RDF_GEM_VERSION='~>2.0.0'
+    - RAILS_VERSION='~>4.1.10'
+    - RAILS_VERSION='~>4.2.5'
 
 before_install:
   - gem install bundler

data/Gemfile

@@ -2,17 +2,11 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in active_annotations.gemspec
 gemspec
 
-if ENV["RDF_GEM_VERSION"]
-  gem 'rdf', ENV["RDF_GEM_VERSION"]
-else
-  gem 'rdf'
-end
-
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.2
-# engine_cart stanza: 0.8.0
+# engine_cart: 1.0.1
+# engine_cart stanza: 0.10.0
 # the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path(".internal_test_app", File.dirname(__FILE__)))
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
 if File.exist?(file)
   begin
     eval_gemfile file
@@ -26,19 +20,19 @@ 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'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
-    # nop
-  else
-    gem 'sass-rails', "< 5.0"
+  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

@@ -48,7 +48,7 @@ Output:
   "@context": "http://www.w3.org/ns/oa.jsonld",
   "@id": "urn:uuid:cac68351-a920-47d5-8c7c-9820e2f4d3bd",
   "@type": "oa:Annotation",
-  "annotatedBy": {
+  "dcterms:creator": {
     "@id": "https://github.com/mbklein/",
     "@type": "foaf:Person"
   },
@@ -75,7 +75,7 @@ Output:
     }
   },
   "label": "This is the annotation label",
-  "oa:annotatedAt": {
+  "dcterms:modified": {
     "@value": "2016-04-22T12:59:31Z",
     "@type": "xsd:dateTime"
   }

data/active_annotations.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json-ld"
-  spec.add_dependency "rdf-vocab"
+  spec.add_dependency "rdf-vocab", "~> 2.1.0"
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "engine_cart"
+  spec.add_development_dependency "engine_cart", "~> 1.0.1"
   spec.add_development_dependency "faker"
   spec.add_development_dependency "coveralls"
   spec.add_development_dependency "simplecov"

data/lib/active_annotations/rdf_annotation.rb

@@ -13,6 +13,10 @@ module ActiveAnnotations
     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'
     
@@ -68,7 +72,7 @@ module ActiveAnnotations
       aid = new_id
       add_statements(
         RDF::Statement.new(aid, RDF.type, RDF::Vocab::OA.Annotation),
-        RDF::Statement.new(aid, RDF::Vocab::OA.annotatedAt, DateTime.now)
+        RDF::Statement.new(aid, RDF::Vocab::DC.created, DateTime.now)
       )
     end
 
@@ -172,7 +176,7 @@ module ActiveAnnotations
     end
     
     def annotated_by
-      get_value(annotation_id, RDF::Vocab::OA.annotatedBy)
+      get_value(annotation_id, RDF::Vocab::DC.creator) || get_value(annotation_id, RDF::Vocab::OA.annotatedBy)
     end
     
     def annotated_by=(value)
@@ -181,16 +185,16 @@ module ActiveAnnotations
       end
 
       value = value.nil? ? nil : RDF::URI(value)
-      set_value(annotation_id, RDF::Vocab::OA.annotatedBy, value)
+      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::OA.annotatedAt)
+      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::OA.annotatedAt, value)
+      set_value(annotation_id, RDF::Vocab::DC.modified, value)
     end
     
     def source

data/lib/active_annotations/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_annotations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Michael B. Klein
@@ -28,16 +28,16 @@ dependencies:
   name: rdf-vocab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement