hydra-editor 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5937ac78d43f5fd201c63ef427ea0d6ea92a5dd
-  data.tar.gz: 3d49662b8bee6eec6e6b9a432dc4049dc8584832
+  metadata.gz: 2d6f571a59f4be4e97f971fd5e70f0158e9e161b
+  data.tar.gz: 5872ae91386407fa5957baaa560852d89ab5f11e
 SHA512:
-  metadata.gz: a0f9dbe37836743e76b213ecba5f70c7fa6802767ca9f904553c303fd2a359074ea1cd1f4800483b620f19ca47bceeb0dd965eeb6f7679fee974540a578ab5b5
-  data.tar.gz: b2bb49f551f84ce0967bc757efcbdf2eabc60610310a25f2d5263fb5f589ec369ff7923ce74f47bfa8dc4beba98a9b8b423dd66cf3c4927fdd635ce7fecdb5c3
+  metadata.gz: be508501a5b4143ba7eb878a327ab6a2e1f6e1e6057a76b119c179cc396d16cace842e81dabb3bf6ab64fb280b5873e4371b27d8eb32df8f4f3d1b6d20a2b961
+  data.tar.gz: c2c01e541df6ac515fb19bbc6d6ea1c96db479396470de5e62dffb77e4697dae8847c3798f3f3034d832f9d38b0f64a528d1bbefb726c5323b24af1fda0953c9

data/app/controllers/concerns/records_controller_behavior.rb

@@ -37,7 +37,7 @@ module RecordsControllerBehavior
         format.html { redirect_to redirect_after_create, notice: 'Object was successfully created.' }
         format.json { render json: object_as_json, status: :created, location: redirect_after_create }
       else
-        format.html { render 'records/new' }
+        format.html { new }
         format.json { render json: resource.errors, status: :unprocessable_entity }
       end
     end
@@ -51,7 +51,7 @@ module RecordsControllerBehavior
         format.html { redirect_to redirect_after_update, notice: 'Object was successfully updated.' }
         format.json { head :no_content }
       else
-        format.html { render 'records/edit' }
+        format.html { edit }
         format.json { render json: resource.errors, status: :unprocessable_entity }
       end
     end
@@ -59,9 +59,9 @@ module RecordsControllerBehavior
 
   protected
 
-  def object_as_json 
+  def object_as_json
     # ActiveFedora::Base#to_json causes a circular reference (before 7.0).  Do something easy
-    resource.terms_for_editing.each_with_object({}) { |term, h|  h[term] = resource[term] } 
+    resource.terms_for_editing.each_with_object({}) { |term, h|  h[term] = resource[term] }
   end
 
   # Override this method if you want to set different metadata on the object
@@ -70,13 +70,19 @@ module RecordsControllerBehavior
   end
 
   def collect_form_attributes
-    raw_attributes = params[ActiveModel::Naming.singular(resource)]
-    # we could probably do this with strong parameters if the gemspec depends on Rails 4+
-    permitted_attributes = resource.terms_for_editing.each_with_object({}) { |key, attrs| attrs[key] = raw_attributes[key] if raw_attributes[key] }
     # removes attributes that were only changed by initialize_fields
     permitted_attributes.reject { |key, value| resource[key].empty? and value == [""] }
   end
 
+  # we could probably do this with strong parameters if the gemspec depends on Rails 4+
+  def permitted_attributes
+    resource.terms_for_editing.each_with_object({}) { |key, attrs| attrs[key] = raw_attributes[key] if raw_attributes[key] }
+  end
+
+  def raw_attributes
+    params[ActiveModel::Naming.singular(resource)]
+  end
+
   # Override to redirect to an alternate location after create
   def redirect_after_create
     main_app.catalog_path resource
@@ -93,7 +99,7 @@ module RecordsControllerBehavior
 
   def initialize_fields
     resource.terms_for_editing.each do |key|
-      # if value is empty, we create an one element array to loop over for output 
+      # if value is empty, we create an one element array to loop over for output
       resource[key] = [''] if resource[key].empty?
     end
   end

data/app/helpers/concerns/records_helper_behavior.rb

@@ -1,7 +1,7 @@
 require 'deprecation'
 module RecordsHelperBehavior
   extend Deprecation
-  
+
   def metadata_help(key)
     I18n.t("hydra_editor.form.metadata_help.#{key}", default: key.to_s.humanize)
   end

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

@@ -1,15 +1,14 @@
 <% render_req ||= true # render_req is true for single file edit, false for batch edit%>
-<div class="form-group">
+<%= f.form_group key do %>
   <% vals =  f.object[key] %>
   <% if render_req && f.object.required?(key) %>
     <% tmp = '<span class="error">*</span>' + field_label(key) %>
-    <%= f.label key, tmp.html_safe, :class=>"control-label"  %>
+    <%= f.label key, tmp.html_safe, class: "control-label"  %>
   <% else %>
-    <%= f.label key, field_label(key), :class=>"control-label"%>
+    <%= f.label key, field_label(key), class: "control-label"%>
   <% end %>
 
   <% vals.to_ary.each_with_index do |v, index| %>
-    <%= render_edit_field_partial(key, f:f,  v: v, index: index, render_req: render_req) %>
+    <%= render_edit_field_partial(key, f: f,  v: v, index: index, render_req: render_req) %>
   <% end %>
- </div><!-- /control-group -->
-
+<% end %>

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

@@ -1,9 +1,9 @@
-<%= bootstrap_form_for resource, url: record_form_action_url(resource), html: {:class => 'form-inline editor'} do |f| %>
+<%= bootstrap_form_for resource, url: record_form_action_url(resource), html: {class: 'form-inline editor'} do |f| %>
   <div id="descriptions_display">
 	<%= render 'records/form_header' %>
     <div class="well">
       <% f.object.terms_for_editing.each do |term| %>
-        <%= render :partial => "records/edit_field", :locals => {:f => f, :render_req => true, :key => term } %>
+        <%= render partial: "records/edit_field", locals: {f: f, render_req: true, key: term } %>
       <% end %>
     </div> <!-- /well -->
   </div>

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

@@ -1,7 +1,6 @@
 <h1><%= t('hydra_editor.choose_type.title') %></h1>
-<%= bootstrap_form_tag hydra_editor.new_record_path, :method => :get do |f| %>
-  <%= bootstrap_select_tag :type, options_for_select(object_type_options) %>
-  <%= bootstrap_actions do %>
-    <%= bootstrap_submit_tag 'Next' %>
-  <% end %>
+<%= bootstrap_form_tag url: hydra_editor.new_record_path, method: :get do |f| %>
+  <label class="control-label" for="type">Select an object type</label>
+  <%= select_tag :type, options_for_select(object_type_options) %>
+  <%= f.primary t('hydra_editor.choose_type.next') %>
 <% end %>

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

@@ -1,3 +1,3 @@
 <h1><%= edit_record_title %></h1>
-<%= render :partial=>'records/form' %>
+<%= render partial: 'records/form' %>
 

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

@@ -1,7 +1,7 @@
-      <div class="input-group" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
+<div class="<%= 'input-group' if f.object.class.multiple?(key) %>" <%  if index == 0 %> id="additional_<%= key.to_s %>_clone" <% end %>>
         <% required = render_req && index == 0 && f.object.required?(key) %>
         <%= text_field_tag "#{ActiveModel::Naming.singular(f.object)}[#{key.to_s}][]", v, id: "#{ActiveModel::Naming.singular(f.object)}_#{key.to_s}", class: "form-control", required: required  %>
-        <% unless f.object.class.unique?(key) %>
+        <% if f.object.class.multiple?(key) %>
           <%= render "records/edit_fields/suffix", {key: key, index: index} %>
         <% end %>
       </div>

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

@@ -1,2 +1,2 @@
 <h1><%= new_record_title %></h1>
-<%= render :partial=>'records/form' %>
+<%= render partial: 'records/form' %>

data/config/locales/hydra_editor.yml

@@ -2,10 +2,11 @@ en:
   hydra_editor:
     choose_type:
       title: 'Create a New Record'
+      next:  'Next'
     edit:
       title: 'Edit %s'
     form:
       title: 'Descriptions'
       required_fields: 'indicates required fields'
     new:
-      title: 'Create a New %s Record'
+      title: 'Create a New %s Record'

data/config/routes.rb

@@ -1,3 +1,3 @@
 HydraEditor::Engine.routes.draw do
-  resources :records, only: [:new, :edit, :create, :update], :constraints => { :id => /[a-zA-Z0-9_.:\-]+/ }
+  resources :records, only: [:new, :edit, :create, :update], constraints: { id: /[a-zA-Z0-9_.:\-]+/ }
 end

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head