smart_listing 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec78db2f43e9f78c7420c7a21efdd506da3dbe6
-  data.tar.gz: 8297a520f5c771c428aa2dddbb3219e1696a5e0b
+  metadata.gz: ed162afb1635a06affeb6c2bb0f3bc0d539b7cad
+  data.tar.gz: 9cae821c8260b22a3782daf452008b1da9822e54
 SHA512:
-  metadata.gz: 542635bdcc49d20e137793ee6e54dc46731c271fedd49d053b5e27c642b362e664b06ffc7f7d65774177f1efa63db6d85252481b9d7c9ad05275f775770393dc
-  data.tar.gz: fa82edc043dc01ac02e53b6d1a8a28388be34ca1e67a4b89061473cd60f5fef975c447679a02cbb479df0e95ced1093f28f41014f0e9666b5fb139fdd6550b6b
+  metadata.gz: 1ee4da5ad5023f269936c615dd547c2710c13925ab6e892fc28dad1bb86c2d2e54aacabe4ce8b241b7c9c2847fe1353539f06a2def7c381cdd5355684d4c556d
+  data.tar.gz: 56fb50e405e8afdee3f471f1e565dd3e764197a183c8113b02321c7edf5756ed40c3bdcca01e5978209a49d1b42d75760812c730f76c183f167de5d99669db25

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

@@ -237,6 +237,10 @@ class SmartListing
   
   destroy: (id, destroyed) =>
     # No need to do anything here, already handled by ajax:success handler
+
+  remove: (id) =>
+    editable = @container.find(".editable[data-id=#{id}]").first()
+    editable.remove()
   
   update_list: (content, data) =>
     $.each data, (key, value) =>

data/app/helpers/smart_listing/helper.rb

@@ -30,7 +30,7 @@ module SmartListing
 
       def paginate options = {}
         if @smart_listing.collection.respond_to? :current_page
-          @template.paginate @smart_listing.collection, :remote => true, :param_name => @smart_listing.param_names[:page], :params => UNSAFE_PARAMS
+          @template.paginate @smart_listing.collection, {:remote => true, :param_name => @smart_listing.param_names[:page], :params => UNSAFE_PARAMS}.merge(@smart_listing.kaminari_options)
         end
       end
 
@@ -39,25 +39,31 @@ module SmartListing
       end
 
       def pagination_per_page_links options = {}
-        @template.content_tag(:div, :class => "pagination_per_page #{'disabled' if empty?}") do
-          if @smart_listing.count > @smart_listing.page_sizes.first
-            @template.concat(@template.t('views.pagination.per_page'))
-            per_page_sizes = @smart_listing.page_sizes.clone
-            per_page_sizes.push(0) if @smart_listing.unlimited_per_page?
-            per_page_sizes.each do |p|
-              name = p == 0 ? @template.t('views.pagination.unlimited') : p
-              if @smart_listing.per_page.to_i != p
-                @template.concat(@template.link_to(name, @template.url_for(sanitize_params(@template.params.merge(@smart_listing.param_names[:per_page] => p, @smart_listing.param_names[:page] => 1))), :remote => true))
-              else 
-                @template.concat(@template.content_tag(:span, name))
-              end
-              break if p > @smart_listing.count
-            end
-            @template.concat ' | '
-          end if @smart_listing.options[:paginate]
-          @template.concat(@template.t('views.pagination.total'))
-          @template.concat(@template.content_tag(:span, @smart_listing.count, :class => "count"))
+        container_classes = ["pagination_per_page"]
+        container_classes << "disabled" if empty?
+
+        per_page_sizes = @smart_listing.page_sizes.clone
+        per_page_sizes.push(0) if @smart_listing.unlimited_per_page?
+
+        locals = {
+          :container_classes => container_classes, 
+          :per_page_sizes => per_page_sizes,
+        }
+
+        @template.render(:partial => 'smart_listing/pagination_per_page_links', :locals => default_locals.merge(locals))
+      end
+
+      def pagination_per_page_link page
+        if @smart_listing.per_page.to_i != page
+          url = @template.url_for(sanitize_params(@template.params.merge(@smart_listing.param_names[:per_page] => page, @smart_listing.param_names[:page] => 1)))
         end
+
+        locals = {
+          :page => page, 
+          :url => url,
+        }
+
+        @template.render(:partial => 'smart_listing/pagination_per_page_link', :locals => default_locals.merge(locals))
       end
 
       def sortable title, attribute, options = {}
@@ -69,14 +75,15 @@ module SmartListing
           @smart_listing.param_names[:sort_extra] => extra
         }
 
-        @template.link_to(@template.url_for(sanitize_params(@template.params.merge(sort_params))), :class => "sortable", :data => {:attr => attribute}, :remote => true) do
-          @template.concat(title)
-          if @smart_listing.sort_attr == attribute && (!@smart_listing.sort_extra || @smart_listing.sort_extra == extra.to_s)
-            @template.concat(@template.content_tag(:span, "", :class => (@smart_listing.sort_order == "asc" ? "glyphicon glyphicon-chevron-up" : "glyphicon glyphicon-chevron-down"))) 
-          else
-            @template.concat(@template.content_tag(:span, "", :class => "glyphicon glyphicon-resize-vertical"))
-          end
-        end
+        locals = {
+          :ordered => @smart_listing.sort_attr == attribute && (!@smart_listing.sort_extra || @smart_listing.sort_extra == extra.to_s),
+          :url => @template.url_for(sanitize_params(@template.params.merge(sort_params))),
+          :container_classes => ["sortable"],
+          :attribute => attribute,
+          :title => title
+        }
+
+        @template.render(:partial => 'smart_listing/sortable', :locals => default_locals.merge(locals))
       end
 
       def update options = {}
@@ -100,24 +107,31 @@ module SmartListing
         else
           locals.merge!({:smart_listing => self})
         end
+
         @template.render options, locals, &block
       end
 
       # Add new item button & placeholder to list
       def item_new options = {}
-        @template.concat(@template.content_tag(:tr, '', :class => "info new_item_placeholder disabled"))
-        @template.concat(@template.content_tag(:tr, :class => "info new_item_action #{'disabled' if !empty? && max_count?}") do
-          @template.concat(@template.content_tag(:td, :colspan => options.delete(:colspan)) do
-            @template.concat(@template.content_tag(:p, :class => "no_records pull-left #{'disabled' unless empty?}") do
-              @template.concat(options.delete(:no_items_text))
-            end)
-            @template.concat(@template.link_to(options.delete(:link), :remote => true, :class => "btn pull-right #{'disabled' if max_count?}") do
-              @template.concat(@template.content_tag(:i, '', :class => "glyphicon glyphicon-plus"))
-              @template.concat(" ")
-              @template.concat(options.delete(:text))
-            end)
-          end)
-        end)
+        new_item_action_classes = %{new_item_action} 
+        new_item_action_classes << "disabled" if !empty? && max_count?
+        no_records_classes = %{no_records}
+        no_records_classes << "disabled" unless empty?
+        new_item_button_classes = []
+        new_item_button_classes << "disabled" if max_count?
+
+        locals = {
+          :placeholder_classes => %w{new_item_placeholder disabled},
+          :new_item_action_classes => new_item_action_classes,
+          :colspan => options.delete(:colspan),
+          :no_items_classes => no_records_classes,
+          :no_items_text => options.delete(:no_items_text),
+          :new_item_button_url => options.delete(:link),
+          :new_item_button_classes => new_item_button_classes,
+          :new_item_button_text => options.delete(:text),
+        }
+
+        @template.render(:partial => 'smart_listing/item_new', :locals => default_locals.merge(locals))
         nil
       end
 
@@ -137,6 +151,10 @@ module SmartListing
       def sanitize_params params
         params.merge(UNSAFE_PARAMS)
       end
+
+      def default_locals
+        {:smart_listing => @smart_listing, :builder => self}
+      end
     end
 
     # Outputs smart list container
@@ -148,11 +166,12 @@ module SmartListing
 
       builder = Builder.new(name, @smart_listings[name], self, options, block)
 
-      output =""
+      output = ""
 
       data = {}
       data['max-count'] = @smart_listings[name].max_count if @smart_listings[name].max_count && @smart_listings[name].max_count > 0
       data['href'] = @smart_listings[name].href if @smart_listings[name].href
+      data.merge!(options[:data]) if options[:data]
 
       if bare
         output = capture(builder, &block)
@@ -176,45 +195,35 @@ module SmartListing
 
           if action.has_key?(:if)
             unless action[:if]
-              concat(content_tag(:i, '', :class => "glyphicon glyphicon-remove-circle"))
+              concat(render(:partial => 'smart_listing/action_inactive'))
               next
             end
           end
 
-          case action.delete(:name).to_sym
+          action_name = action[:name].to_sym
+          case action_name
           when :edit
-            url = action.delete(:url)
-            html_options = {
-              :remote => true, 
-              :class => "edit",
-              :title => t("smart_listing.actions.edit")
-            }.merge(action)
-
-            concat(link_to(url, html_options) do
-              concat(content_tag(:i, '', :class => "glyphicon glyphicon-pencil"))
-            end)
+            locals = {
+              :url => action.delete(:url),
+              :icon => action.delete(:icon),
+            }
+						concat(render(:partial => 'smart_listing/action_edit', :locals => locals))
           when :destroy
-            url = action.delete(:url)
-            icon = action.delete(:icon) || "glyphicon glyphicon-trash"
-            html_options = {
-              :remote => true, 
-              :class => "destroy",
-              :method => :delete,
-              :title => t("smart_listing.actions.destroy"),
-              :data => {:confirmation => action.delete(:confirmation) || t("smart_listing.msgs.destroy_confirmation")},
-            }.merge(action)
-
-            concat(link_to(url, html_options) do
-              concat(content_tag(:i, '', :class => icon))
-            end)
+            locals = {
+              :url => action.delete(:url),
+              :icon => action.delete(:icon),
+              :confirmation => action.delete(:confirmation),
+            }
+						concat(render(:partial => 'smart_listing/action_delete', :locals => locals))
           when :custom
-            url = action.delete(:url)
-            icon = action.delete(:icon)
-            html_options = action
-
-            concat(link_to(url, html_options) do
-              concat(content_tag(:i, '', :class => icon))
-            end)
+            locals = {
+              :url => action.delete(:url),
+              :icon => action.delete(:icon),
+              :html_options => action,
+            }
+						concat(render(:partial => 'smart_listing/action_custom', :locals => locals))
+          else
+						concat(render(:partial => "smart_listing/action_#{action_name}", :locals => {:action => action}))
           end
         end
       end
@@ -250,10 +259,11 @@ module SmartListing
     def smart_listing_item name, item_action, object = nil, partial = nil, options = {}
       name = name.to_sym
       type = object.class.name.downcase.to_sym if object
-      id = object.id if object
+      id = options[:id] || object.try(:id)
+      valid = options[:valid] if options.has_key?(:valid)
       object_key = options.delete(:object_key) || :object
 
-      render(:partial => "smart_listing/item/#{item_action.to_s}", :locals => {:name => name, :id => id, :object_key => object_key, :object => object, :part => partial})
+      render(:partial => "smart_listing/item/#{item_action.to_s}", :locals => {:name => name, :id => id, :valid => valid, :object_key => object_key, :object => object, :part => partial})
     end
   end
 end

data/app/views/smart_listing/_action_custom.html.erb

@@ -0,0 +1,10 @@
+<%# 
+  Custom action.
+
+  Available local variables:
+    url
+    icon
+    html_options:       custom html options
+-%>
+
+<%= link_to(url, html_options) do %><%= content_tag(:i, '', :class => icon) %><% end %>

data/app/views/smart_listing/_action_delete.html.erb

@@ -0,0 +1,10 @@
+<%# 
+  Delete action.
+
+  Available local variables:
+    url:                destroy url
+    icon
+    confirmation:       confrimation text
+-%>
+
+<%= link_to(url, :remote => true, :class => "destroy", :method => :delete, :title => t("smart_listing.actions.destroy"), :data => {:confirmation => confirmation || t("smart_listing.msgs.destroy_confirmation")} ) do %><%= content_tag(:i, "", :class => icon || "glyphicon glyphicon-trash") %><% end %>

data/app/views/smart_listing/_action_edit.html.erb

@@ -0,0 +1,9 @@
+<%# 
+  Edit action.
+
+  Available local variables:
+    url
+    icon
+-%>
+
+<%= link_to(url, :remote => true, :class => "edit", :title => t("smart_listing.actions.edit") ) do %><%= content_tag(:i, '', :class => icon || "glyphicon glyphicon-pencil") %><% end %>

data/app/views/smart_listing/_action_inactive.html.erb

@@ -0,0 +1,5 @@
+<%# 
+  Inactive action.
+-%>
+
+<%= content_tag(:i, '', :class => "glyphicon glyphicon-remove-circle") %>

data/app/views/smart_listing/_item_new.html.erb

@@ -0,0 +1,26 @@
+<%# 
+  New list item element (contains new item placeholder and add button).
+
+  Available local variables:
+    placeholder_classes:      classes for the main container
+    new_item_action_classes:  new item action classes
+    colspan              
+    no_items_classes:         no items container classes
+    no_items_text:            no items text displayed inside container
+    new_item_button_url:      argument to link_to (new item button)
+    new_item_button_classes
+    new_item_button_text
+-%>
+
+<%= content_tag(:tr, '', :class => placeholder_classes.merge(%{info})) %>
+<%= content_tag(:tr, :class => new_item_action_classes.merge(%{info})) do %>
+  <%= content_tag(:td, :colspan => colspan) do %>
+    <%= content_tag(:p, :class => no_items_classes.merge(%{pull-left})) do %>
+      <%= no_items_text %>
+    <% end %>
+    <%= link_to(new_item_button_url, :remote => true, :class => new_item_button_classes.merge(%{btn pull-right})) do %>
+      <%= content_tag(:i, '', :class => "glyphicon glyphicon-plus") %>
+      <%= new_item_text %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/smart_listing/_pagination_per_page_link.html.erb

@@ -0,0 +1,12 @@
+<%# 
+  Pagination single per-page link.
+
+  Available local variables:
+    page:           page number
+    url:            page url (if page is not selected)
+    smart_listing:  current SmartListing instance
+    builder:        current builder instance
+-%>
+
+<% name = page == 0 ? t('views.pagination.unlimited') : page %>
+<%= url ? link_to(name, url) : content_tag(:span, name) %>

data/app/views/smart_listing/_pagination_per_page_links.html.erb

@@ -0,0 +1,19 @@
+<%# 
+  Pagination per-page links.
+
+  Available local variables:
+    container_classes:  classes for the main container
+    per_page_sizes:     array of available per-page sizes
+    smart_listing:      current SmartListing instance
+    builder:            current builder instance
+-%>
+
+<%= content_tag(:div, :class => container_classes ) do %>
+  <% if smart_listing.options[:paginate] && (smart_listing.count > smart_listing.page_sizes.first) %>
+    <%= t('views.pagination.per_page') %>
+    <% per_page_sizes.each do |p| %><%= builder.pagination_per_page_link p %><% break if p > smart_listing.count %><% end %>
+    |
+  <% end %>
+  <%= t('views.pagination.total') %>
+  <%= content_tag(:span, smart_listing.count, :class => "count") %>
+<% end %>

data/app/views/smart_listing/_sortable.html.erb

@@ -0,0 +1,21 @@
+<%# 
+  Sortable attribute listing header.
+
+  Available local variables:
+    container_classes:  classes for the main container
+    url:                sortable link url
+    attribute:          current attribute name
+    title:              current attribute title
+    ordered:            defines whether column is sorted or not
+    smart_listing:      current SmartListing instance
+    builder:            current builder instance
+-%>
+
+<%= link_to url, :class => container_classes, :data => {:attr => attribute}, :remote => true do %>
+  <%= title %>
+  <% if ordered %>
+    <span class="<%= smart_listing.sort_order == "asc" ? "glyphicon glyphicon-chevron-up" : "glyphicon glyphicon-chevron-down" %>"></span>
+  <% else %>
+    <span class="glyphicon glyphicon-resize-vertical"></span>
+  <% end %>
+<% end %>

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +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})) %>");

data/config/locales/en.yml

@@ -0,0 +1,12 @@
+en:
+  smart_listing:
+    msgs:
+      destroy_confirmation: Destroy?
+    actions:
+      destroy: Destroy
+      edit: Edit
+  views:
+    pagination:
+      per_page: Per page
+      unlimited: Unlimited
+      total: Total

data/lib/generators/smart_listing/views_generator.rb

@@ -0,0 +1,23 @@
+module SmartListing
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views/smart_listing', __FILE__)
+
+      def self.banner #:nodoc:
+        <<-BANNER.chomp
+rails g smart_listing:views 
+
+    Copies all smart listing partials templates to your application.
+BANNER
+      end
+
+      desc ''
+      def copy_views
+        filename_pattern = File.join self.class.source_root, "*.html.erb"
+        Dir.glob(filename_pattern).map {|f| File.basename f}.each do |f|
+          copy_file f, "app/views/smart_listing/#{f}"
+        end
+      end
+		end
+	end
+end

data/lib/smart_listing.rb

@@ -31,6 +31,7 @@ module SmartListing
         :default_sort_attr              => nil,                 # default sort by
         :memorize_per_page              => false,
         :page_sizes                     => DEFAULT_PAGE_SIZES,  # set available page sizes array
+        :kaminari_options               => {},                  # Kaminari's paginate helper options
       }.merge!(options)
 
       if @options[:array]
@@ -110,6 +111,10 @@ module SmartListing
       @options[:page_sizes]
     end
 
+    def kaminari_options
+      @options[:kaminari_options]
+    end
+
     def all_params
       ap = {}
       @options[:param_names].each do |k, v|

data/lib/smart_listing/version.rb

@@ -1,3 +1,3 @@
 module SmartListing
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_listing
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Sology
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,16 +73,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/views/smart_listing/item/_new.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/_action_custom.html.erb
+- app/views/smart_listing/_action_inactive.html.erb
 - app/views/smart_listing/_update_list.js.erb
+- app/views/smart_listing/_pagination_per_page_link.html.erb
+- app/views/smart_listing/_action_delete.html.erb
+- app/views/smart_listing/_item_new.html.erb
+- app/views/smart_listing/_sortable.html.erb
+- app/views/smart_listing/_action_edit.html.erb
 - app/assets/stylesheets/smart_listing/application.css
 - app/assets/javascripts/smart_listing/smart_listing.coffee
 - app/assets/javascripts/smart_listing/application.js
 - app/helpers/smart_listing/application_helper.rb
 - app/helpers/smart_listing/helper.rb
 - config/routes.rb
+- config/locales/en.yml
 - lib/tasks/smart_list_tasks.rake
 - lib/smart_listing/engine.rb
 - lib/smart_listing/version.rb
+- lib/generators/smart_listing/views_generator.rb
 - lib/smart_listing.rb
 - LICENSE
 - Rakefile
@@ -107,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: SmartListing helps creating sortable lists of ActiveRecord collections with