hydra-head 3.1.0.rc1 → 3.1.0.rc2

data/HISTORY.textile

@@ -3,6 +3,7 @@ h3. 3.1.0
 * Update rake tasks to leverage jettywrapper
 * Don't fork processes to run tests
 * Refactor helpers, so that applications can easily override them
+* Remove Djatoka support
 
 h3. 3.0.1
 

data/app/controllers/get_controller.rb

@@ -13,17 +13,7 @@ class GetController < ApplicationController
         format.jp2 do 
           canonical_jp2 = downloadables( fedora_object, :canonical=>true, :mime_type=>"image/jp2" )
           jp2_content_url = "#{canonical_jp2.url}/content"
-          if params["image_server"]
-            if params["image_server"]["scale"] 
-              send_data Djatoka.scale(jp2_content_url, params["image_server"]["scale"]), :type=>"image/jpeg"
-            elsif   params["image_server"]["region"] 
-              send_data Djatoka.region(jp2_content_url, params["image_server"]["region"]), :type=>"image/jpeg"
-            else
-              send_data Djatoka.get_image(jp2_content_url, params["image_server"]["region"]), :type=>"image/jpeg"
-            end
-          else
-            send_datastream canonical_jp2
-          end
+          send_datastream canonical_jp2
         end
       end
       

data/app/views/_flash_msg.html.erb

@@ -0,0 +1,5 @@
+<% [:notice, :error, :alert].each do |type| %>
+  <% if flash[type] %>
+    <div class="ui-state-<%= type == :error ? 'error' : 'highlight' %> ui-corner-all <%= type.to_s %>"><%= flash[type] %></div>
+  <% end %>
+<% end %>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.0.rc1"
+  VERSION = "3.1.0.rc2"
 end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 15424103
+  hash: 15424097
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - rc
-  - 1
-  version: 3.1.0.rc1
+  - 2
+  version: 3.1.0.rc2
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -736,7 +736,6 @@ files:
 - app/helpers/hydra/downloads_helper_behavior.rb
 - app/helpers/hydra/generic_content_objects_helper_behavior.rb
 - app/helpers/hydra/hydra_assets_helper_behavior.rb
-- app/helpers/hydra/hydra_djatoka_helper_behavior.rb
 - app/helpers/hydra/hydra_fedora_metadata_helper_behavior.rb
 - app/helpers/hydra/hydra_helper_behavior.rb
 - app/helpers/hydra/hydra_uploader_helper_behavior.rb
@@ -745,7 +744,6 @@ files:
 - app/helpers/hydra/personalization_helper_behavior.rb
 - app/helpers/hydra/release_process_helper_behavior.rb
 - app/helpers/hydra_assets_helper.rb
-- app/helpers/hydra_djatoka_helper.rb
 - app/helpers/hydra_fedora_metadata_helper.rb
 - app/helpers/hydra_helper.rb
 - app/helpers/hydra_uploader_helper.rb
@@ -765,6 +763,7 @@ files:
 - app/models/uses_default_partials.rb
 - app/models/video_asset.rb
 - app/views/_add_assets_links.html.erb
+- app/views/_flash_msg.html.erb
 - app/views/_user_util_links.html.erb
 - app/views/catalog/_citation.html.erb
 - app/views/catalog/_constraints_element.html.erb
@@ -774,7 +773,6 @@ files:
 - app/views/catalog/_edit_partials/_default_details.html.erb
 - app/views/catalog/_email_form.html.erb
 - app/views/catalog/_facets.html.erb
-- app/views/catalog/_flash_msg.html.erb
 - app/views/catalog/_home.html.erb
 - app/views/catalog/_home_text.html.erb
 - app/views/catalog/_index_partials/_default.html.erb
@@ -946,7 +944,6 @@ files:
 - lib/blacklight/blacklight_helper_behavior.rb
 - lib/blacklight/catalog_helper.rb
 - lib/block_mapper.rb
-- lib/djatoka.rb
 - lib/ead_mapper.rb
 - lib/field_maps.rb
 - lib/generators/hydra/assets_generator.rb
@@ -1107,7 +1104,6 @@ files:
 - test_support/spec/helpers/file_assets_helper_spec.rb
 - test_support/spec/helpers/hydra-repository_controller_spec.rb
 - test_support/spec/helpers/hydra_assets_helper_spec.rb
-- test_support/spec/helpers/hydra_djatoka_helper_spec.rb
 - test_support/spec/helpers/hydra_fedora_metadata_helper_spec.rb
 - test_support/spec/helpers/hydra_helper_spec.rb
 - test_support/spec/helpers/hydra_model_methods_spec.rb

data/app/helpers/hydra/hydra_djatoka_helper_behavior.rb

@@ -1,23 +0,0 @@
-module Hydra::HydraDjatokaHelperBehavior
-  
-  def hydra_djatoka_url_for(document, opts={})
-    
-    if document.kind_of?(SolrDocument)
-      pid = document.id
-    elsif document.kind_of?(Mash) 
-      pid = document[:id]
-    elsif document.respond_to?(:pid)
-        pid = document.pid
-    end
-    
-    if !pid.nil?
-      if opts[:scale]
-        result = url_for(:controller=>:get,:action=>"show",:id=>pid, :format=>"jp2", "image_server[scale]"=>opts[:scale])
-      else
-        result = url_for(:controller=>:get,:action=>"show",:id=>pid, :format=>"jp2", "image_server"=>true)
-      end
-    end
-      
-  end
-  
-end

data/app/helpers/hydra_djatoka_helper.rb

@@ -1,4 +0,0 @@
-module HydraDjatokaHelper
-  include Hydra::HydraDjatokaHelperBehavior
-end
-

data/app/views/catalog/_flash_msg.html.erb

@@ -1,17 +0,0 @@
-<% if flash_notice = flash[:notice] %>
-  <div class="notice">
-    <% flash_notice.each do |message| %>
-      <div class="message"><%= message %></div>
-    <% end %>
-  </div>
-<% end %>
-<% if flash_error = flash[:error] %>
-  <div class="error">
-    <h4>Errors</h4>
-    <ul>
-    <% flash_error.each do |message| %>
-      <li class="message"><%= message %></li>
-    <% end %>
-    </ul>
-  </div>
-<% end %>

data/lib/djatoka.rb

@@ -1,59 +0,0 @@
-require "httparty"
-class Djatoka
-  include HTTParty
-  # base_uri 'http://salt-dev.stanford.edu:8080/adore-djatoka/resolver'
-  base_uri "http://localhost:8080/adore-djatoka/resolver"
-  default_params :url_ver => 'Z39.88-2004', :svc_val_fmt=> "info:ofi/fmt:kev:mtx:jpeg2000"
-  
-  # Uses Djatoka to scale the image from @source_url according to @scale_value
-  # Accepts optional hash that will be passed through to djatoka as-is
-  # scale_value is passed through to djatoka as svc.scale.
-  # From the Djatoka docs:
-  # svc.scale - Request specific output size by scaling extracted resource.
-  # Option 1) Define a long-side dimension (e.g., svc.scale=96)
-  # * Nearest resolution level, rounded up, is used for level parameter
-  # * Uses the aspect ratio to calculate second value
-  # Option 2) Define absolute w,h values (e.g. 1024,768)
-  # * Images is scaled to the dimensions you specify.
-  # * Value must be less than 2X current resolution
-  # Option 3) Define a single dimension (e.g. 1024,0) with or without Level Parameter
-  # * Uses the aspect ratio to calculate second value
-  # Option 4) Use a single decimal scaling factor (e.g. 0.854)
-  # * Current resolution = 1.0
-  # * 50% Resolution = 0.5
-  # * 150% Resolution = 1.5
-  # * Value must be greater than 0 and less than 2
-  def self.scale(source_url, scale_value, options={})
-    options.merge!("svc.scale"=>scale_value)
-    get_image(source_url, options)
-  end
-  
-  # Uses Djatoka to retrieve a redion of the image from @source_url according to @scale_value
-  # Accepts optional hash that will be passed through to djatoka as-is
-  # scale_value is passed through to djatoka as svc.scale.
-  # From the Djatoka docs:
-  # svc.region - Y,X,H,W.
-  # * Y is the down inset value (positive) from 0 on the y axis at the max image resolution.
-  # * X is the right inset value (positive) from 0 on the x axis at the max image resolution.
-  # * H is the height of the image provided as response.
-  # * W is the width of the image provided as response.
-  # * All values may either be absolute pixel values (e.g. 100,100,256,256), float values (e.g. 0.1,0.1,0.1,0.1), or a combination (e.g. 0.1,0.1,256,256).
-  def self.region(source_url, region_value, options={})
-    options.merge!("svc.region"=>region_value)
-    get_image(source_url, options)
-  end
-  
-  def self.get_image(source_url, options={})
-    options.merge!({:svc_id => "info:lanl-repo/svc/getRegion", :rft_id=>source_url, "svc.format"=>"image/jpeg"})
-    puts "get_region options: #{options.inspect}"
-    get("", :query => options)
-  end
-  
-end
-
-# url_ver=Z39.88-2004
-# &rft_id=http://memory.loc.gov/gmd/gmd433/g4330/g4330/np000066.jp2
-# &svc_id=info:lanl-repo/svc/getRegion
-# &svc_val_fmt=info:ofi/fmt:kev:mtx:jpeg2000
-# &svc.format=image/jpeg
-#     &svc.scale=600

data/test_support/spec/helpers/hydra_djatoka_helper_spec.rb

@@ -1,34 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-include HydraDjatokaHelper
-
-
-describe HydraDjatokaHelper do
-  
-  describe "hydra_djatoka_url_for" do
-    it "should return the url for retrieving the given document's canonical jp2 url" do
-      mock_doc = mock("document")
-      mock_doc.expects(:kind_of?).with(SolrDocument).returns(true)
-      mock_doc.expects(:id).returns("myPid")
-
-      hydra_djatoka_url_for(mock_doc).should == "/get/myPid.jp2?image_server=true"
-    end
-    it "should work with a mash as the document" do
-      mock_doc = mock("document")
-      mock_doc.expects(:kind_of?).with(SolrDocument).returns(false)
-      mock_doc.expects(:kind_of?).with(Mash).returns(true)      
-      mock_doc.expects(:[]).with(:id).returns("myPid")
-
-      hydra_djatoka_url_for(mock_doc).should == "/get/myPid.jp2?image_server=true"
-    end
-    it "should accept scale arguments" do
-      mock_doc = mock("document")
-      mock_doc.expects(:kind_of?).with(SolrDocument).returns(true)
-      mock_doc.expects(:id).returns("myPid")
-      # rails 3.1.x
-      # hydra_djatoka_url_for(mock_doc, :scale=>"90").should == "/get/myPid.jp2?image_server%5Bscale%5D=90"
-      # rails 3.0.x
-      hydra_djatoka_url_for(mock_doc, :scale=>"90").should == "/get/myPid.jp2?image_server[scale]=90"
-    end
-  end
-  
-end