trk_datatables 0.1.24 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63b484a61536f738a27bc1011d30e4e51f784f07468f13b66ad18912137159a1
-  data.tar.gz: 85d5c270f493090bcb6c0f177d2b71c26fa950adb181a6268747adf05491bc91
+  metadata.gz: 8d75c4de5838a5899996deab1a0737969b6a04294f0de0e7a0e2af1c82713f01
+  data.tar.gz: a307532660a052632e782a2a47d837b6b22c6071c30ee18027b0020084cc275b
 SHA512:
-  metadata.gz: 1f0e940deeb4eebc8e227080a51e95c84f5038b54f00186bd273ac771abac4672d5c7cf262ce12cd653d22328c38f2a8bedf53f8b5f6deb50143233b1dc65349
-  data.tar.gz: eb84cc60601fd30ec87bcaf5c6c3812688ca0d15b7a53ea19f73a06290865fdbe0d72dcb62f7d1e4cdd52cd20fc7c538bbfe037b36e385629b0ad2ab80b1ee3c
+  metadata.gz: 11532df36b2a5be0a3b942112943bbb1d6f4aeb229c986435e11316a826aab8c82117b9e4550334988ef0b06ab5ce19368db7dbc691aff49802a6cedf02b2d67
+  data.tar.gz: a59f1cd547aad4b95be0859aade92c9d1fc49e6d031bc09fdfc790f0742ee17b28644121dab6d5cbdc6e1dcaa5883557c088ea4f1345ca0f3f0fae4a4d395d63

data/Gemfile.lock

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

data/README.md

@@ -5,16 +5,16 @@ used with [trk_datatables npm package](https://www.npmjs.com/package/trk_datatab
 
 Instead of using Rails scaffold generator you can use advanced [Datatables plug-in for jQuery library](https://datatables.net).
 
-After [few lines of code](https://github.com/trkin/trk_datatables#installation)
-you can use one line commands `@datatable.render_html` to generate index page
+After [installation](https://github.com/trkin/trk_datatables#installation)
+you can use one line command `@datatable.render_html` to generate index page
 that supports: global search, filtering and sorting, first page is prerendered
-(so non-js crawlers can see it), adding map and other interesting features.
+(so non-js crawlers can see it), map and other interesting features.
 
-So instead of basic Rails scaffold with a lot of html code
+So instead of basic Rails scaffold
 
 ![rails scaffold](test/scaffold.png "Rails default scaffold")
 
-You can get something like
+you can get something like
 
 ![trk-datatables](test/trk_datatables_with_daterangepicker.png "TRK Datatables")
 
@@ -72,7 +72,7 @@ document.addEventListener('turbolinks:load', () => {
   trkDatatables.initialise()
 })
 
-# app/views/layouts/application.html.erb
+# app/javascript/stylesheet/application.css
 /* here we include other packages so postcss-import plugin will load css file from style attribute from package.json */
 @import 'bootstrap'
 
@@ -91,7 +91,7 @@ module.exports = environment
     <%= stylesheet_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
 ```
 
-To add a gem follow those instructions
+Than add a gem and sample PostsDatatable
 
 ```
 # Gemfile
@@ -302,7 +302,7 @@ class PostsDatatable < TrkDatatables::ActiveRecord
   def columns
     {
       'posts.created_at': {}, # this column will have predefined_ranges
-      'posts.published_date': { predefined_ranges: false }
+      'posts.published_on': { predefined_ranges: false }
   end
 end
 ```
@@ -430,7 +430,7 @@ in multiple values use array `[Post.statuses[:draft]]`.
 <%= link_to 'Active posts for my@email.com', \
       posts_path(
         PostsDatatable.param_set('users.email', 'my@email.com')
-          .deep_merge(PostsDatatable.param_set('posts.published_date', Date.parse('2019-10-20')..Date.parse('2019-10-22')))
+          .deep_merge(PostsDatatable.param_set('posts.published_on', Date.parse('2019-10-20')..Date.parse('2019-10-22')))
           .deep_merge(PostsDatatable.param_set('posts.status', Post.statuses.values_at(:published, :promoted))
           .deep_merge(user_id: 1)
       )
@@ -647,6 +647,7 @@ release a new version, update the version number and then publish with
 
 ```
 vi lib/trk_datatables/version.rb
+git commit -am'...'
 bundle
 bundle exec rake release
 ```

data/lib/generators/trk_datatables/trk_datatables_generator.rb

@@ -25,7 +25,7 @@ module TrkDatatables
           You can use in your controller
 
           # app/controllers/#{plural_name}_controller.rb
-          class #{class_name}Controller < ApplicationController
+          class #{class_name.pluralize}Controller < ApplicationController
             def index
               @datatable = #{@trk_class_name}.new view_context
             end
@@ -36,7 +36,7 @@ module TrkDatatables
           end
 
           In your views mkdir app/views/#{plural_name}
-          # app/views/#{plural_name}/index.html
+          # app/views/#{plural_name}/index.html.erb
           <h1>#{class_name.pluralize}</h1>
           <%= @datatable.render_html search_#{plural_name}_path(format: :json) %>
 

data/lib/trk_datatables/render_html.rb

@@ -58,12 +58,11 @@ module TrkDatatables
     end
     # rubocop:enable Metrics/AbcSize, Metrics/PerceivedComplexity
 
-    def _select_tag(options, search_value)
+    # [{ key: 'draft', value: 0}, {key: 'published', value: 1, selected: 'selected}]
+    def _select_find_options(options, search_value)
       selected = search_value.to_s.split(MULTIPLE_OPTION_SEPARATOR)
-      _content_tag :select, multiple: 'multiple' do
-        safe_join(options.map do |key, value|
-          _content_tag :option, {value: value}.merge(selected.include?(value.to_s) ? {selected: 'selected'} : {}), key
-        end)
+      options.map do |key, value|
+        {key: key, value: value}.merge(selected.include?(value.to_s) ? {selected: 'selected'} : {})
       end
     end
 
@@ -106,7 +105,7 @@ module TrkDatatables
             options['data-datatable-search-value'] = search_value if search_value.present?
             # add eventual select element
             select_options = column_key_option[:column_options][ColumnKeyOptions::SELECT_OPTIONS]
-            options['data-datatable-multiselect'] = _select_tag select_options, search_value if select_options.present?
+            options['data-datatable-multiselect'] = _select_find_options select_options, search_value if select_options.present?
             # all other options are pulled from column_key_option[:html_options]
             _content_tag :th, options, column_key_option[:title]
           end)

data/lib/trk_datatables/version.rb

@@ -1,3 +1,3 @@
 module TrkDatatables
-  VERSION = '0.1.24'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.2.1
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem that simplify using datatables with Ruby on Rails and Sinatra.