iiif-presentation 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40a8beab9d760a59d1bff41487a2f3329ade03e0
-  data.tar.gz: debe13d12cbc1634d28958521c6fe75525e049f5
+  metadata.gz: 136f2338c1c913c7a28bc3beff44986c274ff9a7
+  data.tar.gz: 286915f2245cce194b378b21a8790f39ccf0e16b
 SHA512:
-  metadata.gz: cd6967c2793fff9225183b77f4862c6ec01122c6b29866b0f402af1b05fb0401cfbb9577ed0c525bc3ba88a733b9d21bad18ba10c51bff6dc136d93172627a85
-  data.tar.gz: c584263143abdf9661b1dfde6f45e905f33b66b7bd4e1b26dcc5f466efad64385912e630dabf65b647b73b7b229ee03d045d70cc68ecc169eaf709cae29610f9
+  metadata.gz: 3ffb123653fe951624635cf0f7499f1a34e099a5e44b8a63f5fbae19b43751b3ce44337c251bd46c5337ca719d514a2f48fc87484309061bba18e63ccd227a50
+  data.tar.gz: 0c8acd7f1e9b253cd32ec90cbc855c9666d94552728e4d72858a7d751207c088aafa21a03522ab58c9308ea44e5e818b8bdcff3a326709103ef4c88bb1e79b3a

data/.travis.yml

@@ -2,6 +2,10 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.1.0
+install:
+  - "gem install bundler"
+  - "bundle install --jobs=3 --retry=3"
+
 gemfile:
   - gemfiles/rails3.gemfile
   - gemfiles/rails4.gemfile

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/iiif/hash_behaviours.rb

@@ -17,7 +17,7 @@ module IIIF
     ###
     # Methods that take a block and should return an instance (self or a new'
     # instance) have been overridden to do so, rather than an'
-    # ActiveSupport::OrderedHash based on the internal hash
+    # IIIF::OrderedHash based on the internal hash
 
     SIMPLE_SELF_RETURNERS = %w[delete_if each each_key each_value keep_if]
 

data/lib/{active_support → iiif}/ordered_hash.rb

@@ -1,7 +1,6 @@
 require 'active_support/inflector'
-require 'active_support/ordered_hash'
 
-module ActiveSupport
+module IIIF
   class OrderedHash < ::Hash
 
     # Insert a new key and value at the suppplied index.
@@ -14,7 +13,7 @@ module ActiveSupport
     # @param [Object] key
     # @param [Object] value
     def insert(index, key, value)
-      tmp = ActiveSupport::OrderedHash.new
+      tmp = IIIF::OrderedHash.new
       index = self.length + 1 + index if index < 0
       if index < 0
         m = "Index #{index} is too small for current length (#{length})"

data/lib/iiif/presentation.rb

@@ -15,6 +15,8 @@ abstract_resource
   require File.join(File.dirname(__FILE__), 'presentation', f)
 end
 
+require_relative 'ordered_hash'
+
 module IIIF
   module Presentation
     CONTEXT ||= 'http://iiif.io/api/presentation/2/context.json'

data/lib/iiif/service.rb

@@ -19,7 +19,7 @@ module IIIF
     def int_only_keys; %w{ }; end
 
     def initialize(hsh={})
-      @data = ActiveSupport::OrderedHash[hsh]
+      @data = IIIF::OrderedHash[hsh]
       self.define_methods_for_any_type_keys
       self.define_methods_for_array_only_keys
       self.define_methods_for_string_only_keys
@@ -34,11 +34,11 @@ module IIIF
       def parse(s)
         ordered_hash = nil
         if s.kind_of?(String) && File.exists?(s)
-          ordered_hash = ActiveSupport::OrderedHash[JSON.parse(IO.read(s))]
+          ordered_hash = IIIF::OrderedHash[JSON.parse(IO.read(s))]
         elsif s.kind_of?(String) && !File.exists?(s)
-          ordered_hash = ActiveSupport::OrderedHash[JSON.parse(s)]
+          ordered_hash = IIIF::OrderedHash[JSON.parse(s)]
         elsif s.kind_of?(Hash)
-          ordered_hash = ActiveSupport::OrderedHash[s]
+          ordered_hash = IIIF::OrderedHash[s]
         else
           m = '#parse takes a path to a file, a JSON String, or a Hash, '
           m += "argument was a #{s.class}."
@@ -111,7 +111,7 @@ module IIIF
         self.validate
       end
 
-      export_hash = ActiveSupport::OrderedHash.new
+      export_hash = IIIF::OrderedHash.new
 
       if sort_json_ld_keys
         self.keys.select { |k| k.start_with?('@') }.sort!.each do |k|
@@ -130,7 +130,7 @@ module IIIF
             export_hash[k] = self.data[k].to_ordered_hash(sub_opts)
 
           elsif self.data[k].kind_of?(Hash)
-            export_hash[k] = ActiveSupport::OrderedHash.new
+            export_hash[k] = IIIF::OrderedHash.new
             self.data[k].each do |sub_k, v|
 
               if v.respond_to?(:to_ordered_hash)
@@ -158,7 +158,7 @@ module IIIF
                 export_hash[k] << member.to_ordered_hash(sub_opts)
 
               elsif member.kind_of?(Hash)
-                hsh = ActiveSupport::OrderedHash.new
+                hsh = IIIF::OrderedHash.new
                 export_hash[k] << hsh
                 member.each do |sub_k,v|
 
@@ -196,7 +196,7 @@ module IIIF
       export_hash
     end
 
-    def self.from_ordered_hash(hsh, default_klass=ActiveSupport::OrderedHash)
+    def self.from_ordered_hash(hsh, default_klass=IIIF::OrderedHash)
       # Create a new object (new_object)
       type = nil
       if hsh.has_key?('@type')

data/spec/integration/iiif/service_spec.rb

@@ -24,9 +24,9 @@ describe IIIF::Service do
         s = described_class.parse(h)
         expect(s['label']).to eq 'Book 1'
       end
-      it 'ActiveSupport::OrderedHash' do
+      it 'IIIF::OrderedHash' do
         h = JSON.parse(IO.read(manifest_from_spec_path))
-        oh = ActiveSupport::OrderedHash[h]
+        oh = IIIF::OrderedHash[h]
         s = described_class.parse(oh)
         expect(s['label']).to eq 'Book 1'
       end
@@ -95,7 +95,7 @@ describe IIIF::Service do
       expect(parsed.class).to be expected_klass
     end
     it 'turns keys without "@type" into an OrderedHash' do
-      expected_klass = ActiveSupport::OrderedHash
+      expected_klass = IIIF::OrderedHash
       parsed = described_class.from_ordered_hash(fixture)
       expect(parsed['some_other_thing'].class).to be expected_klass
     end

data/spec/unit/iiif/hash_behaviours_spec.rb

@@ -7,7 +7,7 @@ describe IIIF::HashBehaviours do
       include IIIF::HashBehaviours
       attr_accessor :data # Accessible for easier expects...not sure you'd do this in a real class
       def initialize()
-        @data = ActiveSupport::OrderedHash.new
+        @data = IIIF::OrderedHash.new
       end
     end
   end

data/spec/unit/{active_support → iiif}/ordered_hash_spec.rb

@@ -1,4 +1,4 @@
-describe ActiveSupport::OrderedHash do
+describe IIIF::OrderedHash do
 
   describe '#camelize_keys' do
     before(:each) do
@@ -58,7 +58,7 @@ describe ActiveSupport::OrderedHash do
     let (:init_data) { [ ['wubble', 'fred'], ['baz', 'qux'], ['grault','garply'] ] }
     
     subject do 
-      hsh = ActiveSupport::OrderedHash.new
+      hsh = described_class.new
       init_data.each { |e| hsh[e[0]] = e[1] }
       hsh
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iiif-presentation
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Jon Stroop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,8 +168,8 @@ files:
 - gemfiles/rails3.gemfile
 - gemfiles/rails4.gemfile
 - iiif-presentation.gemspec
-- lib/active_support/ordered_hash.rb
 - lib/iiif/hash_behaviours.rb
+- lib/iiif/ordered_hash.rb
 - lib/iiif/presentation.rb
 - lib/iiif/presentation/abstract_resource.rb
 - lib/iiif/presentation/annotation.rb
@@ -190,8 +190,8 @@ files:
 - spec/integration/iiif/presentation/image_resource_spec.rb
 - spec/integration/iiif/service_spec.rb
 - spec/spec_helper.rb
-- spec/unit/active_support/ordered_hash_spec.rb
 - spec/unit/iiif/hash_behaviours_spec.rb
+- spec/unit/iiif/ordered_hash_spec.rb
 - spec/unit/iiif/presentation/abstract_resource_spec.rb
 - spec/unit/iiif/presentation/annotation_list_spec.rb
 - spec/unit/iiif/presentation/annotation_spec.rb
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: API for working with IIIF Presentation manifests.
@@ -241,8 +241,8 @@ test_files:
 - spec/integration/iiif/presentation/image_resource_spec.rb
 - spec/integration/iiif/service_spec.rb
 - spec/spec_helper.rb
-- spec/unit/active_support/ordered_hash_spec.rb
 - spec/unit/iiif/hash_behaviours_spec.rb
+- spec/unit/iiif/ordered_hash_spec.rb
 - spec/unit/iiif/presentation/abstract_resource_spec.rb
 - spec/unit/iiif/presentation/annotation_list_spec.rb
 - spec/unit/iiif/presentation/annotation_spec.rb