snaptable 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b477ff543871bf871b0674fd943583db4e98f004
-  data.tar.gz: c1077f2ff07dafff52d02344b8648e7211309a88
+  metadata.gz: e6e6d31a3bf48463d9fad64040a6c053a8352757
+  data.tar.gz: db7155abe0b38fe29555df722f51fdc55483382c
 SHA512:
-  metadata.gz: 388a0a6c1577c7bc5785894469b60b8bd59503fcce791341b94c41ac6035ce4bd75f0ae66eb10b8fcb272f9d6204f09c67d26b7a100a16f38ca5311e50a86b31
-  data.tar.gz: d3097ec51087d5d2d02c8a065b3d355c163c5704a546b03c96065bf68be0db123772150723b51b2ff463639c00835c4d935a95b90fcd7253dbde6c141c7caab2
+  metadata.gz: 4ecac7b1b9f5bf65e6cabfddb5ddb247370df44bf78fa62ea0de1e9ee8be0d47d89b574f4688380a7a00682fd934c2a45a51792306fc8eb79d10a2d5a481e90f
+  data.tar.gz: 094bf8bb9894d59f116e6eea93af95fc74324d3ee217e0c6fcdfc8e2f9d38833260650fbb14dd29e7993bd67edfa38f7d3386e53dbb46c2534636633465888d0

data/app/assets/javascripts/snaptable/table.js

@@ -3,9 +3,7 @@
 
 /* Admin table */
 
-function snapifyTable() {
-  
-  var snaptable = $("#snaptable");
+function snapifyTable(snaptable) {
 
   var tableButtons = snaptable.find(".table_buttons"),
       editButton = tableButtons.find("a[class='edit']"),
@@ -23,7 +21,7 @@ function snapifyTable() {
   snaptable.on("click", "tbody tr", function(e) {
     var id = $(this).data("url") ;
     if ( typeof id !== "undefined" && !$(this).hasClass("selected") ) {
-      $("tr.selected").removeClass("selected");
+      snaptable.find("tr.selected").removeClass("selected");
       $(this).addClass("selected");
       deleteButton.add(editButton).add(showButton).addClass("on");
       editButton.attr("href", path + id + "/edit");
@@ -44,8 +42,16 @@ function snapifyTable() {
 
 }
 
+function snapifyTables() {
+
+  $(".snaptable").each(function() {
+    snapifyTable($(this));
+  })
+
+}
+
 $(document).on("ready page:load", function() {
 
-  snapifyTable();
+  snapifyTables();
 
-});
+});

data/app/assets/stylesheets/snaptable/table.css.scss

@@ -1,6 +1,6 @@
 /* Table */
 
-#snaptable {
+.snaptable {
   * {
     padding: 0;
     margin: 0;
@@ -120,4 +120,4 @@
     }
   }
 
-}
+}

data/app/views/snaptable/base.html.erb

@@ -1,6 +1,6 @@
-<div id="snaptable">
+<div class="snaptable <%= presenter.table_name %>">
 	<%= render 'snaptable/search_field' if presenter.options[:search] == true %>
-	
+
 	<div class="table_buttons">
 		<%= render presenter.instance_variable_get(:@buttons) unless presenter.options[:buttons] == false %>
 	</div>
@@ -27,6 +27,6 @@
 			<% end %>
 		</tbody>
 	</table>
-	<%= will_paginate presenter.records %>
+	<%= will_paginate presenter.records, param_name: presenter.paginate_key, params: { table: presenter.table_name } %>
 
-</div>
+</div>

data/app/views/snaptable/sort.js.erb

@@ -1,3 +1,4 @@
-var snaptable = $("#snaptable");
-snaptable.replaceWith('<%= j @table.present(buttons: params[:partial]) %>');
-snapifyTable();
+var tableName = "<%= params[:table] %>";
+var snaptable = $(".snaptable." + tableName);
+snaptable.replaceWith('<%= j content %>');
+snapifyTable($(".snaptable." + tableName));

data/lib/snaptable/constructor/base_table.rb

@@ -25,6 +25,14 @@ module Snaptable
           :id
         end
 
+        def table_name
+          self.class.name.underscore
+        end
+
+        def paginate_key
+          "#{table_name}_page"
+        end
+
         private
 
         def stored_token

data/lib/snaptable/constructor/collection.rb

@@ -7,7 +7,7 @@ module Snaptable
       end
 
       def records
-        @records ||= filter(collection).paginate(page: params[:page], per_page: 30).order(sort_column + " " + sort_direction)
+        @records ||= filter(collection).paginate(page: params[paginate_key], per_page: 30).order(sort_column + " " + sort_direction)
       end
 
       def filter(collection)

data/lib/snaptable/constructor/renderer.rb

@@ -1,5 +1,5 @@
 module Snaptable
-  module Constructor    
+  module Constructor
     module Renderer
 
       def present(buttons: nil)
@@ -10,7 +10,9 @@ module Snaptable
       def respond
         respond_to do |format|
           format.html
-          format.js { render '/snaptable/sort' }
+          format.js do
+            render '/snaptable/sort', locals: { content: self.present(buttons: @buttons) }
+          end
         end
       end
 
@@ -51,4 +53,4 @@ module Snaptable
 
     end
   end
-end
+end

data/lib/snaptable/constructor/sortable.rb

@@ -4,7 +4,7 @@ module Snaptable
 
       def sortable(column)
         if model.reflect_on_association(column.gsub /_id/, '').nil?
-          view_context.link_to({sort: column, direction: direction(column), query: params[:query], page: page, partial: @buttons}, {remote: true, class: css_class(column)}) do
+          view_context.link_to({sort: column, direction: direction(column), query: params[:query], paginate_key => page, table: table_name}, {remote: true, class: css_class(column)}) do
             model.human_attribute_name(column)
           end
         else
@@ -15,13 +15,13 @@ module Snaptable
       def sort_column
         column_names.include?(params[:sort]) ? column_name(params[:sort]) : column_name("id")
       end
-      
+
       def sort_direction
         %w[asc desc].include?(params[:direction]) ? params[:direction] : "desc"
       end
 
       def page
-        params[:page] || 1
+        params[paginate_key] || 1
       end
 
       def css_class(column)
@@ -40,4 +40,4 @@ module Snaptable
 
     end
   end
-end
+end

data/lib/snaptable/helpers/table_helper.rb

@@ -14,6 +14,10 @@ module Snaptable
 					@model
 				end
 
+        def table_name
+          model.model_name.singular
+        end
+
 			end
 		end
 	end

data/lib/snaptable/version.rb

@@ -1,3 +1,3 @@
 module Snaptable
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/lib/snaptable.rb

@@ -8,4 +8,12 @@ module Snaptable
   @@show_button = false
 
   mattr_accessor :use_permission, :add_button, :edit_button, :delete_button, :show_button
-end
+
+  def self.respond_with(controller, *args)
+    if name = controller.params[:table]
+      table = args.find { |table| table.table_name == name }
+      table.respond
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptable
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - khcr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails