hydra-editor 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd61584bb2b1f5fdefdcdaa0b0e98e033a8380cd
-  data.tar.gz: 95da0f05fc7eb22757cc5dba24898e4ab23c303f
+  metadata.gz: 00e027dc2628e668372a4fabc2e39c6c4671841f
+  data.tar.gz: bd836eccdefe6a6579048cd467062b9ce66c14b4
 SHA512:
-  metadata.gz: fa3e4cbc77db162b222b1e490c37f829313df1b7a71c48570632b39f57db0d0d8c8c6b4f79fdc78c370a1135f8f34349990854398ad75d37d80865f1a9f4f468
-  data.tar.gz: 95a78a2fab3ab34584f52cad43d8c6109408f5d9b12869563108e78eead4eb0257f40321e3a0c5bdafc698396d3c8c222ce98547285c50aaea2c67ed7f63aa4b
+  metadata.gz: c04346e9584534386b680b8040cd1d7e594a73d7169b1f489709d635399c15ae40471658ac0915732ff3bf2550efe33ed4c27692db315cb1a6d7abebf3ef500a
+  data.tar.gz: 940e53ec4b57c838b66255e80d87fe1092c1cae333a3d0cf322f91d9ba6c7a58f26aa648b7b4924cb4f33e15146c32ab077d2cd64d8205fb544f0a8cafed5225

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

@@ -2,122 +2,136 @@
 // There are a lot of assumptions about the structure of the classes and elements.
 // These assumptions are reflected in the MultiValueInput class.
 
-(function($){
-
-    var FieldManager = function (element, options) {
-        this.element = $(element);
-        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.fieldWrapperClass = '.field-wrapper';
-        this.warningClass = '.has-warning';
-        this.listClass = '.listing';
-
-        this.init();
-    }
-
-    FieldManager.prototype = {
-        init: function () {
-            this._addInitialClasses();
-            this._appendControls();
-            this._attachEvents();
-            this._addCallbacks();
-        },
-
-        _addInitialClasses: function () {
-            this.element.addClass("managed");
-            $(this.fieldWrapperClass, this.element).addClass("input-group input-append");
-        },
-
-        _appendControls: function() {
-            $(this.fieldWrapperClass, this.element).append(this.controls);
-            $(this.fieldWrapperClass+':not(:last-child) .field-controls', this.element).append(this.remover);
-            $('.field-controls:last', this.element).append(this.adder);
-        },
-
-        _attachEvents: function() {
-            var _this = this;
-            this.element.on('click', '.remove', function (e) {
-              _this.remove_from_list(e);
-            });
-            this.element.on('click', '.add', function (e) {
-              _this.add_to_list(e);
-            });
-        },
-
-        _addCallbacks: function() {
-            this.element.bind('managed_field:add', this.options.add);
-            this.element.bind('managed_field:remove', this.options.remove);
-        },
-
-        add_to_list: function( event ) {
-          event.preventDefault();
-          var $activeField = $(event.target).parents(this.fieldWrapperClass)
-
-          if ($activeField.children('input').val() === '') {
-              this.displayEmptyWarning();
-          } else {
-            var $listing = $(this.listClass, this.element);
-            this.clearEmptyWarning();
-            $listing.append(this._newField($activeField));
+var HydraEditor = (function($) {
+      var FieldManager = function (element, options) {
+          this.element = $(element);
+          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.fieldWrapperClass = '.field-wrapper';
+          this.warningClass = '.has-warning';
+          this.listClass = '.listing';
+
+          this.init();
+      }
+
+      FieldManager.prototype = {
+          init: function () {
+              this._addInitialClasses();
+              this._appendControls();
+              this._attachEvents();
+              this._addCallbacks();
+          },
+
+          _addInitialClasses: function () {
+              this.element.addClass("managed");
+              $(this.fieldWrapperClass, this.element).addClass("input-group input-append");
+          },
+
+          _appendControls: function() {
+              $(this.fieldWrapperClass, this.element).append(this.controls);
+              $(this.fieldWrapperClass+':not(:last-child) .field-controls', this.element).append(this.remover);
+              $('.field-controls:last', this.element).append(this.adder);
+          },
+
+          _attachEvents: function() {
+              var _this = this;
+              this.element.on('click', '.remove', function (e) {
+                _this.remove_from_list(e);
+              });
+              this.element.on('click', '.add', function (e) {
+                _this.add_to_list(e);
+              });
+          },
+
+          _addCallbacks: function() {
+              this.element.bind('managed_field:add', this.options.add);
+              this.element.bind('managed_field:remove', this.options.remove);
+          },
+
+          add_to_list: function( event ) {
+            event.preventDefault();
+            var $activeField = $(event.target).parents(this.fieldWrapperClass)
+
+            if ($activeField.children('input').val() === '') {
+                this.displayEmptyWarning();
+            } else {
+              var $listing = $(this.listClass, this.element);
+              this.clearEmptyWarning();
+              $listing.append(this._newField($activeField));
+            }
+          },
+
+          _newField: function ($activeField) {
+              var $newField = this.createNewField($activeField);
+              // _changeControlsToRemove must come after createNewField
+              // or the new field will not have an add button
+              this._changeControlsToRemove($activeField);
+              return $newField;
+          },
+
+          createNewField: function($activeField) {
+              $newField = $activeField.clone();
+              $newChildren = $newField.children('input');
+              $newChildren.val('').removeProp('required');
+              $newChildren.first().focus();
+              this.element.trigger("managed_field:add", $newChildren.first());
+              return $newField
+          },
+
+          _changeControlsToRemove: function($activeField) {
+              var $removeControl = this.remover.clone();
+              $activeFieldControls = $activeField.children('.field-controls');
+              $('.add', $activeFieldControls).remove();
+              $activeFieldControls.prepend($removeControl);
+          },
+
+          clearEmptyWarning: function() {
+              $listing = $(this.listClass, this.element),
+              $listing.children(this.warningClass).remove();
+          },
+
+          displayEmptyWarning: function () {
+              $listing = $(this.listClass, this.element)
+              var $warningMessage  = $("<div class=\'message has-warning\'>cannot add new empty field</div>");
+              $listing.children(this.warningClass).remove();
+              $listing.append($warningMessage);
+          },
+
+          remove_from_list: function( event ) {
+            event.preventDefault();
+
+            var field = $(event.target).parents(this.fieldWrapperClass)
+            field.remove();
+
+            this.element.trigger("managed_field:remove", field);
+          },
+
+          destroy: function() {
+            $(this.fieldWrapperClass, this.element).removeClass("input-append");
+            this.element.removeClass( "managed" );
           }
-        },
-
-        _newField: function($activeField) {
-            var $removeControl = this.remover.clone(),
-                $activeFieldControls = $activeField.children('.field-controls'),
-                $newField = $activeField.clone();
-            $('.add', $activeFieldControls).remove();
-            $activeFieldControls.prepend($removeControl);
-            $newChildren = $newField.children('input');
-            $newChildren.val('').removeProp('required');
-            $newChildren.first().focus();
-            this.element.trigger("managed_field:add", $newChildren.first());
-            return $newField;
-        },
-
-        clearEmptyWarning: function() {
-            $listing = $(this.listClass, this.element),
-            $listing.children(this.warningClass).remove();
-        },
-
-        displayEmptyWarning: function () {
-            $listing = $(this.listClass, this.element)
-            var $warningMessage  = $("<div class=\'message has-warning\'>cannot add new empty field</div>");
-            $listing.children(this.warningClass).remove();
-            $listing.append($warningMessage);
-        },
-
-        remove_from_list: function( event ) {
-          event.preventDefault();
-
-          var field = $(event.target).parents(this.fieldWrapperClass)
-          field.remove();
-
-          this.element.trigger("managed_field:remove", field);
-        },
-
-        destroy: function() {
-          $(this.fieldWrapperClass, this.element).removeClass("input-append");
-          this.element.removeClass( "managed" );
-        }
-    }
+      }
 
-    FieldManager.DEFAULTS = {
-        add: null,
-        remove: null
-    }
+      FieldManager.DEFAULTS = {
+          add: null,
+          remove: null
+      }
 
+      return { FieldManager: FieldManager };
+})(jQuery);
+
+(function($){
     $.fn.manage_fields = function(option) {
         return this.each(function() {
             var $this = $(this);
             var data  = $this.data('manage_fields');
-            var options = $.extend({}, FieldManager.DEFAULTS, $this.data(), typeof option == 'object' && option);
+            var options = $.extend({}, HydraEditor.FieldManager.DEFAULTS, $this.data(), typeof option == 'object' && option);
 
-            if (!data) $this.data('manage_fields', (data = new FieldManager(this, options)));
+            if (!data) $this.data('manage_fields', (data = new HydraEditor.FieldManager(this, options)));
         })
     }
 })(jQuery);

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

@@ -0,0 +1 @@
+@import 'multi_value_fields';

data/app/controllers/concerns/records_controller_behavior.rb

@@ -2,6 +2,7 @@ module RecordsControllerBehavior
   extend ActiveSupport::Concern
 
   included do
+    include Hydra::Controller::ControllerBehavior
     load_and_authorize_resource only: [:new, :edit, :update, :create], instance_name: resource_instance_name
 
     rescue_from HydraEditor::InvalidType do

data/app/forms/hydra_editor/form.rb

@@ -56,16 +56,19 @@ module HydraEditor
     end
 
     protected
-      # override this method if you need to initialize more complex RDF assertions (b-nodes)
       def initialize_fields
+        # we're making a local copy of the attributes that we can modify.
         @attributes = model.attributes
-        terms.select { |key| self[key].blank? }.each do |key|
-          # if value is empty, we create an one element array to loop over for output
-          if self.class.multiple?(key)
-            self[key] = ['']
-          else
-            self[key] = ''
-          end
+        terms.select { |key| self[key].blank? }.each { |key| initialize_field(key) }
+      end
+
+      # 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)
+          self[key] = ['']
+        else
+          self[key] = ''
         end
       end
   end

data/app/inputs/multi_value_input.rb

@@ -9,21 +9,15 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
         <ul class="listing">
     HTML
 
-    collection.each do |value|
-      unless value.to_s.strip.blank?
-        markup << <<-HTML
-          <li class="field-wrapper">
-            #{build_text_field(value)}
-          </li>
-        HTML
-      end
+    collection.each_with_index do |value, index|
+      markup << <<-HTML
+        <li class="field-wrapper">
+          #{build_field(value, index)}
+        </li>
+      HTML
     end
 
-    # One blank line at the end
     markup << <<-HTML
-          <li class="field-wrapper">
-            #{build_text_field('')}
-          </li>
         </ul>
 
     HTML
@@ -31,7 +25,10 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
 
   private
 
-    def build_text_field(value)
+    # 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)
       options = input_html_options.dup
 
       options[:value] = value
@@ -61,7 +58,7 @@ class MultiValueInput < SimpleForm::Inputs::CollectionInput
     end
 
     def collection
-      @collection ||= Array.wrap(object[attribute_name])
+      @collection ||= Array.wrap(object[attribute_name]).reject { |value| value.to_s.strip.blank? } + ['']
     end
 
     def multiple?; true; end

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

@@ -1,4 +1,4 @@
-<%= simple_form_for form, url: record_form_action_url(form), html: {class: 'form-inline editor'} do |f| %>
+<%= simple_form_for form, url: record_form_action_url(form), html: { class: 'editor' } do |f| %>
   <div id="descriptions_display">
 	<%= render 'records/form_header' %>
     <div class="well">

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -193,8 +193,7 @@ files:
 - 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/application.css
-- app/assets/stylesheets/hydra-editor/hydra-editor.css
+- app/assets/stylesheets/hydra-editor/hydra-editor.scss
 - app/assets/stylesheets/hydra-editor/multi_value_fields.scss
 - app/controllers/concerns/records_controller_behavior.rb
 - app/controllers/records_controller.rb
@@ -237,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head

data/app/assets/stylesheets/hydra-editor/application.css

@@ -1,13 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
- *= require_self
- *= require_tree .
- */