iquest-simple_table 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2515e68e953d71334346a39882b4c87fea41e0
-  data.tar.gz: a4b6c8d37e62d7be30c2db9fa3ada611fb88e811
+  metadata.gz: 3467bc3b3a8172ad4006627cd80ffb16dfdbf42e
+  data.tar.gz: 9d71f5bb3bdc5128fa08045607867da425d401f3
 SHA512:
-  metadata.gz: 773fe0f2d6ce65ba68b658fb89b9b5b9fd980b0c3ef4da5dd3de46434e2c36b903bb4c7c2e51168fa0483565ee8d31c68df3f876eda8c25bab403cdc626af69c
-  data.tar.gz: 753562dafe62da179dbaf3783d69fae03bd22e9a6eb6c1bf51e9199e9a59a9169613b97b1055111dc37e5b7568e5fc854c7024fa7b8f78312c78f263a666ae8d
+  metadata.gz: 346741660d4b9430f19bfaf492aa8e460104d80cac706dc0d6f43a5d5a8e661f9556ce037da4bb5111099373668def71535d46114eecadf5666117e667ab0aa4
+  data.tar.gz: 7275110d69aaa202aa2cb6297c820b6f440c92e7d67fd8db56539c544ffa2a155a024611bd168276af16a07380442c85822c07b5857fc4c642656c3bd99a7db3

data/lib/iquest/simple_table/table_builder.rb

@@ -18,12 +18,24 @@ module Iquest
         elsif collection_or_search.is_a? ActiveRecord::Relation
           @collection = collection_or_search
           @klass = @collection.klass
+        elsif collection_or_search.is_a?(Array) && (search = collection_or_search.detect {|o| o.is_a?(Ransack::Search)})
+          @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
+        elsif collection_or_search.is_a?(Array) && (collection = collection_or_search.detect {|o| o.is_a?(ActiveRecord::Relation)}) 
+          @collection = collection
+          @klass = @collection.klass
+          options[:new_url] ||= new_polymorphic_path(collection_or_search.map {|o| o.is_a?(ActiveRecord::Relation)}) rescue NoMethodError
         else
           raise TypeError, 'ActiveRecord::Relation or Ransack::Search expected'
         end
         apply_pagination
         #draper
         @collection = @collection.decorate if @collection.respond_to?(:decorate)
+        options[:search_url] ||= polymorphic_path(@klass)
+        options[:new_url] ||= new_polymorphic_path(@klass) rescue NoMethodError
         @options = options
         @table_id = "table_#{self.object_id}".parameterize
         @columns = {}.with_indifferent_access
@@ -60,7 +72,8 @@ module Iquest
       end
 
       def new_link(*args, &block)
-        @new_link = block if block_given?
+        @new_link = args.first if args.first
+        @new_link = block.call if block_given?
       end
 
 
@@ -104,7 +117,7 @@ module Iquest
       include RansackSimpleForm::FormHelper
 
       def render_table_with_search
-        ransack_simple_form_for @search do |f|
+        ransack_simple_form_for @search, url: @options[:search_url] do |f|
           @search_form = f
           render_table_without_search
         end
@@ -127,7 +140,7 @@ module Iquest
 
       def render_new_link
         content_tag :th, class:'new-link' do
-          @new_link || (link_to t('simple_table.new', default: 'new'), new_polymorphic_url(@klass), class: "btn btn-primary")
+          @new_link || (link_to t('simple_table.new', default: 'new'), @options[:new_url], class: "btn btn-primary" if @options[:new_url])
         end
       end
 

data/lib/iquest/simple_table/version.rb

@@ -1,5 +1,5 @@
 module Iquest
   module SimpleTable
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iquest-simple_table
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Pavel Dusanek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_simple_form