iiif-presentation 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136f2338c1c913c7a28bc3beff44986c274ff9a7
-  data.tar.gz: 286915f2245cce194b378b21a8790f39ccf0e16b
+  metadata.gz: 5d2ae4eba89da3249e90fd07899b0c959a2ad6d1
+  data.tar.gz: 2b9d3fb56e25a15c4d66f1d8b44488a873a3adba
 SHA512:
-  metadata.gz: 3ffb123653fe951624635cf0f7499f1a34e099a5e44b8a63f5fbae19b43751b3ce44337c251bd46c5337ca719d514a2f48fc87484309061bba18e63ccd227a50
-  data.tar.gz: 0c8acd7f1e9b253cd32ec90cbc855c9666d94552728e4d72858a7d751207c088aafa21a03522ab58c9308ea44e5e818b8bdcff3a326709103ef4c88bb1e79b3a
+  metadata.gz: 30779f16f6794adfac654ea104a49a5d4970a28248fde2b93fdc941e55f2da3bb050fd046ea2fdcde639886ce3cc3a0a71550be74acbce139cd8c123928944a4
+  data.tar.gz: 6c14f0bf0d3c3a5ea647372267634768f8a6ef9dde304c68a5ed0c598e22f937fcd4428d653cb73cd2871123f00f828cdeb56626d0a6bf8d37a786637df5cbdf

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.1.0
+  - 2.3.0
 install:
   - "gem install bundler"
   - "bundle install --jobs=3 --retry=3"

data/README.md

@@ -1,12 +1,12 @@
 # O'Sullivan: A Ruby API for working with IIIF Presentation manifests
 
-[![Build Status](https://travis-ci.org/IIIF/osullivan.svg?branch=development)](https://travis-ci.org/IIIF/osullivan)
-[![Coverage Status](https://coveralls.io/repos/IIIF/osullivan/badge.svg?branch=development&service=github)](https://coveralls.io/github/IIIF/osullivan?branch=development)
+[![Build Status](https://travis-ci.org/iiif-prezi/osullivan.svg?branch=development)](https://travis-ci.org/iiif-prezi/osullivan)
+[![Coverage Status](https://coveralls.io/repos/github/iiif-prezi/osullivan/badge.svg?branch=development)](https://coveralls.io/github/iiif-prezi/osullivan?branch=development)
 
 
 ## Installation
 
-From the source code do `rake install`, or get the latest release [from RubyGems](https://rubygems.org/gems/osullivan).
+From the source code do `rake install`, or get the latest release [from RubyGems](https://rubygems.org/gems/iiif-presentation).
 
 ## Building New Objects
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/iiif-presentation.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'json'
   spec.add_dependency 'activesupport', '>= 3.2.18'
-  spec.add_dependency 'faraday', '~> 0.9.0'
+  spec.add_dependency 'faraday', '>= 0.9'
 end

data/lib/iiif/presentation/image_resource.rb

@@ -13,7 +13,7 @@ module IIIF
       end
 
       def initialize(hsh={})
-        hsh['@type'] = 'dcterms:Image' unless hsh.has_key? '@type'
+        hsh['@type'] = TYPE unless hsh.has_key? '@type'
         super(hsh)
       end
 

data/lib/iiif/service.rb

@@ -241,7 +241,7 @@ module IIIF
 
     # All known subclasses of service.
     def self.all_service_subclasses
-      @all_service_subclasses ||= IIIF::Service.descendants
+      @all_service_subclasses ||= IIIF::Service.descendants.reject(&:singleton_class?)
     end
 
     def data=(hsh)

data/spec/integration/iiif/presentation/image_resource_spec.rb

@@ -32,7 +32,7 @@ describe IIIF::Presentation::ImageResource do
         # expect(resource['@context']).to eq 'http://iiif.io/api/presentation/2/context.json'
         # @context is only added when we call to_json...
         expect(resource['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
-        expect(resource['@type']).to eq 'dcterms:Image'
+        expect(resource['@type']).to eq 'dctypes:Image'
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
@@ -44,7 +44,7 @@ describe IIIF::Presentation::ImageResource do
         opts = { service_id: valid_service_id, copy_info: true }
         resource = described_class.create_image_api_image_resource(opts)
         expect(resource['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
-        expect(resource['@type']).to eq 'dcterms:Image'
+        expect(resource['@type']).to eq 'dctypes:Image'
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
@@ -119,5 +119,3 @@ describe IIIF::Presentation::ImageResource do
 
   end
 end
-
-

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'iiif/presentation'
+require 'simplecov'
 require 'coveralls'
 Dir["#{File.dirname(__FILE__)}/unit/iiif/presentation/shared_examples/*.rb"].each do |f|
   require f
@@ -11,7 +12,13 @@ VCR.configure do |c|
   c.configure_rspec_metadata!
 end
 
-Coveralls.wear!
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter 'spec/'
+end
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

data/spec/unit/iiif/presentation/image_resource_spec.rb

@@ -1,8 +1,8 @@
 describe IIIF::Presentation::ImageResource do
 
   describe '#initialize' do
-    it 'sets @type to dcterms:Image' do
-      expect(subject['@type']).to eq 'dcterms:Image'
+    it 'sets @type to dctypes:Image' do
+      expect(subject['@type']).to eq 'dctypes:Image'
     end
   end
 

data/spec/unit/iiif/service_spec.rb

@@ -1,10 +1,28 @@
 describe IIIF::Service do
 
   describe 'self#get_descendant_class_by_jld_type' do
+    before do
+      class DummyClass < IIIF::Service
+        TYPE = "sc:Collection"
+        def self.singleton_class?
+          true
+        end
+      end
+    end
+    after do
+      Object.send(:remove_const, :DummyClass)
+    end
     it 'gets the right class' do
       klass = described_class.get_descendant_class_by_jld_type('sc:Canvas')
       expect(klass).to be IIIF::Presentation::Canvas
     end
+    context "when there are singleton classes which are returned" do
+      it "gets the right class" do
+        allow(IIIF::Service).to receive(:descendants).and_return([DummyClass, IIIF::Presentation::Collection])
+        klass = described_class.get_descendant_class_by_jld_type('sc:Collection')
+        expect(klass).to be IIIF::Presentation::Collection
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iiif-presentation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Stroop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2017-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,16 +140,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 description: API for working with IIIF Presentation manifests.
 email:
 - jpstroop@gmail.com
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: API for working with IIIF Presentation manifests.
@@ -260,4 +260,3 @@ test_files:
 - spec/unit/iiif/presentation/shared_examples/int_only_keys.rb
 - spec/unit/iiif/presentation/shared_examples/string_only_keys.rb
 - spec/unit/iiif/service_spec.rb
-has_rdoc: