smart_listing 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1f5ca088a8f099afb75fbf7e1e1141d616f44ac
-  data.tar.gz: 1f9cf4a2af47ec66b8bddc3f20a5a3dc51064e42
+  metadata.gz: 9e99ae401d68d2b6f4af5569bf2963fd8eafdb8f
+  data.tar.gz: 8469a86376223350e45927863a7d7c8096c6fc98
 SHA512:
-  metadata.gz: 262ea9cd10b00b30dd902fe8602637b6af3413919d61bd82b6c0dbc56b23472026f00142dc4e6eec48d6613f3eb006f7ea71dd5d30efabe1983c241514361fef
-  data.tar.gz: c37d66bf5b26b7e336c59a4d1e72f767fefa274fb439b7f10b63bd130e32cc5f5ab020bd298f6d9d72ec3b57a973fa4d60fc17b17ce7d024d979c0a813428e0b
+  metadata.gz: 9cf884e1df41a3417a666929c7b66796bf87dbd6089d2c35891650ee178e5c5892c7e7b32c8a8c174f413810669fad3ebca402287b4aef6dc0a0346aa895b697
+  data.tar.gz: 6b412d30392763ad1c5c227ec0261abd9922ffbf5f0f9c95c996b9cba745e9284b4009ffd6b27214edfaea36fef1260eece888168894f121aaee303a911b58f6

data/README.md

@@ -180,10 +180,10 @@ New partial for user (`users/user`) may look like this:
 ```haml
 %td= user.name
 %td= user.email
-%td.actions= smart_listing_item_actions [{name: :edit, url: edit_user_path(user)}, {name: :destroy, url: user_path(user)}]
+%td.actions= smart_listing_item_actions [{name: :show, url: user_path(user)}, {name: :edit, url: edit_user_path(user)}, {name: :destroy, url: user_path(user)}]
 ```
 
-`smart_listing_item_actions` renders here links that allow to edit and destroy user item. `:edit` and `:destroy` are built-in actions, you can also define your `:custom` actions. Again. `<td>`'s class `actions` is important.
+`smart_listing_item_actions` renders here links that allow to edit and destroy user item. `:show`, `:edit` and `:destroy` are built-in actions, you can also define your `:custom` actions. Again. `<td>`'s class `actions` is important.
 
 Controller actions referenced by above urls are again plain Ruby on Rails actions that render JS like:
 

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

@@ -21,6 +21,9 @@ class window.SmartListing
     @selector: (name)->
       @options["constants"]["selectors"][name]
 
+    @element_template: (name)->
+      @options["constants"]["element_templates"][name]
+
   @config: Config
 
 
@@ -186,6 +189,8 @@ class window.SmartListing
       new_item_placeholder.html(content)
       new_item_placeholder.addClass(SmartListing.config.class("inline_editing"))
 
+      @container.trigger("smart_listing:new", new_item_placeholder)
+
       @fadeLoaded()
 
   create: (id, success, content) =>
@@ -196,10 +201,17 @@ class window.SmartListing
       new_item_placeholder.addClass(SmartListing.config.class("hidden"))
       new_item_action.removeClass(SmartListing.config.class("hidden"))
 
-      new_item = $("<tr />").addClass(SmartListing.config.class("editable"))
+      new_item = $(SmartListing.config.element_template("row")).addClass(SmartListing.config.class("editable"))
       new_item.attr("data-#{SmartListing.config.data_attribute("id")}", id)
       new_item.html(content)
-      new_item_placeholder.before(new_item)
+
+      if new_item_placeholder.length != 0
+        if new_item_placeholder.data("insert-mode") == "after"
+          new_item_placeholder.after(new_item)
+        else
+          new_item_placeholder.before(new_item)
+      else
+        @content.append(new_item)
 
       @container.trigger("smart_listing:create:success", new_item)
 
@@ -361,11 +373,19 @@ $.fn.smart_listing_controls = () ->
     # serialize form and merge it with smart listing params
     prms = {}
     $.each controls.serializeArray(), (i, field) ->
-      prms[field.name] = field.value
+      if field.name.endsWith("[]")
+        field_name = field.name.slice(0, field.name.length - 2)
+        if Array.isArray(prms[field_name])
+          prms[field_name].push field.value
+        else
+          prms[field_name] = [field.value]
+      else
+        prms[field.name] = field.value
+
     prms = $.extend(smart_listing.params(), prms)
     smart_listing.params(prms)
 
-    container.trigger("ajax:before")
+    smart_listing.fadeLoading()
     smart_listing.reload()
 
   $(this).each () ->

data/app/helpers/smart_listing/helper.rb

@@ -115,9 +115,9 @@ module SmartListing
       end
 
       # Renders the main partial (whole list)
-      def render_list
+      def render_list locals = {}
         if @smart_listing.partial
-          @template.render :partial => @smart_listing.partial, :locals => {:smart_listing => self}
+          @template.render :partial => @smart_listing.partial, :locals => {:smart_listing => self}.merge(locals || {})
         end
       end
 
@@ -180,6 +180,7 @@ module SmartListing
       private
 
       def sanitize_params params
+        params = params.permit! if params.respond_to?(:permit!)
         params.merge(UNSAFE_PARAMS)
       end
 
@@ -229,8 +230,9 @@ module SmartListing
     end
 
     def smart_listing_render name = controller_name, *args
+      options = args.dup.extract_options!
       smart_listing_for(name, *args) do |smart_listing|
-        concat(smart_listing.render_list)
+        concat(smart_listing.render_list(options[:locals]))
       end
     end
 
@@ -328,7 +330,8 @@ module SmartListing
           smart_listing_config.data_attributes(:params) => smart_listing.all_params,
           smart_listing_config.data_attributes(:max_count) => smart_listing.max_count,
           smart_listing_config.data_attributes(:item_count) => smart_listing.count,
-        }
+        },
+        :locals => options[:locals] || {}
       })
     end
 

data/app/views/smart_listing/_update_list.js.erb

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

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

@@ -81,4 +81,8 @@ SmartListing.configure do |config|
     #:filtering_input       => ".filter input",
     #:pagination_count      => ".pagination-per-page .count",
   }
+
+  config.constants :element_templates, {
+    #:row => "<tr />",
+  }
 end

data/lib/smart_listing/config.rb

@@ -94,6 +94,9 @@ module SmartListing
           :filtering_icon => "button span",
           :filtering_input => ".filter input",
           :pagination_count => ".pagination-per-page .count",
+        },
+        :element_templates => {
+          :row => "<tr />",
         }
       }
     }.freeze
@@ -129,6 +132,10 @@ module SmartListing
       @options[:constants].try(:[], :selectors).try(:[], key) || DEFAULTS[:constants][:selectors][key]
     end
 
+    def element_templates key
+      @options[:constants].try(:[], :element_templates).try(:[], key) || DEFAULTS[:constants][:element_templates][key]
+    end
+
     def global_options value = nil
       if value && !value.empty?
         @options[:global_options] ||= {}

data/lib/smart_listing/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -112,30 +112,30 @@ dependencies:
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.4
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -158,40 +158,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/javascripts/smart_listing.coffee.erb
 - app/views/kaminari/smart_listing/_paginator.html.erb
-- app/views/kaminari/smart_listing/_gap.html.erb
+- app/views/kaminari/smart_listing/_first_page.html.erb
 - app/views/kaminari/smart_listing/_page.html.erb
 - app/views/kaminari/smart_listing/_prev_page.html.erb
-- app/views/kaminari/smart_listing/_first_page.html.erb
-- app/views/kaminari/smart_listing/_next_page.html.erb
 - app/views/kaminari/smart_listing/_last_page.html.erb
-- app/views/smart_listing/item/_new.js.erb
-- app/views/smart_listing/item/_create_continue.js.erb
-- app/views/smart_listing/item/_edit.js.erb
-- app/views/smart_listing/item/_create.js.erb
-- app/views/smart_listing/item/_remove.js.erb
-- app/views/smart_listing/item/_update.js.erb
-- app/views/smart_listing/item/_destroy.js.erb
-- app/views/smart_listing/_pagination_per_page_links.html.erb
-- app/views/smart_listing/create.js.erb
+- app/views/kaminari/smart_listing/_gap.html.erb
+- app/views/kaminari/smart_listing/_next_page.html.erb
+- app/views/smart_listing/destroy.js.erb
 - app/views/smart_listing/_action_custom.html.erb
-- app/views/smart_listing/_update_list.js.erb
+- app/views/smart_listing/_item_new.html.erb
+- app/views/smart_listing/_action_delete.html.erb
 - app/views/smart_listing/edit.js.erb
+- app/views/smart_listing/_pagination_per_page_links.html.erb
 - app/views/smart_listing/_pagination_per_page_link.html.erb
-- app/views/smart_listing/update.js.erb
-- app/views/smart_listing/_action_delete.html.erb
-- app/views/smart_listing/_item_new.html.erb
 - app/views/smart_listing/index.js.erb
+- app/views/smart_listing/_action_show.html.erb
+- app/views/smart_listing/update.js.erb
+- app/views/smart_listing/_action_edit.html.erb
 - app/views/smart_listing/new.js.erb
+- app/views/smart_listing/_update_list.js.erb
 - app/views/smart_listing/_sortable.html.erb
-- app/views/smart_listing/_action_edit.html.erb
-- app/views/smart_listing/_action_show.html.erb
-- app/views/smart_listing/destroy.js.erb
-- app/assets/javascripts/smart_listing.coffee.erb
+- app/views/smart_listing/create.js.erb
+- app/views/smart_listing/item/_create.js.erb
+- app/views/smart_listing/item/_edit.js.erb
+- app/views/smart_listing/item/_destroy.js.erb
+- app/views/smart_listing/item/_remove.js.erb
+- app/views/smart_listing/item/_new.js.erb
+- app/views/smart_listing/item/_update.js.erb
+- app/views/smart_listing/item/_create_continue.js.erb
 - app/helpers/smart_listing/application_helper.rb
 - app/helpers/smart_listing/helper.rb
 - config/routes.rb
 - config/locales/en.yml
+- lib/smart_listing.rb
 - lib/tasks/smart_list_tasks.rake
 - lib/smart_listing/config.rb
 - lib/smart_listing/engine.rb
@@ -199,7 +200,6 @@ files:
 - lib/generators/smart_listing/views_generator.rb
 - lib/generators/smart_listing/install_generator.rb
 - lib/generators/smart_listing/templates/initializer.rb
-- lib/smart_listing.rb
 - LICENSE
 - Rakefile
 - README.md
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: SmartListing helps creating sortable lists of ActiveRecord collections with