hydra-editor 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b812815848fd931a305e6daaeba0d4bd37a2e3b
-  data.tar.gz: e76c5b91ae1e127edede454955484f66946470f5
+  metadata.gz: ef71ded0d1bc1ff49e2532decb6d4c9c5154151f
+  data.tar.gz: b3ec457db08eefcf939a2887514922727693fe80
 SHA512:
-  metadata.gz: fe045f0271232ab10b264b43372283e0da24cf81c3b00de27e8d335556e843523dbcf3190f7946c287a71efce8b9c0e3906bfcda3cb9699376a2719473230e36
-  data.tar.gz: 83ad623003fd061b2fdbc17fd4cd9a59b7880b57907e4e4bdc4207866b51fe638bfc9fba330d49dadac3cc27dacfdff0b7ea721e45cd3260b7cc840d4f2c791b
+  metadata.gz: 32d9db8b9c5f6f4d956e42455cffc1064e3b92bc4dadf37d4c8be01454be03dc95b389eaf80f5cd7735eccab1dfcadfeab67a2bcfe4f244ec01899e6c2297220
+  data.tar.gz: 5a25a6e826b9e3fbaa2992bf9af345218a78b21e6b8557fc1083b863bf629edc0fbf9e22b6836aeb410734b2933d550a83003f2eee39a08db626b4c870673906

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 action: "new" }
+        format.html { render 'records/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 action: "edit" }
+        format.html { render 'records/edit' }
         format.json { render json: resource.errors, status: :unprocessable_entity }
       end
     end

data/app/helpers/concerns/records_helper_behavior.rb

@@ -1,4 +1,6 @@
+require 'deprecation'
 module RecordsHelperBehavior
+  extend Deprecation
   
   def metadata_help(key)
     I18n.t("hydra_editor.form.metadata_help.#{key}", default: key.to_s.humanize)
@@ -21,7 +23,8 @@ module RecordsHelperBehavior
   end
 
   def render_edit_field_partial(key, locals)
-    render_edit_field_partial_with_action('records', key, locals)
+    collection = ActiveSupport::Inflector.tableize(locals[:f].object.class)
+    render_edit_field_partial_with_action(collection, key, locals)
   end
 
   def add_field (key)
@@ -49,14 +52,24 @@ module RecordsHelperBehavior
     Array(resource.title).first
   end
 
- private 
+ protected 
 
-  def render_edit_field_partial_with_action(action, key, locals)
-    if lookup_context.find_all("#{action}/edit_fields/_#{key}").any?
-      render :partial => "#{action}/edit_fields/#{key}", :locals=>locals.merge({key: key})
+  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
-      render :partial => "#{action}/edit_fields/default", :locals=>locals.merge({key: key})
+      "records/edit_fields/default"
     end
+    render partial: path, locals: locals.merge({key: key})
+  end
+
+  def partial_exists?(path, file)
+    lookup_context.find_all("#{path}/_#{file}").any?
   end
   
   def more_or_less_button(key, html_class, symbol)

data/lib/hydra_editor/version.rb

@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-editor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,6 +59,20 @@ 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: sqlite3
   requirement: !ruby/object:Gem::Requirement