iquest-simple_table 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db6f28eda6e5c7387dd320504b0d760e8247b46d
-  data.tar.gz: f1aff3605d65b5b13bcc2110af3832dc4c552fbc
+  metadata.gz: 487255feccbbd18459b41325c4ba0072301ba4bb
+  data.tar.gz: 9d767604c918f80dbb629f0ce226bde0bd1d73c6
 SHA512:
-  metadata.gz: 02085c18ba6bde7a89f96cc0de9ad7ce260b0b8f483ae84f17c3334cbbbe70b331e7d619fcf28db487895e973b5581c006f86a239e71875ea2dc151a9adf5a52
-  data.tar.gz: 825e215e2665e5fb0625091834bd338ff68f9c8e1225d2bfc18c6dce218701a84a2bf094a8894470da43822751f33851e6db2bf7aaff1d389387fbc8ce2b4439
+  metadata.gz: 2ccec335f52588138657eb6e79bc2829d254fd3ae64995a739d65ac96a090dd3dcc1fa29457f4591c485fc814e2a432980c43b585653dc5adaff8c0156b8b0a8
+  data.tar.gz: e8f96ccfcb6517d44164d16a4a3600a3d9b8604225b68ddae6d00b79a562564248a9f2fbeeb46ca237d3415634176aceb8d09ca450e5a6d56ad583de886205af

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.0.0-p576

data/lib/iquest/simple_table/table_builder.rb

@@ -3,10 +3,10 @@ require 'ransack_simple_form'
 module Iquest
   module SimpleTable
     class TableBuilder
-      attr_reader :parent, :table_id, :columns, :collection, :search_form, :actions, :new_link
+      attr_reader :parent, :table_id, :columns, :collection, :search_form, :actions, :collection_actions
       delegate :capture, :content_tag, :link_to, :paginate, :page_entries_info, :params, to: :parent
       delegate :sort_link, :search_form_for, to: :parent
-      delegate :polymorphic_path, :polymorphic_url, :new_polymorphic_path, :new_polymorphic_url, to: :parent
+      delegate :polymorphic_path, :polymorphic_url, to: :parent
       delegate :l, :t, to: :parent
 
       def initialize(parent, collection_or_search, options = {})
@@ -22,37 +22,35 @@ module Iquest
           @search = search
           @collection = search.result
           @klass = @collection.klass
-          options[:search_url] ||= polymorphic_path(collection_or_search.map {|o| o.is_a?(Ransack::Search) ? o.klass : o})
-          options[:new_url] ||= new_polymorphic_path(collection_or_search.map {|o| o.is_a?(Ransack::Search) ? o.klass : o}) rescue NoMethodError
+          options[:search_url] ||= polymorphic_path(collection_or_search.map {|o| o.is_a?(Ransack::Search) ? o.klass : o})          
         elsif collection_or_search.is_a?(Array) && (collection = collection_or_search.detect {|o| o.is_a?(ActiveRecord::Relation) || o.is_a?(ActiveRecord::AssociationRelation)}) 
           @collection = collection
-          @klass = @collection.klass
-          options[:new_url] ||= new_polymorphic_path(collection_or_search.map {|o| o.is_a?(ActiveRecord::Relation) || o.is_a?(ActiveRecord::AssociationRelation)}) rescue NoMethodError
+          @klass = @collection.klass          
         else
           raise TypeError, 'ActiveRecord::Relation, ActiveRecord::AssociationRelation or Ransack::Search expected'
         end
         apply_pagination
         #draper
         @collection = @collection.decorate if @collection.respond_to?(:decorate)
-        options[:search_url] ||= polymorphic_path(@klass) rescue NoMethodError
-        options[:new_url] ||= new_polymorphic_path(@klass) rescue NoMethodError
+        options[:search_url] ||= polymorphic_path(@klass) rescue NoMethodError        
         @options = options
         @table_id = "table_#{self.object_id}".parameterize
         @columns = {}.with_indifferent_access
         @actions = []
+        @collection_actions = []
         @search_input_default_options = {label: false, placeholder: false}.with_indifferent_access
       end
 
       def column(*args, &block)
         attr = args.first
         options = args.extract_options!
-        search = options.delete(:search)
+        search = options.delete(:search)                
         @columns[attr] = options
         if @search
           @columns[attr][:label] ||= Ransack::Translate.attribute(attr.to_s.tr('.','_'), context: @search.context)
         else
           @columns[attr][:label] ||= @klass.human_attribute_name(attr)
-        end
+        end        
         #iniciaizce search options
         if search.is_a?(Symbol) || search.is_a?(String)
           @columns[attr][:search] = {search.to_sym => {}}
@@ -62,6 +60,7 @@ module Iquest
           @columns[attr][:search] = search
         end
         @columns[attr][:formatter] ||= block if block_given?
+        @columns[attr][:sort] ||= attr.to_s.tr('.','_') #sort link attr
       end
 
       def action(*args, &block)
@@ -71,11 +70,18 @@ module Iquest
         @actions << options
       end
 
-      def new_link(*args, &block)
-        @new_link = args.first if args.first
-        @new_link = block.call if block_given?
+      def collection_action(*args, &block)
+        action = args.first
+        if action.is_a? String
+          @collection_actions << action
+        elsif block_given?
+          @collection_actions << block.call
+        end        
       end
 
+      def new_link(*args, &block)
+        ActiveSupport::Deprecation.warn("Iquest::SimpleTable#new_link does nothing. Use collection_action")
+      end
 
       def search_link(*args, &block)
         @search_button = block if block_given?
@@ -134,13 +140,13 @@ module Iquest
           rendered_columns = columns.map do |col, opts|
             render_column_label(col)
           end.join.html_safe
-          render_new_link + rendered_columns
+          render_collection_actions + rendered_columns
         end
       end
 
-      def render_new_link
-        content_tag :th, class:'new-link' do
-          @new_link || (link_to t('simple_table.new', default: 'new'), @options[:new_url], class: "btn btn-primary" if @options[:new_url])
+      def render_collection_actions
+        content_tag :th, class:'collection-actions' do
+          @collection_actions.join.html_safe
         end
       end
 
@@ -208,10 +214,10 @@ module Iquest
       def render_label(column)
         attr = column
         options = @columns[attr]
-
         label = options[:label] || attr.to_s
-        if @search
-          sort_link(@search, attr, label, method: search_action)
+        sort = options[:sort]
+        if @search && sort
+          sort_link(@search, sort, label, method: search_action)
         else
           label
         end

data/lib/iquest/simple_table/version.rb

@@ -1,5 +1,5 @@
 module Iquest
   module SimpleTable
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: iquest-simple_table
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavel Dusanek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Simple table helper
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
+- .gitignore
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -81,17 +81,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Simple table helper, taht supports filtering through Ransack