rails-tables 0.0.1 → 0.1.0

data/app/tables/column.rb

@@ -0,0 +1,53 @@
+class Column
+
+  attr_accessor :name, :column_name, :referring_column_name, :render_with, :sortable, :blank_value
+  def initialize(name, *args)
+    self.name = name
+
+    attributes = args.pop || {}
+    self.column_name = attributes.fetch(:column_name, name)
+    self.referring_column_name = attributes.fetch(:referring_column_name, nil)
+    self.render_with = attributes.fetch(:render_with, :default_render)
+    self.sortable = attributes.fetch(:sortable, true)
+    self.blank_value = attributes.fetch(:blank_value, '–')
+
+    define_singleton_method :render do |view, object|
+      if self.render_with.kind_of? Symbol
+        content = self.send(self.render_with, view, object)
+      else
+        content = self.render_with.call(view, object)
+      end
+      content.present? ? content.to_s.html_safe : self.blank_value
+    end
+  end
+
+  def default_render(view, object)
+    property = object.send(self.column_name)
+    property if not property.nil?
+  end
+  def self_referential_link(view, object)
+    property = object.send(self.column_name)
+    view.link_to property, object if not property.nil?
+  end
+  def related_link(view, object)
+    property = object.send(self.column_name)
+    view.link_to self.name, 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?
+  end
+  def time(view, object)
+    property = object.send(self.column_name)
+    property.strftime("%I:%M%p") if not property.nil?
+  end
+  def date(view, object)
+    property = object.send(self.column_name)
+    property.strftime("%m/%d/%Y") if not property.nil?
+  end
+  def datetime(view, object)
+    property = object.send(self.column_name)
+    property.strftime("%m/%d/%Y at %I:%M%p") if not property.nil?
+  end
+
+end

data/app/tables/datatable.rb

@@ -1,131 +1,81 @@
-module RailsTables
-  module Datatable
-    delegate :params, to: 'self.view'
-    
-    attr_accessor :view, :filters
-    def initialize(view, filters={})
-      self.view = view
-      self.filters = filters
-    end
+class Datatable
+  delegate :params, to: 'self.view'
+  
+  attr_accessor :view, :filters
+  def initialize(view, filters={})
+    self.view = view
+    self.filters = filters
+  end
 
-    def as_json(options = {})
-      {
-        sEcho: params[:sEcho].to_i,
-        iTotalRecords: objects.size,
-        iTotalDisplayRecords: objects.total_entries,
-        aaData: data
-      }
-    end
+  def as_json(options = {})
+    {
+      sEcho: params[:sEcho].to_i,
+      iTotalRecords: objects.size,
+      iTotalDisplayRecords: objects.total_entries,
+      aaData: data
+    }
+  end
 
-    module ClassMethods
-      attr_accessor :columns
-      def column(name, *args)
-        arguments = args.pop || {}
-        self.columns = [] if self.columns.nil?
-        self.columns << Column.new(name, arguments)
-      end
-    end
-    def self.included(base)
-      base.extend ClassMethods
+  class << self
+    attr_accessor :columns, :searches
+    def column(name, *args)
+      arguments = args.pop || {}
+      self.columns = [] if self.columns.nil?
+      self.columns << Column.new(name, arguments)
     end
+    # def search_by(name, *args)
+    #   arguments = args.pop || {}
+    #   self.searches = [] if self.searches.nil?
+    #   self.searches << Search.new(name, self.table, arguments)
+    # end
+  end
 
-  private
+private
 
-    def objects
-      if sortable
-        objects = self.model.reorder("#{sort_column} #{sort_direction}")
-      else
-        objects = self.model
-      end
-      @filters.each do |method, arguments|
-        objects = objects.send(method, arguments)
-      end
-      if params[:sSearch].present?
-        terms = params[:sSearch].split.map{|s| s+="%"}
-        columns = self.searches.keys.map(&:to_s)
-        objects = objects.full_text_search(columns, terms)
-        #objects = objects.where("name like :search or category like :search", search: "%#{params[:sSearch]}%")
-      end
-      objects = objects.paginate(page: page, per_page: per_page)
-      objects
+  def objects
+    if sortable
+      objects = self.class.model.reorder("#{sort_column} #{sort_direction}")
+    else
+      objects = self.class.model
     end
-    
-    def page
-      params[:iDisplayStart].to_i/per_page + 1
-    end
-    def per_page
-      params[:iDisplayLength].to_i > 0 ? params[:iDisplayLength].to_i : 10
-    end
-    
-    def sortable
-      self.class.columns.map{ |column| column.sortable }[params[:iSortCol_0].to_i]
-    end
-    def sort_column
-      self.class.columns.map(&:column_name)[params[:iSortCol_0].to_i]
-    end
-    def sort_direction
-      params[:sSortDir_0] == "desc" ? "desc" : "asc"
+    @filters.each do |method, arguments|
+      objects = objects.send(method, arguments)
     end
+    # if params[:sSearch].present?
+    #   objects = self.model(:datatable_search, search(objects, 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
+  end
 
-    def data
-      objects.map do |object|
-        self.class.columns.map{ |column| column.render(self.view, object) }
-      end
+  def search(objects, terms)
+    self.class.searches.each do |search|
+      objects = search.search(objects, terms)
     end
+  end
+  
+  def page
+    params[:iDisplayStart].to_i/per_page + 1
+  end
+  def per_page
+    params[:iDisplayLength].to_i > 0 ? params[:iDisplayLength].to_i : 10
+  end
+  
+  def sortable
+    self.class.columns.map{ |column| column.sortable }[params[:iSortCol_0].to_i]
+  end
+  def sort_column
+    self.class.columns.map(&:column_name)[params[:iSortCol_0].to_i]
+  end
+  def sort_direction
+    params[:sSortDir_0] == "desc" ? "desc" : "asc"
+  end
 
-    class Column
-
-      attr_accessor :name, :column_name, :referring_column_name, :render_with, :sortable, :default
-      def initialize(name, *args)
-        self.name = name
-
-        attributes = args.pop || {}
-        self.column_name = attributes.fetch(:column_name, name)
-        self.referring_column_name = attributes.fetch(:referring_column_name, nil)
-        self.render_with = attributes.fetch(:render_with, :default_render)
-        self.sortable = attributes.fetch(:sortable, true)
-        self.default = attributes.fetch(:default, '&ndash;')
-
-        define_singleton_method :render do |view, object|
-          if self.render_with.kind_of? Symbol
-            content = self.send(self.render_with, view, object)
-          else
-            content = self.render_with.call(view, object)
-          end
-          content.present? ? content.to_s.html_safe : self.default
-        end
-      end
-
-      def default_render(view, object)
-        property = object.send(self.column_name)
-        property if not property.nil?
-      end
-      def self_referential_link(view, object)
-        property = object.send(self.column_name)
-        view.link_to property, object if not property.nil?
-      end
-      def related_link(view, object)
-        property = object.send(self.column_name)
-        view.link_to self.name, 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?
-      end
-      def time(view, object)
-        property = object.send(self.column_name)
-        property.strftime("%I:%M%p") if not property.nil?
-      end
-      def date(view, object)
-        property = object.send(self.column_name)
-        property.strftime("%m/%d/%Y") if not property.nil?
-      end
-      def datetime(view, object)
-        property = object.send(self.column_name)
-        property.strftime("%m/%d/%Y at %I:%M%p") if not property.nil?
-      end
-
+  def data
+    objects.map do |object|
+      self.class.columns.map{ |column| column.render(self.view, object) }
     end
-
   end
+
 end

data/app/tables/search.rb

@@ -0,0 +1,68 @@
+class Search
+
+  attr_accessor :name, :table, :column_name, :search_with
+  def initialize(name, table, *args)
+    self.name = name
+    self.table = table
+
+    attributes = args.pop || {}
+    self.column_name = attributes.fetch(:column_name, name)
+    self.search_with = attributes.fetch(:strategy, :default_strategy)
+
+    
+    define_singleton_method :search do |objects, terms|
+      if self.search_with.kind_of? Symbol
+        self.send(self.search_with, self.column_name, objects, terms)
+      else
+        self.search_with.call(self.column_name, objects, terms)
+      end
+    end
+  end
+
+  def default_strategy(field, objects, terms)
+    self.starts_with_strategy(field, objects, terms)
+  end
+  def starts_with_strategy(field, objects, terms)
+    terms.split.map{|s| s+="%"}.map do |term|
+      Squeel::Nodes::Predicate.new(Squeel::Nodes::Stub.new(field), :matches, term)
+    end.inject do |t, expr|
+      t | expr
+    end.tap do |block|
+      return objects.where{block}
+    end
+  end
+  def contains_strategy(field, objects, terms)
+    terms.split.map{|s| s="%#{s}%"}.map do |term|
+      Squeel::Nodes::Predicate.new(Squeel::Nodes::Stub.new(field), :matches, term)
+    end.inject do |t, expr|
+      t | expr
+    end.tap do |block|
+      return objects.where{block}
+    end
+  end
+  # def self_referential_link(view, object)
+  #   property = object.send(self.column_name)
+  #   view.link_to property, object if not property.nil?
+  # end
+  # def related_link(view, object)
+  #   property = object.send(self.column_name)
+  #   view.link_to self.name, 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?
+  # end
+  # def time(view, object)
+  #   property = object.send(self.column_name)
+  #   property.strftime("%I:%M%p") if not property.nil?
+  # end
+  # def date(view, object)
+  #   property = object.send(self.column_name)
+  #   property.strftime("%m/%d/%Y") if not property.nil?
+  # end
+  # def datetime(view, object)
+  #   property = object.send(self.column_name)
+  #   property.strftime("%m/%d/%Y at %I:%M%p") if not property.nil?
+  # end
+
+end

data/lib/rails-tables/model_additions.rb

@@ -0,0 +1,13 @@
+def has_datatable(*args)
+  arguments = args.pop || {}
+  name = arguments.fetch(:name, 'datatable')
+  klass = arguments.fetch(:klass, "#{self.name.pluralize}Table")
+  require File.join(Rails.root, 'app', 'tables', "#{klass.underscore}.rb")
+  model = self
+  klass.constantize.class.send(:define_method, 'model') do
+    model
+  end
+  self.class.send(:define_method, name) do
+    klass.constantize
+  end
+end  

data/lib/rails-tables/version.rb

@@ -1,3 +1,3 @@
 module RailsTables
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/rails-tables.rb

@@ -1,4 +1,5 @@
 require "rails-tables/engine"
+require "rails-tables/model_additions"
 
 module RailsTables
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-tables
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A clean jQuery datatables API that follows the structure of Ryan Bate's
+description: A clean jQuery datatables DSL that follows the structure of Ryan Bate's
   jQuery datatables railscast.
 email:
 - dev@chriskeele.com
@@ -51,9 +51,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/tables/column.rb
 - app/tables/datatable.rb
+- app/tables/search.rb
 - config/routes.rb
 - lib/rails-tables/engine.rb
+- lib/rails-tables/model_additions.rb
 - lib/rails-tables/version.rb
 - lib/rails-tables.rb
 - lib/tasks/rails-tables_tasks.rake
@@ -114,7 +117,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: A clean jQuery datatables API.
+summary: A clean jQuery datatables DSL.
 test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css