tabulatr2 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c3ba40f552d220b7d52deb96bf187e7cdd6aa71
-  data.tar.gz: 76696b532827ff7d6edeb20bd86e32ac9c18858f
+  metadata.gz: b1dc69e34a9977e78a0969398cdbbb39bd2601f4
+  data.tar.gz: b4c0b9bd6cb6e97829767fc3f2a85942e49cfb11
 SHA512:
-  metadata.gz: 11f4ef2d45cc07067e61eaa077c969114b84eb7c0f51568ca658083fa5fdcadb44c62d4239937eac8f61bd0c553e86b28be6107857306e16969dfc935ec41cd3
-  data.tar.gz: 8e3f374395f9e50cc813590a275a6dae58589b244a029ba35cdbccaa77feb9b520f8888522f32736b7a3f4b43fc6d8b1b2124f8abe1b434a8db126420319ae09
+  metadata.gz: f4fa0da835396c1cc9e355559a74934e723a00fccbc26e5db23bd84ff2b603c198f0cf9b74126f5a1e9be09e59a37cd1d9e082a276c029adc7e67973228a025b
+  data.tar.gz: 9c33aa54ee60d5035b02e229dcc37c0e9db393261a48ac4aa641a8cf1ba7b7c04e426d0af454cdcbb9a958dac8edfea69067d80179de68158c826a347b431bca

data/Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'tabulatr2', path: './', require: 'tabulatr'
+gem 'tabulatr2', path: './'
 
 gem 'jquery-rails'
 gem 'slim'

data/README.md

@@ -7,7 +7,7 @@
 
 Require tabulatr2 in your Gemfile:
 ```ruby
-gem 'tabulatr2', github: 'provideal/tabulatr2', require: 'tabulatr'
+gem 'tabulatr2', github: 'provideal/tabulatr2'
 ```
 After that run `bundle install`.
 
@@ -82,7 +82,7 @@ class ProductTabulatrData < Tabulatr::Data
                         filter_sql: "vendors.street || '' || vendors.zipcode || '' vendors.city" do
          "#{vendor.house_number} #{vendor.street}, #{vendor.zipcode} #{vendor.city}"
   end
-  column :edit_link do 
+  column :edit_link do
     link_to "edit #{title}", product_path(id)
   end
   column :updated_at do
@@ -114,7 +114,7 @@ _Hint:_ If you want to prefilter your table, you can do that too! Just pass an `
 
 ### View
 
-In the view we can use all the attributes which are defined in our `ProductTabulatrData` class. 
+In the view we can use all the attributes which are defined in our `ProductTabulatrData` class.
 
 ```erb
   <%= table_for Product do |t|

data/app/views/tabulatr/_tabulatr_table.html.slim

@@ -36,8 +36,9 @@
   .tabulatr-info-string-wrapper data-table-id=table_id
     = render '/tabulatr/tabulatr_info_string', opts
 
-  .tabulatr-fuzzy-search-field-wrapper data-table-id=table_id
-    = render '/tabulatr/tabulatr_fuzzy_search_field', opts
+  - if tabulatr_data.search?
+    .tabulatr-fuzzy-search-field-wrapper data-table-id=table_id
+      = render '/tabulatr/tabulatr_fuzzy_search_field', opts
 
   .tabulatr-filter-dialog-wrapper data-table-id=table_id
     = render '/tabulatr/tabulatr_filter_dialog', opts

data/lib/tabulatr/data/data.rb

@@ -93,6 +93,10 @@ class Tabulatr::Data
     self.class.instance_variable_get("@table_columns")
   end
 
+  def search?
+    self.class.instance_variable_get('@search')
+  end
+
   #--
   # Params
   #++

data/lib/tabulatr/data/dsl.rb

@@ -25,30 +25,34 @@ module Tabulatr::Data::DSL
 
   def column(name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
     @columns ||= HashWithIndifferentAccess.new
+    table_column = Tabulatr::Renderer::Column.from(table_column_options.merge(name: name, klass: @base))
+    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
+    @table_columns << table_column
+
     @columns[name.to_sym] = {
       name: name,
       sort_sql: sort_sql || sql,
       filter_sql: filter_sql || sql,
-      output: block
+      output: block,
+      table_column: table_column
     }
-
-    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
-    @table_columns << Tabulatr::Renderer::Column.from(table_column_options.merge(name: name))
   end
 
   def association(assoc, name, sort_sql: nil, filter_sql: nil, sql: nil, table_column_options: {}, &block)
     @table_columns ||= Tabulatr::Renderer::Columns.new
     @assocs ||= HashWithIndifferentAccess.new
     @assocs[assoc.to_sym] ||= {}
+    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
+    table_column = Tabulatr::Renderer::Association.from(table_column_options.merge(name: name, table_name: assoc, klass: @base))
+    @table_columns << table_column
+
     @assocs[assoc.to_sym][name.to_sym] = {
       name: name,
       sort_sql: sort_sql || sql,
       filter_sql: filter_sql || sql,
-      output: block
+      output: block,
+      table_column: table_column
     }
-
-    @table_columns ||= Tabulatr::Renderer::Columns.new(nil)
-    @table_columns << Tabulatr::Renderer::Association.from(table_column_options.merge(name: name, table_name: assoc))
   end
 
   def search(*args, &block)

data/lib/tabulatr/data/formatting.rb

@@ -45,18 +45,13 @@ module Tabulatr::Data::Formatting
     if opts[:output]
       view.instance_exec(record, &opts[:output])
     else
-      record.send(name)
+      opts[:table_column].value_for(record, view)
     end
   end
 
   def format_association(record, table_name, name, opts, view)
     return view.instance_exec(record, &opts[:output]) if opts[:output]
-    assoc = record.class.reflect_on_association(table_name.to_sym)
-    val = if assoc.collection?
-      record.try(table_name).try(:map, &name).join(', ')
-    else
-      record.try(table_name).try(:send, name)
-    end
+    opts[:table_column].value_for(record, view)
   end
 
 

data/lib/tabulatr/renderer/column.rb

@@ -26,7 +26,7 @@ class Tabulatr::Renderer::Column
 
   attr_accessor *%i{name header width align valign wrap type th_html filter_html
     filter checkbox_value checkbox_label filter_width range_filter_symbol
-    sortable format_methods table_name block klass format map}
+    sortable table_name block klass format map}
 
   def self.from(
     name: nil,

data/lib/tabulatr/renderer/renderer.rb

@@ -48,10 +48,10 @@ class Tabulatr::Renderer
   end
 
   def build_table(&block)
+    tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
     if block_given?
       @columns = ColumnsFromBlock.process @klass, &block
     else
-      tdc = "#{@klass.name}TabulatrData".constantize.new(@klass)
       @columns = tdc.table_columns
     end
 
@@ -59,7 +59,8 @@ class Tabulatr::Renderer
       columns: @columns,
       table_options: @table_options,
       klass: @klass,
-      classname: @classname
+      classname: @classname,
+      tabulatr_data: tdc
     })
   end
 

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Peter Horn
@@ -65,7 +65,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
-- Changelog.textile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md

data/Changelog.textile

@@ -1,124 +0,0 @@
-h1. Changelog for tabulatr
-
-* Fixed <tt>:filter_width</tt> not working for <tt>select</tt> filters.
-* Giving a Hash as <tt>:format</tt> option gives the corresponding value.
-* We now allow column presets:
-  <pre>
-  Tabulatr.config do |config|
-    #...
-    config.column_presets({
-    config.column_presets({
-      :action_column => {:width => '100px'},
-      :smallint => { :width =>  '55px', :filter_width =>  '30px', :align => 'right' },
-      :id  =>      :smallint,
-      :sid =>      { :width => '200px', :filter_width => '170px', :filter => :like },
-      :title =>    { :filter => :like },
-      :count =>    { :map => false, :width => '40px', :filter => false, :align => 'right' },
-      :moo =>      { :width =>  '155px', :filter_width =>  '120px', :align => 'right' }
-    })
-  end
-  </pre>
-
-Now, every column will check whether there is as entry corresponding to its name in this table and get the content as 'default' options.
-
-  <pre>
-    <%= table_for @regions do |t|
-      t.column :id
-      t.column :sid
-      # ...
-    end %>
-  </pre>
-
-so, the :id column has all the options defined above. The :action_column entry is used for 'action' columns.
-
-But even better, you can use arbitrary presets:
-
-  <pre>
-  t.column :foo, :preset => :moo
-  </pre>
-
-gets the :moo preset.
-
-h2. 0.4.2
-
-* Fixed two more bugs breaking ruby 1.8 compatibility. (Thanks to <a href="https://github.com/moabite">moabite</a> for reporting)
-
-h2. 0.4.1
-
-* Fixed a "bug" breaking ruby 1.8 compatibility. (Thanks to <a href="https://github.com/moabite">moabite</a> for reporting)
-
-h2. 0.4.0
-
-* Mongoid now really works.
-* A lot of cleanup in the finder code (million thanks to <a href="https://github.com/plukevdh">plukevdh</a>)
-* You can use <tt>table_for</tt> for 'normal' arrays that weren't found with <tt>find_for_table</tt>.
-* Added a :name_mapping option to find_for_table to allow filtering by compund expressions, example:
-
-  <pre>
-  @customers = Customer.find_for_table(params,
-    name_mapping: {
-      name: '("addresses"."firstname" || \' \' || "addresses"."lastname")',
-      address: '("addresses"."street" || \' \' || "addresses"."zip_code" || \' \' || "addresses"."city")'
-    },
-    default_order: 'updated_at desc'
-  )
-  </pre>
-
-* Added Mysql2Adapter to the ActiveRecord connection list (thanks to <a href="https://github.com/AaronLasseigne">AaronLasseigne</a>).
-* Monkeypatch mongoid only if it is present. (thanks to <a href="https://github.com/rwz">rwz</a>)
-
-h2. 0.3.0
-
-* Converted into a Rails 3.1 engine and moved css and images to use the new asset pipeline. Works with 3.0.x -- 'opefully. Thanks to all that reported the problem.
-* Header cells are now auto translated. Thanks to <a href="https://github.com/niedhui">niedhui</a>!
-
-h2. 0.2.1
-
-* Fixed a ruby 1.8 syntax issue. (Thanks to <a href="https://github.com/TBAA">TBAA</a> for reporting.)
-
-h2. 0.2.0
-
-* Mongoid can also be used in place of ActiveRecord
-* fixed handling of the primary_key column and name
-* Added dom_id to tables tr. Thanks to <a href="https://github.com/sterrym">sterrym (Tim Glen)</a>!
-* Added note on "Request-URI Too Large error" to README
-
-h2. 0.1.3
-
-* nicer table headers. Thanks to <a href="https://github.com/troya2" target="_blank">troya2 (Troy Anderson)</a>!
-
-h2. 0.1.2
-
-* Fixed bug with nil exception on 'empty' belongs_to association. Thanks to <a href="https://github.com/dgm" target="_blank">dgm</a>!
-
-h2. 0.1.1
-
-* Fixed bug with "Select ..." buttons introduced in 0.1.0.
-* Added tests for these buttons.
-
-h2. v0.1.0
-
-* new <tt>find_for_table</tt> option <tt>:stateful</tt>. If
-
-<pre>
-  MyFancyModel.find_for_table params, :stateful => session
-</pre>
-
-is given, the current sorting, filtering, selecting and paging information is stored to the session and restored when reopened. Great for procession specifically filtered lists.
-
-h2. v0.0.5 (2011-03-28)
-
-* new column option :map (defaults to true) to disable automatic mapping on the enries of the association as in
-
-  <pre>
-  <%= table_for @products do |t|
-    ...
-    t.association :tags, :title # mapped to all tags
-    t.association :tags, :count, :map => false # called on the list-of-tags
-  end %>
-  </pre>
-
-
-h2. v0.0.4 (2011-03-27)
-
-* fixed the path to paging/sorting images installed by generator. Thanks to <a href="https://github.com/sdsykes" target="_blank">sdsykes</a>!