sorting_table_for 0.2.0 → 0.2.1

data/spec/helpers/caption_spec.rb

@@ -1,16 +1,19 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
 describe SortingTableFor, :type => :helper do
 
+  before :all do
+    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+  end
+
   before :each do
-    @users = User.all
-    helper.stub!(:url_for).and_return('fake_link')
-    helper.stub!(:params).and_return({ :controller => 'fakes', :action => 'index' })
+    @users = SortingTableForUser.all
+    helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
   end
   

data/spec/helpers/cell_value_spec.rb

@@ -1,16 +1,19 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
 describe SortingTableFor, :type => :helper do
 
+  before :all do
+    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+  end
+
   before :each do
-    @users = User.all
-    helper.stub!(:url_for).and_return('fake_link')
-    helper.stub!(:params).and_return({ :controller => 'fakes', :action => 'index' })
+    @users = SortingTableForUser.all
+    helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
     SortingTableFor::TableBuilder.default_boolean = [I18n.t(:bool_true, :scope => [:sorting_table_for, :columns]), I18n.t(:bool_false, :scope => [:sorting_table_for, :columns])]      
     SortingTableFor::TableBuilder.i18n_default_format_date = :default

data/spec/helpers/column_spec.rb

@@ -1,16 +1,19 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
 describe SortingTableFor, :type => :helper do
 
+  before :all do
+    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+  end
+
   before :each do
-    @users = User.all
-    helper.stub!(:url_for).and_return('fake_link')
-    helper.stub!(:params).and_return({ :controller => 'fakes', :action => 'index' })
+    @users = SortingTableForUser.all
+    helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
   end
   
@@ -21,7 +24,7 @@ describe SortingTableFor, :type => :helper do
         html = table.columns
         html.should have_comp_tag("tbody", :count => 1)
         html.should have_comp_tag("tr", :count => (@users.size + 1))
-        html.should have_comp_tag("td", :count => (@users.size * (User.content_columns.size + 2)) + 1)
+        html.should have_comp_tag("td", :count => (@users.size * (SortingTableForUser.content_columns.size + 2)) + 1)
       end
     end
     
@@ -33,7 +36,7 @@ describe SortingTableFor, :type => :helper do
     
     it "should add colspan for total entries" do
       helper.sorting_table_for(@users) do |table|
-        table.columns.should match("<td colspan=\"" + (User.content_columns.size + 2).to_s  + "\">")
+        table.columns.should match("<td colspan=\"" + (SortingTableForUser.content_columns.size + 2).to_s  + "\">")
       end
     end
   
@@ -45,7 +48,7 @@ describe SortingTableFor, :type => :helper do
     
     it "should add colspan for total entries" do
       helper.sorting_table_for(@users) do |table|
-        table.columns.should match("<td colspan=\"" + (User.content_columns.size + 2).to_s  + "\">")
+        table.columns.should match("<td colspan=\"" + (SortingTableForUser.content_columns.size + 2).to_s  + "\">")
       end
     end
     
@@ -85,7 +88,7 @@ describe SortingTableFor, :type => :helper do
     it "should have option colspan" do
       table_html = helper.sorting_table_for(@users) do |table|
         html = table.columns :colspan => 5
-        html.should have_comp_tag('td[colspan="5"]', :count => (@users.size * User.content_columns.size))
+        html.should have_comp_tag('td[colspan="5"]', :count => (@users.size * SortingTableForUser.content_columns.size))
       end
     end
     
@@ -347,7 +350,7 @@ describe SortingTableFor, :type => :helper do
       helper.sorting_table_for(@users) do |table|
         html = table.columns
         html.should_not match("Total Entries " + @users.size.to_s)
-        html.should_not match("<td colspan=\"" + (User.content_columns.size + 2).to_s  + "\">")        
+        html.should_not match("<td colspan=\"" + (SortingTableForUser.content_columns.size + 2).to_s  + "\">")        
       end
     end
     
@@ -356,7 +359,7 @@ describe SortingTableFor, :type => :helper do
       helper.sorting_table_for(@users) do |table|
         html = table.columns
         html.should match("Total Entries " + @users.size.to_s)
-        html.should match("<td colspan=\"" + (User.content_columns.size + 2).to_s  + "\">")        
+        html.should match("<td colspan=\"" + (SortingTableForUser.content_columns.size + 2).to_s  + "\">")        
       end
     end    
     
@@ -383,7 +386,7 @@ describe SortingTableFor, :type => :helper do
     it "should edit default actions" do
       SortingTableFor::TableBuilder.default_actions = [:show, :edit_password, :edit, :delete]
       helper.sorting_table_for(@users) do |table|
-        table.columns.should have_comp_tag("td", :count => (@users.size * (User.content_columns.size + 4)) + 1)
+        table.columns.should have_comp_tag("td", :count => (@users.size * (SortingTableForUser.content_columns.size + 4)) + 1)
       end
     end
     

data/spec/helpers/footer_spec.rb

@@ -1,16 +1,19 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
 describe SortingTableFor, :type => :helper do
 
+  before :all do
+    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+  end
+
   before :each do
-    @users = User.all
-    helper.stub!(:url_for).and_return('fake_link')
-    helper.stub!(:params).and_return({ :controller => 'fakes', :action => 'index' })
+    @users = SortingTableForUser.all
+    helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
   end
   

data/spec/helpers/header_spec.rb

@@ -1,16 +1,19 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
 describe SortingTableFor, :type => :helper do
+
+  before :all do
+    (SortingTableFor::Tools::rails3?) ? routes_rails3 : routes_rails2
+  end
   
   before :each do
-    @users = User.all
-    helper.stub!(:url_for).and_return('fake_link')
-    helper.stub!(:params).and_return({ :controller => 'fakes', :action => 'index' })
+    @users = SortingTableForUser.all
+    helper.stub!(:params).and_return({ :controller => 'sorting_table_for_users', :action => 'index' })
     helper.output_buffer = ''
   end
   
@@ -58,7 +61,7 @@ describe SortingTableFor, :type => :helper do
       it "should have option colspan" do
         table_html = helper.sorting_table_for(@users) do |table|
           html = table.headers :colspan => 5
-          html.should have_comp_tag('th[colspan="5"]', :count => User.content_columns.size)          
+          html.should have_comp_tag('th[colspan="5"]', :count => SortingTableForUser.content_columns.size)          
         end
       end      
 
@@ -217,9 +220,31 @@ describe SortingTableFor, :type => :helper do
           end
           html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
           html.should_not have_comp_tag("th:nth-child(2)[class=cur-sort-not]")
-        end        
-      end      
+        end
+      end
       
+      it "should works with options sort_as" do
+        helper.sorting_table_for(@users) do |table|
+          html = table.headers do
+            table.header 'my name', :sort_as => :username
+          end
+          html.should have_comp_tag("th:nth-child(1)", :text => 'my name')
+          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
+        end
+      end
+
+      it "should works with options sort_as and sort" do
+        helper.sorting_table_for(@users, :sort => false) do |table|
+          html = table.headers do
+            table.header 'my name', :sort_as => :username, :sort => true
+            table.header :price
+          end
+          html.should have_comp_tag("th:nth-child(1)", :text => 'my name')
+          html.should have_comp_tag("th:nth-child(1)[class=cur-sort-not]")
+          html.should_not have_comp_tag("th:nth-child(2)[class=cur-sort-not]")
+        end
+      end
+
       it "should have option colspan" do
         table_html = helper.sorting_table_for(@users) do |table|
           html = table.headers do
@@ -360,7 +385,7 @@ describe SortingTableFor, :type => :helper do
       it "should edit default actions" do
         SortingTableFor::TableBuilder.default_actions = [:show, :edit_password, :edit, :delete]
         helper.sorting_table_for(@users) do |table|
-          table.headers.should have_comp_tag("th", :count => User.column_names.size + 3)
+          table.headers.should have_comp_tag("th", :count => SortingTableForUser.column_names.size + 3)
         end
       end
       

data/spec/helpers/i18n_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 include SortingTableForSpecHelper
 
@@ -9,11 +9,12 @@ describe SortingTableFor do
   describe ' #i18n' do
     
     before :each do
-      SortingTableFor::I18n.set_options({:controller => 'fakes_controller', :action => 'fake_action'}, 'user', '')
+      SortingTableFor::TableBuilder.i18n_default_scope = [ :namespace, :controller, :action ]
+      SortingTableFor::I18n.set_options({:controller => 'fakes_controller', :action => 'fake_action'}, 'user')
     end
     
     it "should works by default" do
-      SortingTableFor::I18n.set_options({}, 'user', '')
+      SortingTableFor::I18n.set_options({}, 'user')
       SortingTableFor::I18n.t(:test_name).should == 'i18n name'
     end
     
@@ -28,12 +29,16 @@ describe SortingTableFor do
     it "should works with i18n options" do
       SortingTableFor::I18n.t(:my_test, :value => :hello).should == 'say hello'
     end
+
+    it "should works with options add_scope" do
+      SortingTableFor::I18n.t(:name, :add_scope => [:add_scope]).should == 'add to scope'
+    end
     
     it "should set namespace scope" do
-      SortingTableFor::I18n.set_options({:controller => 'fakes_controller', :action => 'fake_action'}, 'user', 'fake_namespace')
+      SortingTableFor::I18n.set_options({:controller => 'fake_namespace/fakes_controller', :action => 'fake_action'}, 'user')
       SortingTableFor::I18n.t(:name).should == 'fake namespace'
     end
-
+    
     it "should set scope with options" do
       SortingTableFor::TableBuilder.i18n_default_scope = [ :action ]
       SortingTableFor::I18n.t(:name).should == 'fake action'
@@ -41,7 +46,7 @@ describe SortingTableFor do
     
     it "should set scope with all options" do
       SortingTableFor::TableBuilder.i18n_default_scope = [ :model, :namespace, :controller, :action ]
-      SortingTableFor::I18n.set_options({:controller => 'fakes_controller', :action => 'fake_action'}, 'user', 'fake_namespace')
+      SortingTableFor::I18n.set_options({:controller => 'fake_namespace/fakes_controller', :action => 'fake_action'}, 'user')
       SortingTableFor::I18n.t(:name).should == 'fake'
     end
     
@@ -51,4 +56,4 @@ describe SortingTableFor do
     end
     
   end
-end
+end

data/spec/locales/test.yml

@@ -1,10 +1,17 @@
 test:
+
   date:
     formats:
       default: "%Y-%m-%d"
       short: "%b %d"
       long: "%B %d, %Y"
 
+  time:
+    formats:
+      default: "%d %B %Y %H:%M:%S"
+      short: "%d %b %H:%M"
+      long: "%A %d %B %Y %H:%M"
+
     day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
     abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
 
@@ -42,12 +49,11 @@ test:
         strip_insignificant_zeros: false
     
   sorting_table_for:
-    total_entries: "Total Entries {{value}}"
     columns:
       bool_true: 'True'
       bool_false: 'False'      
   
-  fakes:
+  sorting_table_for_users:
     index:
       table_caption: 'Quick Caption'
       edit: 'Edit'
@@ -68,6 +74,7 @@ test:
       footer:
         username: 'UserFoot'
         price: 'PriceFoot'
+      total_entries: "Total Entries %{value}"
 
   fake_scope:
     my_test: 'Hello'
@@ -79,6 +86,8 @@ test:
       my_test: 'say {{value}}'
       my_add:
         name: 'fake add'
+      add_scope:
+        name: "add to scope"        
 
   user:
     fake_namespace:

data/spec/locales/test_rails3.yml

@@ -1,4 +1,5 @@
 test:
+
   date:
     formats:
       default: "%Y-%m-%d"
@@ -42,12 +43,11 @@ test:
         strip_insignificant_zeros: false
     
   sorting_table_for:
-    total_entries: "Total Entries %{value}"
     columns:
       bool_true: 'True'
-      bool_false: 'False'      
+      bool_false: 'False'
   
-  fakes:
+  sorting_table_for_users:
     index:
       table_caption: 'Quick Caption'
       edit: 'Edit'
@@ -68,7 +68,7 @@ test:
       footer:
         username: 'UserFoot'
         price: 'PriceFoot'
-
+      total_entries: "Total Entries %{value}"
 
   fake_scope:
     my_test: 'Hello'
@@ -80,6 +80,8 @@ test:
       my_test: 'say %{value}'
       my_add:
         name: 'fake add'
+      add_scope:
+        name: "add to scope"
 
   user:
     fake_namespace:

data/spec/model/sorting_table_model_scope_spec.rb

@@ -1,34 +1,40 @@
 require 'spec_helper'
-require File.expand_path(File.dirname(__FILE__) + '/../fixtures/user')
+require File.expand_path(File.dirname(__FILE__) + '/../fixtures/sorting_table_for_user')
 
 describe SortingTableModelScope do
   
   describe "# default usage" do
     
     it "should do nothing with no option" do
-      User.sorting_table.all.should == User.all
+      SortingTableForUser.sorting_table.all.should == SortingTableForUser.all
     end
     
     it "should do nothing with option nil" do
-      User.sorting_table(nil).all.should == User.all
+      SortingTableForUser.sorting_table(nil).all.should == SortingTableForUser.all
     end
     
     it "should do nothing with all options nil" do
-      User.sorting_table(nil, nil, nil).all.should == User.all
+      SortingTableForUser.sorting_table(nil, nil, nil).all.should == SortingTableForUser.all
     end
     
     it "should raise an error with 4 arguments" do
        expect {
-          User.sorting_table(nil, nil, nil, nil).all
+          SortingTableForUser.sorting_table(nil, nil, nil, nil).all
         }.to raise_error { ArgumentError }
     end
     
     it "should works with other scope" do
-      User.good_position.sorting_table.set_limit(2).all.should == User.find(:all, :conditions => 'position > 3', :limit => 2)
+      SortingTableForUser.good_position.sorting_table.set_limit(2).all.should == SortingTableForUser.find(:all, :conditions => 'position > 3', :limit => 2)
     end
     
     it "should not erase other order" do
-      User.sorting_table(nil, :firstname, :desc).find(:all, :order => 'lastname asc').should == User.find(:all, :order => 'lastname asc, firstname desc')
+      # Change order with scope in rails 3.0.3
+      if !defined? ActionPack or (ActionPack::VERSION::MAJOR <= 3 and ActionPack::VERSION::MINOR == 0 and ActionPack::VERSION::TINY <= 1)
+        current_order = 'lastname asc, firstname desc'
+      else
+        current_order = 'firstname desc, lastname asc'
+      end
+      SortingTableForUser.sorting_table(nil, :firstname, :desc).find(:all, :order => 'lastname asc').should == SortingTableForUser.find(:all, :order => current_order)
     end
     
   end
@@ -36,32 +42,32 @@ describe SortingTableModelScope do
   describe "# params usage" do
     
     it "should works with correct params" do
-      User.sorting_table({ "table_sort" => { "username" => "asc" } }).all.should == User.find(:all, :order => 'username asc')
+      SortingTableForUser.sorting_table({ "table_sort" => { "username" => "asc" } }).all.should == SortingTableForUser.find(:all, :order => 'username asc')
     end
     
     it "should do nothing with wrong column" do
-      User.sorting_table({ "table_sort" => { "test" => "asc" } }).all.should == User.all
+      SortingTableForUser.sorting_table({ "table_sort" => { "test" => "asc" } }).all.should == SortingTableForUser.all
     end
     
     it "should do nothing with wrong direction" do
-      User.sorting_table({ "table_sort" => { "username" => "test" } }).all.should == User.all
+      SortingTableForUser.sorting_table({ "table_sort" => { "username" => "test" } }).all.should == SortingTableForUser.all
     end
     
     it "should do nothing with wrong arguments" do
-      User.sorting_table({ "table_sort" => { "price" => nil } }).all.should == User.all
+      SortingTableForUser.sorting_table({ "table_sort" => { "price" => nil } }).all.should == SortingTableForUser.all
     end
     
     it "should do nothing with wrong arguments (2)" do
-      User.sorting_table({ "table_sort" => nil }).all.should == User.all
+      SortingTableForUser.sorting_table({ "table_sort" => nil }).all.should == SortingTableForUser.all
     end
 
     it "should order by params not option" do
-      User.sorting_table({ "table_sort" => { "username" => "asc" } }, :firstname, :desc).all.should == User.find(:all, :order => 'username asc')
+      SortingTableForUser.sorting_table({ "table_sort" => { "username" => "asc" } }, :firstname, :desc).all.should == SortingTableForUser.find(:all, :order => 'username asc')
     end
     
     it "should works with custom param name" do
       SortingTableFor::TableBuilder.params_sort_table = :sort_my_test
-      User.sorting_table({ "sort_my_test" => { "username" => "asc" } }).all.should == User.find(:all, :order => 'username asc')
+      SortingTableForUser.sorting_table({ "sort_my_test" => { "username" => "asc" } }).all.should == SortingTableForUser.find(:all, :order => 'username asc')
     end
     
   end
@@ -69,19 +75,19 @@ describe SortingTableModelScope do
   describe "# options usage" do
     
     it "should works with option" do
-      User.sorting_table(nil, :username, :desc).all.should == User.find(:all, :order => 'username desc')
+      SortingTableForUser.sorting_table(nil, :username, :desc).all.should == SortingTableForUser.find(:all, :order => 'username desc')
     end
     
     it "should set option asc if not given" do
-      User.sorting_table(nil, :username).all.should == User.find(:all, :order => 'username asc')
+      SortingTableForUser.sorting_table(nil, :username).all.should == SortingTableForUser.find(:all, :order => 'username asc')
     end
     
     it "should do nothing with wrong column" do
-      User.sorting_table(nil, :test).all.should == User.all
+      SortingTableForUser.sorting_table(nil, :test).all.should == SortingTableForUser.all
     end
     
     it "should do nothing with wring direction" do
-      User.sorting_table(nil, :username, :test).all.should == User.all
+      SortingTableForUser.sorting_table(nil, :username, :test).all.should == SortingTableForUser.all
     end
     
   end