trk_datatables 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1aa2f1569881e6948b2c1adf114f495269fe7f95094b440e5090d16d17153ce
-  data.tar.gz: c976b45043a85ee2312654b4f0b02b79357f909c6cd161d0b04cf92148d310a0
+  metadata.gz: 07c3787293eeff0d7de126d9f7396ab7e2b50b8115fb8ff7bdc082c5430729e5
+  data.tar.gz: b051feaec9ea1d1278fb34426c2641cc7073d9ba1a0428288661a833ca2fa66a
 SHA512:
-  metadata.gz: cf9fd299b20ab006efca8570a88ac32564429daba58ec8c0e77a92cb62be660899d4e737822be3ab7f0d04176ac05f7e26286ee17765ebb37202d4496848b7bf
-  data.tar.gz: cfb2323199e837430283a31a12cd5998975943a5cfa269567933ca60acd5a6cfab356bb925631bafa3c1a7cee316316b1b0b8f9ce1aef602359e704e31c73f1c
+  metadata.gz: 72a519b5c19de4dad5412e4089fb07a87a1537c897012e3562b474bcb0ea73fa8744faa51ce3900a170b5c5f2b4ca85b15a671fc3e92dc0a8b37e3529e067c62
+  data.tar.gz: 84668274b21444a0eb75505250d0b8b192c65ac8b38f221cdf4b85aa5da5593dc0e82c5ed02a32a683b6f89fa674f424a7b5de6528d91d922c6050580a317750

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trk_datatables (0.1.16)
+    trk_datatables (0.1.17)
       activesupport
 
 GEM

data/README.md

@@ -499,6 +499,20 @@ class PostsDatatableTest < ActiveSupport::TestCase
 end
 ```
 
+# Exceptions
+
+To catch errors from TrkDatables you can
+
+```
+# app/controllers/application_controller.rb
+  rescue_from TrkDatatables::Error do |exception|
+    respond_to do |format|
+      format.html { redirect_to root_path, alert: exception.message }
+      format.json { render json: { error_message: exception.message, error_status: :bad_request }, status: :bad_request }
+    end
+  end
+```
+
 ## Debug
 
 You can override some of the methos and put byebug, for example
@@ -537,13 +551,13 @@ You can also run `bin/console` for an interactive prompt that will allow you to
 
 To install this gem onto your local machine, run `bundle exec rake install`. To
 release a new version, update the version number in
-`lib/trk_datatables/version.rb`, and then run
+`lib/trk_datatables/version.rb`, and then publish with
 
 ```
 bundle exec rake release
 ```
 
-which will create a git tag for the version, push git commits and tags, and push the
+which will create a git tag for the version, push git commits and tags, and deploy the
 `.gem` file to [rubygems.org](https://rubygems.org).
 
 Instead of installing you can point directly to your path

data/lib/generators/templates/trk_datatable.rb

@@ -0,0 +1,29 @@
+class <%= class_name.pluralize %>Datatable < TrkDatatables::ActiveRecord
+  def columns
+    {
+<% class_name.constantize.columns.each do |column| -%>
+<% next if %w[created_at updated_at].include? column.name -%>
+      '<%= table_name %>.<%= column.name %>': {},
+<% end -%>
+    }
+  end
+
+  def all_items
+    <%= class_name %>.all
+  end
+
+  def rows(filtered)
+    filtered.map do |<%= singular_table_name %>|
+      [
+<% class_name.constantize.columns.each do |column| -%>
+<% next if %w[created_at updated_at].include? column.name -%>
+<% if column.name == 'id' -%>
+        @view.link_to(<%= singular_table_name %>.id, <%= singular_table_name %>),
+<% else -%>
+        <%= singular_table_name %>.<%= column.name %>,
+<% end -%>
+<% end -%>
+      ]
+    end
+  end
+end

data/lib/generators/trk_datatables/trk_datatables_generator.rb

@@ -0,0 +1,21 @@
+module TrkDatatables
+  module Generators
+    class TrkDatatablesGenerator < Rails::Generators::NamedBase
+      MissingModelError = Class.new(Thor::Error)
+      # we can call with `rails g trk_datatables` instead of: `rails g trk_datatables:trk_datatables`
+      namespace 'trk_datatables'
+      source_root File.expand_path('../templates', __dir__)
+
+      desc 'Generates datatables file for a give NAME'
+      def create
+        begin
+          class_name.constantize
+        rescue NameError => e
+          raise MissingModelError, e.message
+        end
+
+        template 'trk_datatable.rb', "app/datatables/#{plural_name}_datatable.rb"
+      end
+    end
+  end
+end

data/lib/trk_datatables/column_key_options.rb

@@ -100,7 +100,7 @@ module TrkDatatables
           column_name: column_name,
           column_type_in_db: column_type_in_db,
           # the following are used for RenderHtml
-          title: column_options[TITLE_OPTION] || column_name.humanize,
+          title: column_options[TITLE_OPTION] || _determine_column_name(table_class, column_name),
           html_options: html_options(column_options, column_type_in_db),
         }
       end
@@ -145,6 +145,13 @@ module TrkDatatables
       end
     end
 
+    def _determine_column_name(table_class, column_name)
+      return column_name.humanize if table_class.blank?
+
+      # maybe we should check if human_attribute_name exists
+      table_class.human_attribute_name column_name
+    end
+
     def searchable
       @data.reject do |column_key_option|
         column_key_option[:column_options][SEARCH_OPTION] == false

data/lib/trk_datatables/render_html.rb

@@ -2,7 +2,7 @@ module TrkDatatables
   # rubocop:disable Rails/OutputSafety
   class RenderHtml
     @indent = 0
-    def initialize(search_link, datatable, html_options)
+    def initialize(search_link, datatable, html_options = {})
       @search_link = search_link
       @datatable = datatable
       @html_options = html_options
@@ -36,6 +36,7 @@ module TrkDatatables
     # _content_tag :div, class: 'background' do
     def _content_tag(tag, options = {}, content = nil)
       if !options.is_a?(Hash)
+        # content is first argument, do not pass hash as content
         inline = true
         content = options
         options = {}
@@ -120,7 +121,7 @@ module TrkDatatables
         safe_join(@datatable.rows(@datatable.ordered_paginated_filtered_items).map do |row|
           _content_tag :tr do
             safe_join(row.map do |col|
-              _content_tag :td, col
+              _content_tag :td, col.to_s
             end)
           end
         end, "\n".html_safe)

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.1.16'.freeze
+  VERSION = '0.1.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -168,6 +168,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/generators/templates/trk_datatable.rb
+- lib/generators/trk_datatables/trk_datatables_generator.rb
 - lib/trk_datatables.rb
 - lib/trk_datatables/active_record.rb
 - lib/trk_datatables/base.rb