edgarj 0.01.26 → 0.01.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e10562392e96ef62e5743ea5647dbc1e9a16a41
-  data.tar.gz: 38d611e3f70002175a4161ab5feb28c7635e9ac6
+  metadata.gz: e6af6ab6ec407b632cd5c3de8af5d1d98e73d493
+  data.tar.gz: 1d28796fbafe41afcd8b0a5d66e06130dd496f99
 SHA512:
-  metadata.gz: 22ec7ee34ccebb1dc7501da2987b835f770e67697f6584fba5af13949d2a22a2394481bfc0b248c1b31f78176023859b83c5f08aa0eb5230962fa08ee12824a2
-  data.tar.gz: 88e1c61f4279feb740eb2b93598c63e82efda93b9a5e7f2e302ffeaa23ab07461826799a99986f051e2dae5cf81b0a29dd52b25cb666ea43af53b2fa8b465366
+  metadata.gz: a043d93250f226f6d8ea2c13d032351b744b54d72db5e923f38ebd31fdf3cc290a13ecdea64c3669c052df7cb3f4d0abafd31f8560e072f8c28f57d9fb142e0d
+  data.tar.gz: b101146580ec426101ba42731d8115e1179b8f2f9fe03ad5d9f89cdf10cd0c2548b77d032a779faa380cbff97cb8b675bb1e6834dc07a6d8915bd3d82626c032

data/app/helpers/edgarj/assoc_helper.rb

@@ -119,12 +119,16 @@ module Edgarj
     end
 =end
 
-    # 1. column I18n is used if defined
-    # 2. else, parent.human_name is used.
+    # 1. t('view.CONTROLLER.label.MODEL.COLUMN') if exists.
+    # 1. column I18n is used if exists.
+    # 1. else, parent.human_name is used.
     def draw_belongs_to_label_sub(model, col_name, parent_model)
+      @controller_model ||= controller.send(:model)
       I18n.t(col_name,
-          scope:    "activerecord.attributes.#{model.to_s.underscore}",
-          default:  parent_model.human_name)
+          scope:    "view.#{controller_path}.#{@controller_model.name.underscore}",
+          default:  I18n.t(col_name,
+              scope:    "activerecord.attributes.#{model.to_s.underscore}",
+              default:  parent_model.human_name))
     end
 
 =begin

data/app/helpers/edgarj/common_helper.rb

@@ -33,5 +33,15 @@ module Edgarj
         nil
       end
     end
+
+    # column label with the following fallback order:
+    # 1. t('view.CONTROLLER.label.MODEL.COLUMN') if exists.
+    # 1. model.human_attribute_name(col.name)
+    def column_label(col)
+      @controller_model ||= controller.send(:model)
+      I18n.t(col.name,
+          scope:    "view.#{controller_path}.#{@controller_model.name.underscore}",
+          default:  @controller_model.human_attribute_name(col.name))
+    end
   end
 end

data/app/helpers/edgarj/form_drawer.rb

@@ -122,7 +122,7 @@ module Edgarj
       #
       def _draw_head(col, label=nil, &block)
         _draw_2_lane{
-          html = @vc.content_tag(:th, label || @record.class.human_attribute_name(col.name))
+          html = @vc.content_tag(:th, label || @vc.column_label(col))
           html << @vc.content_tag(:td, '')
           html << (@vc.content_tag(:td) do yield end)
           html
@@ -225,7 +225,7 @@ module Edgarj
       #
       def _draw_head(col, label=nil, &block)
         _draw_2_lane{
-          sprintf("<th>%s</th><td>", label || @record.klass.human_attribute_name(col.name)) +
+          sprintf("<th>%s</th><td>", label || @vc.column_label(col)) +
 
           # add operator for appropreate data type.
           if col.name == 'id'

data/app/helpers/edgarj/list_drawer.rb

@@ -98,7 +98,7 @@ module Edgarj
       # col::         column data
       # options::     options to url_for
       def draw_sort(col, options={})
-        label = @drawer.model.human_attribute_name(col.name)
+        label = @vc.column_label(col)
         dir   = 'asc'
         if @drawer.page_info.order_by == @drawer.fullname(col)
           # toggle direction

data/lib/edgarj/version.rb

@@ -1,3 +1,3 @@
 module Edgarj
-  VERSION = "0.01.26"
+  VERSION = "0.01.27"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: edgarj
 version: !ruby/object:Gem::Version
-  version: 0.01.26
+  version: 0.01.27
 platform: ruby
 authors:
 - Fuminori Ido
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails