hydra-head 4.0.0.rc2 → 4.0.0.rc3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-head
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70204953136400 !ruby/object:Gem::Requirement
+  requirement: &70261450818920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70204953136400
+  version_requirements: *70261450818920
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: &70204953135580 !ruby/object:Gem::Requirement
+  requirement: &70261450817940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70204953135580
+  version_requirements: *70261450817940
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70204953134760 !ruby/object:Gem::Requirement
+  requirement: &70261450817260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204953134760
+  version_requirements: *70261450817260
 - !ruby/object:Gem::Dependency
   name: active-fedora
-  requirement: &70204953134160 !ruby/object:Gem::Requirement
+  requirement: &70261450816280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc13
+        version: 4.0.0.rc18
   type: :runtime
   prerelease: false
-  version_requirements: *70204953134160
+  version_requirements: *70261450816280
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70204953133460 !ruby/object:Gem::Requirement
+  requirement: &70261450815340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,10 +66,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70204953133460
+  version_requirements: *70261450815340
 - !ruby/object:Gem::Dependency
   name: solrizer-fedora
-  requirement: &70204953132760 !ruby/object:Gem::Requirement
+  requirement: &70261450814520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70204953132760
+  version_requirements: *70261450814520
 - !ruby/object:Gem::Dependency
   name: block_helpers
-  requirement: &70204953148640 !ruby/object:Gem::Requirement
+  requirement: &70261450813780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204953148640
+  version_requirements: *70261450813780
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &70204953148160 !ruby/object:Gem::Requirement
+  requirement: &70261450812920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,21 +99,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204953148160
+  version_requirements: *70261450812920
 - !ruby/object:Gem::Dependency
-  name: om
-  requirement: &70204953147620 !ruby/object:Gem::Requirement
+  name: cancan
+  requirement: &70261450812300 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70204953147620
+  version_requirements: *70261450812300
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70204953147180 !ruby/object:Gem::Requirement
+  requirement: &70261450811800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204953147180
+  version_requirements: *70261450811800
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70204953146640 !ruby/object:Gem::Requirement
+  requirement: &70261450827640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204953146640
+  version_requirements: *70261450827640
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70204953146120 !ruby/object:Gem::Requirement
+  requirement: &70261450826800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,21 +143,21 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70204953146120
+  version_requirements: *70261450826800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70204953145600 !ruby/object:Gem::Requirement
+  requirement: &70261450826060 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204953145600
+  version_requirements: *70261450826060
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70204953145200 !ruby/object:Gem::Requirement
+  requirement: &70261450825200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204953145200
+  version_requirements: *70261450825200
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &70204953144640 !ruby/object:Gem::Requirement
+  requirement: &70261450824560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70204953144640
+  version_requirements: *70261450824560
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70204953144160 !ruby/object:Gem::Requirement
+  requirement: &70261450824020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,7 +187,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70204953144160
+  version_requirements: *70261450824020
 description: ! 'Hydra-Head is a Rails Engine containing the core code for a Hydra
   application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora,
   solrizer, and om'
@@ -296,6 +296,7 @@ files:
 - app/assets/stylesheets/redmond/images/ui-icons_f9bd01_256x240.png
 - app/assets/stylesheets/redmond/jquery-ui-1.8.5.custom.css
 - app/controllers/downloads_controller.rb
+- app/controllers/hydra/application_controller.rb
 - app/controllers/hydra/assets_controller.rb
 - app/controllers/hydra/contributors_controller.rb
 - app/controllers/hydra/file_assets_controller.rb
@@ -327,11 +328,18 @@ files:
 - app/helpers/javascript_includes_helper.rb
 - app/helpers/personalization_helper.rb
 - app/helpers/release_process_helper.rb
+- app/models/ability.rb
 - app/models/audio_asset.rb
 - app/models/common_metadata_asset.rb
 - app/models/file_asset.rb
 - app/models/generic_content.rb
 - app/models/generic_image.rb
+- app/models/hydra/datastream/common_mods_index_methods.rb
+- app/models/hydra/datastream/mods_article.rb
+- app/models/hydra/datastream/mods_dataset.rb
+- app/models/hydra/datastream/mods_generic_content.rb
+- app/models/hydra/datastream/mods_image.rb
+- app/models/hydra/datastream/rights_metadata.rb
 - app/models/image_asset.rb
 - app/models/mods_asset.rb
 - app/models/role_mapper.rb
@@ -484,7 +492,6 @@ files:
 - lib/hydra/generic_content.rb
 - lib/hydra/generic_image.rb
 - lib/hydra/generic_user_attributes.rb
-- lib/hydra/image.rb
 - lib/hydra/model_methods.rb
 - lib/hydra/model_mixins.rb
 - lib/hydra/model_mixins/common_metadata.rb
@@ -505,6 +512,7 @@ files:
 - lib/hydra/workflow/controller.rb
 - lib/marc_mapper.rb
 - lib/marc_record_ext.rb
+- lib/mediashelf/active_fedora_helper.rb
 - lib/prev_next_links.rb
 - lib/railties/active-fedora.rake
 - lib/railties/all_tests.rake
@@ -621,6 +629,7 @@ files:
 - test_support/spec/lib/catalog_spec.rb
 - test_support/spec/lib/common_mods_index_methods_spec.rb
 - test_support/spec/lib/hydra_submission_workflow_spec.rb
+- test_support/spec/models/ability_spec.rb
 - test_support/spec/models/audio_asset_spec.rb
 - test_support/spec/models/file_asset_spec.rb
 - test_support/spec/models/generic_content_spec.rb
@@ -639,11 +648,10 @@ files:
 - test_support/spec/unit/hydra-head-engine_spec.rb
 - test_support/spec/unit/hydra-head_spec.rb
 - tmp/.placeholder
-- uninstall.rb
 - vendor/cache/RedCloth-4.2.9.gem
 - vendor/cache/actionmailer-3.2.2.gem
 - vendor/cache/actionpack-3.2.2.gem
-- vendor/cache/active-fedora-4.0.0.rc13.gem
+- vendor/cache/active-fedora-4.0.0.rc18.gem
 - vendor/cache/activemodel-3.2.2.gem
 - vendor/cache/activerecord-3.2.2.gem
 - vendor/cache/activeresource-3.2.2.gem
@@ -652,12 +660,16 @@ files:
 - vendor/cache/akami-1.0.0.gem
 - vendor/cache/arel-3.0.2.gem
 - vendor/cache/bcrypt-ruby-3.0.1.gem
+- vendor/cache/blacklight-3.3.1.gem
 - vendor/cache/block_helpers-0.3.3.gem
 - vendor/cache/builder-3.0.0.gem
+- vendor/cache/cancan-1.6.7.gem
 - vendor/cache/capybara-1.1.2.gem
 - vendor/cache/childprocess-0.3.1.gem
 - vendor/cache/chunky_png-1.2.5.gem
-- vendor/cache/compass-0.12.rc.1.gem
+- vendor/cache/compass-0.12.1.gem
+- vendor/cache/compass-rails-1.0.1.gem
+- vendor/cache/compass-susy-plugin-0.9.gem
 - vendor/cache/cucumber-1.1.9.gem
 - vendor/cache/cucumber-rails-1.3.0.gem
 - vendor/cache/daemons-1.1.8.gem
@@ -665,11 +677,11 @@ files:
 - vendor/cache/diff-lcs-1.1.3.gem
 - vendor/cache/equivalent-xml-0.2.9.gem
 - vendor/cache/erubis-2.7.0.gem
-- vendor/cache/factory_girl-2.6.1.gem
+- vendor/cache/factory_girl-2.6.4.gem
 - vendor/cache/fastercsv-1.5.4.gem
 - vendor/cache/ffi-1.0.11.gem
 - vendor/cache/fssm-0.2.8.1.gem
-- vendor/cache/gherkin-2.9.0.gem
+- vendor/cache/gherkin-2.9.1.gem
 - vendor/cache/gyoku-0.4.4.gem
 - vendor/cache/hike-1.2.1.gem
 - vendor/cache/httpi-0.9.6.gem
@@ -679,7 +691,7 @@ files:
 - vendor/cache/json-1.6.5.gem
 - vendor/cache/kaminari-0.13.0.gem
 - vendor/cache/logger-1.2.8.gem
-- vendor/cache/mail-2.4.3.gem
+- vendor/cache/mail-2.4.4.gem
 - vendor/cache/marc-0.4.4.gem
 - vendor/cache/mediashelf-loggable-0.4.9.gem
 - vendor/cache/metaclass-0.0.1.gem
@@ -687,13 +699,13 @@ files:
 - vendor/cache/mocha-0.10.5.gem
 - vendor/cache/multi_json-1.1.0.gem
 - vendor/cache/multipart-post-1.1.2.gem
-- vendor/cache/nokogiri-1.5.0.gem
+- vendor/cache/nokogiri-1.5.2.gem
 - vendor/cache/nori-1.1.0.gem
-- vendor/cache/om-1.5.3.gem
-- vendor/cache/orm_adapter-0.0.6.gem
+- vendor/cache/om-1.6.0.rc3.gem
+- vendor/cache/orm_adapter-0.0.7.gem
 - vendor/cache/polyglot-0.3.3.gem
 - vendor/cache/rack-1.4.1.gem
-- vendor/cache/rack-cache-1.1.gem
+- vendor/cache/rack-cache-1.2.gem
 - vendor/cache/rack-ssl-1.3.2.gem
 - vendor/cache/rack-test-0.6.1.gem
 - vendor/cache/rails-3.2.2.gem
@@ -705,16 +717,16 @@ files:
 - vendor/cache/rest-client-1.6.7.gem
 - vendor/cache/rsolr-1.0.6.gem
 - vendor/cache/rsolr-ext-1.0.3.gem
-- vendor/cache/rspec-2.6.0.gem
-- vendor/cache/rspec-core-2.6.4.gem
-- vendor/cache/rspec-expectations-2.6.0.gem
-- vendor/cache/rspec-mocks-2.6.0.gem
-- vendor/cache/rspec-rails-2.6.1.gem
+- vendor/cache/rspec-2.9.0.gem
+- vendor/cache/rspec-core-2.9.0.gem
+- vendor/cache/rspec-expectations-2.9.0.gem
+- vendor/cache/rspec-mocks-2.9.0.gem
+- vendor/cache/rspec-rails-2.9.0.gem
 - vendor/cache/rubydora-0.5.7.gem
 - vendor/cache/rubyzip-0.9.6.1.gem
 - vendor/cache/sanitize-2.0.3.gem
 - vendor/cache/sass-3.1.15.gem
-- vendor/cache/sass-rails-3.2.4.gem
+- vendor/cache/sass-rails-3.2.5.gem
 - vendor/cache/savon-0.9.9.gem
 - vendor/cache/selenium-webdriver-2.20.0.gem
 - vendor/cache/solr-ruby-0.0.8.gem
@@ -723,7 +735,7 @@ files:
 - vendor/cache/sprockets-2.1.2.gem
 - vendor/cache/sqlite3-1.3.5.gem
 - vendor/cache/sqlite3-ruby-1.3.3.gem
-- vendor/cache/stomp-1.2.1.gem
+- vendor/cache/stomp-1.2.2.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
 - vendor/cache/thor-0.14.6.gem
 - vendor/cache/tilt-1.3.3.gem

data/lib/hydra/image.rb

@@ -1,178 +0,0 @@
-# Hydra::Image
-#
-# Default content datastreams: MASTER, MAX, THUMBNAIL, SCREEN
-#
-# Sample Usages:
-#
-# Generate an image and then assign an image to it:
-# hi = Hydra::Image.new(:derivatives=>true)
-# f = File.new("/path/to/image.tiff")
-# hi.image=f
-# 
-# Generate an image from a url:
-# hi = Hydra::Image.new(:file=>"http://example.com/some_image.jpg", :derivatives=>true)
-# 
-#
-# Generate an image from a file:
-# f = File.new("/path/to/image.tiff")
-# hi = Hydra::Image.new(:file=>f, :derivatives=>true)
-#
-# Generate an image with alternate resizing:
-# hi = Hydra::Image.new(:file=>file)
-# hi.derivations = {:thumbnail=> {:op => "resize", :newWidth => 75 }
-# hi.send(:generate_derivatives)
-#
-
-# require "hydra"
-# require "httparty"
-
-module Hydra
-class Image < ActiveFedora::Base
-  include Hydra::ModelMethods
-  include HTTParty
-
-  class Hydra::Image::NoFileError < RuntimeError; end;
-  class Hydra::Image::UnknownImageType < RuntimeError; end;
-
-  DEFAULT_IMAGE_DATASTREAMS = ["MASTER","MAX","THUMBNAIL","SCREEN"]
-
-  DS_DEFAULTS = {
-    :max => {:op => "convert", :convertTo => "jpg"},
-    :thumbnail => {:op => "resize",:newWidth=> 100},
-    :screen => {:op => "resize", :newWidth => 960}
-  }
-
-  attr_accessor :derivations, :generate_derived_images
-
-  def initialize( attrs={})
-    ActiveSupport::Deprecation.warn("Hydra:Image will be removed in the next version")
-    existing_image = true if attrs[:pid]
-    @generate_derived_images = attrs[:derivatives] ? attrs[:derivatives] : false
-    super
-    unless existing_image
-      if attrs.has_key?(:file) #&& attrs[:file].class == File
-        self.image = attrs[:file]
-        attrs.delete(:file)
-      elsif attrs.has_key?(:stream) && attrs.has_key?(:image_type)
-        data = attrs[:stream]
-        attrs.delete(:stream)
-        self.image = data, attrs[:image_type]
-      else
-        #raise Hydra::Image::NoFileError, "No file indicated."
-      end
-    end
-  end
-
-  has_relationship "parts", :is_part_of, :inbound => true
-  
-  # Uses the Hydra Rights Metadata Schema for tracking access permissions & copyright
-  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata 
-
-  # A place to put extra metadata values
-  has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
-    m.field 'collection', :string
-    m.field 'depositor', :string
-  end
-
-  def image=(image_data)
-    delete_file_datastreams
-    case image_data
-      when File
-        master_from_file image_data
-      when Array
-        needs_cleanup = true
-        image_file =  string_to_file(image_data[0],"MASTER",image_data[1])
-        master_from_file image_file
-      when String
-        master_from_url image_data
-      else
-        raise Hydra::Image::UnknownImageType, "Specified image is neither a file nor an appropriate image blob: #{image_data.class.to_s}"
-    end
-    save
-    File.delete(image_file.path) if needs_cleanup
-    generate_derivatives if @generate_derived_images
-  end
-
-  def ds_options
-    if @derivations
-      return DS_DEFAULTS.merge( @derivations )
-    else
-      return DS_DEFAULTS
-    end
-  end
-
-  def derivative_datastream ds_name
-    opts = ds_options[ds_name]
-    ds_location = derivation_url(ds_name, opts)
-    ds = ActiveFedora::Datastream.new(:dsid => ds_name.to_s.upcase, :label => ds_name.to_s.upcase, :dsLocation => ds_location, :controlGroup => "M", :mimeType => "image/jpeg")
-    add_datastream(ds)
-    save
-  end
-
-  DEFAULT_IMAGE_DATASTREAMS.each do |m|
-    class_eval <<-EOM
-      def has_#{m.downcase}?
-        self.datastreams.keys.include? "#{m}"
-      end
-
-      def #{m.downcase}
-        datastreams["#{m}"].content if has_#{m.downcase}?
-      end
-    EOM
-  end
-
-  private
-
-  def master_from_file image_file
-    add_file_datastream(image_file,:dsid=>"MASTER",:label=>"MASTER")
-    
-  end
-
-  def master_from_url url
-    puts "creating datastream object for: #{url}"
-    mime_types = MIME::Types.of(url.split(/\//).last)
-    mime_type ||= mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-    ds = ActiveFedora::Datastream.new(:dsid=> "MASTER", :label => "MASTER", :controlGroup => "M", :dsLocation => url, :mimeType=>mime_type)
-    add_datastream(ds)
-    save
-  end
-
-  def generate_derivatives
-    DEFAULT_IMAGE_DATASTREAMS.each {|ds| derivative_datastream ds.downcase.to_sym unless ds == "MASTER"}
-  end
-
-  def delete_file_datastreams
-    DEFAULT_IMAGE_DATASTREAMS.each {|ds_name| datastreams[ds_name].delete if datastreams.has_key? ds_name}
-  end
-
-  def derivation_url ds_name, opts={}
-    source_ds_name = ds_name == :max ? "MASTER" : "MAX"
-    if ds_name == :max && datastreams["MASTER"].mimeType == "image/jpeg"
-      url = datastream_url(source_ds_name)
-    else
-      opts_array=[]
-      opts.merge!(:url => datastream_url(source_ds_name)).each{|k,v| opts_array << "#{k}=#{v}" }
-      url = "#{admin_site}imagemanip/ImageManipulation?" + opts_array.join("&")
-    end
-    return url
-  end
-
-  def admin_site
-    Fedora::Repository.instance.send(:connection).site.to_s.gsub(/fedora$/,"")
-  end
-
-  def string_to_file blob, suffix, ext=nil
-    file_name = Time.now.strftime("%Y%m%d-%H%M%S")
-    ext = "jpg" unless suffix == "MASTER"
-    f = File.new("#{Rails.root}/tmp/#{file_name}-#{suffix}.#{ext}","w")
-    f.write blob
-    f.close
-    return f
-  end
-
-  def datastream_url ds_name="MASTER"
-    "#{admin_site}fedora/objects/#{pid}/datastreams/#{ds_name}/content"
-  end
-
-end
-end

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here