sufia 4.0.0.rc1 → 4.0.0.rc2

data/app/views/collections/show_fields/_creator.html.erb

@@ -1,11 +0,0 @@
-        <tr>
-          <th>Creator</th>
-          <td>
-            <% @collection.creator.each do |creator| %>
-            <span itemprop="creator" itemscope itemtype="http://schema.org/Thing">
-              <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("properties__creator", :facetable)) %></span>
-            </span>
-            <br />
-            <% end %>
-          </td>
-        </tr>

data/app/views/collections/show_fields/_description.html.erb

@@ -1,8 +0,0 @@
-        <tr>
-          <th>Abstract or Summary</th>
-          <td>
-            <span itemprop="description">
-              <%= iconify_auto_link(@collection.description) %>
-            </span>
-          </td>
-        </tr>

data/app/views/collections/show_fields/_title.html.erb

@@ -1,8 +0,0 @@
-        <tr>
-          <th>Title</th>
-          <td>
-            <span itemprop="name">
-              <%= @collection.title %>
-            </span>
-          </td>
-        </tr>

data/app/views/generic_files/edit_fields/_default.html.erb

@@ -1,6 +0,0 @@
-      <div class="col-sm-9" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <% required = render_req && (index == 0) && required?(key) %>
-        <%= f.text_field :title, name: "generic_file[#{key.to_s}][]", id: "generic_file_#{key.to_s}", value: v, class: "input-large", required: required  %>
-        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
-      </div><!-- /controls -->
-      <div id="additional_<%= key %>_elements"></div>

data/app/views/generic_files/edit_fields/_description.html.erb

@@ -1,5 +0,0 @@
-      <div class="col-sm-9" <%  if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-        <%= f.text_area :description, name:"generic_file[#{key.to_s}][]", id: "generic_file_{key.to_s}", value: v, class: "input-large" %>
-        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
-      </div><!-- /controls -->
-      <div id="additional_<%= key %>_elements"></div>

data/app/views/generic_files/edit_fields/_resource_type.html.erb

@@ -1,6 +0,0 @@
-<%# convert class variable to a local variable if the local hasn't been set %>
-<% generic_file = @generic_file unless generic_file  %>
-        <div class="col-sm-9">
-          <%= f.select "resource_type", options_for_select(Sufia.config.resource_types.keys, generic_file.resource_type), {}, { multiple: true, size: 7 } %>
-          <p class="help-block">You may select multiple types to apply <%= help_icon(:resource_type) %><p>
-        </div>

data/app/views/generic_files/edit_fields/_rights.html.erb

@@ -1,6 +0,0 @@
-      <div class="col-sm-9" <% if index == 0%> id="additional_<%= key.to_s %>_clone" <% end %>>
-              <% choices = {"" => ""}.merge(Sufia.config.cc_licenses) %>
-              <%= f.select "rights", options_for_select(choices, v) %>
-        <%= render partial: "generic_files/edit_fields/suffix", locals: { key: key, index: index } %>
-      </div><!-- /controls -->
-      <div id="additional_<%= key %>_elements"></div>

data/app/views/generic_files/edit_fields/_suffix.html.erb

@@ -1,9 +0,0 @@
-        <% if index == 0  %>
-          <%= add_field(key) %>
-          &nbsp;
-          <%= help_icon(key) %>
-          <%= render partial: "generic_files/rights_modal" if key == "rights" %>
-        <% else %>
-          <%= subtract_field(key) %>
-        <% end %>
-

data/app/views/generic_files/show_fields/_creator.html.erb

@@ -1,7 +0,0 @@
-<% @generic_file.creator.each do |creator| %>
-        <span itemprop="creator" itemscope itemtype="http://schema.org/Thing">
-    <span itemprop="name"><%= link_to_facet(creator, Solrizer.solr_name("desc_metadata__creator", :facetable)) %></span>
-        </span>
-  <br />
-<% end %>
-

data/app/views/generic_files/show_fields/_default.html.erb

@@ -1,6 +0,0 @@
-<% Array(generic_file[key]).each do |v| %>
-  <span itemprop="#{key}" itemscope itemtype="http://schema.org/Thing">
-    <%= v %>
-  </span>
-  <br />
-<% end %>

data/app/views/generic_files/show_fields/_description.html.erb

@@ -1,7 +0,0 @@
-<% @generic_file.description.each do |desc| %>
-  <span itemprop="description">
-  <%= iconify_auto_link(desc) %>
-  </span>
-  <br />
-<% end %>
-

data/app/views/generic_files/show_fields/_identifier.html.erb

@@ -1,4 +0,0 @@
-<% @generic_file.identifier.each do |id| %>
-  <%= id %><br />
-<% end %>
-

data/app/views/generic_files/show_fields/_related_url.html.erb

@@ -1,6 +0,0 @@
-<% @generic_file.related_url.each do |url| %>
-  <div style="word-break:break-all;">
-    <%= iconify_auto_link(url) %>
-  </div>
-<% end %>
-

data/app/views/generic_files/show_fields/_title.html.erb

@@ -1,7 +0,0 @@
-<% @generic_file.title.each do |title| %>
-  <span itemprop="name">
-  <%= title %>
-  </span>
-  <br />
-<% end %>
-

data/lib/generators/sufia/sufia_generator.rb

@@ -1,89 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class SufiaGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-
-  source_root File.expand_path('../templates', __FILE__)
-
-  argument :model_name, type: :string , default: "user"
-  desc """
-This generator makes the following changes to your application:
- 1. Runs sufia-models:install
- 2. Adds Sufia's abilities into the Ability class
- 3. Adds controller behavior to the application controller
- 4. Copies the catalog controller into the local app
- 5. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
-       """
-
-  def run_required_generators
-    generate "blacklight:install --devise"
-    generate "hydra:head -f"
-    generate "sufia:models:install"
-  end
-
-  def insert_abilities
-    insert_into_file 'app/models/ability.rb', after: /Hydra::Ability/ do
-      "\n  include Sufia::Ability\n"
-    end
-  end
-
-  # Add behaviors to the application controller
-  def inject_sufia_controller_behavior
-    controller_name = "ApplicationController"
-    file_path = "app/controllers/application_controller.rb"
-    if File.exists?(file_path)
-      insert_into_file file_path, after: 'include Blacklight::Controller' do
-        "  \n# Adds Sufia behaviors into the application controller \n" +
-        "  include Sufia::Controller\n"
-      end
-      gsub_file file_path, "layout 'blacklight'", "layout 'sufia-one-column'"
-    else
-      puts "     \e[31mFailure\e[0m  Could not find #{file_path}.  To add Sufia behaviors to your Controllers, you must include the Sufia::Controller module in the Controller class definition."
-    end
-  end
-
-  def catalog_controller
-    copy_file "catalog_controller.rb", "app/controllers/catalog_controller.rb"
-  end
-
-  def copy_helper
-    copy_file 'sufia_helper.rb', 'app/helpers/sufia_helper.rb'
-  end
-
-  def remove_blacklight_scss
-    remove_file 'app/assets/stylesheets/blacklight.css.scss'
-  end
-
-  def tinymce_config
-    copy_file "config/tinymce.yml", "config/tinymce.yml"
-  end
-
-  # The engine routes have to come after the devise routes so that /users/sign_in will work
-  def inject_routes
-    gsub_file 'config/routes.rb', 'root :to => "catalog#index"', ''
-
-    routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" +
-      "  # This must be the very last route in the file because it has a catch-all route for 404 errors.
-  # This behavior seems to show up only in production mode.
-  mount Sufia::Engine => '/'\n  root to: 'homepage#index'\n"
-
-    sentinel = /devise_for :users/
-    inject_into_file 'config/routes.rb', routing_code, { after: sentinel, verbose: false }
-  end
-
-  # Add behaviors to the SolrDocument model
-  def inject_sufia_solr_document_behavior
-    file_path = "app/models/solr_document.rb"
-    if File.exists?(file_path)
-      inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
-        "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
-          "  include Sufia::SolrDocumentBehavior\n"
-      end
-    else
-      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
-    end
-  end
-
-end

data/spec/active_fedora/unsaved_digital_object_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe ActiveFedora::UnsavedDigitalObject do
-  it "should have an ARK-style pid" do    
-    @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id')
-    @obj.save
-    Sufia::IdService.valid?(@obj.pid).should be_true
-  end
-  it "should not use Fedora's pid service" do
-    ActiveFedora::RubydoraConnection.any_instance.should_receive(:nextid).never
-    @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id')
-    @obj.save
-  end
-  it "should allow objects to override ARK-style pid generation" do
-    mock_pid = 'scholarsphere:ef12ef12f'
-    @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id', mock_pid)
-    @obj.pid.should == mock_pid
-  end
-  it "should not assign a new pid if a pid was specified at instantiation" do
-    mock_pid = 'scholarsphere:ef12ef12f'
-    @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id', mock_pid)
-    @obj.assign_pid
-    @obj.pid.should == mock_pid
-  end
-  it "should not assign a pid that already exists in Fedora" do
-    mock_pid = 'scholarsphere:ef12ef12f'
-    unique_pid = 'scholarsphere:bb22bb22b'
-    Sufia::IdService.stub(:next_id).and_return(mock_pid, unique_pid)
-    ActiveFedora::Base.stub(:exists?).with(mock_pid).and_return(true)
-    ActiveFedora::Base.stub(:exists?).with(unique_pid).and_return(false)
-    @obj = ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'id')
-    pid = @obj.assign_pid
-    @obj.pid.should == unique_pid
-  end
-end