dpla-map 4.0.0.0.pre.1 → 4.0.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ebd5e84c95f802530ade9eb09ee8a8790d6e053
-  data.tar.gz: 8a431e821e1e7dc0e81172cfef1d5b613a05989f
+  metadata.gz: 85cd1fe3e6f70bf1970db072095aa0e9ef9dcb7f
+  data.tar.gz: 11d6a16b889ccc742651a03526e0feb81bd89ca5
 SHA512:
-  metadata.gz: 93111c3fd951e3dd37449412590975f6dd887bd814466ca86777b89a9a3054da550cb11225a3d670717dde2b4ab6338a39a3a4eb3f95c8b5b3b619f3684baa22
-  data.tar.gz: 88b91dacc8b6629fde2387bf21c9e198322c1c48cab3a2f61a75bdb62b1d4c35a53741ea769d21725154bb0b88d2ee5f52a7a23d6be6898394ac919fba129b89
+  metadata.gz: 2c41dc82ba808ae2c9cf0db247ee93f7315584bbf2f0c106b78ad7bb7f09001e6c55d8cd5164af64c59c715cd4d30972d4dab0907646681e72c9c39eb8b1d429
+  data.tar.gz: 5e62e0d9164861cfd82bf31133a0d3db5b0d2d34cc21871909a486630676d7cb9e1b40b19cd5fd5585750d9ed508c3ba25ee54af2464a2d6c09c6fa82c79ae5c

data/dpla-map.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-doc'
   s.add_development_dependency 'pry-debugger'
-  s.add_development_dependency 'factory_girl', '~>4.0'
+  s.add_development_dependency 'factory_girl', '~>4.4.0'
 end

data/lib/dpla/map/agent.rb

@@ -3,6 +3,8 @@ module DPLA::MAP
     configure :type => RDF::EDM.Agent
     
     property :label, :predicate => RDF::SKOS.prefLabel
-    property :sameAs, :predicate => RDF::OWL.sameAs
+    property :providedLabel, :predicate => RDF::DPLA.providedLabel
+    property :exactMatch, :predicate => RDF::SKOS.exactMatch
+    property :closeMatch, :predicate => RDF::SKOS.closeMatch
   end
 end

data/lib/dpla/map/aggregation.rb

@@ -2,18 +2,17 @@ module DPLA::MAP
   class Aggregation < ActiveTriples::Resource
     configure :type => RDF::ORE.Aggregation
 
-    validates_presence_of :aggregatedSourceResource, :originalRecord, :isShownAt, :object, :provider
+    validates_presence_of :aggregatedCHO, :originalRecord, :isShownAt, :object, :provider
 
-    property :aggregatedSourceResource, :predicate => RDF::EDM.aggregatedCHO, :class_name => 'DPLA::MAP::SourceResource'
-    property :dataProvider, :predicate => RDF::EDM.dataProvider
+    property :aggregatedCHO, :predicate => RDF::EDM.aggregatedCHO, :class_name => 'DPLA::MAP::SourceResource'
+    property :dataProvider, :predicate => RDF::EDM.dataProvider, :class_name => 'DPLA::MAP::Agent'
     property :originalRecord, :predicate => RDF::DPLA.originalRecord
     property :hasView, :predicate => RDF::EDM.hasView, :class_name => 'DPLA::MAP::WebResource'
-    property :intermediateProvider, :predicate => RDF::DPLA.intermediateProvider
+    property :intermediateProvider, :predicate => RDF::DPLA.intermediateProvider, :class_name => 'DPLA::MAP::Agent'
     property :isShownAt, :predicate => RDF::EDM.isShownAt, :class_name => 'DPLA::MAP::WebResource'
     property :object, :predicate => RDF::EDM.object, :class_name => 'DPLA::MAP::WebResource'
     property :preview, :predicate => RDF::EDM.preview, :class_name => 'DPLA::MAP::WebResource'
     property :provider, :predicate => RDF::EDM.provider, :class_name => 'DPLA::MAP::Agent'
     property :rightsStatement, :predicate => RDF::EDM.rights, :class_name => 'DPLA::MAP::RightsStatement'
-
   end
 end

data/lib/dpla/map/collection.rb

@@ -2,7 +2,7 @@ module DPLA::MAP
   class Collection < ActiveTriples::Resource
     configure :base_uri => 'http://dp.la/api/collections/', :type => RDF::DCMITYPE.Collection
 
-    property :title, :predicate => RDF::DC11.title # any real reason not to use dcterms here? RDF::DC.title
-    property :description, :predicate => RDF::DC11.description # any reason not to use dcterms here? RDF::DC.description
+    property :title, :predicate => RDF::DC.title
+    property :description, :predicate => RDF::DC.description
   end
 end

data/lib/dpla/map/concept.rb

@@ -1,8 +1,11 @@
 module DPLA::MAP
   class Concept < ActiveTriples::Resource
     configure :type => RDF::SKOS.Concept
-    
+
     property :prefLabel, :predicate => RDF::SKOS.prefLabel
+    property :providedLabel, :predicate => RDF::DPLA.providedLabel
+    property :exactMatch, :predicate => RDF::SKOS.exactMatch
+    property :closeMatch, :predicate => RDF::SKOS.closeMatch
     property :note, :predicate => RDF::SKOS.note
     property :scheme, :predicate => RDF::SKOS.inScheme
 

data/lib/dpla/map/factories.rb

@@ -3,38 +3,39 @@ require 'dpla/map'
 FactoryGirl.define do
 
   factory :source_resource, class: DPLA::MAP::SourceResource do
+    alternateTitle 'Stonewall Inn Graffiti'
     collection { |collection| collection.association :collection, :strategy => :build }
-    contributor 'Norma Ford'
-    title 'Stonewall Inn [2]'
-    creator 'Davies, Diana (1938-)'
-    subject ['Lesbians', 'Gay activists']
+    contributor { |person| person.association :agent, :strategy => :build }
+    creator { |person| person.association :agent, :label => 'Davies, Diana (1938-)', :strategy => :build }
+    date { |timespan| timespan.association :timespan, :strategy => :build }
     description 'Window of the Stonewall Bar N.Y. 1969. The other half of the graffiti was erased by the time Diana photographed it.'
     extent '10x12 cm'
     format 'Silver Gelatin Print'
+    genre { |genre| genre.association :genre, :strategy => :build }
     identifier '510d47e3-57d2-a3d9-e040-e00a18064a99'
     language { |language| language.association :language, :strategy => :build }
     place { |place| place.association :place, :strategy => :build }
-    publisher 'Penguin Books'
+    publisher { |agent| agent.association :agent, :label => 'Penguin Books', :strategy => :build }
     relation ['Stonewall Inn [1]', 'Stonewall Inn [3]']
+    #replacedBy
+    #replaces
     rights "The New York Public Library is interested in learning more about items you've seen on our websites or elsewhere online. If you have any more information about an item or its copyright status, we want to hear from you. Please contact DigitalCollections@nypl.org with your contact information and a link to the relevant content."
-    genre { |genre| genre.association :genre, :strategy => :build }
+    subject { |concept| concept.association :concept, :strategy => :build }
     temporalCoverage '1969'
+    title 'Stonewall Inn [2]'
     dctype { |type| type.association :dctype, :strategy => :build }
   end
 
   factory :aggregation, class: DPLA::MAP::Aggregation do
-    aggregatedSourceResource { |sr| sr.association :source_resource, :strategy => :build }
-    dataProvider 'Manuscripts and Archives Division. The New York Public Library'
-    originalRecord '<record><title>Stonewall Inn [2]</title></record>'
+    aggregatedCHO { |sr| sr.association :source_resource, :strategy => :build }
+    dataProvider { |agent| agent.association :agent, :label => 'Manuscripts and Archives Division. The New York Public Library', :strategy => :build }
+    originalRecord { RDF::URI('http://api.dp.la/originalRecord/12345') }
     hasView { |wr| wr.association :web_resource, :strategy => :build }
-    intermediateProvider 'NYPL'
-    isShownAt 'http://digitalcollections.nypl.org/items/510d47e3-57d2-a3d9-e040-e00a18064a99'
-    object 'http://dp.la/item/116d5aaf3d77a5d7c5a6c7a3e10c5afe'
-    provider { 
-      prov = ActiveTriples::Resource.new('http://dp.la/api/contributor/nypl')
-      prov << RDF::Statement(prov, RDF::SKOS.prefLabel, "The New York Public Library")
-      prov
-    }
+    intermediateProvider  { |agent| agent.association :agent, :label => 'The New York Public Library', :strategy => :build }
+    isShownAt  { |wr| wr.association :web_resource, :strategy => :build } # 'http://digitalcollections.nypl.org/items/510d47e3-57d2-a3d9-e040-e00a18064a99'
+    object { |wr| wr.association :web_resource, :strategy => :build } # 'http://dp.la/item/116d5aaf3d77a5d7c5a6c7a3e10c5afe'
+    preview { |wr| wr.association :web_resource, :strategy => :build }
+    provider  { |agent| agent.association :agent, :label => 'The New York Public Library', :strategy => :build }
     rightsStatement { ActiveTriples::Resource.new('http://creativecommons.org/publicdomain/mark/1.0/') }
   end
 
@@ -45,10 +46,19 @@ FactoryGirl.define do
   end
 
   factory :place, class: DPLA::MAP::Place do
-    name 'New York, NY'
-    # city 'New York'
-    # county 'New York County'
-    # coordinates '40.7127, 74.0059'
+    label 'New York, NY'
+    providedLabel 'New York City'
+    lat '40.7127'
+    long '74.0059'
+    alt '10'
+    parentFeature { ActiveTriples::Resource.new('http://sws.geonames.org/5128638/') }
+    countryCode 'US'
+    exactMatch { ActiveTriples::Resource.new('http://sws.geonames.org/5128581/') }
+  end
+
+  factory :agent, class: DPLA::MAP::Agent do
+    label 'Norma Ford'
+    providedLabel 'Norma Ford'
   end
 
   factory :collection, class: DPLA::MAP::Collection do
@@ -56,6 +66,17 @@ FactoryGirl.define do
     description 'Photographs of Diana Davies; LGBT and HIV/AIDS Activist Collections'
   end
 
+  factory :concept, class: DPLA::MAP::Concept do
+    prefLabel 'Gay activists'
+    providedLabel 'Gay Activists'
+  end
+
+  factory :timespan, class: DPLA::MAP::TimeSpan do
+    providedLabel '1969.'
+    self.begin Date.new(1969)
+    self.end Date.new(1969, 12, 31)
+  end
+
   factory :language, class: DPLA::MAP::Controlled::Language do    
     initialize_with do
       new('eng')
@@ -75,8 +96,10 @@ FactoryGirl.define do
   end
 end
 
-RSpec.configure do |config|
-  config.before(:suite) do
-    FactoryGirl.lint
+if defined?(RSpec)
+  RSpec.configure do |config|
+    config.before(:suite) do
+      FactoryGirl.lint
+    end
   end
 end

data/lib/dpla/map/place.rb

@@ -2,15 +2,17 @@ module DPLA::MAP
   class Place < ActiveTriples::Resource
     configure :type => RDF::EDM.Place
 
-    validates_presence_of :name # validates_cardinality_of ... :count => 1?
+    validates_presence_of :label
 
-    property :name, :predicate => RDF::SKOS.prefLabel
-    property :latitude, :predicate => RDF::GEO.lat
-    property :longitude, :predicate => RDF::GEO.long
-    property :altitude, :predicate => RDF::GEO.alt
-    property :parentFeature, :predicate => RDF::GN.parentFeature
-    property :parentCountry, :predicate => RDF::GN.countryCode
-    property :sameAs, :predicate => RDF::OWL.sameAs
-    
+    property :label, :predicate => RDF::SKOS.prefLabel
+    property :providedLabel, :predicate => RDF::DPLA.providedLabel
+    property :lat, :predicate => RDF::GEO.lat
+    property :long, :predicate => RDF::GEO.long
+    property :alt, :predicate => RDF::GEO.alt
+    #property :geometry, :predicate => RDF::GEOJSON.geometry, :class_name => DPLA::MAP::Geometry
+    property :parentFeature, :predicate => RDF::GN.parentFeature, :class_name => 'DPLA::MAP::Place'
+    property :countryCode, :predicate => RDF::GN.countryCode
+    property :exactMatch, :predicate => RDF::SKOS.exactMatch
+    property :closeMatch, :predicate => RDF::SKOS.closeMatch
   end
 end

data/lib/dpla/map/source_resource.rb

@@ -5,35 +5,26 @@ module DPLA::MAP
     validates_presence_of :rights, :title
     validates_vocabulary_of :dctype, :genre, :language
 
-    property :alternateTitle, :predicate => RDF::DC.alternative
+    property :alternative, :predicate => RDF::DC.alternative
     property :collection, :predicate => RDF::DC.isPartOf, :class_name => 'DPLA::MAP::Collection'
-    property :contributor, :predicate => RDF::DC11.contributor, :class_name => 'DPLA::MAP::Agent'  # literal and/or URI
-    property :creator, :predicate => RDF::DC11.creator, :class_name => 'DPLA::MAP::Agent' # literal and/or URI
+    property :contributor, :predicate => RDF::DC.contributor, :class_name => 'DPLA::MAP::Agent'
+    property :creator, :predicate => RDF::DC.creator, :class_name => 'DPLA::MAP::Agent'
     property :date, :predicate => RDF::DC11.date, :class_name => 'DPLA::MAP::TimeSpan'
-    property :description, :predicate => RDF::DC11.description # any reason not to use dcterms here? RDF::DC.description
+    property :description, :predicate => RDF::DC.description
     property :extent, :predicate => RDF::DC.extent
-    property :format, :predicate => RDF::DC11.format # literal and/or URI
-    property :identifier, :predicate => RDF::DC11.identifier # literal and/or URI
+    property :format, :predicate => RDF::DC11.format
+    property :genre, :predicate => RDF::EDM.hasType, :class_name => 'DPLA::MAP::Controlled::Genre'
+    property :identifier, :predicate => RDF::DC11.identifier
     property :language, :predicate => RDF::DC.language, :class_name => 'DPLA::MAP::Controlled::Language'
-    property :place, :predicate => RDF::DC.spatial, :class_name => 'DPLA::MAP::Place' # literal and/or URI
-    property :publisher, :predicate => RDF::DC11.publisher # literal and/or URI
-    property :relation, :predicate => RDF::DC11.relation # literal and/or URI
-    property :replacedBy, :predicate => RDF::DC.isReplacedBy # literal and/or URI
-    property :replaces, :predicate => RDF::DC.replaces # literal and/or URI
+    property :spatial, :predicate => RDF::DC.spatial, :class_name => 'DPLA::MAP::Place'
+    property :publisher, :predicate => RDF::DC.publisher, :class_name => 'DPLA::MAP::Agent'
+    property :relation, :predicate => RDF::DC11.relation
+    property :isReplacedBy, :predicate => RDF::DPLA.isReplacedBy
+    property :replaces, :predicate => RDF::DPLA.replaces
     property :rights, :predicate => RDF::DC11.rights
-    property :genre, :predicate => RDF::EDM.hasType, :class_name => 'DPLA::MAP::Controlled::Genre'
     property :subject, :predicate => RDF::DC.subject, :class_name => 'DPLA::MAP::Concept'
-    property :temporalCoverage, :predicate => RDF::DC.temporal # literal and/or URI
-    property :title, :predicate => RDF::DC11.title # any reason not to use dcterms here? RDF::DC.title
-    property :dctype, :predicate => RDF::DC11.type, :class_name => 'DPLA::MAP::Controlled::DCMIType'
-
-    # formal rights statements
-    # property :rights, :predicate => RDF::DC.rights, :class_name => 'DPLA::RightsStatement'
-    
-    # languages w/ better handling of the controlled vocab?
-    # property :languageControlled, :predicate => RDF::DC.language, :class_name => 'DPLA::Controlled::Language'
-
-    # controlled vocab on type
-    # property :dcmitype, :predicate => RDF::DC.type, :class_name => 'DPLA::Controlled::DCMIType'
+    property :temporal, :predicate => RDF::DC.temporal, :class_name => 'DPLA::MAP::TimeSpan'
+    property :title, :predicate => RDF::DC.title
+    property :dctype, :predicate => RDF::DC.type, :class_name => 'DPLA::MAP::Controlled::DCMIType'
   end
 end

data/lib/dpla/map/time_span.rb

@@ -2,8 +2,9 @@ module DPLA::MAP
   class TimeSpan < ActiveTriples::Resource
     configure :type => RDF::EDM.TimeSpan
     
-    validates_presence_of :originalSourceDate # validates_cardinality_of ... :count => 1?
-    
+    validates_presence_of :providedLabel
+
+    property :providedLabel, :predicate => RDF::DPLA.providedLabel    
     property :begin, :predicate => RDF::EDM.begin
     property :end, :predicate => RDF::EDM.end
   end

data/lib/dpla/map/version.rb

@@ -1,6 +1,6 @@
 module DPLA
   module MAP
-    VERSION = '4.0.0.0.pre.1'
+    VERSION = '4.0.0.0.pre.2'
   end
 end
 

data/lib/dpla/map.rb

@@ -1,6 +1,8 @@
 require 'active_triples'
 require 'linked_vocabs'
 
+require 'date'
+
 require 'rdf/dpla'
 
 require 'rdf/aat'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpla-map
 version: !ruby/object:Gem::Version
-  version: 4.0.0.0.pre.1
+  version: 4.0.0.0.pre.2
 platform: ruby
 authors:
 - Tom Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-triples
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.4.0
 description: DPLA's metadata application profile in ActiveTriples.
 email: tom@dp.la
 executables: []