rails-tables 0.4.1 → 0.4.2

data/README.md

@@ -0,0 +1,32 @@
+RailsTables
+===========
+
+A clean jQuery datatables DSL
+-----------------------------
+
+[RailsTables][rails-tables] is a simple DSL built on top of [jquery-datatables-rails][jqd-rails] to quickly compose performant [jQuery datatables][jqd] for your Rails app. It is inspired by, and was born as an abstraction of, the pattern used in Ryan Bates's [datatables Railscast][jqd-railscast]. It's powered by the indomitable ActiveRecord extension [Squeel][squeel].
+
+[rails-tables]: https://github.com/christhekeele/rails-tables (RailsTables)
+[jqd]: http://datatables.net/ (jQuery Datatables)
+[jqd-rails]: https://github.com/rweng/jquery-datatables-rails (jQuery Datatables for Rails)
+[jqd-railscast]: http://railscasts.com/episodes/340-datatables (Episode #340: Datatables)
+[squeel]: https://github.com/ernie/squeel (Squeel: ActiveRecord 3, improved)
+
+Version: 0.4.2
+
+Please refer to the [RailsTables Wiki][wiki] for:
+
+- [Installation][wiki-installation]
+- [Quick Start][wiki-quick-start]
+- [Customization][wiki-customization]
+- [Contributions][wiki-contributions]
+- [Feedback][wiki-feedback]
+- [Change Log][wiki-change-log]
+
+[wiki]: https://github.com/christhekeele/rails-tables/wiki (RailsTables Wiki)
+[wiki-installation]: https://github.com/christhekeele/rails-tables/wiki/Installation (RailsTables Installation)
+[wiki-quick-start]: https://github.com/christhekeele/rails-tables/wiki/Quick_Start (RailsTables Quick Start)
+[wiki-customization]: https://github.com/christhekeele/rails-tables/wiki/Customization (RailsTables Customization)
+[wiki-contributions]: https://github.com/christhekeele/rails-tables/wiki/Contributions (RailsTables Contributions)
+[wiki-feedback]: https://github.com/christhekeele/rails-tables/wiki/Feedback (RailsTables Feedback)
+[wiki-change-log]: https://github.com/christhekeele/rails-tables/wiki/Change_Log (RailsTables Change Log)

data/app/tables/column.rb

@@ -14,11 +14,12 @@ class Column
     self.blank_value = attributes.fetch(:blank_value, '–')
 
     define_singleton_method :render do |view, object|
+      related = object
       self.column_source.split('.').each do |relation|
-        object = object.try(:send, relation)
+        related = related.try(:send, relation)
       end
       if self.render_with.kind_of? Symbol
-        content = self.send(self.render_with, view, object)
+        content = self.send(self.render_with, view, related)
       else
         content = self.render_with.call(view, object)
       end
@@ -39,8 +40,12 @@ class Column
     view.link_to property, property if not property.nil?
   end
   def related_link_list(view, objects)
-    objects.map{ |object| related_link(view, object).strip }.reject(&:blank?).join(', ') if not objects.nil?
+    objects.reject(&:blank?).map{ |object| related_link(view, object).strip }.join(', ') if not objects.nil?
   end
+  # def unique_related_link_list(view, objects, field)
+  #   binding.pry if objects.length > 1
+  #   related_link_list(view, objects.uniq{|o| o.send(field)} )
+  # end
   def time(view, object)
     property = object.try(:send, self.method)
     property.strftime("%I:%M%p") if not property.nil?

data/app/tables/datatable.rb

@@ -62,9 +62,14 @@ class_attribute :columns, :column_factory
     @columns ||= self.column_factory.map{ |new_column| Column.new(self.model, new_column[:name], new_column[:args]) }
   end
 
+class_attribute :joins
+self.joins = []
+  def self.join(join)
+    self.joins += [join.to_s]
+  end
 attr_accessor :joins
   def joins
-    @joins ||= self.columns.map(&:column_source).reject(&:blank?).uniq
+    @joins ||= (self.columns.map(&:column_source).reject(&:blank?) + self.class.joins).uniq 
   end
 attr_accessor :searches
   def searches
@@ -76,7 +81,8 @@ private
   def objects
     query = self.model.uniq
     self.joins.each do |join|
-      query = query.joins{ join.split('.').inject(self, :__send__).outer }.includes{ join.split('.').inject(self, :__send__).outer }
+      query = query.joins{ join.split('.').inject(self, :__send__).outer }
+      query = query.includes{ join.split('.').inject(self, :__send__).outer }
     end
     if sortable
       sort_expression = sort

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-tables
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -126,7 +126,7 @@ files:
 - lib/tasks/rails-tables_tasks.rake
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
+- README.md
 homepage: https://github.com/christhekeele/rails-tables
 licenses: []
 post_install_message: 

data/README.rdoc

@@ -1,3 +0,0 @@
-= RailsTables
-
-This project rocks and uses MIT-LICENSE.