dpla-map 4.0.0.0.pre.11 → 4.0.0.0.pre.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a9b43fd14e8d0e12b60b293c75112589dcd6fe
-  data.tar.gz: 7254051109b36fd179f8df23d896d60298429b6d
+  metadata.gz: e236a1a3ba86fb86369bdec3c3ed2d1ab7574cac
+  data.tar.gz: b77d05ed046373454880c183274389e33b00833d
 SHA512:
-  metadata.gz: 6fe5fd84b8d22e9ed3936a4c04a5ec2e6e9e2011a63f14fb0eaa36417bfc9ebab288f1814fe28c39f7246bbe156898ab7c5aa212499dca5974ed83d67511c182
-  data.tar.gz: 9abefaa90b57c69876d42c6d0699c72b53c43be7eecc711df25f7546be254ddb7cfd41e934f50cbeb6edcab0889211bf7d0d07cbe33e0f251d290d0f6d07ad00
+  metadata.gz: 2f37276c9a897a15106d8cd4e7214b41ae0c393dd75e48df09774dd3cb179113046104cb8ab3e74b13bf98ce6f5805f27450680450bb18016a092c888f3cae98
+  data.tar.gz: 26a0832c886399b4926a71caa50f01e9a7fc712b345b00d55a90077e0fbee1a5d5ddf7dbf87b2b0518c315c0c070f6487868a9b3bf53d9bb0ba187e6c1e44846

data/dpla-map.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib', 'lib/dpla', 'lib/dpla/map', 'lib/rdf']
 
   s.add_dependency 'active-triples', '~>0.6.0'
-  s.add_dependency 'linked_vocabs', '~>0.2.0'
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'pry'

data/lib/dpla/map.rb

@@ -1,8 +1,8 @@
 require 'active_triples'
-require 'linked_vocabs'
 
 require 'date'
 
+require 'rdf/turtle'
 require 'rdf/dpla'
 
 require 'rdf/aat'
@@ -15,11 +15,6 @@ require 'rdf/ore'
 
 module DPLA
   module MAP
-    LinkedVocabs.add_vocabulary(:aat, 'http://vocab.getty.edu/aat/')
-    LinkedVocabs.add_vocabulary(:iso_639_3, 'http://lexvo.org/id/iso639-3/')
-    LinkedVocabs.add_vocabulary(:gn, 'http://www.geonames.org/ontology#', :source => 'http://www.geonames.org/ontology/ontology_v3.1.rdf', :fetch => true)
-
-
     autoload :SourceResource,     'dpla/map/source_resource'
     autoload :Collection,         'dpla/map/collection'
     autoload :Place,              'dpla/map/place'

data/lib/dpla/map/controlled/dcmitype.rb

@@ -1,10 +1,8 @@
 module DPLA::MAP
   module Controlled
     class DCMIType < DPLA::MAP::Concept
-      include LinkedVocabs::Controlled
-      configure :type => RDF::RDFS.Class
-
-      use_vocabulary :dcmitype
+        configure :type => RDF::RDFS.Class, 
+                  :base_uri => RDF::URI('http://purl.org/dc/dcmitype/')
     end
   end
 end

data/lib/dpla/map/controlled/genre.rb

@@ -1,11 +1,7 @@
 module DPLA::MAP
   module Controlled
     class Genre < DPLA::MAP::Concept
-      include LinkedVocabs::Controlled
-      
       configure :base_uri => 'http://vocab.getty.edu/aat/', :type => 'http://vocab.getty.edu/ontology#Concept'
-      
-      use_vocabulary :aat
     end
   end
 end

data/lib/dpla/map/controlled/language.rb

@@ -1,13 +1,9 @@
 module DPLA::MAP
   module Controlled
     class Language < DPLA::MAP::Concept
-      include LinkedVocabs::Controlled
-
       configure :base_uri => "http://lexvo.org/id/iso639-3/", 
                 :rdf_label => RDF::SKOS.prefLabel,
                 :type => RDF::DC.LinguisticSystem
-
-      use_vocabulary :iso_639_3
     end
   end
 end

data/lib/dpla/map/source_resource.rb

@@ -3,7 +3,6 @@ module DPLA::MAP
     configure :base_uri => 'http://dp.la/api/items/', :type => RDF::DPLA.SourceResource
 
     validates_presence_of :rights, :title
-    validates_vocabulary_of :dctype, :genre, :language
 
     property :alternative, :predicate => RDF::DC.alternative
     property :collection, :predicate => RDF::DC.isPartOf, :class_name => 'DPLA::MAP::Collection'

data/lib/dpla/map/version.rb

@@ -1,5 +1,5 @@
 module DPLA
   module MAP
-    VERSION = '4.0.0.0.pre.11'
+    VERSION = '4.0.0.0.pre.12'
   end
 end

data/spec/lib/dpla_spec.rb

@@ -23,4 +23,35 @@ describe DPLA::MAP::SourceResource do
   it 'has a dcterms:type that is a DPLA::MAP::Controlled::DCMIType' do
     expect(subject.dctype).to contain_exactly(an_instance_of(DPLA::MAP::Controlled::DCMIType))
   end
-end
+end
+
+describe DPLA::MAP::Aggregation do
+  subject { build(:aggregation) }
+
+  it 'has nested values' do
+    expect(subject.sourceResource.first.subject.first.prefLabel)
+      .to contain_exactly('Gay activists')
+  end
+  
+  context 'when built from parsed graph' do
+    let(:parsed) do
+      lang = DPLA::MAP::Controlled::Language.new
+      lang.providedLabel = label
+      subject.sourceResource.first.language = lang
+
+      uri = RDF::URI('http://example.org/moomin')
+      subject.set_subject!(uri)
+
+      agg = DPLA::MAP::Aggregation.new(uri)
+      agg << RDF::Reader.for(:ttl).new(subject.dump(:ttl))
+      agg
+    end
+
+    let(:label) { 'eng' }
+
+    it 'has nested values' do
+      expect(parsed.sourceResource.first.language.first.providedLabel)
+        .to contain_exactly(label)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpla-map
 version: !ruby/object:Gem::Version
-  version: 4.0.0.0.pre.11
+  version: 4.0.0.0.pre.12
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-triples
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: linked_vocabs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement