trk_datatables 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c3787293eeff0d7de126d9f7396ab7e2b50b8115fb8ff7bdc082c5430729e5
-  data.tar.gz: b051feaec9ea1d1278fb34426c2641cc7073d9ba1a0428288661a833ca2fa66a
+  metadata.gz: 206ca38dbabdc5c5efc6977db4c34ee6300336e7162479a7c7b8a94f3fb74b8c
+  data.tar.gz: db45ebc154b0da6a653c785eee388128bfc3d982750fd3dd296e77c120932740
 SHA512:
-  metadata.gz: 72a519b5c19de4dad5412e4089fb07a87a1537c897012e3562b474bcb0ea73fa8744faa51ce3900a170b5c5f2b4ca85b15a671fc3e92dc0a8b37e3529e067c62
-  data.tar.gz: 84668274b21444a0eb75505250d0b8b192c65ac8b38f221cdf4b85aa5da5593dc0e82c5ed02a32a683b6f89fa674f424a7b5de6528d91d922c6050580a317750
+  metadata.gz: 15ecc3cc4c9c0fb978bb76cdc9f136d7907956d6c4c7c464f5d4d5d6298147be91b00ed6e9314ef9b32318fd2772600067003da937c634585f687b0e27b3e3c4
+  data.tar.gz: ccf49ae9953ca13b9c0f850b67eb38f03cd7429a780ed46c15b078eea1028116a1ee19a29115474e3954cafb021c685e2ccf214e169f1c7b447fce34770e43a0

data/Gemfile.lock

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

data/README.md

@@ -102,7 +102,7 @@ In controller add a route to `:search`
 # config/routes.rb
 Rails.application.routes.draw do
   resources :posts do
-    colletion do
+    collection do
       post :search
     end
   end
@@ -343,12 +343,15 @@ end
 ### Params
 
 To set parameters that you can use for links to set column search value, use
-this `PostsDatatable.param_set 'users.email', 'my@email.com'` for example
+this `PostsDatatable.param_set 'users.email', 'my@email.com'`. For between
+search you can use range `Time.zone.today..(Time.zone.today + 1.year)` and for
+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.status', Post.statuses.values_at(:published, :promoted))
           .deep_merge(user_id: 1)
       )
@@ -374,6 +377,15 @@ If you need, you can fetch params with this helper
 PostsDatatable.param_get('users.email', params)
 ```
 
+You can set filters on datatable even params are blank, for example
+
+```
+  def index
+    view_context.params.merge! PostsDatatable.param_set 'posts.start_date', Time.zone.today..(Time.zone.today + 1.year)
+    @datatable = PostsDatatable.new view_context
+  end
+```
+
 ### Saved Preferences (optional)
 
 You can save column order and page length in User.preferences field so
@@ -550,10 +562,11 @@ ruby -I test test/trk_datatables/base_test.rb -n /additional/
 You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 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 publish with
+release a new version, update the version number and then publish with
 
 ```
+vi lib/trk_datatables/version.rb
+bundle
 bundle exec rake release
 ```
 

data/lib/generators/templates/trk_datatable.rb

@@ -1,7 +1,7 @@
-class <%= class_name.pluralize %>Datatable < TrkDatatables::ActiveRecord
+class <%= @trk_class_name %> < TrkDatatables::ActiveRecord
   def columns
     {
-<% class_name.constantize.columns.each do |column| -%>
+<% @skip_model || class_name.constantize.columns.each do |column| -%>
 <% next if %w[created_at updated_at].include? column.name -%>
       '<%= table_name %>.<%= column.name %>': {},
 <% end -%>
@@ -9,13 +9,15 @@ class <%= class_name.pluralize %>Datatable < TrkDatatables::ActiveRecord
   end
 
   def all_items
+    # you can use @view.params
     <%= class_name %>.all
   end
 
   def rows(filtered)
+    # you can use @view.link_to and other helpers
     filtered.map do |<%= singular_table_name %>|
       [
-<% class_name.constantize.columns.each do |column| -%>
+<% @skip_model || 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 %>),

data/lib/generators/trk_datatables/trk_datatables_generator.rb

@@ -1,7 +1,6 @@
 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__)
@@ -10,11 +9,49 @@ module TrkDatatables
       def create
         begin
           class_name.constantize
+          @trk_class_name = "#{class_name.pluralize}Datatable"
+          @trk_file_name = "#{plural_name}_datatable"
         rescue NameError => e
-          raise MissingModelError, e.message
+          Rails.logger.info e.message
+          @skip_model = true
+          @trk_class_name = "#{class_name}Datatable"
+          @trk_file_name = "#{singular_name}_datatable"
         end
 
-        template 'trk_datatable.rb', "app/datatables/#{plural_name}_datatable.rb"
+        template 'trk_datatable.rb', "app/datatables/#{@trk_file_name}.rb"
+
+        say <<~TEXT
+          ======================================================================
+          You can use in your controller
+
+          # app/controllers/#{plural_name}_controller.rb
+          class #{class_name}Controller < ApplicationController
+            def index
+              @datatable = #{@trk_class_name}.new view_context
+            end
+
+            def search
+              render json: #{@trk_class_name}.new(view_context)
+            end
+          end
+
+          In your views mkdir app/views/#{plural_name}
+          # app/views/#{plural_name}/index.html
+          <h1>#{class_name.pluralize}</h1>
+          <%= @datatable.render_html search_#{plural_name}_path(format: :json) %>
+
+          And in routes
+
+          # config/routes.rb
+          Rails.application.routes.draw do
+            resources :#{plural_name} do
+              collection do
+                post :search
+              end
+            end
+          end
+          ======================================================================
+        TEXT
       end
     end
   end

data/lib/trk_datatables/base_helpers.rb

@@ -16,6 +16,7 @@ module TrkDatatables
     def param_set(column_key, value)
       datatable = new OpenStruct.new(params: {})
       value = value.join MULTIPLE_OPTION_SEPARATOR if value.is_a? Array
+      value = [value.first, value.last].join BETWEEN_SEPARATOR if value.is_a? Range
       column_index = datatable.index_by_column_key column_key
       DtParams.param_set column_index, value
     end

data/lib/trk_datatables/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trk_datatables
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Dusan Orlovic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2019-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport