sufia 3.7.2 → 4.0.0.beta1

data/spec/models/pageview.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Sufia::Pageview do
+  before do
+    @pageview = Sufia::Pageview
+  end
+
+  it 'has a pageviews metric' do
+    expect(@pageview.metrics).to be  == Legato::ListParameter.new(:metrics, [:pageviews])
+  end
+
+  it 'has a date dimension' do
+    expect(@pageview.dimensions).to be == Legato::ListParameter.new(:dimensions, [:date])
+  end
+
+  it 'responds to :for_path' do
+    expect(@pageview).to respond_to(:for_path)
+  end
+end

data/spec/models/properties_datastream_spec.rb

@@ -10,9 +10,9 @@ describe PropertiesDatastream do
 
   describe "to_solr" do
     before do
-      @doc = PropertiesDatastream.new.tap do |ds|
+      @doc = PropertiesDatastream.new(nil, 'properties').tap do |ds|
         ds.import_url = 'http://example.com/somefile.txt'
-      end 
+      end
     end
     subject { @doc.to_solr}
     it "should have import_url" do

data/spec/models/solr_document_spec.rb

@@ -18,4 +18,13 @@ describe SolrDocument do
       subject.date_uploaded.should == '03/14/2013'
     end
   end
+
+  describe "to_param" do
+    before do
+      subject['noid_tsi'] = '1v53kn56d'
+    end
+    it "should be noid" do
+      expect(subject.to_param).to eq '1v53kn56d'
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe User do
   before(:all) do
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     @another_user = FactoryGirl.find_or_create(:archivist)
   end
   after(:all) do
@@ -38,7 +38,7 @@ describe User do
   end
   describe "follow/unfollow" do
     before(:all) do
-      @user = FactoryGirl.find_or_create(:user)
+      @user = FactoryGirl.find_or_create(:jill)
       @another_user = FactoryGirl.find_or_create(:archivist)
       @user.follow(@another_user)
     end

data/spec/routing/featured_works_route_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe "file routes" do
+  routes { Sufia::Engine.routes }
+  it 'should create a featured_work' do
+    expect(post: '/files/1/featured_work').to route_to(controller: 'featured_works', action: 'create', id: '1')
+  end
+  it 'should remove a featured_work' do
+    expect(delete: '/files/1/featured_work').to route_to(controller: 'featured_works', action: 'destroy', id: '1')
+  end
+
+  it 'should update a collection of featured works' do
+    expect(featured_work_lists_path).to eq '/featured_works'
+    expect(post: '/featured_works').to route_to(controller: 'featured_work_lists', action: 'create')
+  end
+end

data/spec/routing/route_spec.rb

@@ -1,21 +1,12 @@
 require 'spec_helper'
 
 describe 'Routes' do
-  before(:each) do
-    @routes = Sufia::Engine.routes 
-    # so we have to do this instead:
-    # engine routes broke in rspec rails 2.12.1, so we had to add this:
-    assertion_instance.instance_variable_set(:@routes, @routes)
-  end
+  routes { Sufia::Engine.routes }
+
   describe 'Catalog' do
-  
     it 'should route the root url to the catalog controller' do
       { get: '/' }.should route_to(controller: 'catalog', action: 'index')
     end
-
-    it 'should route to recently added files' do
-      { get: '/catalog/recent' }.should route_to(controller: 'catalog', action: 'recent')
-    end
   end
 
   describe 'GenericFile' do
@@ -23,6 +14,10 @@ describe 'Routes' do
       { get: '/files/1/citation' }.should route_to(controller: 'generic_files', action: 'citation', id: '1')
     end
 
+    it 'should route to stats' do
+      { get: '/files/1/stats' }.should route_to(controller: 'generic_files', action: 'stats', id: '1')
+    end
+
     it 'should route to audit' do
       { post: '/files/7/audit' }.should route_to(controller: 'generic_files', action: 'audit', id: '7')
     end
@@ -81,8 +76,6 @@ describe 'Routes' do
       { get: '/dashboard/facet/1' }.should route_to(controller: 'dashboard', action: 'facet', id: '1')
     end
 
-  
-
     it "should route to dashboard activity" do
       { get: '/dashboard/activity' }.should route_to(controller: 'dashboard', action: 'activity')
     end
@@ -164,11 +157,13 @@ describe 'Routes' do
     end
   end
 
-  describe "Static Pages" do
+  describe "Dynamically edited pages" do
     it "should route to about" do
-      { get: '/about' }.should route_to(controller: 'static', action: 'about')
+      { get: '/about' }.should route_to(controller: 'pages', action: 'show', id: 'about_page')
     end
+  end
 
+  describe "Static Pages" do
     it "should route to help" do
       { get: '/help' }.should route_to(controller: 'static', action: 'help')
     end

data/spec/spec_helper.rb

@@ -60,6 +60,9 @@ module EngineRoutes
   def self.included(base)
     base.routes { Sufia::Engine.routes }
   end
+  def main_app
+    Rails.application.class.routes.url_helpers
+  end
 end
 
 RSpec.configure do |config|

data/spec/support/lib/generators/test_app_generator.rb

@@ -4,19 +4,30 @@ class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../support", __FILE__)
 
   def run_sufia_generator
-    say_status("warning", "GENERATING SUFIA", :yellow)       
-
+    say_status("warning", "GENERATING SUFIA", :yellow)
     generate 'sufia', '-f'
-
+    generate "browse_everything:config"
     remove_file 'spec/factories/users.rb'
   end
 
-  def remove_index_page
-    remove_file 'public/index.html'
+  def add_analytics_config
+    append_file 'config/analytics.yml' do
+      "\n" +
+        "analytics:\n" +
+        "  app_name: My App Name\n" +
+        "  app_version: 0.0.1\n" +
+        "  privkey_path: /tmp/privkey.p12\n" +
+        "  privkey_secret: s00pers3kr1t\n" +
+        "  client_email: oauth@example.org\n"
+    end
   end
 
-  def copy_rspec_rake_task
-    copy_file "lib/tasks/rspec.rake"
+  def add_sufia_assets
+    insert_into_file 'app/assets/stylesheets/application.css', after: ' *= require_self' do
+      "\n *= require sufia"
+    end
+
+    gsub_file 'app/assets/javascripts/application.js',
+              '//= require_tree .', '//= require sufia'
   end
-  
 end

data/spec/views/dashboard/facet_limit.html.erb_spec.rb

@@ -7,9 +7,9 @@ describe 'dashboard/_facet_limit.html.erb' do
     allow(view).to receive(:solr_field).and_return('desc_metadata__resource_type_sim')
     allow(view).to receive(:facet_limit_for).and_return(5)
     allow(view).to receive(:blacklight_config).and_return(DashboardController.blacklight_config)
+    allow(view).to receive(:search_action_path).and_return('/search')
     allow(view).to receive(:params).and_return({controller: 'dashboard'})
     render
-    expect(rendered).to match /<a class="facet_select" href="\/dashboard\?f%5Bdesc_metadata__resource_type_sim%5D%5B%5D=Audio">Audio<\/a> <span class="count">3<\/span>/
-
+    expect(rendered).to include '<span class="facet-label"><a class="facet_select" href="/search">Audio</a></span><span class="facet-count">3</span>'
   end
 end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'generic_files/show.html.erb' do
+  describe 'usage statistics' do
+    let(:generic_file) {
+      content = double('content', versions: [])
+      stub_model(GenericFile, noid: '123',
+        depositor: 'bob',
+        audit_stat: 1,
+        content: content)
+    }
+
+    before do
+      allow(controller).to receive(:current_user).and_return(stub_model(User))
+      allow_any_instance_of(Ability).to receive(:can?).and_return(true)
+      assign(:generic_file, generic_file)
+      assign(:events, [])
+    end
+
+    context 'when enabled' do
+      before do
+        Sufia.config.usage_statistics = true
+      end
+
+      it 'appears on page' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_selector('a#stats', count: 1)
+      end
+    end
+
+    context 'when disabled' do
+      before do
+        Sufia.config.usage_statistics = false
+      end
+
+      it 'does not appear on page' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_no_selector('a#stats')
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe 'generic_files/stats.html.erb' do
+  describe 'usage statistics' do
+    let(:generic_file) {
+      stub_model(GenericFile, noid: '123',
+        title: 'file1.txt')
+    }
+
+    before do
+      assign(:generic_file, generic_file)
+      assign(:created, Date.parse('2014-01-01'))
+      assign(:stats_json, [].to_json)
+    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)
+      end
+
+      it 'shows 0 visits' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_selector('div.alert-info', text: /0 views since January 1, 2014/i, count: 1)
+      end
+    end
+
+    context 'when results are returned' do
+      before do
+        assign(:stats_json, [[1396422000000,2],[1396508400000,3],[1396594800000,4]].to_json)
+        assign(:pageviews, 9)
+      end
+
+      it 'shows visits' do
+        render
+        page = Capybara::Node::Simple.new(rendered)
+        expect(page).to have_selector('div.alert-info', text: /9 views since January 1, 2014/i, count: 1)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'users/_follower_modal.html.erb' do
+  let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
+
+  before do
+    assign :followers, [user]
+  end
+
+  it "should draw user list" do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_link "Frank", href: "/users/#{user.to_param}" 
+  end
+
+end
+
+

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

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe 'users/_following_modal.html.erb' do
+  let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
+
+  before do
+    assign :following, [user]
+  end
+
+  it "should draw user list" do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_link "Frank", href: "/users/#{user.to_param}" 
+  end
+
+end
+
+

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

@@ -17,7 +17,7 @@ describe 'users/index.html.erb' do
   it "should draw user list" do
     render
     page = Capybara::Node::Simple.new(rendered)
-    expect(page).to have_content("ScholarSphere Users")
+    expect(page).to have_content("Sufia Users")
     (1..10).each  do |i|
       expect(page).to have_content("user#{i}")
     end

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

@@ -19,7 +19,7 @@ class Batch < ActiveFedora::Base
   end
 
   def to_solr(solr_doc={}, opts={})
-    super(solr_doc, opts)
+    solr_doc = super(solr_doc, opts)
     solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile.noid_indexer)] = noid
     return solr_doc
   end

data/sufia-models/app/models/concerns/sufia/properties_datastream_behavior.rb

@@ -0,0 +1,30 @@
+module Sufia
+  module PropertiesDatastreamBehavior
+    extend ActiveSupport::Concern
+
+    included do
+      set_terminology do |t|
+        t.root(:path=>"fields" )
+        # This is where we put the user id of the object depositor -- impacts permissions/access controls
+        t.depositor :index_as=>[:stored_searchable]
+        # This is where we put the relative path of the file if submitted as a folder
+        t.relative_path
+        t.import_url path: 'importUrl', :index_as=>:symbol
+      end
+    end
+
+    module ClassMethods
+      def xml_template
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.fields
+        end
+        builder.doc
+      end
+    end
+
+    def prefix
+      ""
+    end
+
+  end
+end

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -45,7 +45,7 @@ module Sufia::User
 
   def trophy_files
     trophies.map do |t|
-      GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
+      ::GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
     end
   end
 

data/sufia-models/app/models/datastreams/batch_rdf_datastream.rb

@@ -1,9 +1,6 @@
 class BatchRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  map_predicates do |map|
-    map.part(:to => "hasPart", :in => RDF::DC)
-    map.creator(:to => "creator", :in => RDF::DC)
-    map.title(:to => "title", :in => RDF::DC)
-    map.status(:to => "type", :in => RDF::DC)
-  end
+  property :part, predicate: RDF::DC.hasPart
+  property :creator, predicate: RDF::DC.creator
+  property :title, predicate: RDF::DC.title
+  property :status, predicate: RDF::DC.type
 end
-

data/sufia-models/app/models/datastreams/fits_datastream.rb

@@ -1,5 +1,8 @@
 class FitsDatastream < ActiveFedora::OmDatastream
   include OM::XML::Document
+  def prefix
+    ""
+  end
 
   set_terminology do |t|
     t.root(:path => "fits", 

data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -1,56 +1,58 @@
 class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-  map_predicates do |map|
-    map.part_of(:to => "isPartOf", :in => RDF::DC)
-    map.resource_type(:to => "type", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.title(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.creator(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.contributor(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.description(:in => RDF::DC) do |index|
-      index.type :text
-      index.as :stored_searchable
-    end
-    map.tag(:to => "relation", :in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.rights(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.publisher(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.date_created(:to => "created", :in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.date_uploaded(:to => "dateSubmitted", :in => RDF::DC) do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    map.date_modified(:to => "modified", :in => RDF::DC) do |index|
-      index.type :date
-      index.as :stored_sortable
-    end
-    map.subject(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.language(:in => RDF::DC) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.identifier(:in => RDF::DC) do |index|
-      index.as :stored_searchable
-    end
-    map.based_near(:in => RDF::FOAF) do |index|
-      index.as :stored_searchable, :facetable
-    end
-    map.related_url(:to => "seeAlso", :in => RDF::RDFS)
+  property :part_of, predicate: RDF::DC.isPartOf
+  property :resource_type, predicate: RDF::DC.type do |index|
+    index.as :stored_searchable, :facetable
   end
+  property :title, predicate: RDF::DC.title do |index|
+    index.as :stored_searchable
+  end
+  property :creator, predicate: RDF::DC.creator do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :contributor, predicate: RDF::DC.contributor do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :description, predicate: RDF::DC.description do |index|
+    index.type :text
+    index.as :stored_searchable
+  end
+  property :tag, predicate: RDF::DC.relation do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :rights, predicate: RDF::DC.rights do |index|
+    index.as :stored_searchable
+  end
+  property :publisher, predicate: RDF::DC.publisher do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :date_created, predicate: RDF::DC.created do |index|
+    index.as :stored_searchable
+  end
+  property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+    index.type :date
+    index.as :stored_sortable
+  end
+  property :date_modified, predicate: RDF::DC.modified do |index|
+    index.type :date
+    index.as :stored_sortable
+  end
+  property :subject, predicate: RDF::DC.subject do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :language, predicate: RDF::DC.language do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :identifier, predicate: RDF::DC.identifier do |index|
+    index.as :stored_searchable
+  end
+  property :based_near, predicate: RDF::FOAF.based_near do |index|
+    index.as :stored_searchable, :facetable
+  end
+  property :related_url, predicate: RDF::RDFS.seeAlso do |index|
+    index.as :stored_searchable
+  end
+
+  # TODO: Move this somewhere more appropriate
   begin
     LocalAuthority.register_vocabulary(self, "subject", "lc_subjects")
     LocalAuthority.register_vocabulary(self, "language", "lexvo_languages")