record_view_helper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d613563d57f181d96b21daee693f428ac5424077
-  data.tar.gz: 1a48fb71c90cd36516e92c14c9465d6b4523f98c
+SHA256:
+  metadata.gz: 484e0e2bc1f93978d015d58e826dec01598b1297d1dec6e4dbf30b9b4bf04d77
+  data.tar.gz: b56a7796e056fd245510ded3c773fd625b4d4c2000d9a88f9a5016d24761ab9f
 SHA512:
-  metadata.gz: 1061d0457c6b9d242e295bc72129db54ab6ce5ed279fa44420457a19996e218b9500c581f2cb781474fe28f6e9e5c727bca7df514496353bc7f544426efb2f8b
-  data.tar.gz: 7c00b6cd33a07215ade4090543c1e60b04b99b9e33010a6b3f10ad1a3426294ae07892372746aed8e7d7ac661be946e10caaa703bbf64b3a3a6ced3d18d35dca
+  metadata.gz: 5473baa96d7ac03c39cb5ea4b9db5f728961980a093775b0e9803f5485ef2f0629bdcbdfafaa5ca28b55885a3583599f10aec5d8651c9708035e71cdaa853a45
+  data.tar.gz: 8d19a02261b49c17d17d4bcab66368e0527d653f5f8fde03aa41b6f63b27adb2e692adb8ea9042d47fd564ec48e979e1f8e06e10a8775738b74ac56811ec9361

data/README.md

@@ -45,5 +45,9 @@ Or install it yourself as:
 $ gem install record_view_helper
 ```
 
+## See also
+
+- [table-for](https://github.com/hunterae/table-for)
+
 ## License
 The gem is available as open source under the terms of the [MIT License](https://narazaka.net/license/MIT?2017).

data/lib/record_view_helper/config.rb

@@ -42,5 +42,22 @@ module RecordViewHelper
     #
     # @return [String] (default = "record_view_helper")
     attr_accessor :locale_namespace
+
+    # Proc which returns name for column
+    #
+    # @example in Rails
+    #   Rails.application.config.record_view_helper.column_name =
+    #     ->(table_class, column) { "[#{column}]<br>#{table_class.columns_hash[column.to_s].comment}".html_safe }
+    #
+    # @example basic
+    #   class MyView < ActionView::Base
+    #     include RecordViewHelper
+    #   end
+    #
+    #   MyView.record_view_helper_config.locale_name =
+    #     ->(table_class, column) { "[#{column}]<br>#{table_class.columns_hash[column.to_s].comment}".html_safe }
+    #
+    # @return [Proc]
+    attr_accessor :column_name
   end
 end

data/lib/record_view_helper/dl.rb

@@ -8,12 +8,11 @@ module RecordViewHelper
   # @yieldparam [RecordValueSetting] setting setting object
   # @yieldreturn [void]
   # @return [ActiveSupport::SafeBuffer] rendered result
-  def dl_for(record, options = {})
-    return if record.nil?
+  def dl_for(record, options = {}) # rubocop:disable Metrics/AbcSize
     setting = RecordValueSetting.build_from_hash!(
       record.attributes.keys,
       record.class.name.tableize,
-      options
+      options,
     )
     yield setting if block_given?
     content_tag(
@@ -21,12 +20,12 @@ module RecordViewHelper
       safe_join(
         setting.columns.map do |column|
           safe_join [
-            content_tag("dt", record_view_helper_t(setting.table_name, column), setting.header_attrs[column]),
+            content_tag("dt", record_view_helper_t(record.class, column), setting.header_attrs[column]),
             content_tag("dd", format_record_value(record, column, setting.formats[column], setting.links[column]), setting.attrs[column]),
           ]
-        end
+        end,
       ),
-      options
+      options,
     )
   end
 end

data/lib/record_view_helper/record_value_setting.rb

@@ -29,7 +29,7 @@ module RecordViewHelper
         formats: options.delete(:formats),
         links: options.delete(:links),
         attrs: options.delete(:attrs),
-        header_attrs: options.delete(:header_attrs)
+        header_attrs: options.delete(:header_attrs),
       )
     end
 
@@ -41,7 +41,16 @@ module RecordViewHelper
     # @param [Hash<Symbol, Symbol|Hash<Symbol, Symbol|Array<Symbol>>>] links links settings
     # @param [Hash<Symbol, Hash<Symbol, String>>] attrs column value dom tag attrs
     # @param [Hash<Symbol, Hash<Symbol, String>>] header_attrs column header dom tag attrs
-    def initialize(columns, table_name, only: nil, except: nil, formats: nil, links: nil, attrs: nil, header_attrs: nil)
+    def initialize( # rubocop:disable Metrics/ParameterLists
+      columns,
+      table_name,
+      only: nil,
+      except: nil,
+      formats: nil,
+      links: nil,
+      attrs: nil,
+      header_attrs: nil
+    )
       @columns = columns
       @table_name = table_name
       @only = only || []

data/lib/record_view_helper/table.rb

@@ -53,12 +53,11 @@ module RecordViewHelper
   #     - s.only :id, :name
   #   / recommended for complex settings
   #   / see RecordValueSetting for details
-  def table_for(records, options = {})
-    return if records.empty?
+  def table_for(records, options = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     setting = RecordValueSetting.build_from_hash!(
       records.first.attributes.keys,
       records.first.class.name.tableize,
-      options
+      options,
     )
     yield setting if block_given?
     content_tag(
@@ -70,10 +69,10 @@ module RecordViewHelper
             "tr",
             safe_join(
               setting.columns.map do |column|
-                content_tag("th", record_view_helper_t(setting.table_name, column), setting.header_attrs[column])
-              end
-            )
-          )
+                content_tag("th", record_view_helper_t(records.first.class, column), setting.header_attrs[column])
+              end,
+            ),
+          ),
         ),
         content_tag(
           "tbody",
@@ -84,14 +83,14 @@ module RecordViewHelper
                 safe_join(
                   setting.columns.map do |column|
                     content_tag("td", format_record_value(record, column, setting.formats[column], setting.links[column]), setting.attrs[column])
-                  end
-                )
+                  end,
+                ),
               )
-            end
-          )
+            end,
+          ),
         ),
       ]),
-      options
+      options,
     )
   end
 end

data/lib/record_view_helper/util.rb

@@ -28,7 +28,7 @@ module RecordViewHelper
       else
         deep_record_values(record, format || [column])
       end
-    formatted_value = safe_join values.map { |value| [format_view_value(value), " "] }.flatten[0..-2]
+    formatted_value = safe_join values.map {|value| [format_view_value(value), " "] }.flatten[0..-2]
     case link
     when String, Symbol
       link_record_value(record, formatted_value, link, [column])
@@ -49,7 +49,7 @@ module RecordViewHelper
   #   deep_record_values(record, [:a, [:a, :b]]) == [record.a, record.a.b]
   #
   def deep_record_values(record, columns)
-    columns.map { |column| deep_record_value(record, column) }
+    columns.map {|column| deep_record_value(record, column) }
   end
 
   # deep call
@@ -61,7 +61,7 @@ module RecordViewHelper
   #   deep_record_value(record, [:a, :b]) == record.a.b
   #
   def deep_record_value(record, column)
-    Array(column).reduce(record) { |receiver, method| receiver.try(:public_send, method) }
+    Array(column).reduce(record) {|receiver, method| receiver.try(:public_send, method) }
   end
 
   # format value
@@ -97,13 +97,18 @@ module RecordViewHelper
 
   private
 
-    def record_view_helper_t(table_name, column)
-      t(
-        if record_view_helper_config.locale_name
-          record_view_helper_config.locale_name.call(table_name, column)
-        else
-          "#{record_view_helper_config.locale_namespace}.#{table_name}.columns.#{column}"
-        end
-      )
+    def record_view_helper_t(table_class, column)
+      if record_view_helper_config.column_name
+        record_view_helper_config.column_name.call(table_class, column)
+      else
+        table_name = table_class.name.tableize
+        t(
+          if record_view_helper_config.locale_name
+            record_view_helper_config.locale_name.call(table_name, column)
+          else
+            "#{record_view_helper_config.locale_namespace}.#{table_name}.columns.#{column}"
+          end,
+        )
+      end
     end
 end

data/lib/record_view_helper/version.rb

@@ -1,4 +1,4 @@
 module RecordViewHelper
   # version
-  VERSION = "1.0.1".freeze
+  VERSION = "1.1.0".freeze
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: record_view_helper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Narazaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionview
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: onkcop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: onkcop
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: table builder and description list (dl) helper for Rails / ActiveModels