tabulatr2 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f040295cd2078f84e9b0379bb3de019cfbef72fd
-  data.tar.gz: fffd809f5632e690cfd1506ea37e936e28c4ce27
+  metadata.gz: c86917764e777b62b55d5741f7d18d2caefcb2fd
+  data.tar.gz: aef2b2dadefb4ff48fae9734f33359a1a65e873a
 SHA512:
-  metadata.gz: d235adcae54d4509002c521f03fd68e97f79f590a103b1a91b07fecf91d09b02d372aaf7f3601cf0cace1c3462df04f444aeeea0fbae9774197ea46fbf2af689
-  data.tar.gz: 8e96e7988fd8bd40b496625fce9e063352109cce1ad3b7955ff4758b62e0c5442a9a138f1adcefd3415a136308cb29cfbe3629788fa9250060df988700995e7f
+  metadata.gz: a73c7babe347a36b98e7cf62ddbe8f3f44f5b7b443935a468f68fe91d4d96bd1f6cf990121487e997b6f6b841edaf10ebdb6d88a5e06cdef5ae4a7e56226a204
+  data.tar.gz: 132b552b8e86abe7bf07f35fc1f670c8d66806340c4662f608367b44a48a128501859898a00abd42fccda68f1d44ea87fd5f755dc4b81e5ef94653dc7b9ea845

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.8.5
+
+* Added `order_by` option to `table_for` for default sorting.
+
 ## 0.8.3
 
 * New table_column_options `cell_style` and `header_style`

data/Gemfile

@@ -15,8 +15,8 @@ end
 
 group :development, :test do
   gem 'sqlite3', :require => 'sqlite3'
-  gem 'rspec'
-  gem 'rspec-rails'
+  gem 'rspec', '~> 2.14.1'
+  gem 'rspec-rails', '~> 2.14.0'
   gem 'capybara'
   gem 'launchy'
   gem 'database_cleaner', '< 1.1.0'

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

@@ -21,7 +21,7 @@
 
 
 form.form.form-horizontal.tabulatr_filter_form data-table=table_id  data-remote="true" role='form'
-  input name="#{classname}_sort" type="hidden"
+  input name="#{classname}_sort" type="hidden" value=table_options[:order_by]
   - if table_options[:filter] && columns.filtered_columns.present?
     - columns.filtered_columns.each do |column|
       - name = column.full_name

data/lib/tabulatr/data/sorting.rb

@@ -39,7 +39,7 @@ module Tabulatr::Data::Sorting
       raise "asasa" unless ['asc', 'desc'].member?(orientation.downcase)
       @relation = @relation.order("#{nn} #{orientation}")
     else
-      @relation = @relation.order(default_order || "#{@table_name}.#{@base.primary_key} asc")
+      @relation = @relation.order(default_order || "#{@table_name}.#{@base.primary_key} desc")
     end
   end
 

data/lib/tabulatr/rails/active_record.rb

@@ -26,9 +26,9 @@
 if Object.const_defined? "ActiveRecord"
   class ActiveRecord::Base
     def self.tabulatr(relation, tabulatr_data_class = nil)
-      return tabulatr_data_class.new(relation) if tabulatr_data_class
+      tabulatr_data_class = "#{self.name}TabulatrData".constantize unless tabulatr_data_class
       begin
-        "#{self.name}TabulatrData".constantize.new(relation)
+        td = tabulatr_data_class.new(relation)
       rescue NameError => e
         puts e.message
         # TODO: Better message

data/lib/tabulatr/renderer/renderer.rb

@@ -31,7 +31,8 @@ class Tabulatr::Renderer
       sortable: true,        # true to allow sorting (can be specified for every sortable column)
       batch_actions: false,  # :name => value hash of batch action stuff
       footer_content: false, # if given, add a <%= content_for <footer_content> %> before the </table>
-      path: '#')             # where to send the AJAX-requests to
+      path: '#',             # where to send the AJAX-requests to
+      order_by: nil)         # default order
     @klass = klass
     @view = view
     @table_options = {
@@ -42,7 +43,8 @@ class Tabulatr::Renderer
       sortable: sortable,
       batch_actions: batch_actions,
       footer_content: footer_content,
-      path: path
+      path: path,
+      order_by: order_by
     }
     @classname = @klass.name.underscore
   end

data/lib/tabulatr/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module Tabulatr
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/spec/lib/tabulatr/data/data_spec.rb

@@ -1,14 +1,42 @@
 require 'spec_helper'
 
 describe Tabulatr::Data do
-  it 'prefilters the result' do
+
+  before do
     Tabulatr::Data.any_instance.stub_chain(:table_columns, :klass=).and_return(Product)
     Tabulatr::Data.any_instance.stub_chain(:table_columns, :map).as_null_object
+  end
+
+  it 'prefilters the result' do
 
     td = Tabulatr::Data.new(Product.where(price: 10))
     td.data_for_table(example_params)
     expect(td.instance_variable_get('@relation').to_sql).to match(/.+WHERE \"products\".\"price\" = 10.+/)
   end
+
+  it 'uses default order' do
+    Product.create([{title: 'foo', price: 5}, {title: 'bar', price: 10}, {title: 'fuzz', price: 7}])
+
+    cols = {
+      title: {
+        name: 'title',
+        sort_sql: nil,
+        filter_sql: nil,
+        output: nil,
+        table_column: Tabulatr::Renderer::Column.from(name: 'title', klass: Product)
+      }
+    }
+    Tabulatr::Data.instance_variable_set('@columns', cols)
+    td = Tabulatr::Data.new(Product)
+    # mod_params = example_params.merge(product_sort: 'products.title DESC')
+    # raise mod_params.inspect
+    records = td.data_for_table(HashWithIndifferentAccess.new(example_params.merge(product_sort: 'products.title DESC')))
+    expect(records.count).to eql 3
+    titles = ['fuzz', 'foo', 'bar']
+    records.each_with_index do |r, ix|
+      expect(r[:title]).to eql titles[ix]
+    end
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabulatr2
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Peter Horn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,4 +268,3 @@ test_files:
 - spec/features/tabulatrs_spec.rb
 - spec/lib/tabulatr/data/data_spec.rb
 - spec/spec_helper.rb
-has_rdoc: