hydra-core 5.2.0 → 5.3.0

data/lib/generators/hydra/head_generator.rb

@@ -45,9 +45,6 @@ class HeadGenerator < Rails::Generators::Base
     copy_file "config/role_map_production.yml", "config/role_map_production.yml"
     copy_file "config/role_map_test.yml", "config/role_map_test.yml"
    
-    # Solr Mappings
-    copy_file "config/solr_mappings.yml", "config/solr_mappings.yml"
-
     # Fedora & Solr YAML files
     begin
       invoke('active_fedora:config')

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "5.2.0"
+  VERSION = "5.3.0"
 end
 

data/lib/hydra/controller/upload_behavior.rb

@@ -32,11 +32,7 @@ module Hydra::Controller::UploadBehavior
     # deprecating 2 argument constructor because it depends on a HTTP request.  If we pass the file name we can use for non-web too.
     Deprecation.warn(Hydra::Controller::UploadBehavior, "add_posted_blob_to_asset with a 2 argument constructor is deprecated. Pass a filename (e.g. \"file.original_name\") as the third argument. 2 argument constructor will be removed in hydra-core 6" ) if file_name.nil?
     file_name ||= file.original_filename
-    options = {:label=>file_name, :mimeType=>mime_type(file_name)}
-    dsid = datastream_id #Only call this once so that it could be a sequence
-    options[:dsid] = dsid if dsid
-    asset.add_file_datastream(file, options)
-    asset.set_title_and_label( file_name, :only_if_blank=>true )
+    asset.add_file(file, datastream_id, file_name)
   end
 
   #Override this if you want to specify the datastream_id (dsID) for the created blob
@@ -58,13 +54,4 @@ module Hydra::Controller::UploadBehavior
   deprecation_deprecate :associate_file_asset_with_container
   
   
-  private
-  # Return the mimeType for a given file name
-  # @param [String] file_name The filename to use to get the mimeType
-  # @return [String] mimeType for filename passed in. Default: application/octet-stream if mimeType cannot be determined
-  def mime_type file_name
-    mime_types = MIME::Types.of(file_name)
-    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
-  end
-  
 end

data/lib/hydra/model_methods.rb

@@ -1,6 +1,7 @@
 # will move to lib/hydra/model/model_behavior.rb  (with appropriate namespace changes) in release 5.x
 module Hydra::ModelMethods
   extend ActiveSupport::Concern
+  extend Deprecation
 
   included do
     unless self.class ==  Module
@@ -26,6 +27,21 @@ module Hydra::ModelMethods
     return true
   end
 
+  # Puts the contents of file (posted blob) into a datastream and sets the title and label 
+  # Sets asset label and title to filename if they're empty
+  #
+  # @param [#read] file the IO object that is the blob
+  # @param [String] file the IO object that is the blob
+  def add_file(file, dsid, file_name)
+    mime_types = MIME::Types.of(file_name)
+    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
+    options = {:label=>file_name, :mimeType=>mime_type}
+    options[:dsid] = dsid if dsid
+    add_file_datastream(file, options)
+    set_title_and_label( file_name, :only_if_blank=>true )
+  end
+
+
   #
   # Set the collection type (e.g. hydrangea_article) for the asset
   #
@@ -35,6 +51,7 @@ module Hydra::ModelMethods
       prop_ds.collection_values = collection
     end
   end
+  deprecation_deprecate :set_collection_type
   
   # Set the title and label on the current object
   #
@@ -70,20 +87,6 @@ module Hydra::ModelMethods
     end
   end
 
-  # Call insert_contributor on the descMetadata datastream
-  def insert_contributor(type, opts={})
-    ds = self.datastreams["descMetadata"]
-    node, index = ds.insert_contributor(type,opts)
-    return node, index
-  end
-  
-  # Call remove_contributor on the descMetadata datastream
-  def remove_contributor(type, index)
-    ds = self.datastreams["descMetadata"]
-    result = ds.remove_contributor(type,index)
-    return result
-  end
-  
   # Call to remove file objects
   def destroy_child_assets
     destroyable_child_assets.each.inject([]) do |destroyed,fo|
@@ -93,6 +96,8 @@ module Hydra::ModelMethods
     end
 
   end
+  deprecation_deprecate :destroy_child_assets
+  
 
   def destroyable_child_assets
     return [] unless self.parts
@@ -104,9 +109,12 @@ module Hydra::ModelMethods
       file_assets
     end
   end
+  deprecation_deprecate :destroyable_child_assets
 
   def file_asset_count
     ### TODO switch to AF::Base.count
     parts.length
   end
+  deprecation_deprecate :file_asset_count
+
 end

data/lib/hydra/models/file_asset.rb

@@ -70,7 +70,6 @@ module Hydra
           super(solr_doc,opts)
         end
       end
-
     end
   end
 end

data/spec/helpers/upload_behavior_spec.rb

@@ -14,9 +14,7 @@ describe Hydra::Controller::UploadBehavior do
       mock_fa = mock("file asset")
       mock_file.should_receive(:original_filename).and_return(file_name)
       helper.stub(:datastream_id).and_return('bar')
-      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
-      mock_fa.should_receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
-      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
+      mock_fa.should_receive(:add_file).with(mock_file, 'bar', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file) # this is the deprecated 2 argument method
     end
     
@@ -26,9 +24,7 @@ describe Hydra::Controller::UploadBehavior do
       helper.stub(:params).and_return( :Filedata=>[mock_file], :Filename=>file_name, "container_id"=>"hydrangea:2973" )      
       mock_fa = mock("file asset")
       mock_file.should_receive(:original_filename).and_return(file_name)
-      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
-      mock_fa.stub(:set_title_and_label)
-      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
+      mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file)
     end
     it "should support submissions from single-file uploader, defaulting to dsId of content" do
@@ -37,9 +33,7 @@ describe Hydra::Controller::UploadBehavior do
       helper.stub(:params).and_return( :Filedata=>[mock_file], :container_id=>"hydrangea:2973" )      
       mock_file.should_receive(:original_filename).and_return(file_name)
       mock_fa = mock("file asset")
-      helper.should_receive(:mime_type).with(file_name).and_return("mymimetype")
-      mock_fa.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid => 'content')
-      mock_fa.stub(:set_title_and_label)
+      mock_fa.should_receive(:add_file).with(mock_file, 'content', file_name)
       helper.add_posted_blob_to_asset(mock_fa,mock_file)
     end
   end

data/spec/lib/model_methods_spec.rb

@@ -10,8 +10,9 @@ describe Hydra::ModelMethods do
     end
   end
 
+  subject {TestModel.new }
+
   describe "apply_depositor_metadata" do
-    subject {TestModel.new }
     it "should add edit access" do
       subject.apply_depositor_metadata('naomi')
       subject.rightsMetadata.individuals.should == {'naomi' => 'edit'}
@@ -31,4 +32,15 @@ describe Hydra::ModelMethods do
       subject.properties.depositor.should == ['monty']
     end
   end
+
+  describe 'add_file' do
+    it "should set the dsid, mimetype and content" do
+      file_name = "my_file.foo"
+      mock_file = "File contents"
+      subject.should_receive(:add_file_datastream).with(mock_file, :label=>file_name, :mimeType=>"mymimetype", :dsid=>'bar')
+      subject.should_receive(:set_title_and_label).with( file_name, :only_if_blank=>true )
+      MIME::Types.should_receive(:of).with(file_name).and_return([stub(:content_type=>"mymimetype")])
+      subject.add_file(mock_file, 'bar', file_name)
+    end
+  end
 end

data/spec/models/file_asset_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe FileAsset do
+  
+  before(:each) do
+    @file_asset = FileAsset.new
+    @file_asset.stub(:create_date).and_return("2008-07-02T05:09:42.015Z")
+    @file_asset.stub(:modified_date).and_return("2008-09-29T21:21:52.892Z")
+  end
+  
+  it "Should be a kind of ActiveFedora::Base" do
+    @file_asset.should be_kind_of(ActiveFedora::Base)
+  end
+  
+  it "should include Hydra Model Methods" do
+    @file_asset.class.included_modules.should include(Hydra::ModelMethods)
+    @file_asset.should respond_to(:apply_depositor_metadata)
+  end
+  
+  describe 'label' do
+    asset = FileAsset.new
+    asset.label = 'image.jp2'
+    asset.label.should == 'image.jp2'
+  end
+end

data/spec/support/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.11'
 
 gem 'sqlite3'
 
@@ -9,4 +9,4 @@ gem 'blacklight'
 gem 'hydra-access-controls', :path=>'../../../hydra-access-controls'
 gem 'hydra-core', :path=>'../../', :require=>'hydra-core'
 gem 'rspec-rails'
-gem 'factory_girl_rails', "<2.0.0" # >=2.0.0 requires ruby 1.9
+gem 'factory_girl_rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -335,7 +335,6 @@ files:
 - lib/generators/hydra/templates/config/role_map_production.yml
 - lib/generators/hydra/templates/config/role_map_test.yml
 - lib/generators/hydra/templates/config/solr.yml
-- lib/generators/hydra/templates/config/solr_mappings.yml
 - lib/generators/hydra/templates/fedora_conf/conf/development/fedora.fcfg
 - lib/generators/hydra/templates/fedora_conf/conf/test/fedora.fcfg
 - lib/generators/hydra/templates/solr_conf/conf/schema.xml
@@ -373,6 +372,7 @@ files:
 - spec/lib/model_methods_spec.rb
 - spec/lib/repository_controller_behavior_spec.rb
 - spec/lib/solr_document_extension_spec.rb
+- spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb
@@ -413,6 +413,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4384136025588094224
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -432,6 +435,7 @@ test_files:
 - spec/lib/model_methods_spec.rb
 - spec/lib/repository_controller_behavior_spec.rb
 - spec/lib/solr_document_extension_spec.rb
+- spec/models/file_asset_spec.rb
 - spec/models/mods_asset_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/user_spec.rb

data/lib/generators/hydra/templates/config/solr_mappings.yml

@@ -1,22 +0,0 @@
-# Define additional properties for OM terms to communicate with Solrizer
-#   (Solrizer's use of dynamic fields to turn OM terms into Solr fields)
-#  example:  t.my_term(:index_as=>[:searchable, :displayable])
-#    implies that the Solr document will have fields my_term_t and my_term_display
-#    if there is a value for the OM term  :my_term  in an object.
-id: id
-default: searchable
-searchable: 
-  default: _t
-  date: _dt
-  string: _t
-  text: _t
-  symbol: _s
-  integer: _i
-  long: _l
-  boolean: _b
-  float: _f
-  double: _d
-displayable: _display
-facetable: _facet
-sortable: _sort
-unstemmed_searchable: _unstem_search