redde 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bed0244de3a491709a6fbd0463718ca5aff7ace
-  data.tar.gz: 3e816ac527d2e03f74464dd57fb000246ecdeed2
+  metadata.gz: 4f3a8ebbbbabc634c7d635fc1866cfc7037e79e7
+  data.tar.gz: ba57b0cdfcdddad068b33e3ea9d2589f3ed2fc51
 SHA512:
-  metadata.gz: ec49025bd08b8a5f4a356decf45bbfcf1d4713cb0cc3369bc39a67bd2ed48aa8ea7401f2d2294d6a75951b81931cd34ed4e82adf19c04c9fe9037fe9bc0547c4
-  data.tar.gz: 0ae6e02f0d2b781b02a89422e4c6cf17cdd518d7a041731e16039f54db0fcfcffac9ac95634648c272dfa19ad64ff4c702339a7dbbf8d3e89021759e79ba0e8e
+  metadata.gz: fdad516c267d2bc606de509e742c73348d813c85784b0aaa31a322e562bfad5fedda6400f551a87f5227045c95049fc05151dfaf04e2005c7c886210da80913f
+  data.tar.gz: 8a29e5419cf76aa24aca38188cad5dd4552a2521287f4ba2376a8250579d0ae15b0c7f2fb7e898510caac8522cc32dc6b4fc89e40b72e7f93c133e5638202023

data/README.md

@@ -163,3 +163,33 @@ ru:
         position: Позиция
         visible: Отображать на сайте
 ```
+
+## Index view customization
+
+By default, gem will render view with all fields.
+You can customize this in two ways:
+
+### Array
+
+You can `INDEX_COLUMNS` array to your model to customize index fields and ther sort order by defining constant inside model
+
+```
+INDEX_COLUMNS = %w(title created_at)
+```
+
+### Hash
+
+If you need to add, for example, link to nested model, you can define hash inside model:
+
+```
+class Calculator < ActiveRecord::Base
+  INDEX_COLUMNS = {
+    name: '',
+    hop: "link_to \"Live (#{2 * 2})\", root_url"
+  }
+  FORM_COLUMNS = %w(name)
+end
+
+```
+
+

data/app/form_builders/redde_form_builder.rb

@@ -4,7 +4,7 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
 
   def redde_field(name, *args)
     label(name)
-    case object.class.columns.detect { |column| column.name == name.to_s }.type
+    case object.class.columns.detect { |column| column.name == name.to_s }.try(:type)
     when :text then redde_text_area(name, *args)
     when :boolean then redde_check_box(name, *args)
     when :time then redde_date_time(name, *args)

data/app/helpers/redde/index_helper.rb

@@ -64,13 +64,16 @@ module Redde::IndexHelper
   end
 
   def index_columns
-    return model_name::INDEX_COLUMNS if defined?(model_name::INDEX_COLUMNS)
-    column_names
+    return column_names unless defined?(model_name::INDEX_COLUMNS)
+    return model_name::INDEX_COLUMNS if model_name::INDEX_COLUMNS.is_a?(Array)
+    model_name::INDEX_COLUMNS.keys
   end
 
   def form_column_names
+    return column_names.select { |i| !IGNORED_COLUMNS.include?(i) } unless defined?(model_name::FORM_COLUMNS)
     return model_name::FORM_COLUMNS if defined?(model_name::FORM_COLUMNS)
-    column_names.select { |i| !IGNORED_COLUMNS.include?(i) }
+    res = model_name::INDEX_COLUMNS
+    res.keys if model_name::INDEX_COLUMNS.is_a?(Hash)
   end
 
   def sort_priority(column_name)
@@ -134,13 +137,18 @@ module Redde::IndexHelper
   end
 
   def render_item_column(item, column)
-    value = item.send(column)
+    value = index_value_for(item, column)
     return 'Не задано' unless value.present?
     case value.class.name
-    when 'Time' then l(item.send(column), format: '%d %b %Y, %H:%M')
-    when 'Date' then l(item.send(column), format: '%d %b %Y')
+    when 'Time' then l(value, format: '%d %b %Y, %H:%M')
+    when 'Date' then l(value, format: '%d %b %Y')
     else
       value
     end
   end
+
+  def index_value_for(item, column)
+    return eval(model_name::INDEX_COLUMNS[column.to_sym]) if defined?(model_name::INDEX_COLUMNS) && model_name::INDEX_COLUMNS.is_a?(Hash) && model_name::INDEX_COLUMNS[column.to_sym].present?
+    item.send(column)
+  end
 end

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.16'.freeze
+  VERSION = '0.3.17'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -584,7 +584,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Admin scaffold generator for redde projects