sorting_table_for 0.2.0 → 0.2.1

data/spec/spec_helper.rb

@@ -56,6 +56,24 @@ module SortingTableForSpecHelper
   include ActiveSupport
   include SortingTableFor
   
+  def routes_rails2
+    ActionController::Routing::Routes.clear!
+      ActionController::Routing::Routes.draw do |map|
+        map.resources :sorting_table_for_users, :member => { :edit_password => :get }
+    end
+  end
+  
+  def routes_rails3
+    Rails.application.routes.clear!
+    Rails.application.routes.draw do
+      resources :sorting_table_for_users do
+        member do
+          get :edit_password
+        end
+      end
+    end
+  end
+  
   def have_comp_tag(selector, options = {})
     if ::SortingTableFor::Tools::rails3?
       if options.has_key? :text

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sorting_table_for
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Thomas Floch
@@ -27,14 +23,16 @@ extensions: []
 extra_rdoc_files: 
 - README.mdown
 files: 
-- lib/model/sorting_table_model_scope.rb
+- lib/sorting_table_for/format_cell.rb
+- lib/sorting_table_for/format_line.rb
 - lib/sorting_table_for/i18n.rb
+- lib/sorting_table_for/model_scope.rb
 - lib/sorting_table_for/table_builder.rb
 - lib/sorting_table_for/tools.rb
 - lib/sorting_table_for.rb
 - spec/db/database.yml
 - spec/db/schema.rb
-- spec/fixtures/user.rb
+- spec/fixtures/sorting_table_for_user.rb
 - spec/helpers/builder_spec.rb
 - spec/helpers/caption_spec.rb
 - spec/helpers/cell_value_spec.rb
@@ -71,23 +69,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 4
       version: 1.3.4
 requirements: []
 
 rubyforge_project: sorting_table_for
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rails table builder made to easily create and sort a table

data/lib/model/sorting_table_model_scope.rb

@@ -1,72 +0,0 @@
-# encoding: utf-8
-
-module SortingTableModelScope
-  
-  # Include the methods in models
-  def self.included(base)
-    base.extend(SingletonMethods)
-  end
-  
-  module SingletonMethods
-    
-    # Return a scope of the object with an order
-    #
-    # === Usage
-    # 
-    #  sorting_table(the params) - Sorting by the given parameters
-    #  sorting_table(the params, column name) - Sort by the column name with direction ascending, if no parameters
-    #  sorting_table(the params, column name, direction) - Sort by the column name with the given direction, if no parameters
-    #
-    # === Exemples
-    #
-    #  User.sorting_table(params)
-    #  User.sorting_table(params, :username)
-    #  User.sorting_table(params, :username, :desc)
-    #
-    def sorting_table(*args)
-      raise ArgumentError, 'sorting_table: Too many arguments (max : 3)' if args.size > 3 
-      sort_table_param = get_sorting_table_params(args)
-      return scoped({})  if !sort_table_param and args.size == 1
-      sort, direction = get_sort_and_direction(sort_table_param, args)
-      return scoped({}) if !sort or !valid_column?(sort) or !valid_direction?(direction)
-      scoped({ :order => "#{sort} #{direction}" })
-    end
-
-    private
-    
-    # Return the params for sorting table
-    def get_sorting_table_params(args)
-      return nil unless args.first.is_a? Hash
-      return nil unless args.first.has_key? SortingTableFor::TableBuilder.params_sort_table.to_s
-      args.first[SortingTableFor::TableBuilder.params_sort_table.to_s]
-    end
-    
-    # Parse the params and return the column name and the direction
-    def get_sort_and_direction(sort_table_param, args)
-      if sort_table_param
-        key = sort_table_param.keys.first rescue nil
-        value = sort_table_param.values.first rescue nil
-        return nil if !key.is_a?(String) or !value.is_a?(String)
-        return key, value
-      end
-      return nil if args.size < 2
-      return args[1], 'asc' if args.size == 2
-      return args[1], args[2]
-    end
-    
-    # Return true if the column name exist
-    def valid_column?(column)
-      column_names.include? column.to_s.downcase
-    end
-    
-    # Return true if the direction exist
-    def valid_direction?(direction)
-      %[asc desc].include? direction.to_s.downcase
-    end
-    
- end  
-end
-
-if defined? ActiveRecord
-  ActiveRecord::Base.send :include, SortingTableModelScope
-end