sufia 4.0.0.beta4 → 4.0.0.rc1

data/sufia-models/app/services/sufia/noid.rb

@@ -16,11 +16,8 @@ module Sufia
       end
 
       def namespaceize(identifier)
-        if identifier.start_with?(namespace)
-          identifier
-        else
-          "#{namespace}:#{identifier}"
-        end
+        return identifier if identifier.include?(':')
+        "#{namespace}:#{identifier}"
       end
 
       protected

data/sufia-models/lib/generators/sufia/models/upgrade400_generator.rb

@@ -0,0 +1,78 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Sufia::Models::Upgrade400Generator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  argument     :model_name, type: :string , default: "user"
+  desc """
+This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following changes to your application:
+ 1. Creates several database migrations if they do not exist in /db/migrate
+ 2. Runs the mailboxer upgrade generator
+ 3. Adds analytics to the sufia.rb configuration file
+       """
+
+  # Implement the required interface for Rails::Generators::Migration.
+  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+  def self.next_migration_number(path)
+    if @prev_migration_nr
+      @prev_migration_nr += 1
+    else
+      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      end
+    end
+    @prev_migration_nr.to_s
+  end
+
+  def banner
+    say_status("warning", "UPGRADING SUFIA MODELS", :yellow)
+  end
+
+  # Setup the database migrations
+  def copy_migrations
+    # Can't get this any more DRY, because we need this order.
+    [
+      'create_tinymce_assets.rb',
+      'create_content_blocks.rb',
+      'create_featured_works.rb'
+    ].each do |file|
+      better_migration_template file
+    end
+  end
+
+  # Upgrade mailboxer
+  def install_mailboxer
+    generate "mailboxer:namespacing_compatibility"
+  end
+
+  # Add config file for Google Analytics
+  def add_analytics_config
+    copy_file 'config/analytics.yml', 'config/analytics.yml'
+  end
+
+  # Add Google Analytics option to Sufia config
+  def inject_analytics_initializer
+    inject_into_file 'config/initializers/sufia.rb', after: /^Sufia\.config do.*$/ do
+      "\n  # Enable displaying usage statistics in the UI\n" +
+        "  # Defaults to FALSE\n" +
+        "  # Requires a Google Analytics id and OAuth2 keyfile.  See README for more info\n" +
+        "  #config.analytics = false\n"
+      end
+  end
+
+  private
+
+  def better_migration_template(file)
+    begin
+      migration_template "migrations/#{file}", "db/migrate/#{file}"
+    rescue Rails::Generators::Error => e
+      say_status("warning", e.message, :yellow)
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Sufia
       config.enable_contact_form_delivery = false
       config.browse_everything = nil
       config.enable_local_ingest = nil
-      config.usage_statistics = nil
+      config.analytics = false
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(

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

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

data/sufia-models/sufia-models.gemspec

@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
   spec.add_dependency 'activeresource', "~>4.0.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 7.0.1"
+  spec.add_dependency "hydra-head", "~> 7.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'
-  spec.add_dependency 'resque-pool', '0.3.0'
+  spec.add_dependency 'resque-pool', '~> 0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'mailboxer', '~> 0.12.0.rc2'
+  spec.add_dependency 'mailboxer', '~> 0.12.0'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.1'

data/sufia.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rails_autolink', '~> 1.1.0'
   gem.add_dependency 'yaml_db', '0.2.3'
   gem.add_dependency 'font-awesome-sass-rails', '~> 3.0'
-  gem.add_dependency 'hydra-editor'
+  gem.add_dependency 'hydra-editor', '~> 0.3.0'
   gem.add_dependency 'hydra-collections', '~> 2.0.2'
   gem.add_dependency 'bootstrap_form', '~> 2.1.1'
   gem.add_dependency 'blacklight-gallery'

data/tasks/sufia-dev.rake

@@ -5,7 +5,7 @@ require 'jettywrapper'
 #ENV["RAILS_ROOT"] ||= 'spec/internal'
 
 desc 'Spin up hydra-jetty and run specs'
-task ci: ['jetty:config'] do
+task ci: ['jetty:clean', 'jetty:config'] do
   puts 'running continuous integration'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta4
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-06 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.beta4
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta4
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -203,16 +203,16 @@ dependencies:
   name: hydra-editor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +265,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".gitmodules"
 - ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
@@ -273,10 +272,9 @@ files:
 - History.md
 - LICENSE.md
 - README.md
+- RELEASING.md
 - Rakefile
-- Releasing_sufia.md
 - SUFIA_VERSION
-- UpgradeGuide.md
 - app/assets/images/audio.png
 - app/assets/images/blacklight/bg.png
 - app/assets/images/blacklight/border.png
@@ -356,8 +354,8 @@ files:
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
-- app/assets/stylesheets/dashboard.css.scss
 - app/assets/stylesheets/featured.css.scss
+- app/assets/stylesheets/file-listing.css.scss
 - app/assets/stylesheets/fileupload/application.css
 - app/assets/stylesheets/fileupload/jquery.fileupload-ui.css.erb
 - app/assets/stylesheets/fileupload/pbar-ani.gif
@@ -454,6 +452,7 @@ files:
 - app/views/advanced/_facet_layout.html.erb
 - app/views/advanced/_facet_limit.html.erb
 - app/views/advanced/index.html.erb
+- app/views/batch/_edit.js.erb
 - app/views/batch/_metadata.html.erb
 - app/views/batch/_more_metadata.html.erb
 - app/views/batch/edit.html.erb
@@ -462,59 +461,20 @@ files:
 - app/views/batch_edits/_delete_selected.html.erb
 - app/views/batch_edits/edit.html.erb
 - app/views/batch_edits/update_edit.js.erb
-- app/views/catalog/_bookmark_control.html.erb
-- app/views/catalog/_citation.html.erb
-- app/views/catalog/_constraints.html.erb
-- app/views/catalog/_constraints_element.html.erb
 - app/views/catalog/_delete_partials/_default.html.erb
-- app/views/catalog/_did_you_mean.html.erb
-- app/views/catalog/_document.html.erb
 - app/views/catalog/_document_list.html.erb
 - app/views/catalog/_edit_partials/_default.html.erb
 - app/views/catalog/_edit_partials/_default_details.html.erb
-- app/views/catalog/_email_form.html.erb
-- app/views/catalog/_facet_layout.html.erb
 - app/views/catalog/_facet_limit.html.erb
-- app/views/catalog/_facet_selected.html.erb
-- app/views/catalog/_facets.html.erb
-- app/views/catalog/_folder_control.html.erb
-- app/views/catalog/_index_default.html.erb
-- app/views/catalog/_index_header_default.html.erb
-- app/views/catalog/_index_partials/_default_group.html.erb
-- app/views/catalog/_index_partials/_list_files.html.erb
-- app/views/catalog/_marc_view.html.erb
-- app/views/catalog/_opensearch_response_metadata.html.erb
-- app/views/catalog/_previous_next_doc.html.erb
-- app/views/catalog/_refworks_form.html.erb
-- app/views/catalog/_results_pagination.html.erb
 - app/views/catalog/_search_form.html.erb
-- app/views/catalog/_show_default.html.erb
 - app/views/catalog/_show_partials/_default.html.erb
 - app/views/catalog/_show_partials/_default_details.html.erb
 - app/views/catalog/_show_partials/_facets.html.erb
-- app/views/catalog/_show_sidebar.html.erb
-- app/views/catalog/_show_tools.html.erb
-- app/views/catalog/_sms_form.html.erb
-- app/views/catalog/_sort_and_per_page.html.erb
-- app/views/catalog/about.html.erb
-- app/views/catalog/citation.html.erb
-- app/views/catalog/email.erb
-- app/views/catalog/endnote.endnote.erb
-- app/views/catalog/index.atom.builder
 - app/views/catalog/index.html.erb
-- app/views/catalog/index.rss.builder
-- app/views/catalog/librarian_view.html.erb
-- app/views/catalog/opensearch.json.erb
-- app/views/catalog/opensearch.xml.builder
 - app/views/catalog/recent.js.erb
-- app/views/catalog/send_email_record.erb
-- app/views/catalog/show.endnote.erb
-- app/views/catalog/show.html.erb
-- app/views/catalog/show.refworks.erb
-- app/views/catalog/sms.erb
 - app/views/collections/_action_menu.html.erb
 - app/views/collections/_batch_edits_actions.html.erb
-- app/views/collections/_button_for_creating_empty_collection.html.erb
+- app/views/collections/_collection.html.erb
 - app/views/collections/_dashboard_document_list.html.erb
 - app/views/collections/_document_list.html.erb
 - app/views/collections/_edit_actions.html.erb
@@ -552,9 +512,11 @@ files:
 - 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
 - app/views/generic_files/_extra_fields_modal.html.erb
 - app/views/generic_files/_field_form.html.erb
 - app/views/generic_files/_flot_stats.js.erb
+- app/views/generic_files/_generic_file.html.erb
 - app/views/generic_files/_groups_description.html.erb
 - app/views/generic_files/_local_file_import.html.erb
 - app/views/generic_files/_media_display.html.erb
@@ -694,6 +656,7 @@ files:
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
 - lib/generators/sufia/templates/config/tinymce.yml
 - lib/generators/sufia/templates/sufia_helper.rb
+- lib/generators/sufia/upgrade400_generator.rb
 - lib/sufia.rb
 - lib/sufia/role_mapper.rb
 - lib/sufia/single_use_error.rb
@@ -738,6 +701,7 @@ files:
 - spec/factories/users.rb
 - spec/features/browse_dashboard_files_spec.rb
 - spec/features/browse_files_spec.rb
+- spec/features/catalog_search_spec.rb
 - spec/features/cloud_upload_spec.rb
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
@@ -816,6 +780,7 @@ files:
 - spec/models/user_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/route_spec.rb
+- spec/services/noid_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
@@ -823,13 +788,14 @@ files:
 - spec/support/fixture_helpers.rb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/views/batch/edit.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
 - spec/views/dashboard/index_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
-- spec/views/my/facet_limit.html.erb_spec.rb
+- spec/views/my/facet.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
@@ -913,6 +879,7 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_trophies.rb
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
+- sufia-models/lib/generators/sufia/models/upgrade400_generator.rb
 - sufia-models/lib/generators/sufia/models/usagestats_generator.rb
 - sufia-models/lib/sufia/ability.rb
 - sufia-models/lib/sufia/models.rb
@@ -1040,6 +1007,7 @@ test_files:
 - spec/factories/users.rb
 - spec/features/browse_dashboard_files_spec.rb
 - spec/features/browse_files_spec.rb
+- spec/features/catalog_search_spec.rb
 - spec/features/cloud_upload_spec.rb
 - spec/features/collection_spec.rb
 - spec/features/contact_form_spec.rb
@@ -1118,6 +1086,7 @@ test_files:
 - spec/models/user_spec.rb
 - spec/routing/featured_works_route_spec.rb
 - spec/routing/route_spec.rb
+- spec/services/noid_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
@@ -1125,13 +1094,14 @@ test_files:
 - spec/support/fixture_helpers.rb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
+- spec/views/batch/edit.html.erb_spec.rb
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/catalog/sort_and_per_pange.html.erb_spec.rb
 - spec/views/dashboard/index_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
-- spec/views/my/facet_limit.html.erb_spec.rb
+- spec/views/my/facet.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb

data/.gitmodules

@@ -1,4 +0,0 @@
-[submodule "jetty"]
-	path = jetty
-  url = git://github.com/projecthydra/hydra-jetty.git
-	ignore = dirty

data/Releasing_sufia.md

@@ -1,6 +0,0 @@
-Update /SUFIA_VERSION
-
-`rake all:release`
-
-### make sure all the changes get to everyone else:
-`git push`

data/UpgradeGuide.md

@@ -1,3 +0,0 @@
-#Upgrading to Sufia 3.4.0
-
-* If you are using Sufia::Models::AccessRight, substitute Hydra::AccessControls::AccessRight instead

data/app/views/catalog/_bookmark_control.html.erb

@@ -1,24 +0,0 @@
-<% if has_user_authentication_provider? and current_user %>
-  <%- 
-  # Note these two forms are pretty similar but for different :methods, classes, and labels. 
-  # but it was simpler to leave them separate instead of DRYing them, got confusing trying that.
-  # the data-doc-id attribute is used by our JS that converts to a checkbox/label.
-  -%>  
-  <% if current_user.document_is_bookmarked? document %>  
-
-      <%= form_tag( bookmark_path( document ), method: :put, class: "bookmark_toggle", "data-doc-id" => document.id, title: document[document_show_link_field] ) do %>        
-        <%= hidden_field(:bookmark, :title, value: document[document_show_link_field] ) %>
-        <%= submit_tag("Bookmark", id: "bookmark_toggle_#{document.id.to_s.parameterize}", class: "bookmark_add") %>
-      <% end %>
-  
-  <% else %>
-  
-      <%= form_tag( bookmark_path( document ), method: :delete, class: "bookmark_toggle", "data-doc-id" => document.id, title: document[document_show_link_field]) do %>  
-        <%= hidden_field(:bookmark, :title, value: document[document_show_link_field] ) %>
-        <%= submit_tag("Remove bookmark", id: "bookmark_toggle_#{document.id.to_s.parameterize}", class: "bookmark_remove") %>
-      <% end %>
-      
-  <% end %>
-<% else %>
-  &nbsp;
-<% end %>

data/app/views/catalog/_citation.html.erb

@@ -1,11 +0,0 @@
-<h1><%= document_show_html_title %></h1>
-
-<% if @document.respond_to?(:export_as_mla_citation_txt) %>
-  <h4>MLA</h4>
-  <%= @document.send(:export_as_mla_citation_txt) %><br/><br/>
-<% end %>
-
-<% if @document.respond_to?(:export_as_apa_citation_txt) %>
-  <h4>APA</h4>
-  <%= @document.send(:export_as_apa_citation_txt) %>
-<% end %>

data/app/views/catalog/_constraints.html.erb

@@ -1,6 +0,0 @@
-<!-- 
-<div id="appliedParams">
-	<h3 class="label">You searched for:</h3>
-  <%# render_constraints(localized_params) %>  
-</div>
--->