sufia 4.0.0.rc2 → 4.0.0

data/spec/jobs/import_url_job_spec.rb

@@ -46,7 +46,8 @@ describe ImportUrlJob do
     it "should create a content datastream" do
       Net::HTTP.any_instance.should_receive(:request_get).with(file_path).and_yield(mock_response)
       job.run
-      generic_file.reload.content.size.should == 4218
+      expect(generic_file.reload.content.size).to eq 4218
+      expect(generic_file.content.dsLabel).to eq file_path
     end
   end
 

data/spec/lib/sufia/breadcrumbs_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+describe Sufia::Breadcrumbs do  
+
+  let(:crumbs) do
+    TestClass.new
+  end
+
+  let(:sufia) do
+    Sufia::Engine.routes.url_helpers
+  end
+
+  before do
+    class TestClass
+      attr_accessor :trail, :request
+      include Sufia::Breadcrumbs
+      def initialize
+        @trail = []
+        @request = true # avoids the allow_message_expectations_on_nil warning
+      end
+      def add_breadcrumb text, link
+        @trail << [text, link]
+      end
+    end
+    allow_any_instance_of(TestClass).to receive(:sufia).and_return(sufia)
+  end
+
+  describe "#default_trail" do
+    context "when the user is logged in" do
+      before do
+        crumbs.stub(:user_signed_in?) { true }
+      end
+      specify "the default trail is nil" do
+        expect(crumbs.default_trail).to eql([[I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path]])
+      end
+    end
+    context "when there is no user" do
+      before do
+        crumbs.stub(:user_signed_in?) { false }
+      end
+      specify "the default trail is nil" do
+        expect(crumbs.default_trail).to be_nil
+      end
+    end
+  end
+
+  describe "#trail_from_referer" do
+    context "when coming from the catalog" do
+      let(:referer) { "http://...catalog/" }
+      before do
+        allow(crumbs.request).to receive(:referer).and_return(referer)
+      end
+      specify "the trail goes back to the search" do
+        expect(crumbs.trail_from_referer).to eql([[I18n.t('sufia.bread_crumb.search_results'), referer]])
+      end
+    end
+    context "when coming from the dashboard" do
+      before do
+        allow(crumbs.request).to receive(:referer).and_return("http://...dashboard/")
+        crumbs.stub(:user_signed_in?) { true }
+      end
+      specify "the trail goes back to the user's files" do
+        allow(crumbs).to receive(:controller_name).and_return("my/files")
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+      end
+      specify "the trail goes back to the user's collections" do
+        allow(crumbs).to receive(:controller_name).and_return("my/collections")
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.collections'), sufia.dashboard_collections_path])
+      end
+      specify "the trail goes back to the user's files when on the batch edit page" do
+        allow(crumbs).to receive(:controller_name).and_return("batch_edit")
+        expect(crumbs.trail_from_referer.first).to eql([I18n.t('sufia.dashboard.title'), sufia.dashboard_index_path])
+        expect(crumbs.trail_from_referer.last).to eql([I18n.t('sufia.dashboard.my.files'), sufia.dashboard_files_path])
+      end
+    end
+  end
+
+end

data/spec/lib/sufia/messages_spec.rb

@@ -3,10 +3,17 @@ require 'spec_helper'
 describe Sufia::Messages do
 
   let(:message) do
+    TestClass.new
+  end
+
+  before do
     class TestClass
       include Sufia::Messages
     end
-    TestClass.new
+  end
+
+  after do
+    Object.send(:remove_const, :TestClass)
   end
 
   let(:batch_id)  { "1" }

data/spec/models/characterization_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Sufia::GenericFile::Characterization do
+  before do
+    class TestClass < ActiveFedora::Base
+      include Sufia::GenericFile::Characterization
+
+      has_file_datastream 'content', type: FileContentDatastream
+      attr_accessor :title, :creator
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :TestClass)
+  end
+
+  subject { TestClass.new }
+
+  it "should not depend on anything except a file datastream and some property accessors" do
+    expect { subject.characterize }.to_not raise_error
+  end
+
+end

data/spec/models/fits_datastream_spec.rb

@@ -8,31 +8,28 @@ describe FitsDatastream, unless: $in_travis do
       @file.characterize
     end
     it "should have a format label" do
-      @file.format_label.should == ["Portable Network Graphics"]
+      expect(@file.format_label).to eq ["Portable Network Graphics"]
     end
     it "should have a mime type" do
-      @file.mime_type.should == "image/png"
+      expect(@file.mime_type).to eq "image/png"
     end
     it "should have a file size" do
-      @file.file_size.should == ["4218"]
-    end
-    it "should have a file size" do
-      @file.file_size.should == ["4218"]
+      expect(@file.file_size).to eq ["4218"]
     end
     it "should have a last modified timestamp" do
-      @file.last_modified.should_not be_empty
+      expect(@file.last_modified).to_not be_empty
     end
     it "should have a filename" do
-      @file.filename.should_not be_empty
+      expect(@file.filename).to_not be_empty
     end
     it "should have a checksum" do
-      @file.original_checksum.should == ["28da6259ae5707c68708192a40b3e85c"]
+      expect(@file.original_checksum).to eq ["28da6259ae5707c68708192a40b3e85c"]
     end
     it "should have a height" do
-      @file.height.should == ["50"]
+      expect(@file.height).to eq ["50"]
     end
     it "should have a width" do
-      @file.width.should == ["50"]
+      expect(@file.width).to eq ["50"]
     end
   end
   describe "video" do
@@ -42,38 +39,38 @@ describe FitsDatastream, unless: $in_travis do
       @file.characterize
     end
     it "should have a format label" do
-      @file.format_label.should == ["ISO Media, MPEG v4 system, version 2"]
+      expect(@file.format_label).to eq ["ISO Media, MPEG v4 system, version 2"]
     end
     it "should have a mime type" do
-      @file.mime_type.should == "video/mp4"
+      expect(@file.mime_type).to eq "video/mp4"
     end
     it "should have a file size" do
-      @file.file_size.should == ["245779"]
+      expect(@file.file_size).to eq ["245779"]
     end
     it "should have a last modified timestamp" do
-      @file.last_modified.should_not be_empty
+      expect(@file.last_modified).to_not be_empty
     end
     it "should have a filename" do
-      @file.filename.should_not be_empty
+      expect(@file.filename).to_not be_empty
     end
     it "should have a checksum" do
-      @file.original_checksum.should == ["dc77a8de8c091c19d86df74280f6feb7"]
+      expect(@file.original_checksum).to eq ["dc77a8de8c091c19d86df74280f6feb7"]
     end
     it "should have a width" do
-      @file.width.should == ["190"]
+      expect(@file.width).to eq ["190"]
     end
     it "should have a height" do
-      @file.height.should == ["240"]
+      expect(@file.height).to eq ["240"]
     end
     it "should have a sample_rate" do
-      @file.sample_rate.should == ["32000"]
+      expect(@file.sample_rate).to eq ["32000"]
     end
     it "should have a duration" do
-      @file.duration.should == ["4.97 s"]
+      expect(@file.duration).to eq ["4.97 s"]
     end
     it "should have a frame_rate" do
-      @file.frame_rate.count.should == 1
-      @file.frame_rate[0].to_f.should == 30.0
+      expect(@file.frame_rate.count).to eq 1
+      expect(@file.frame_rate[0].to_f).to eq 30.0
     end
   end
 end

data/spec/support/features/session_helpers.rb

@@ -21,7 +21,7 @@ module Features
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
-      click_button 'Sign in'
+      click_button 'Log in'
       expect(page).to_not have_text 'Invalid email or password.'
     end
   end

data/spec/views/catalog/index.html.erb_spec.rb

@@ -29,6 +29,8 @@ describe 'catalog/index.html.erb' do
   it 'appears on page without error' do
     render
     expect(rendered).to include(@collection.title)
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_selector("span.glyphicon.glyphicon-th.collection-icon-search")
   end
 
 end

data/spec/views/generic_file/stats.html.erb_spec.rb

@@ -33,12 +33,6 @@ describe 'generic_files/stats.html.erb' do
       assign(:stats, no_stats)
     end
 
-    it 'shows breadcrumbs' do
-      render
-      page = Capybara::Node::Simple.new(rendered)
-      expect(page).to have_selector('span.active', text: 'file1.txt')
-    end
-
     context 'when no analytics results returned' do
       before do
         assign(:pageviews, 0)

data/spec/views/users/show.html.erb_spec.rb

@@ -28,4 +28,23 @@ describe 'users/show.html.erb' do
     render
     rendered.should match /Joined on #{join_date.strftime("%b %d, %Y")}/
   end
+
+  context "with trophy" do
+
+    let(:generic_file) { GenericFile.new(title: ["Fake object"], pid:"sufia:abc123") }
+    before do
+      allow(view).to receive(:search_session).and_return({})
+      allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+      allow(view).to receive(:current_search_session).and_return(nil)
+      assign(:trophies, [generic_file])
+    end
+
+    it "should have trophy" do
+      render
+      page = Capybara::Node::Simple.new(rendered)
+      expect(page).to have_selector(".tab-content > div#contributions.tab-pane")
+      expect(page).to have_selector("#trophyrow_#{generic_file.noid}")
+
+    end
+  end
 end

data/sufia-models/app/actors/sufia/generic_file/actor.rb

@@ -28,7 +28,8 @@ module Sufia::GenericFile
     end
 
     def create_content(file, file_name, dsid)
-      generic_file.add_file(file, dsid, file_name)
+      fname = generic_file.label.blank? ? file_name.truncate(255) : generic_file.label
+      generic_file.add_file(file, dsid, fname)
       save_characterize_and_record_committer do
         if Sufia.config.respond_to?(:after_create_content)
           Sufia.config.after_create_content.call(generic_file, user)

data/sufia-models/app/models/concerns/sufia/generic_file/characterization.rb

@@ -42,11 +42,10 @@ module Sufia
 
       ## Extract the metadata from the content datastream and record it in the characterization datastream
       def characterize
-        metadata = self.content.extract_metadata
-        self.characterization.ng_xml = metadata if metadata.present?
-        self.append_metadata
+        metadata = content.extract_metadata
+        characterization.ng_xml = metadata if metadata.present?
+        append_metadata
         self.filename = [self.label]
-        extract_content
         save
       end
 

data/sufia-models/app/models/concerns/sufia/generic_file/full_text_indexing.rb

@@ -7,21 +7,28 @@ module Sufia
         has_file_datastream 'full_text', versionable: false
       end
 
-      def extract_content
-        url = Blacklight.solr_config[:url] ? Blacklight.solr_config[:url] : Blacklight.solr_config["url"] ? Blacklight.solr_config["url"] : Blacklight.solr_config[:fulltext] ? Blacklight.solr_config[:fulltext]["url"] : Blacklight.solr_config[:default]["url"]
-        uri = URI("#{url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
-        req = Net::HTTP.new(uri.host, uri.port)
-        resp = req.post(uri.to_s, self.content.content, {
-            'Content-type' => "#{self.mime_type};charset=utf-8",
-            'Content-Length' => self.content.content.size.to_s
-          })
-        raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
-        self.content.content.rewind if self.content.content.respond_to?(:rewind)
-        extracted_text = JSON.parse(resp.body)[''].rstrip
-        full_text.content = extracted_text if extracted_text.present?
-      rescue => e
-        logger.error("Error extracting content from #{self.pid}: #{e.inspect}")
+      def append_metadata
+        super
+        extract_content
       end
+
+      private
+
+        def extract_content
+          url = Blacklight.solr_config[:url] ? Blacklight.solr_config[:url] : Blacklight.solr_config["url"] ? Blacklight.solr_config["url"] : Blacklight.solr_config[:fulltext] ? Blacklight.solr_config[:fulltext]["url"] : Blacklight.solr_config[:default]["url"]
+          uri = URI("#{url}/update/extract?extractOnly=true&wt=json&extractFormat=text")
+          req = Net::HTTP.new(uri.host, uri.port)
+          resp = req.post(uri.to_s, self.content.content, {
+              'Content-type' => "#{self.mime_type};charset=utf-8",
+              'Content-Length' => self.content.content.size.to_s
+            })
+          raise "URL '#{uri}' returned code #{resp.code}" unless resp.code == "200"
+          self.content.content.rewind if self.content.content.respond_to?(:rewind)
+          extracted_text = JSON.parse(resp.body)[''].rstrip
+          full_text.content = extracted_text if extracted_text.present?
+        rescue => e
+          logger.error("Error extracting content from #{self.pid}: #{e.inspect}")
+        end
     end
   end
 end

data/sufia-models/app/models/concerns/sufia/generic_file/mime_types.rb

@@ -23,6 +23,10 @@ module Sufia
         self.class.office_document_mime_types.include? self.mime_type
       end
 
+      def collection?
+        false
+      end
+
       def file_format
         return nil if self.mime_type.blank? and self.format_label.blank?
         return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?

data/sufia-models/app/models/file_usage.rb

@@ -28,12 +28,16 @@ class FileUsage
 
   private
 
+  # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download
+  # see Legato::ProfileMethods.method_name_from_klass
   def download_statistics
-    Sufia::Analytics.profile.download(sort: 'date').for_file(self.id)
+    Sufia::Analytics.profile.sufia__download(sort: 'date').for_file(self.id)
   end
 
+  # Sufia::Pageview is sent to Sufia::Analytics.profile as #sufia__pageview
+  # see Legato::ProfileMethods.method_name_from_klass
   def pageview_statistics
-    Sufia::Analytics.profile.pageview(sort: 'date').for_path(self.path)
+    Sufia::Analytics.profile.sufia__pageview(sort: 'date').for_path(self.path)
   end
 
   def pageviews_to_flot values = Array.new

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0.rc2"
+    VERSION = "4.0.0"
   end
 end

data/sufia.gemspec

@@ -41,6 +41,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'bootstrap_form', '~> 2.1'
   gem.add_dependency 'bootstrap-sass', '< 3.2'
   gem.add_dependency 'blacklight-gallery'
+  gem.add_dependency 'breadcrumbs_on_rails', '~>2.3.0'
 
   gem.add_development_dependency 'engine_cart'
   gem.add_development_dependency 'mida'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc2
+  version: 4.0.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -269,6 +269,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: breadcrumbs_on_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -481,6 +495,7 @@ files:
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
+- app/assets/stylesheets/batch-edit.css.scss
 - app/assets/stylesheets/catalog.css.scss
 - app/assets/stylesheets/collections.css.scss
 - app/assets/stylesheets/featured.css.scss
@@ -501,11 +516,13 @@ files:
 - app/assets/stylesheets/sufia.css.scss
 - app/assets/stylesheets/tagcloud.css
 - app/assets/stylesheets/usage-stats.css
+- app/builders/sufia/bootstrap_breadcrumbs_builder.rb
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
 - app/controllers/collections_controller.rb
 - app/controllers/concerns/sufia/batch_edits_controller_behavior.rb
+- app/controllers/concerns/sufia/breadcrumbs.rb
 - app/controllers/concerns/sufia/catalog.rb
 - app/controllers/concerns/sufia/contact_form_controller_behavior.rb
 - app/controllers/concerns/sufia/controller.rb
@@ -642,7 +659,6 @@ files:
 - app/views/generic_files/_asset_permissions_denial_flash.html.erb
 - app/views/generic_files/_asset_saved_flash.html.erb
 - app/views/generic_files/_asset_updated_flash.html.erb
-- app/views/generic_files/_breadcrumbs.html.erb
 - app/views/generic_files/_browse_everything.html.erb
 - app/views/generic_files/_descriptions.html.erb
 - app/views/generic_files/_edit.js.erb
@@ -696,6 +712,7 @@ files:
 - app/views/kaminari/blacklight/_page.html.erb
 - app/views/kaminari/blacklight/_paginator.html.erb
 - app/views/kaminari/blacklight/_prev_page.html.erb
+- app/views/kaminari/blacklight_compact/_paginator.html.erb
 - app/views/layouts/_head_tag_content.html.erb
 - app/views/layouts/error.html.erb
 - app/views/layouts/homepage.html.erb
@@ -891,6 +908,7 @@ files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
+- spec/lib/sufia/breadcrumbs_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/messages_spec.rb
 - spec/lib/sufia/readable_permissions_spec.rb
@@ -898,6 +916,7 @@ files:
 - spec/lib/sufia/writable_permissions_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/batch_spec.rb
+- spec/models/characterization_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/download_spec.rb
@@ -936,7 +955,6 @@ files:
 - spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
-- spec/views/generic_file/_breadcrumbs.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
@@ -1116,9 +1134,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -1215,6 +1233,7 @@ test_files:
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/analytics_spec.rb
+- spec/lib/sufia/breadcrumbs_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/messages_spec.rb
 - spec/lib/sufia/readable_permissions_spec.rb
@@ -1222,6 +1241,7 @@ test_files:
 - spec/lib/sufia/writable_permissions_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/batch_spec.rb
+- spec/models/characterization_spec.rb
 - spec/models/checksum_audit_log_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/download_spec.rb
@@ -1260,7 +1280,6 @@ test_files:
 - spec/views/collections/_form.html.erb_spec.rb
 - spec/views/collections/_show_descriptions.html.erb_spec.rb
 - spec/views/dashboard/index_spec.rb
-- spec/views/generic_file/_breadcrumbs.html.erb_spec.rb
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb