smart_listing 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e99ae401d68d2b6f4af5569bf2963fd8eafdb8f
-  data.tar.gz: 8469a86376223350e45927863a7d7c8096c6fc98
+  metadata.gz: 0d036e38f0ade94d2360779aad5df71aa55044c9
+  data.tar.gz: 77fd8c742f4f0795e6bf6e20b0ef756b60083602
 SHA512:
-  metadata.gz: 9cf884e1df41a3417a666929c7b66796bf87dbd6089d2c35891650ee178e5c5892c7e7b32c8a8c174f413810669fad3ebca402287b4aef6dc0a0346aa895b697
-  data.tar.gz: 6b412d30392763ad1c5c227ec0261abd9922ffbf5f0f9c95c996b9cba745e9284b4009ffd6b27214edfaea36fef1260eece888168894f121aaee303a911b58f6
+  metadata.gz: 929c87c6a88255ea1a8e1510252f6d1c08578818d94490d6b7395ed6fb24133bb818250b1e1d54df092e4b42c36f79c23e31279bc457e8d414c8edc2cecb5f3c
+  data.tar.gz: ad3fb94f079e41cbbc6d6ef8e56f00703a94fc93b954a522ab35a8ff4977e1b214b12cda9e89581f0a5aa008b9c4ca565a1bc37f8f75174bbad56aff50ebe1b9

data/README.md

@@ -73,7 +73,7 @@ smart_listing_render(:users)
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th User name
         %th Email
     %tbody
@@ -82,7 +82,7 @@ smart_listing_render(:users)
           %td= user.name
           %td= user.email
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
@@ -112,7 +112,7 @@ SmartListing supports two modes of sorting: implicit and explicit. Implicit mode
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th= smart_listing.sortable "User name", :name
         %th= smart_listing.sortable "Email", :email
     %tbody
@@ -121,12 +121,12 @@ SmartListing supports two modes of sorting: implicit and explicit. Implicit mode
           %td= user.name
           %td= user.email
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
 
-In this case `:name` and `:email` are sorting column names. `Builder#sortable` renders special link containing column name and sort order (either `asc`, `desc`, or empty value). 
+In this case `:name` and `:email` are sorting column names. `Builder#sortable` renders special link containing column name and sort order (either `asc`, `desc`, or empty value).
 
 You can also specify default sort order in the controller:
 
@@ -136,7 +136,7 @@ You can also specify default sort order in the controller:
 
 Implicit mode is convenient with simple data sets. In case you want to sort by joined column names, we advise you to use explicit sorting:
 ```ruby
-@users = smart_listing_create :users, User.active.joins(:stats), partial: "users/listing", 
+@users = smart_listing_create :users, User.active.joins(:stats), partial: "users/listing",
                               sort_attributes: [[:last_signin, "stats.last_signin_at"]],
                               default_sort: {last_signin: "desc"}
 ```
@@ -153,7 +153,7 @@ In order to allow managing and editing list items, we need to reorganize our vie
 - unless smart_listing.empty?
   %table
     %thead
-      %tr 
+      %tr
         %th= smart_listing.sortable "User name", "name"
         %th= smart_listing.sortable "Email", "email"
         %th
@@ -161,9 +161,9 @@ In order to allow managing and editing list items, we need to reorganize our vie
       - smart_listing.collection.each do |user|
         %tr.editable{data: {id: user.id}}
           = smart_listing.render partial: 'users/user', locals: {user: user}
-      = smart_listing.item_new colspan: 3, link: new_user_path 
+      = smart_listing.item_new colspan: 3, link: new_user_path
 
-  = smart_listing.paginate 
+  = smart_listing.paginate
 - else
   %p.warning No records!
 ```
@@ -174,7 +174,7 @@ In order to allow managing and editing list items, we need to reorganize our vie
 <%= smart_listing_item :users, :new, @new_user, "users/form" %>
 ```
 
-Note that `new` action does not need to create SmartListing (via `smart_listing_create`). It just initializes `@new_user` and renders JS view. 
+Note that `new` action does not need to create SmartListing (via `smart_listing_create`). It just initializes `@new_user` and renders JS view.
 
 New partial for user (`users/user`) may look like this:
 ```haml
@@ -204,10 +204,10 @@ Partial name supplied to `smart_listing_item` (`users/form`) references `@user`
 
   = form_for object, url: object.new_record? ? users_path : user_path(object), remote: true do |f|
     %p
-      Name: 
+      Name:
       = f.text_field :name
     %p
-      Email: 
+      Email:
       = f.text_field :email
     %p= f.submit "Save"
 ```
@@ -228,7 +228,7 @@ SmartListing controls allow you to change somehow presented data. This is typica
   .filter.input-append
     = text_field_tag :filter, '', class: "search", placeholder: "Type name here", autocomplete: "off"
     %button.btn.disabled{type: "submit"}
-      %i.icon.icon-search
+      %span.glyphicon.glyphicon-search
 ```
 
 This gives you nice Bootstrap-enabled filter field with keychange handler. Of course you can use any other form fields in controls too.
@@ -262,7 +262,7 @@ SmartListing.configure(:awesome_profile) do |config|
 end
 ```
 
-In order to use this profile, create helper method named `smart_listing_config_profile` returning profile name and put into your JS `SmartListing.config.merge()` function call. `merge()` function expects parameter with config attributes hash or reads body data-attribute named `smart-listing-config`. Hash of config attributes can be obtained by using helper method `SmartListing.config(:awesome_profile).to_json`. 
+In order to use this profile, create helper method named `smart_listing_config_profile` returning profile name and put into your JS `SmartListing.config.merge()` function call. `merge()` function expects parameter with config attributes hash or reads body data-attribute named `smart-listing-config`. Hash of config attributes can be obtained by using helper method `SmartListing.config(:awesome_profile).to_json`.
 
 ## Not enough?
 

data/app/assets/javascripts/smart_listing.coffee.erb

@@ -24,6 +24,9 @@ class window.SmartListing
     @element_template: (name)->
       @options["constants"]["element_templates"][name]
 
+    @bootstrap_commands: (name)->
+      @options["constants"]["bootstrap_commands"][name]
+
   @config: Config
 
 
@@ -319,8 +322,8 @@ $.fn.smart_listing.observeField = (field, opts = {}) ->
      , 400)
 
 $.fn.smart_listing.showPopover = (elem, body) ->
-  elem.popover("destroy")
-  elem.popover(content: body, html: true, trigger: "manual", title: null)
+  elem.popover(SmartListing.config.bootstrap_commands("popover_destroy"))
+  elem.popover(content: body, html: true, trigger: "manual")
   elem.popover("show")
 
 $.fn.smart_listing.showConfirmation = (confirmation_elem, msg, confirm_callback) ->
@@ -333,12 +336,12 @@ $.fn.smart_listing.showConfirmation = (confirmation_elem, msg, confirm_callback)
         editable = $(event.currentTarget).closest(SmartListing.config.class_name("editable"))
         confirm_callback(confirmation_elem)
         $(confirmation_elem).click()
-        $(confirmation_elem).popover("destroy")
+        $(confirmation_elem).popover(SmartListing.config.bootstrap_commands("popover_destroy"))
       )
       .append(" ")
       .append($("<button/>").html("No").addClass("btn btn-small").click (event) =>
         editable = $(event.currentTarget).closest(SmartListing.config.class_name("editable"))
-        $(confirmation_elem).popover("destroy")
+        $(confirmation_elem).popover(SmartListing.config.bootstrap_commands("popover_destroy"))
       )
     )
 
@@ -438,4 +441,4 @@ ready = ->
   $(SmartListing.config.class_name("controls")).smart_listing_controls()
 
 $(document).ready ready
-$(document).on "page:load", ready
+$(document).on "page:load turbolinks:load", ready

data/app/helpers/smart_listing/helper.rb

@@ -11,6 +11,7 @@ module SmartListing
         name = (args[0] || options[:name] || controller_name).to_sym
         collection = args[1] || options[:collection] || smart_listing_collection
 
+        view_context = self.respond_to?(:controller) ? controller.view_context : self.view_context
         options = {:config_profile => view_context.smart_listing_config_profile}.merge(options)
 
         list = SmartListing::Base.new(name, collection, options)

data/app/views/smart_listing/item/_create.js.erb

@@ -1,3 +1,3 @@
 var smart_listing = $('#<%= name %>').smart_listing();
 smart_listing.setAutoshow(false);
-smart_listing.create(<%= id || 0 %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.create(<%= (id || 0).to_json.html_safe %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");

data/app/views/smart_listing/item/_create_continue.js.erb

@@ -1,6 +1,6 @@
 var smart_listing = $('#<%= name %>').smart_listing();
 smart_listing.setAutoshow(true);
-smart_listing.create(<%= id || 0 %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.create(<%= (id || 0).to_json.html_safe %>, <%= object.persisted? %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
 <% if object.persisted? %>
   smart_listing.new_item("<%= escape_javascript(render(:partial => new.last, :locals => {object_key => new.first})) %>");
 <% end %>

data/app/views/smart_listing/item/_destroy.js.erb

@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name.to_s %>').smart_listing();
-smart_listing.destroy(<%= id %>, <%= object.destroyed? %>);
+smart_listing.destroy(<%= id.to_json.html_safe %>, <%= object.destroyed? %>);

data/app/views/smart_listing/item/_edit.js.erb

@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.edit(<%= id %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.edit(<%= id.to_json.html_safe %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");

data/app/views/smart_listing/item/_remove.js.erb

@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.remove(<%= id %>);
+smart_listing.remove(<%= id.to_json.html_safe %>);

data/app/views/smart_listing/item/_update.js.erb

@@ -1,2 +1,2 @@
 var smart_listing = $('#<%= name %>').smart_listing();
-smart_listing.update(<%= id %>, <%= valid.nil? ? object.valid? : valid %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");
+smart_listing.update(<%= id.to_json.html_safe %>, <%= valid.nil? ? object.valid? : valid %>, "<%= escape_javascript(render(:partial => part, :locals => {object_key => object})) %>");

data/lib/generators/smart_listing/install_generator.rb

@@ -5,7 +5,7 @@ module SmartListing
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
-rails g smart_listing:install 
+rails g smart_listing:install
 
     Copies initializer file
 BANNER
@@ -15,6 +15,6 @@ BANNER
       def copy_views
         template 'initializer.rb', 'config/initializers/smart_listing.rb'
       end
-		end
-	end
+    end
+  end
 end

data/lib/generators/smart_listing/templates/initializer.rb

@@ -85,4 +85,8 @@ SmartListing.configure do |config|
   config.constants :element_templates, {
     #:row => "<tr />",
   }
+
+  config.constants :bootstrap_commands, {
+    #:popover_destroy       => "destroy", # Bootstrap 4 requries dipsose instead of destroy
+  }
 end

data/lib/generators/smart_listing/views_generator.rb

@@ -5,7 +5,7 @@ module SmartListing
 
       def self.banner #:nodoc:
         <<-BANNER.chomp
-rails g smart_listing:views 
+rails g smart_listing:views
 
     Copies all smart listing partials templates to your application.
 BANNER
@@ -18,6 +18,6 @@ BANNER
           copy_file f, "app/views/smart_listing/#{f}"
         end
       end
-		end
-	end
+    end
+  end
 end

data/lib/smart_listing.rb

@@ -68,8 +68,8 @@ module SmartListing
       end
 
       if @options[:array]
-        if @sort && @sort.any? # when array we sort only by first attribute
-          i = sort_keys.index{|x| x[0] == @sort.first[0]}
+        if @sort && !@sort.empty? # when array we sort only by first attribute
+          i = sort_keys.index{|x| x[0] == @sort.to_h.first[0]}
           @collection = @collection.sort do |x, y|
             xval = x
             yval = y
@@ -83,7 +83,7 @@ module SmartListing
             if xval.nil? || yval.nil?
               xval.nil? ? 1 : -1
             else
-              if @sort.first[1] == "asc"
+              if @sort.to_h.first[1] == "asc"
                 (xval <=> yval) || (xval && !yval ? 1 : -1)
               else
                 (yval <=> xval) || (yval && !xval ? 1 : -1)
@@ -94,13 +94,13 @@ module SmartListing
         if @options[:paginate] && @per_page > 0
           @collection = ::Kaminari.paginate_array(@collection).page(@page).per(@per_page)
           if @collection.length == 0
-            @collection = @collection.page(@collection.num_pages)
+            @collection = @collection.page(@collection.total_pages)
           end
         end
       else
         # let's sort by all attributes
         #
-        @collection = @collection.order(sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}" if @sort[s[0]]}.compact) if @sort && @sort.any?
+        @collection = @collection.order(sort_keys.collect{|s| "#{s[1]} #{@sort[s[0]]}" if @sort[s[0]]}.compact) if @sort && !@sort.empty?
 
         if @options[:paginate] && @per_page > 0
           @collection = @collection.page(@page).per(@per_page)

data/lib/smart_listing/config.rb

@@ -97,6 +97,9 @@ module SmartListing
         },
         :element_templates => {
           :row => "<tr />",
+        },
+        :bootstrap_commands => {
+          :popover_destroy => "destroy",
         }
       }
     }.freeze

data/lib/smart_listing/version.rb

@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails