rails-tables 0.2.1 → 0.2.2

data/app/tables/column.rb

@@ -31,11 +31,11 @@ class Column
   end
   def related_link(view, object)
     property = object.send(self.column_name)
-    view.link_to self.name, property if not property.nil?
+    view.link_to property, property if not property.nil?
   end
   def related_link_list(view, object)
     property = object.send(self.referring_column_name)
-    property.collect { |related_object| self_referential_link(view, related_object) }.join(', ') if not property.nil?
+    property.collect { |related_object| related_link(view, related_object) }.join(', ') if not property.nil?
   end
   def time(view, object)
     property = object.send(self.column_name)

data/app/tables/datatable.rb

@@ -24,7 +24,7 @@ attr_accessor :view, :filters
     }
   end
 
-class_attribute :columns, :searches, :match_any
+class_attribute :columns, :searches, :scopes, :match_any
   def self.column(name, *args)
     arguments = args.pop || {}
     self.columns = [] if self.columns.nil?
@@ -35,8 +35,12 @@ class_attribute :columns, :searches, :match_any
     self.searches = [] if self.searches.nil?
     self.searches << Search.new(name, self, arguments)
   end
-  self.match_any = true
+  def self.available_scopes(*args)
+    self.scopes = [] if self.scopes.nil?
+    self.scopes += args
+  end
   def self.match_any_column(match_any=true)
+    self.match_any = true if self.match_any.nil?
     self.match_any = match_any
   end
 
@@ -48,12 +52,11 @@ private
     else
       objects = self.model
     end
-    @filters.each do |method, arguments|
-      objects = objects.send(method, arguments)
+    self.filters.each do |method, arguments|
+      objects = objects.send(method, *arguments) if self.scopes.include?(method.to_sym)
     end
     if params[:sSearch].present?
       objects = objects.send("#{self.name}_search", params[:sSearch])
-      #objects = objects.where("name like :search or category like :search", search: "%#{params[:sSearch]}%")
     end
     objects = objects.paginate(page: page, per_page: per_page)
     objects

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-tables
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,21 +28,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.7
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: jquery-datatables-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.11.0
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.3
+- !ruby/object:Gem::Dependency
+  name: squeel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.11
 description: A clean jQuery datatables DSL that follows the structure of Ryan Bate's
   jQuery datatables railscast.
 email: