hydra-derivatives 1.0.0.beta1 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80810fa0b2485899158d367b925840c7919c70ae
-  data.tar.gz: 0711a06da2a40f7fe71450ec7d7efc94c79a3019
+  metadata.gz: a187e27d98d4794b3b08e838f1447ab327c3c087
+  data.tar.gz: af4f7cb52f6ba4baa4030fec666246c56d15f316
 SHA512:
-  metadata.gz: 4ded4fc1774ddd3d2088a179c8ca545783a338580533e5051b824497de769ea1ec102956b6232fa635478ca8112401fbe82620dad35ce1b75e8a3becf759fee4
-  data.tar.gz: 729a4e5397096b15f4b7f9c4ce28dc00780471ea2ad7b99010fa162d21fbfbec5aa28bacdb40d72ed1795c8453871eb134acb0958a9f71f56bcd63140a68b817
+  metadata.gz: 088f11cb8055706f5598635efa2cfa2b30f3c9cb68da5569b462fc416198a19aad676464fa3696e41d21810e00414033e1cca6cfb328e52772ca68cb39e33b4e
+  data.tar.gz: bb4f41955207630d92d09bc3c7e53b1a1a93b5c1e46efe711eb6136725d3205d02d7495a2be775b1e669bb6a8895c341d70fbda51de61adfafa1804e6dd9ec42

data/Rakefile

@@ -2,10 +2,8 @@
 
 require "bundler/gem_tasks"
 
-APP_ROOT="." # for jettywrapper
 require 'jettywrapper'
-JETTY_ZIP_BASENAME = 'fedora-4/master'
-Jettywrapper.url = "https://github.com/projecthydra/hydra-jetty/archive/#{JETTY_ZIP_BASENAME}.zip"
+Jettywrapper.hydra_jetty_version = "v8.1.0"
 
 # Dir.glob('tasks/*.rake').each { |r| import r }
 

data/VERSION

@@ -1 +1 @@
-1.0.0.beta1
+1.0.0.rc1

data/hydra-derivatives.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
 version = File.read(File.expand_path("../VERSION", __FILE__)).strip
 
-
 Gem::Specification.new do |spec|
   spec.name          = "hydra-derivatives"
-  spec.version       = version 
+  spec.version       = version
   spec.authors       = ["Justin Coyne"]
   spec.email         = ["justin@curationexperts.com"]
   spec.description   = %q{Derivative generation plugin for hydra}
@@ -22,11 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "jettywrapper"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'active-fedora', '~> 9.0.0.beta3'
+  spec.add_dependency 'active-fedora', '~> 9.0.0.rc2'
   spec.add_dependency 'hydra-file_characterization'
   spec.add_dependency 'mini_magick'
   spec.add_dependency 'activesupport', '>= 3.2.13', '< 5.0'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'deprecation'
 end
-

data/lib/hydra/derivatives/jpeg2k_image.rb

@@ -72,7 +72,7 @@ module Hydra
 
       def self.kdu_compress_recipe(args, quality, long_dim)
         if args[:recipe].is_a? Symbol
-          recipe = [args[:recipe].to_s, quality].join('_')
+          recipe = [args[:recipe].to_s, quality].join('_').to_sym
           if Hydra::Derivatives.kdu_compress_recipes.has_key? recipe
             return Hydra::Derivatives.kdu_compress_recipes[recipe]
           else

data/lib/hydra/derivatives/railtie.rb

@@ -1,7 +1,9 @@
-module Hydra::Derivative
-  class Railtie < Rails::Railtie
-    initializer 'hydra-derivative' do
-      require 'hydra-file_characterization'
+module Hydra
+  module Derivative
+    class Railtie < Rails::Railtie
+      initializer 'hydra-derivative' do
+        require 'hydra-file_characterization'
+      end
     end
   end
 end

data/spec/fixtures/jpeg2k_config.yml

@@ -1,13 +1,13 @@
 defaults: &defaults
   jp2_recipes:
     # note that these aren't real recipes, just enough to test configuration options
-    myrecipe_color: >
+    :myrecipe_color: >
       -rate 2.4
-      -jp2_space sRGB 
+      -jp2_space sRGB
       Stiles=\{1024,1024\}
-    myrecipe_grey: >
+    :myrecipe_grey: >
       -rate 2.4
-      -jp2_space sLUM 
+      -jp2_space sLUM
       Stiles=\{1024,1024\}
 
 development:

data/spec/units/jpeg2k_spec.rb

@@ -13,7 +13,7 @@ describe Hydra::Derivatives::Jpeg2kImage do
     it "calculates the compression rates for each quality layer" do
       compression_num = 10
       layers = 8
-      calc = Hydra::Derivatives::Jpeg2kImage.layer_rates(layers, compression_num) 
+      calc = Hydra::Derivatives::Jpeg2kImage.layer_rates(layers, compression_num)
       expect(calc).to eq("2.4,1.48331273,0.91675694,0.56659885,0.3501847,0.21643059,0.13376427,0.0826726")
     end
 
@@ -28,7 +28,7 @@ describe Hydra::Derivatives::Jpeg2kImage do
     it "can get the recipe from a config file" do
       args = { recipe: :myrecipe }
       r = Hydra::Derivatives::Jpeg2kImage.kdu_compress_recipe(args, 'grey', 7200)
-      expect(r).to eq(@sample_cfg['jp2_recipes']['myrecipe_grey'])
+      expect(r).to eq(@sample_cfg['jp2_recipes'][:myrecipe_grey])
     end
 
     it "can take a recipe as a string" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-derivatives
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta3
+        version: 9.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta3
+        version: 9.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: hydra-file_characterization
   requirement: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Derivative generation plugin for hydra
@@ -262,4 +262,3 @@ test_files:
 - spec/units/logger_spec.rb
 - spec/units/transcoding_spec.rb
 - spec/units/video_spec.rb
-has_rdoc: