sufia 7.0.0.beta1 → 7.0.0.beta2

data/spec/views/curation_concerns/base/_relationships.html.erb_spec.rb

@@ -15,7 +15,7 @@ describe 'curation_concerns/base/relationships' do
   end
 
   context "when collections are present" do
-    let(:collection_presenters) { [double(id: '456', title: 'Containing collection')] }
+    let(:collection_presenters) { [double(id: '456', title: ['Containing collection', 'foobar'], to_s: 'Containing collection')] }
     let(:page) { Capybara::Node::Simple.new(rendered) }
     before do
       allow(presenter).to receive(:collection_presenters).and_return(collection_presenters)
@@ -24,5 +24,8 @@ describe 'curation_concerns/base/relationships' do
     it "links to collections" do
       expect(page).to have_link 'Containing collection'
     end
+    it "labels the link using the presenter's #to_s method" do
+      expect(page).not_to have_content 'foobar'
+    end
   end
 end

data/sufia.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '>= 1.0.0.beta7', '< 2'
+  spec.add_dependency 'curation_concerns', '>= 1.0.0.beta8', '< 2'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'
   spec.add_dependency 'browse-everything', '~> 0.10'
   spec.add_dependency 'blacklight-gallery', '~> 0.1'
@@ -43,6 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'zeroclipboard-rails', '~> 0.0.13'
   spec.add_dependency 'redis-namespace', '~> 1.5.2'
+  spec.add_dependency 'flot-rails', '~> 0.0.6'
 
   spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'mida', '~> 0.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta1
+  version: 7.0.0.beta2
 platform: ruby
 authors:
 - Justin Coyne
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,7 +20,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta7
+        version: 1.0.0.beta8
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta7
+        version: 1.0.0.beta8
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -382,6 +382,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: flot-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
@@ -858,7 +872,6 @@ files:
 - app/search_builders/sufia/my_works_search_builder.rb
 - app/search_builders/sufia/search_builder.rb
 - app/services/sufia/actor_factory.rb
-- app/services/sufia/admin/depositor_stats.rb
 - app/services/sufia/analytics.rb
 - app/services/sufia/audit_failure_service.rb
 - app/services/sufia/batch_create_failure_service.rb
@@ -872,10 +885,16 @@ files:
 - app/services/sufia/message_user_service.rb
 - app/services/sufia/query_service.rb
 - app/services/sufia/repository_audit_service.rb
-- app/services/sufia/statistics/collections.rb
+- app/services/sufia/statistics/collections/over_time.rb
+- app/services/sufia/statistics/depositors/summary.rb
+- app/services/sufia/statistics/file_sets/by_format.rb
 - app/services/sufia/statistics/over_time.rb
-- app/services/sufia/statistics/works.rb
-- app/services/sufia/system_stats.rb
+- app/services/sufia/statistics/system_stats.rb
+- app/services/sufia/statistics/term_query.rb
+- app/services/sufia/statistics/works/by_depositor.rb
+- app/services/sufia/statistics/works/by_resource_type.rb
+- app/services/sufia/statistics/works/count.rb
+- app/services/sufia/statistics/works/over_time.rb
 - app/services/sufia/user_stat_importer.rb
 - app/services/sufia/work_thumbnail_path_service.rb
 - app/uploaders/sufia/avatar_uploader.rb
@@ -883,7 +902,6 @@ files:
 - app/uploaders/tinymce_asset_uploader.rb
 - app/views/_controls.html.erb
 - app/views/_flash_msg.html.erb
-- app/views/_footer.html.erb
 - app/views/_ga.html.erb
 - app/views/_head_tag_extras.html.erb
 - app/views/_logo.html.erb
@@ -892,10 +910,10 @@ files:
 - app/views/_user_util_links.html.erb
 - app/views/admin/stats/_date_form.html.erb
 - app/views/admin/stats/_deposits.html.erb
-- app/views/admin/stats/_files.html.erb
 - app/views/admin/stats/_new_users.html.erb
 - app/views/admin/stats/_stats_by_date.html.erb
 - app/views/admin/stats/_top_data.html.erb
+- app/views/admin/stats/_works.html.erb
 - app/views/admin/stats/index.html.erb
 - app/views/advanced/_advanced_search_facets.html.erb
 - app/views/advanced/_advanced_search_fields.html.erb
@@ -1064,6 +1082,7 @@ files:
 - app/views/records/show_fields/_subject.html.erb
 - app/views/records/show_fields/_title.html.erb
 - app/views/shared/_citations.html.erb
+- app/views/shared/_footer.html.erb
 - app/views/static/agreement.html.erb
 - app/views/static/help.html.erb
 - app/views/static/mendeley.html.erb
@@ -1126,7 +1145,6 @@ files:
 - lib/generators/sufia/cached_work_stats_generator.rb
 - lib/generators/sufia/citation_config_generator.rb
 - lib/generators/sufia/config_generator.rb
-- lib/generators/sufia/fulltext_generator.rb
 - lib/generators/sufia/geonames_username_config_generator.rb
 - lib/generators/sufia/install_generator.rb
 - lib/generators/sufia/minimagick_config_generator.rb
@@ -1374,15 +1392,21 @@ files:
 - spec/routing/ownership_transfers_route_spec.rb
 - spec/routing/route_spec.rb
 - spec/routing/stats_route_spec.rb
-- spec/search_builder/sufia_search_builder_spec.rb
+- spec/search_builder/sufia/catalog_search_builder_spec.rb
+- spec/search_builder/sufia/my_shares_search_builder_spec.rb
 - spec/services/collection_member_service_spec.rb
 - spec/services/collection_size_service_spec.rb
 - spec/services/file_set_csv_service_spec.rb
 - spec/services/repository_audit_service_spec.rb
-- spec/services/statistics/collections_spec.rb
-- spec/services/statistics/works_spec.rb
+- spec/services/statistics/collections/over_time_spec.rb
+- spec/services/statistics/depositors/summary_spec.rb
+- spec/services/statistics/file_sets/by_format_spec.rb
+- spec/services/statistics/system_stats_spec.rb
+- spec/services/statistics/works/by_depositor_spec.rb
+- spec/services/statistics/works/by_resource_type_spec.rb
+- spec/services/statistics/works/count_spec.rb
+- spec/services/statistics/works/over_time_spec.rb
 - spec/services/sufia/actor_factory_spec.rb
-- spec/services/sufia/admin/depositor_stats_spec.rb
 - spec/services/sufia/audit_failure_service_spec.rb
 - spec/services/sufia/batch_create_failure_service_spec.rb
 - spec/services/sufia/batch_create_success_service_spec.rb
@@ -1390,7 +1414,6 @@ files:
 - spec/services/sufia/import_url_failure_service_spec.rb
 - spec/services/sufia/import_url_success_service_spec.rb
 - spec/services/sufia/query_service_spec.rb
-- spec/services/sufia/system_stats_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
@@ -1463,10 +1486,6 @@ files:
 - vendor/assets/javascripts/fileupload/jquery.iframe-transport.js
 - vendor/assets/javascripts/fileupload/tmpl.js
 - vendor/assets/javascripts/fixedsticky.js
-- vendor/assets/javascripts/flot/excanvas.js
-- vendor/assets/javascripts/flot/jquery.flot.js
-- vendor/assets/javascripts/flot/jquery.flot.selection.js
-- vendor/assets/javascripts/flot/jquery.flot.time.js
 - vendor/assets/javascripts/jquery.validate.js
 - vendor/assets/javascripts/nestable.js
 homepage: http://sufia.io/
@@ -1666,15 +1685,21 @@ test_files:
 - spec/routing/ownership_transfers_route_spec.rb
 - spec/routing/route_spec.rb
 - spec/routing/stats_route_spec.rb
-- spec/search_builder/sufia_search_builder_spec.rb
+- spec/search_builder/sufia/catalog_search_builder_spec.rb
+- spec/search_builder/sufia/my_shares_search_builder_spec.rb
 - spec/services/collection_member_service_spec.rb
 - spec/services/collection_size_service_spec.rb
 - spec/services/file_set_csv_service_spec.rb
 - spec/services/repository_audit_service_spec.rb
-- spec/services/statistics/collections_spec.rb
-- spec/services/statistics/works_spec.rb
+- spec/services/statistics/collections/over_time_spec.rb
+- spec/services/statistics/depositors/summary_spec.rb
+- spec/services/statistics/file_sets/by_format_spec.rb
+- spec/services/statistics/system_stats_spec.rb
+- spec/services/statistics/works/by_depositor_spec.rb
+- spec/services/statistics/works/by_resource_type_spec.rb
+- spec/services/statistics/works/count_spec.rb
+- spec/services/statistics/works/over_time_spec.rb
 - spec/services/sufia/actor_factory_spec.rb
-- spec/services/sufia/admin/depositor_stats_spec.rb
 - spec/services/sufia/audit_failure_service_spec.rb
 - spec/services/sufia/batch_create_failure_service_spec.rb
 - spec/services/sufia/batch_create_success_service_spec.rb
@@ -1682,7 +1707,6 @@ test_files:
 - spec/services/sufia/import_url_failure_service_spec.rb
 - spec/services/sufia/import_url_success_service_spec.rb
 - spec/services/sufia/query_service_spec.rb
-- spec/services/sufia/system_stats_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb

data/app/services/sufia/admin/depositor_stats.rb

@@ -1,48 +0,0 @@
-# Gather information about the depositors who have contributed to the repository
-class Sufia::Admin::DepositorStats
-  include Blacklight::SearchHelper
-
-  # @param [String] start_date optionally specify the start date to gather the stats from
-  # @param [String] end_date optionally specify the end date to gather the stats from
-  def initialize(start_date, end_date)
-    @start_dt = Time.zone.parse(start_date) unless start_date.blank?
-    @end_dt = Time.zone.parse(end_date).end_of_day unless end_date.blank?
-  end
-
-  attr_accessor :start_dt, :end_dt
-
-  def depositors
-    # step through the array by twos to get each pair
-    results.map do |key, deposits|
-      user = User.find_by_user_key(key)
-      { key: key, deposits: deposits, user: user }
-    end
-  end
-
-  private
-
-    delegate :blacklight_config, to: CatalogController
-    delegate :depositor_field, to: DepositSearchBuilder
-
-    # results come from Solr in an array where the first item is the user and
-    # the second item is the count
-    # [ abc123, 55, ccczzz, 205 ]
-    # @return [#each] an enumerable object of tuples (user and count)
-    def results
-      facet_results = repository.search(query)
-      facet_results.facet_fields[depositor_field].each_slice(2)
-    end
-
-    def search_builder
-      DepositSearchBuilder.new([:include_depositor_facet], self)
-    end
-
-    # TODO: This can probably be pushed into the DepositSearchBuilder
-    def query
-      search_builder.merge(q: date_query).query
-    end
-
-    def date_query
-      Sufia::QueryService.new.build_date_query(start_dt, end_dt) unless start_dt.blank?
-    end
-end

data/app/services/sufia/statistics/collections.rb

@@ -1,12 +0,0 @@
-module Sufia
-  module Statistics
-    class Collections < OverTime
-      private
-
-        def point(min, max)
-          query = QueryService.new.build_date_query(min, max)
-          Collection.where(query).count
-        end
-    end
-  end
-end

data/app/services/sufia/statistics/works.rb

@@ -1,12 +0,0 @@
-module Sufia
-  module Statistics
-    class Works < OverTime
-      private
-
-        def point(min, max)
-          query = QueryService.new.build_date_query(min, max)
-          CurationConcerns::WorkRelation.new.where(query).count
-        end
-    end
-  end
-end

data/app/services/sufia/system_stats.rb

@@ -1,120 +0,0 @@
-# A class that retrieves system level statistics about the system
-#
-# @attr_reader int limit      limits the results returned from top_depositors and top_formats
-#                             Default is 5, maximum is 20, minimum is 5
-# @attr_reader int start_date Filters the statistics returned by the class to after the start date
-#                             blank means no filter
-# @attr_reader int end_date   Filters the statistics returned by the class to before end date (end of day)
-#                             blank means today
-class Sufia::SystemStats
-  attr_reader :limit, :start_date, :end_date
-
-  # initialize the stats class setting the limitations
-  #
-  # @attr_reader int limit      limits the results returned from top_depositors and top_formats
-  #                             Default is 5, maximum is 20, minimum is 5
-  # @attr_reader int start_date Filters the statistics returned by the class to after the start date
-  #                             blank means no filter
-  # @attr_reader int end_date   Filters the statistics returned by the class to before end date (end of day)
-  #                             blank means today
-  def initialize(limit_records = 5, start_date_str = nil, end_date_str = nil)
-    @limit = validate_limit(limit_records)
-    @start_date = Time.zone.parse(start_date_str).beginning_of_day unless start_date_str.blank?
-    @end_date = Time.zone.parse(end_date_str).end_of_day unless end_date_str.blank?
-  end
-
-  # returns the total files in the system filtered by the start_date and end_date if present
-  #
-  # @return [Hash] A hash with the total files by permission for the system
-  # @option [Number] :total Total number of files without regard to permissions
-  # @option [Number] :public Total number of files that have public permissions
-  # @option [Number] :registered Total number of files that have registered (logged in) permissions
-  # @option [Number] :private Total number of files that have private permissions
-  def document_by_permission
-    return document_by_date_by_permission if start_date
-
-    files_count = {}
-    files_count[:total] = query_service.count
-    files_count[:public] = query_service.where_public.count
-    files_count[:registered] = query_service.where_registered.count
-    files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-    files_count
-  end
-
-  # returns a list (of size limit) of system users (depositors) that have the most deposits in the system
-  # @return [Hash] a hash with the user name as the key and the number of deposits as the value
-  #    { 'cam156' => 25, 'hjc14' => 24 ... }
-  def top_depositors
-    top_data(depositor_field, limit)
-  end
-
-  delegate :depositor_field, to: DepositSearchBuilder
-
-  # returns a list (of size limit) of file formats (mime_types) that have the most files in the system
-  # @return [Hash] a hash with the file format as the key and the number of files as the value
-  #    { 'png' => 25, 'pdf' => 24 ... }
-  def top_formats
-    format_key = Solrizer.solr_name('file_format', Solrizer::Descriptor.new(:string, :indexed, :multivalued))
-    top_data(format_key, limit)
-  end
-
-  # returns [Array<user>] a list (of size limit) of users most recently registered with the system
-  #
-  def recent_users
-    # no dates return the top few based on limit
-    return ::User.order('created_at DESC').limit(limit) if start_date.blank?
-
-    ::User.recent_users start_date, end_date
-  end
-
-  # returns [Number] the number of currently registered users
-  #
-  def users_count
-    ::User.count
-  end
-
-  private
-
-    def validate_limit(count)
-      if count.blank? || count < 5
-        5
-      elsif count > 20
-        20
-      else
-        count
-      end
-    end
-
-    def document_by_date_by_permission
-      files_count = {}
-      files_count[:total] = query_service.find_by_date_created(start_date, end_date).count
-      files_count[:public] = query_service.find_public_in_date_range(start_date, end_date).count
-      files_count[:registered] = query_service.find_registered_in_date_range(start_date, end_date).count
-      files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-      files_count
-    end
-
-    def query_service
-      @query_service ||= Sufia::QueryService.new
-    end
-
-    def solr_connection
-      ActiveFedora::SolrService.instance.conn
-    end
-
-    def top_data(key, limit)
-      # Grab JSON response (looks like {"terms": {"depositor_tesim": {"mjg36": 3}}} for depositor)
-      json = solr_connection.get 'terms', params: { 'terms.fl' => key,
-                                                    'terms.sort' => 'count',
-                                                    'terms.limit' => limit,
-                                                    wt: 'json',
-                                                    'json.nl' => 'map',
-                                                    omitHeader: 'true' }
-      unless json
-        Rails.logger.error "Unable to reach TermsComponent via Solr connection. Is it enabled in your solr config?"
-        return []
-      end
-
-      json['terms'][key]
-    end
-end

data/app/views/admin/stats/_files.html.erb

@@ -1,8 +0,0 @@
-<h3>File Statistics (<%= @presenter.date_filter_string %>)</h3>
-<h4>Total Files: <%= @presenter.files_count[:total] %> </h4>
-<h4>Totals by Visibility</h4>
-<ul>
-  <li>Open Access <span class="count">(<%= @presenter.files_count[:public] %>)</span></li>
-  <li><%= t("sufia.admin.stats.registered") %> <span class="count">(<%= @presenter.files_count[:registered] %>)</span></li>
-  <li>Private <span class="count">(<%= @presenter.files_count[:private] %>)</span></li>
-</ul>

data/lib/generators/sufia/fulltext_generator.rb

@@ -1,26 +0,0 @@
-require 'rails/generators'
-
-class Sufia::FulltextGenerator < Rails::Generators::Base
-  source_root File.expand_path('../templates', __FILE__)
-
-  desc """
-This generator makes the following changes to your application:
- 1. Copies solrconfig.xml into solr_conf/conf/
- 2. Reconfigures jetty
-       """
-
-  def banner
-    say_status("info", "GENERATING SUFIA FULL-TEXT", :blue)
-  end
-
-  # Copy Sufia's solrconfig into the dir from which the jetty:config task pulls
-  # Sufia's solrconfig includes full-text extraction
-  def copy_solr_config
-    copy_file 'config/solrconfig.xml', 'solr_conf/conf/solrconfig.xml', force: true
-  end
-
-  # Copy config, schema, and jars into jetty dir if it exists
-  def reconfigure_jetty
-    rake "curation_concerns:jetty:config" if File.directory?('jetty')
-  end
-end