hydra-editor 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07b3e61fba7144fb5d24d64cdc241ab1c5e09f5a
-  data.tar.gz: 046d6ccb60e056267ed1e09c29b74999715f2ccf
+  metadata.gz: dd1419f83e2d52941a3816a3087a012fd80bc98f
+  data.tar.gz: a0ca374521dd0fb94acdb553cd5fb9cd74666558
 SHA512:
-  metadata.gz: 712434962668b46f9b6b4dbbc5df09e2acf60b02e4f43b06218a0df30d5891a3046ef938f8ab039c96f1d12da5cc1a072a641f1614308bcecc7fb93bd4154acf
-  data.tar.gz: 3875cf1521283e6358fa89d400876665a931f719ce08ea8c0a54b24eebcd41acd4c6ad7720b7545865b9aa85eaa91403af9d365943e1437a0f772792598dd7a7
+  metadata.gz: 9ad0aad1cd3fdcf694bcf318f076107ef8c6b4bc108cd51e6e6fef4d8663b53504e25fce8010f0344692d0a1e51fb39654d50ee84036632155bb57b0aafe8b6e
+  data.tar.gz: d11f4e9817c7daa1aac868cb32890776ba364cb2f9855ded3c119da725334a241ac5a1d3820b6b202311c0537d73f24f5520f0045a27fb30c79877bf9e1490ed

data/History.md

@@ -1,5 +1,20 @@
 # History of hydra-editor releases
 
+## 1.1.0
+* 2015-10-09: multiple? shouldn't raise errors when confronted with non-properties [Justin Coyne]
+* 2015-09-17: Add an instance method version of multiple? [Justin Coyne]
+* 2015-09-17: Update build matrix [Justin Coyne]
+* 2015-09-17: Make add and remove button the same size [Justin Coyne]
+* 2015-09-17: Use property instead of deprecated has_attributes [Justin Coyne]
+* 2015-09-17: Pin bootstrap-sass to 3.3.4.1 for rails 4.1 build [Justin Coyne]
+* 2015-06-10: Use html-safe translation to avoid raw() call [Jeremy Echols]
+* 2015-04-23: Add <kbd> tags for more semantic form instructions [Jeremy Echols]
+* 2015-04-21: Allow overriding jetty port [Jeremy Echols]
+* 2015-04-21: Add form instructions for screen readers [Jeremy Echols]
+* 2015-04-17: Don't hardcode a version of hydra-head in the test app [Justin Coyne]
+* 2015-04-16: Split option-building from field-building [Jeremy Echols]
+* 2015-04-14: Make [ENTER] default to submit the form [Jeremy Echols]
+
 ## 1.0.3
 * 2015-04-02: Updated README with info on how to set form labels [val99erie]
 * 2015-03-30: Add documentation to Form#model_attributes. (ci skip) [Justin Coyne]

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

@@ -1,4 +1,3 @@
 //= require hydra-editor/manage_repeating_fields
-//= require hydra-editor/keyboard_support
 //= require hydra-editor/editMetadata
 

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

@@ -8,8 +8,8 @@ var HydraEditor = (function($) {
           this.options = options;
 
           this.controls = $("<span class=\"input-group-btn field-controls\">");
-          this.remover  = $("<button class=\"btn btn-danger remove\"><i class=\"icon-white glyphicon-minus\"></i><span>Remove</span></button>");
-          this.adder    = $("<button class=\"btn btn-success add\"><i class=\"icon-white glyphicon-plus\"></i><span>Add</span></button>");
+          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.fieldWrapperClass = '.field-wrapper';
           this.warningClass = '.has-warning';

data/app/assets/stylesheets/hydra-editor/multi_value_fields.scss

@@ -1,4 +1,8 @@
 .multi_value {
+  .btn.add, .btn.remove {
+    width: 6em;
+  }
+
   .field-wrapper {
     list-style-type:none;
   }

data/app/forms/hydra_editor/form.rb

@@ -45,6 +45,10 @@ module HydraEditor
         end
       end
 
+      def multiple?(field)
+        HydraEditor::FieldMetadataService.multiple?(model_class, field)
+      end
+
       # Return a hash of all the parameters from the form as a hash.
       # This is typically used by the controller as the main read interface to the form.
       # This hash can then be used to create or update an object in the data store.
@@ -90,7 +94,7 @@ module HydraEditor
       # override this method if you need to initialize more complex RDF assertions (b-nodes)
       def initialize_field(key)
         # if value is empty, we create an one element array to loop over for output
-        if self.class.multiple?(key)
+        if multiple?(key)
           self[key] = ['']
         else
           self[key] = ''

data/app/inputs/multi_value_input.rb

@@ -39,7 +39,7 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
     # Although the 'index' parameter is not used in this implementation it is useful in an
     # an overridden version of this method, especially when the field is a complex object and
     # the override defines nested fields.
-    def build_field(value, index)
+    def build_field_options(value, index)
       options = input_html_options.dup
 
       options[:value] = value
@@ -53,6 +53,12 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
       options[:class] += ["#{input_dom_id} form-control multi-text-field"]
       options[:'aria-labelledby'] = label_id
       @rendered_first_element = true
+
+      options
+    end
+
+    def build_field(value, index)
+      options = build_field_options(value, index)
       if options.delete(:type) == 'textarea'.freeze
         @builder.text_area(attribute_name, options)
       else

data/app/presenters/hydra/presenter.rb

@@ -3,6 +3,10 @@ module Hydra
     extend ActiveSupport::Concern
     included do
       attr_reader :model
+
+      # model_class only needs to be set if you are using the
+      # deprecated class methods multiple? or unique? or if you
+      # need to use +model_name+ method or if this class includes Hydra::Editor::Form.
       class_attribute :model_class
     end
 
@@ -51,16 +55,22 @@ module Hydra
       self.class._terms
     end
 
+    # If the field is a reflection, delegate to the reflection.
+    # If the field is a property, delegate to the property.
+    # Otherwise return false
+    def multiple?(field)
+      HydraEditor::FieldMetadataService.multiple?(model.class, field)
+    end
+
     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)
-        if reflection = model_class.reflect_on_association(field)
-          reflection.collection?
-        else
-          model_class.multiple?(field)
-        end
+        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
 
       def unique?(field)
+        Deprecation.warn(ClassMethods, "The class method unique? has been deprecated. Use the instance method 'multiple?' instead. This will be removed in version 2.0")
         if reflection = model_class.reflect_on_association(field)
           !reflection.collection?
         else

data/app/services/hydra_editor/field_metadata_service.rb

@@ -0,0 +1,16 @@
+module HydraEditor
+  class FieldMetadataService
+    # If the field is a reflection, delegate to the reflection.
+    # If the field is a property, delegate to the property.
+    # Otherwise return false
+    def self.multiple?(model_class, field)
+      if reflection = model_class.reflect_on_association(field)
+        reflection.collection?
+      elsif model_class.attribute_names.include?(field.to_s)
+        model_class.multiple?(field)
+      else
+        false
+      end
+    end
+  end
+end

data/app/views/records/_form_header.html.erb

@@ -1,4 +1,5 @@
-    <h2 class="non lower">
-	  <%= t('hydra_editor.form.title') %>
-	  <small class="pull-right"><span class="error">*</span> <%= t('hydra_editor.form.required_fields') %></small> 
-	</h2>
+<p class="instructions"><%= t('hydra_editor.form.instructions_html') %></p>
+<h2 class="non lower">
+  <%= t('hydra_editor.form.title') %>
+  <small class="pull-right"><span class="error">*</span> <%= t('hydra_editor.form.required_fields') %></small>
+</h2>

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

@@ -1,4 +1,4 @@
-<% if f.object.class.multiple? key %>
+<% if f.object.multiple? key %>
   <%= f.input key, as: :multi_value, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
 <% else %>
   <%= f.input key, required: f.object.required?(key) %>

data/config/jetty.yml

@@ -1,6 +1,6 @@
 default:
   startup_wait: 90
-  jetty_port: 8983
+  jetty_port: <%= ENV['JETTY_PORT'] || 8983 %>
   java_opts:
     - "-Xmx256m" 
     - "-XX:MaxPermSize=128m"

data/config/locales/hydra_editor.yml

@@ -8,5 +8,8 @@ en:
     form:
       title: 'Descriptions'
       required_fields: 'indicates required fields'
+      instructions_html: 'Use the <kbd>Tab</kbd> key to navigate the form, press
+                         <kbd>Space</kbd> to activate a button, and press
+                         <kbd>Enter</kbd> to submit the whole form.'
     new:
       title: 'Create a New %s Record'

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,7 +191,6 @@ files:
 - Rakefile
 - app/assets/javascripts/hydra-editor/editMetadata.js
 - app/assets/javascripts/hydra-editor/hydra-editor.js
-- app/assets/javascripts/hydra-editor/keyboard_support.js
 - app/assets/javascripts/hydra-editor/manage_repeating_fields.js
 - app/assets/stylesheets/hydra-editor/hydra-editor.scss
 - app/assets/stylesheets/hydra-editor/multi_value_fields.scss
@@ -203,6 +202,7 @@ files:
 - app/helpers/records_helper.rb
 - app/inputs/multi_value_input.rb
 - app/presenters/hydra/presenter.rb
+- app/services/hydra_editor/field_metadata_service.rb
 - app/views/records/_form.html.erb
 - app/views/records/_form_header.html.erb
 - app/views/records/choose_type.html.erb
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head

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

@@ -1,14 +0,0 @@
-Blacklight.onLoad(function() {
-  $('body').on('keypress', '.multi-text-field', function(event) {
-    var $activeField = $(event.target).parents('.field-wrapper'),
-        $activeFieldControls = $activeField.children('.field-controls'),
-        $addControl = $activeFieldControls.children('.add'),
-        $removeControl = $activeFieldControls.children('.remove');
-    if (event.keyCode == 13) {
-      event.preventDefault();
-      $addControl.click()
-      $removeControl.click()
-    }
-  });
-});
-