hydra-editor 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c7bcefdae8a2a708950ca465f1a8fd1681c0ed
-  data.tar.gz: 30897bee5326cf52c481968e43a303b1639f8816
+  metadata.gz: a4b9156e8136c594af4e76af76ea7fe527a1b972
+  data.tar.gz: 0d9d6a7c2c63353b27c5a059531c1ed37dd2b2c7
 SHA512:
-  metadata.gz: 423d8220008a8c5cdab2da1097d6873da0e1f6ffd7a3c997e01004ae8adef4f4742c8a1089d0d43db4a62d4e806a55b5d24d1273fe1fedc7336a663f6eafb29d
-  data.tar.gz: 5449e1cd9d8bda697ab1d727c978742c530d717d76754cac82bf6893a42779a5adc00ac2b0f498f4f9965110752e3346d85a15678607092779b91fbabbe05389
+  metadata.gz: 341432004b0c7624c3f60bae5830511f54372af022e79642482fbc618fc2bc59cd4536c101402dadbf91ef8e22eb10c0c0090a4e5adbe35679aae881cc391465
+  data.tar.gz: c9bfeba5d7ff247557fee88700fb38a7f9b10df123eb065711abef9d0a80f9dbe53fe9a8d7baba7eec34d6cae01a37910926b4396d8e14dca9b400f4fc54bf97

data/README.md

@@ -1,5 +1,4 @@
-# HydraEditor [![Gem Version](https://badge.fury.io/rb/hydra-editor.png)](http://badge.fury.io/rb/hydra-editor) [![Build Status](https://travis-ci.org/projecthydra-labs/hydra-editor.png)](https://travis-ci.org/projecthydra-labs/hydra-editor)
-
+# HydraEditor [![Gem Version](https://badge.fury.io/rb/hydra-editor.png)](http://badge.fury.io/rb/hydra-editor) [![Build Status](https://travis-ci.org/projecthydra/hydra-editor.png)](https://travis-ci.org/projecthydra/hydra-editor)
 
 To use add to your gemfile:
 
@@ -7,6 +6,16 @@ To use add to your gemfile:
 gem 'hydra-editor'
 ```
 
+Then run:
+```
+bundle install
+```
+
+Next generate the bootstrap form layouts:
+```
+rails generate simple_form:install --bootstrap
+```
+
 And to config/routes.rb add:
 
 ```ruby
@@ -79,3 +88,9 @@ end
 ```
 
 If you are not mounting the engine or using its default routes, you can include RecordsControllerBehavior in your own controller and add the appropriate routes to your app's config/routes.rb.
+
+# Project Hydra
+This software has been developed by and is brought to you by the Hydra community.  Learn more at the
+[Project Hydra website](http://projecthydra.org)
+
+![Project Hydra Logo](https://github.com/uvalib/libra-oa/blob/a6564a9e5c13b7873dc883367f5e307bf715d6cf/public/images/powered_by_hydra.png?raw=true)

data/Rakefile

@@ -25,15 +25,25 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-require 'jettywrapper'
-Jettywrapper.hydra_jetty_version = "v8.1.1"
-
+require 'solr_wrapper/rake_task'
+require 'fcrepo_wrapper'
+require 'active_fedora/rake_support'
 require 'engine_cart/rake_task'
 
-task ci: ['engine_cart:generate', 'jetty:clean'] do
+require 'jasmine'
+load 'jasmine/tasks/jasmine.rake'
+
+# Set up the test application prior to running jasmine tasks.
+task 'jasmine:require' => :setup_test_server
+task :setup_test_server do
+  require 'engine_cart'
+  EngineCart.load_application!
+end
+
+desc 'Continuous Integration'
+task ci: ['engine_cart:generate'] do
   ENV['environment'] = "test"
-  jetty_params = Jettywrapper.load_config
-  error = Jettywrapper.wrap(jetty_params) do
+  with_test_server do
     Rake::Task['spec'].invoke
   end
 end

data/app/assets/javascripts/hydra-editor/manage_repeating_fields.js

@@ -7,13 +7,13 @@ var HydraEditor = (function($) {
           this.element = $(element);
           this.options = options;
 
-          this.controls = $("<span class=\"input-group-btn field-controls\">");
-          this.remover  = $("<button type=\"button\" class=\"btn btn-danger remove\"><i class=\"icon-white glyphicon-minus\"></i><span>Remove</span></button>");
-          this.adder    = $("<button type=\"button\" class=\"btn btn-success add\"><i class=\"icon-white glyphicon-plus\"></i><span>Add</span></button>");
+          this.controls = $(options.controlsHtml);
+          this.remover  = $(options.removeButtonHtml);
+          this.adder    = $(options.addButtonHtml);
 
-          this.fieldWrapperClass = '.field-wrapper';
-          this.warningClass = '.has-warning';
-          this.listClass = '.listing';
+          this.fieldWrapperClass = options.fieldWrapperClass;
+          this.warningClass = options.warningClass;
+          this.listClass = options.listClass;
 
           this.init();
       }
@@ -121,8 +121,18 @@ var HydraEditor = (function($) {
       }
 
       FieldManager.DEFAULTS = {
-          add: null,
-          remove: null
+          /* callback to run after add is called */
+          add:    null,
+          /* callback to run after remove is called */
+          remove: null,
+
+
+          controlsHtml:      "<span class=\"input-group-btn field-controls\">",
+          addButtonHtml:     "<button type=\"button\" class=\"btn btn-success add\"><i class=\"icon-white glyphicon-plus\"></i><span>More</span></button>",
+          removeButtonHtml:  "<button type=\"button\" class=\"btn btn-danger remove\"><i class=\"icon-white glyphicon-minus\"></i><span>Remove</span></button>",
+          warningClass:      '.has-warning',
+          listClass:         '.listing',
+          fieldWrapperClass: '.field-wrapper'
       }
 
       return { FieldManager: FieldManager };

data/app/controllers/concerns/records_controller_behavior.rb

@@ -16,7 +16,7 @@ module RecordsControllerBehavior
       HydraEditor::ControllerResource
     end
     def resource_instance_name
-      name.sub("Controller", "").underscore.split('/').last.singularize
+      name.sub('Controller', '').underscore.split('/').last.singularize
     end
   end
 
@@ -32,7 +32,6 @@ module RecordsControllerBehavior
 
   def create
     set_attributes
-
     respond_to do |format|
       if resource.save
         format.html { redirect_to redirect_after_create, notice: 'Object was successfully created.' }
@@ -42,7 +41,6 @@ module RecordsControllerBehavior
         format.json { render json: resource.errors, status: :unprocessable_entity }
       end
     end
-
   end
 
   def update
@@ -58,7 +56,7 @@ module RecordsControllerBehavior
     end
   end
 
-  protected
+protected
 
   def object_as_json
     resource.to_json
@@ -102,7 +100,7 @@ module RecordsControllerBehavior
   end
 
   def form_name
-    if resource_instance_name == 'record'.freeze
+    if resource_instance_name == 'record'
       if params[:id]
         "#{resource.class.name}Form"
       elsif has_valid_type?
@@ -132,5 +130,4 @@ module RecordsControllerBehavior
   def resource_instance_name
     self.class.resource_instance_name
   end
-
 end

data/app/forms/hydra_editor/form.rb

@@ -85,6 +85,7 @@ module HydraEditor
     end
 
     protected
+
       def initialize_fields
         # we're making a local copy of the attributes that we can modify.
         @attributes = model.attributes

data/app/forms/hydra_editor/form/permissions.rb

@@ -4,7 +4,6 @@ module HydraEditor
       extend ActiveSupport::Concern
 
       module ClassMethods
-
         def build_permitted_params
           permitted = super
           permitted << { permissions_attributes: [:type, :name, :access, :id, :_destroy] }
@@ -15,9 +14,7 @@ module HydraEditor
       # This is required so that fields_for will draw a nested form.
       # See ActionView::Helpers#nested_attributes_association?
       #   https://github.com/rails/rails/blob/a04c0619617118433db6e01b67d5d082eaaa0189/actionview/lib/action_view/helpers/form_helper.rb#L1890
-      def permissions_attributes= attributes
-        model.permissions_attributes= attributes
-      end
+      delegate :permissions_attributes=, to: :model
     end
   end
 end

data/app/helpers/concerns/records_helper_behavior.rb

@@ -5,9 +5,9 @@ module RecordsHelperBehavior
 
   def object_type_options
     @object_type_options ||= HydraEditor.models.inject({}) do |h, model|
-        label = model_label(model)
-        h["#{label[0].upcase}#{label[1..-1]}"] = model
-        h
+      label = model_label(model)
+      h["#{label[0].upcase}#{label[1..-1]}"] = model
+      h
     end
   end
 
@@ -33,7 +33,7 @@ module RecordsHelperBehavior
     Array(form.title).first
   end
 
- protected
+protected
 
   # This finds a partial based on the record_type and field_name
   # if no partial exists for the record_type it tries using "records" as a default
@@ -44,7 +44,7 @@ module RecordsHelperBehavior
 
   def find_edit_field_partial(record_type, field_name)
     ["#{record_type}/edit_fields/_#{field_name}", "records/edit_fields/_#{field_name}",
-     "#{record_type}/edit_fields/_default", "records/edit_fields/_default"].find do |partial|
+     "#{record_type}/edit_fields/_default", 'records/edit_fields/_default'].find do |partial|
       logger.debug "Looking for edit field partial #{partial}"
       return partial.sub(/\/_/, '/') if partial_exists?(partial)
     end

data/app/inputs/multi_value_input.rb

@@ -1,7 +1,7 @@
 class MultiValueInput < SimpleForm::Inputs::CollectionInput
   def input(wrapper_options)
     @rendered_first_element = false
-    input_html_classes.unshift("string")
+    input_html_classes.unshift('string')
     input_html_options[:name] ||= "#{object_name}[#{attribute_name}][]"
 
     outer_wrapper do
@@ -25,9 +25,8 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
       "    <ul class=\"listing\">\n        #{yield}\n      </ul>\n"
     end
 
-
     def inner_wrapper
-        <<-HTML
+      <<-HTML
           <li class="field-wrapper">
             #{yield}
           </li>

data/app/presenters/hydra/presenter.rb

@@ -14,25 +14,8 @@ module Hydra
       @model = object
     end
 
-    def to_key
-      model.to_key
-    end
-
-    def to_param
-      model.to_param
-    end
-
-    def to_model
-      model.to_model
-    end
-
-    def persisted?
-      model.persisted?
-    end
-
-    def [](key)
-      model[key]
-    end
+    delegate :to_key, :to_param, :to_model, :persisted?, :new_record?,
+             :[], to: :model
 
     module ClassMethods
       def model_name
@@ -65,7 +48,7 @@ module Hydra
     module ClassMethods
       # @deprecated Because if we use an instance method, there will be no need to set self.model_class in most instances. Note, there is a class method multiple? on the form.
       def multiple?(field)
-        Deprecation.warn(ClassMethods, "The class method multiple? has been deprecated. Use the instance method instead. This will be removed in version 2.0")
+        Deprecation.warn(ClassMethods, 'The class method multiple? has been deprecated. Use the instance method instead. This will be removed in version 2.0')
         HydraEditor::FieldMetadataService.multiple?(model_class, field)
       end
 
@@ -84,7 +67,7 @@ module Hydra
       end
 
       def terms
-        self._terms
+        _terms
       end
 
       private

data/lib/hydra-editor.rb

@@ -1,14 +1,13 @@
-require "hydra_editor/engine"
+require 'hydra_editor/engine'
 
 module HydraEditor
-
   class InvalidType < RuntimeError; end
 
   extend ActiveSupport::Autoload
 
   autoload :ControllerResource
 
-  def self.models= val
+  def self.models=(val)
     @models = val
   end
 

data/lib/hydra_editor/controller_resource.rb

@@ -4,7 +4,7 @@ class HydraEditor::ControllerResource < CanCan::ControllerResource
   end
 
   def resource_class
-    raise HydraEditor::InvalidType, "Lost the type" unless has_valid_type?
+    raise HydraEditor::InvalidType, 'Lost the type' unless has_valid_type?
     type_param.constantize
   end
 

data/lib/hydra_editor/engine.rb

@@ -1,12 +1,13 @@
 module HydraEditor
   class Engine < ::Rails::Engine
+    require 'simple_form'
     engine_name 'hydra_editor'
     config.eager_load_paths += %W(
        #{config.root}/app/helpers/concerns
        #{config.root}/app/presenters
     )
-    initializer "hydra-editor.initialize" do
-      require "cancan"
+    initializer 'hydra-editor.initialize' do
+      require 'cancan'
     end
   end
 end

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "1.2.0"
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -155,30 +155,58 @@ dependencies:
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: solr_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: fcrepo_wrapper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: jasmine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 description: A basic metadata editor for hydra-head
 email:
 - hydra-tech@googlegroups.com
@@ -209,7 +237,6 @@ files:
 - app/views/records/edit.html.erb
 - app/views/records/edit_fields/_default.html.erb
 - app/views/records/new.html.erb
-- config/initializers/simple_form.rb
 - config/jetty.yml
 - config/locales/hydra_editor.yml
 - config/routes.rb
@@ -237,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head

data/config/initializers/simple_form.rb

@@ -1,31 +0,0 @@
-require 'simple_form'
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  config.wrappers :inline, tag: 'span', class: 'form-group inline', error_class: 'has-error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label, class: 'control-label'
-    b.use :input, class: 'form-control'
-    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
-  end
-
-  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label, class: 'control-label'
-    b.wrapper tag: 'div' do |ba|
-      ba.use :input, class: 'form-control'
-      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
-      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
-    end
-  end
-
-  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
-  # Check the Bootstrap docs (http://getbootstrap.com/css/)
-  # to learn about the different styles for forms and inputs,
-  # buttons and other elements.
-  config.default_wrapper = :vertical_form
-
-  config.error_notification_class = 'alert alert-danger'
-  config.button_class = 'btn btn-default'
-end