hydra-editor 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6f571a59f4be4e97f971fd5e70f0158e9e161b
-  data.tar.gz: 5872ae91386407fa5957baaa560852d89ab5f11e
+  metadata.gz: d5887fe8d0012e6771f7692ab1283824295e18dc
+  data.tar.gz: 0979ec4106adb726337eeb071a818c434b05cb09
 SHA512:
-  metadata.gz: be508501a5b4143ba7eb878a327ab6a2e1f6e1e6057a76b119c179cc396d16cace842e81dabb3bf6ab64fb280b5873e4371b27d8eb32df8f4f3d1b6d20a2b961
-  data.tar.gz: c2c01e541df6ac515fb19bbc6d6ea1c96db479396470de5e62dffb77e4697dae8847c3798f3f3034d832f9d38b0f64a528d1bbefb726c5323b24af1fda0953c9
+  metadata.gz: 945c22ff3dccfbe2b50c3fdd5a190e31f5cce9175b3c8856f09c091aa1eaedaaeda8695c5fe12ecddabac744e8fc27770f7c5536d0185fe4c05293aba9539f83
+  data.tar.gz: 2462a7e7d9e270a5d396e6069ffce9649ecf9a2be11a1449f77b875f54c9f18c849b4cf684700164166e6a4a13331d93698de96480de061d1adc7359bdb8e891

data/app/helpers/concerns/records_helper_behavior.rb

@@ -1,6 +1,4 @@
-require 'deprecation'
 module RecordsHelperBehavior
-  extend Deprecation
 
   def metadata_help(key)
     I18n.t("hydra_editor.form.metadata_help.#{key}", default: key.to_s.humanize)
@@ -22,9 +20,9 @@ module RecordsHelperBehavior
     end
   end
 
-  def render_edit_field_partial(key, locals)
+  def render_edit_field_partial(field_name, locals)
     collection = ActiveSupport::Inflector.tableize(locals[:f].object.class)
-    render_edit_field_partial_with_action(collection, key, locals)
+    render_edit_field_partial_with_action(collection, field_name, locals)
   end
 
   def add_field (key)
@@ -52,34 +50,34 @@ module RecordsHelperBehavior
     Array(resource.title).first
   end
 
- protected 
-
-  def render_edit_field_partial_with_action(requested_path, key, locals)
-    path = if partial_exists?("#{requested_path}/edit_fields", key)
-      "#{requested_path}/edit_fields/#{key}"
-    elsif partial_exists?("records/edit_fields", key) # for backwards compatibility
-      Deprecation.warn RecordsHelperBehavior, "Rendering view from `records/edit_fields/#{key}`. Move to #{requested_path}/edit_fields/#{key}. This will be removed in 1.0.0"
-      "records/edit_fields/#{key}"
-    elsif partial_exists?("#{requested_path}/edit_fields", 'default')
-      "#{requested_path}/edit_fields/default"
-    else
-      "records/edit_fields/default"
+ 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
+  def render_edit_field_partial_with_action(record_type, field_name, locals)
+    partial = find_edit_field_partial(record_type, field_name)
+    render partial: partial, locals: locals.merge({key: field_name})
+  end
+
+  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|
+      logger.debug "Looking for edit field partial #{partial}"
+      return partial.sub(/\/_/, '/') if partial_exists?(partial)
     end
-    render partial: path, locals: locals.merge({key: key})
   end
 
-  def partial_exists?(path, file)
-    lookup_context.find_all("#{path}/_#{file}").any?
+  def partial_exists?(partial)
+    lookup_context.find_all(partial).any?
   end
-  
+
   def more_or_less_button(key, html_class, symbol)
     # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
     content_tag('button', class: "#{html_class} btn btn-default", id: "additional_#{key}_submit", name: "additional_#{key}") do
-      (symbol + 
+      (symbol +
       content_tag('span', class: 'sr-only') do
         "add another #{key.to_s}"
       end).html_safe
     end
   end
-  
 end

data/lib/hydra_editor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,20 +59,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.3.0
-- !ruby/object:Gem::Dependency
-  name: deprecation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A basic metadata editor for hydra-head