jtable-rails 0.1.4 → 0.2.0

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "jeweler", "~> 1.5.2"
   gem "rails", "3.0.5"
   gem 'sqlite3-ruby', :require => 'sqlite3'
+  gem 'ruby-debug19'
 end

data/Gemfile.lock

@@ -28,8 +28,10 @@ GEM
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
     activesupport (3.0.5)
+    archive-tar-minitar (0.5.2)
     arel (2.0.9)
     builder (2.1.2)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -40,6 +42,8 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -74,6 +78,16 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
@@ -91,4 +105,5 @@ DEPENDENCIES
   jeweler (~> 1.5.2)
   rails (= 3.0.5)
   rspec
+  ruby-debug19
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/jtable-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jtable-rails}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor Yelverton"]
-  s.date = %q{2011-02-28}
+  s.date = %q{2011-04-08}
   s.description = %q{A Rails gem to power the jTable jQuery plugin}
   s.email = %q{tny5357@gmail.com}
   s.extra_rdoc_files = [
@@ -33,9 +33,11 @@ Gem::Specification.new do |s|
     "lib/jtable-rails/railtie.rb",
     "lib/jtable-rails/version.rb",
     "lib/tasks/jtable_rails.rake",
-    "spec/controller_specs/people_controller_spec.rb",
+    "spec/controller_specs/basic_controller_spec.rb",
     "spec/fabricators/person.rb",
-    "spec/model_specs/person_spec.rb",
+    "spec/fabricators/place.rb",
+    "spec/model_specs/basic_spec.rb",
+    "spec/model_specs/one_to_one_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/rails_app/.DS_Store",
     "spec/support/rails_app/.gitignore",
@@ -44,15 +46,23 @@ Gem::Specification.new do |s|
     "spec/support/rails_app/Rakefile",
     "spec/support/rails_app/app/controllers/application_controller.rb",
     "spec/support/rails_app/app/controllers/people_controller.rb",
+    "spec/support/rails_app/app/controllers/places_controller.rb",
     "spec/support/rails_app/app/helpers/application_helper.rb",
     "spec/support/rails_app/app/helpers/people_helper.rb",
+    "spec/support/rails_app/app/helpers/places_helper.rb",
     "spec/support/rails_app/app/models/person.rb",
+    "spec/support/rails_app/app/models/place.rb",
     "spec/support/rails_app/app/views/layouts/application.html.erb",
     "spec/support/rails_app/app/views/people/_form.html.erb",
     "spec/support/rails_app/app/views/people/edit.html.erb",
     "spec/support/rails_app/app/views/people/index.html.erb",
     "spec/support/rails_app/app/views/people/new.html.erb",
     "spec/support/rails_app/app/views/people/show.html.erb",
+    "spec/support/rails_app/app/views/places/_form.html.erb",
+    "spec/support/rails_app/app/views/places/edit.html.erb",
+    "spec/support/rails_app/app/views/places/index.html.erb",
+    "spec/support/rails_app/app/views/places/new.html.erb",
+    "spec/support/rails_app/app/views/places/show.html.erb",
     "spec/support/rails_app/config.ru",
     "spec/support/rails_app/config/application.rb",
     "spec/support/rails_app/config/boot.rb",
@@ -69,6 +79,7 @@ Gem::Specification.new do |s|
     "spec/support/rails_app/config/locales/en.yml",
     "spec/support/rails_app/config/routes.rb",
     "spec/support/rails_app/db/migrate/20110207142623_create_people.rb",
+    "spec/support/rails_app/db/migrate/20110302024653_create_places.rb",
     "spec/support/rails_app/db/schema.rb",
     "spec/support/rails_app/db/seeds.rb",
     "spec/support/rails_app/public/images/jTable-icons.png",
@@ -77,6 +88,10 @@ Gem::Specification.new do |s|
     "spec/support/rails_app/public/stylesheets/jTable.css",
     "spec/support/rails_app/public/stylesheets/scaffold.css",
     "spec/support/rails_app/script/rails",
+    "spec/support/rails_app/test/fixtures/places.yml",
+    "spec/support/rails_app/test/functional/places_controller_test.rb",
+    "spec/support/rails_app/test/unit/helpers/places_helper_test.rb",
+    "spec/support/rails_app/test/unit/place_test.rb",
     "spec/support/rails_app/tmp/.DS_Store",
     "spec/support/rails_app/tmp/jtable.zip"
   ]
@@ -86,15 +101,20 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Rails gem to power the jTable jQuery plugin}
   s.test_files = [
-    "spec/controller_specs/people_controller_spec.rb",
+    "spec/controller_specs/basic_controller_spec.rb",
     "spec/fabricators/person.rb",
-    "spec/model_specs/person_spec.rb",
+    "spec/fabricators/place.rb",
+    "spec/model_specs/basic_spec.rb",
+    "spec/model_specs/one_to_one_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/rails_app/app/controllers/application_controller.rb",
     "spec/support/rails_app/app/controllers/people_controller.rb",
+    "spec/support/rails_app/app/controllers/places_controller.rb",
     "spec/support/rails_app/app/helpers/application_helper.rb",
     "spec/support/rails_app/app/helpers/people_helper.rb",
+    "spec/support/rails_app/app/helpers/places_helper.rb",
     "spec/support/rails_app/app/models/person.rb",
+    "spec/support/rails_app/app/models/place.rb",
     "spec/support/rails_app/config/application.rb",
     "spec/support/rails_app/config/boot.rb",
     "spec/support/rails_app/config/environment.rb",
@@ -108,8 +128,12 @@ Gem::Specification.new do |s|
     "spec/support/rails_app/config/initializers/session_store.rb",
     "spec/support/rails_app/config/routes.rb",
     "spec/support/rails_app/db/migrate/20110207142623_create_people.rb",
+    "spec/support/rails_app/db/migrate/20110302024653_create_places.rb",
     "spec/support/rails_app/db/schema.rb",
-    "spec/support/rails_app/db/seeds.rb"
+    "spec/support/rails_app/db/seeds.rb",
+    "spec/support/rails_app/test/functional/places_controller_test.rb",
+    "spec/support/rails_app/test/unit/helpers/places_helper_test.rb",
+    "spec/support/rails_app/test/unit/place_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -123,6 +147,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rails>, ["= 3.0.5"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, ["= 3.0.5"])
     else
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -131,6 +156,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rails>, ["= 3.0.5"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<rails>, ["= 3.0.5"])
     end
   else
@@ -140,6 +166,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rails>, ["= 3.0.5"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<rails>, ["= 3.0.5"])
   end
 end

data/lib/jtable-rails/action_controller.rb

@@ -1,9 +1,9 @@
 module JTable
   module ActionController
-    def jtable_for_json(rel, jtable_params)
+    def jtable_for_json(jtable_name, rel, jtable_params)
       jtable_params = HashWithIndifferentAccess.new(jtable_params)
-      items = rel.jtable_paginate(jtable_params[:limit], jtable_params[:offset])
-      {:total_items => rel.count, :items => items.collect(&:jtable_item)}
+      items = rel.send("jtable_#{jtable_name}_paginate",jtable_params[:limit], jtable_params[:offset])
+      {:total_items => rel.count, :items => items.collect(&("jtable_#{jtable_name}_item").to_sym)}
     end
   end
 end

data/lib/jtable-rails/active_record.rb

@@ -2,59 +2,113 @@ module JTable
   module ActiveRecord
     extend ActiveSupport::Concern
     module ClassMethods
-      def jtable(*fields)
+      def jtable(name, *fields)
         metaclass = class << self
           self
         end
+        join_associations = []
         fields.each do |field|
-          metaclass.instance_eval do
-            define_method "jtable_search_#{field}" do |term|
-              unless [:date].include? arel_table[field.to_sym].column.type
-                if [:integer, :boolean].include? arel_table[field.to_sym].column.type
-                  arel_table[field.to_sym].eq(term.to_i)
-                else
-                  arel_table[field.to_sym].matches("%#{term}%")
+          if field.kind_of? Hash
+            field.each_pair do |assoc_name, assoc_fields|
+              join_associations << assoc_name
+              assoc_klass = assoc_name.to_s.camelcase.constantize
+              assoc_fields.each do |assoc_field|
+                metaclass.instance_eval do
+                  define_method "jtable_#{name}_search_#{assoc_name}_#{assoc_field}" do |term|
+                    unless [:date].include? assoc_klass.arel_table[assoc_field.to_sym].column.type
+                      if [:integer, :boolean].include? assoc_klass.arel_table[assoc_field.to_sym].column.type
+                        if term.to_i.to_s == term
+                          assoc_klass.arel_table[assoc_field.to_sym].eq(term.to_i)
+                        end
+                      else
+                        assoc_klass.arel_table[assoc_field.to_sym].matches("%#{term}%")
+                      end
+                    end
+                  end
+                  
+                  define_method "jtable_#{name}_order_#{assoc_name}_#{assoc_field}" do |direction|
+                    %Q["#{assoc_name.to_s.camelcase.constantize.table_name}".#{assoc_field} #{direction}]
+                  end
+                end
+                
+                define_method "jtable_#{name}_attribute_#{assoc_name}_#{assoc_field}" do
+                  if assoc_klass.arel_table[assoc_field.to_sym].column.type == :date
+                    self.send(assoc_name).send(assoc_field).strftime("%m/%d/%Y %I:%M%P")
+                  else
+                    self.send(assoc_name).send(assoc_field)
+                  end
                 end
               end
             end
+          else
+            metaclass.instance_eval do
+              define_method "jtable_#{name}_search_#{field}" do |term|
+                unless [:date].include? arel_table[field.to_sym].column.type
+                  if [:integer, :boolean].include? arel_table[field.to_sym].column.type
+                    if term.to_i.to_s == term
+                      arel_table[field.to_sym].eq(term.to_i)
+                    end
+                  else
+                    arel_table[field.to_sym].matches("%#{term}%")
+                  end
+                end
+              end
             
-            define_method "jtable_order_#{field}" do |direction|
-              "#{field} #{direction}"
+              define_method "jtable_#{name}_order_#{field}" do |direction|
+                "#{field} #{direction}"
+              end
             end
-          end
-          define_method "jtable_attribute_#{field}" do
-            if self.class.arel_table[field.to_sym].column.type == :date
-              self.send(field).strftime("%m/%d/%Y %I:%M%P")
-            else
-              self.send(field)
+            define_method "jtable_#{name}_attribute_#{field}" do
+              if self.class.arel_table[field.to_sym].column.type == :date
+                self.send(field).strftime("%m/%d/%Y %I:%M%P")
+              else
+                self.send(field)
+              end
             end
           end
         end
         
         metaclass.instance_eval do
-          define_method "jtable_attributes" do
+          define_method "jtable_#{name}_attributes" do
             fields
           end
         end
         
-        define_method "jtable_item" do
+        define_method "jtable_#{name}_item" do
           item_hash = {}
           item_hash[:id] = self.id
           fields.each do |field|
-            item_hash[field.to_sym] = self.send("jtable_attribute_#{field}")
+            if field.kind_of? Hash
+              field.each_pair do |assoc_name, assoc_fields|
+                assoc_fields.each do |assoc_field|
+                  item_hash["#{assoc_name}_#{assoc_field}".to_sym] = self.send("jtable_#{name}_attribute_#{assoc_name}_#{assoc_field}")
+                end
+              end
+            else
+              item_hash[field.to_sym] = self.send("jtable_#{name}_attribute_#{field}")
+            end
           end
           item_hash
         end
         
-        scope :jtable_search, lambda { |jtable_params|
+        scope "jtable_#{name}_search", lambda { |jtable_params|
           search_terms = jtable_params[:search]
           unless search_terms.blank?
             wheres = []
             search_terms.split(" ").each do |term|
               where_query = []
               fields.each do |field|
-                next unless jtable_params[:searchable_columns].include?(field.to_s)
-                where_query << self.send("jtable_search_#{field}", term)
+                if field.kind_of? Hash
+                  field.each_pair do |assoc_name, assoc_fields|
+                    assoc_fields.each do |assoc_field|
+                      next unless jtable_params[:searchable_columns].include?("#{assoc_name}_#{assoc_field}")
+                      where_query << self.send("jtable_#{name}_search_#{assoc_name}_#{assoc_field}", term)
+                    end
+                  end
+                else
+                  next unless jtable_params[:searchable_columns].include?(field.to_s)
+                  where_query << self.send("jtable_#{name}_search_#{field}", term)
+                end
               end
               wheres << where(where_query.inject(&:or))
             end
@@ -62,41 +116,46 @@ module JTable
           end
         }
         
-        scope :jtable_single_search, lambda {|column, search_terms|
+        scope "jtable_#{name}_single_search", lambda {|column, search_terms|
           unless column.blank? or search_terms.blank?
             wheres = []
             search_terms.split(" ").each do |term|
-              wheres << where(self.send("jtable_search_#{column}", term))
+              wheres << where(self.send("jtable_#{name}_search_#{column}", term))
             end
             wheres.inject(&:merge)
           end
         }
         
-        scope :jtable_order, lambda {|column, direction|
+        scope "jtable_#{name}_order", lambda {|column, direction|
           if !column.blank? and !direction.blank? and %w(asc desc).include?(direction.downcase)
-            order(self.send("jtable_order_#{column}", direction))
+            order(self.send("jtable_#{name}_order_#{column}", direction))
           end
         }
         
-        scope :jtable_paginate, lambda {|per_page, page_start|
+        scope "jtable_#{name}_paginate", lambda {|per_page, page_start|
           limit(per_page.to_i).offset(page_start.to_i)
         }
         
-        scope :jtable_default, lambda {
+        scope "jtable_#{name}_default", lambda {
           
         }
         
-        scope :jtable_query, lambda { |jtable_params|
+        scope "jtable_#{name}_query", lambda { |jtable_params|
           jtable_params = HashWithIndifferentAccess.new(jtable_params)
           queries = []
-          queries << jtable_default()
-          queries << jtable_search(jtable_params)
+          unless join_associations.empty?
+            join_associations.each do |join_association|
+              queries << joins(join_association)
+            end
+          end
+          queries << self.send("jtable_#{name}_default")
+          queries << self.send("jtable_#{name}_search", jtable_params)
           unless jtable_params[:column_search].blank?
             jtable_params[:column_search].each_pair do |column, search|
-              queries << jtable_single_search(column, search)
+              queries << self.send("jtable_#{name}_single_search", column, search)
             end
           end
-          queries << jtable_order(jtable_params[:sort_column], jtable_params[:sort_direction])
+          queries << self.send("jtable_#{name}_order", jtable_params[:sort_column], jtable_params[:sort_direction])
           queries.inject(&:merge)
         }
       end

data/spec/controller_specs/{people_controller_spec.rb → basic_controller_spec.rb}

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe "PeopleController" do
+describe "BasicController" do
   before(:each) do
     @people_controller = PeopleController.new
     
@@ -24,8 +24,8 @@ describe "PeopleController" do
   end
   
   it "should return the appropriate json" do
-    people = Person.jtable_query(@params)
-    jtable_items = people.jtable_paginate(@params[:limit], @params[:offset]).collect(&:jtable_item)
-    @people_controller.jtable_for_json(people, @params).to_json.should eql({:total_items => people.count, :items => jtable_items}.to_json)
+    people = Person.jtable_basic_query(@params)
+    jtable_items = people.jtable_basic_paginate(@params[:limit], @params[:offset]).collect(&:jtable_basic_item)
+    @people_controller.jtable_for_json(:basic, people, @params).to_json.should eql({:total_items => people.count, :items => jtable_items}.to_json)
   end
 end

data/spec/fabricators/place.rb

@@ -0,0 +1,5 @@
+Fabricator(:place) do
+  address   {Fabricate.sequence(:place_address) {|i| "#{i} Some Rd."}}
+  city      {Fabricate.sequence(:place_city) {|i| "City #{i}"}}
+  state     {Fabricate.sequence(:place_state) {|i| "State #{i}"}}
+end

data/spec/model_specs/basic_spec.rb

@@ -0,0 +1,85 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "Basic" do
+  before(:each) do
+    10.times do |i|
+      Fabricate(:person)
+    end
+    
+    @params = {
+      :searchable_columns => ["first_name", "last_name", "age", "date_of_birth", "gender"],
+      :column_search => {},
+      :limit => "5",
+      :offset => "0",
+      :search => "",
+      :sort_column => "",
+      :sort_direction => ""
+    }
+  end
+  
+  it "should have the jtable scopes and methods" do
+    Person.respond_to?(:jtable).should be_true
+    Person.respond_to?(:jtable_basic_search).should be_true
+    Person.respond_to?(:jtable_basic_single_search).should be_true
+    Person.respond_to?(:jtable_basic_order).should be_true
+    Person.respond_to?(:jtable_basic_paginate).should be_true
+    Person.respond_to?(:jtable_basic_default).should be_true
+    Person.respond_to?(:jtable_basic_query).should be_true
+    [:first_name, :last_name, :age, :date_of_birth, :gender, :alive].each do |attribute|
+      Person.respond_to?("jtable_basic_search_#{attribute}").should be_true
+      Person.respond_to?("jtable_basic_order_#{attribute}").should be_true
+      Person.respond_to?("jtable_basic_attributes").should be_true
+      Person.new.respond_to?("jtable_basic_attribute_#{attribute}").should be_true
+      Person.new.respond_to?("jtable_basic_item").should be_true
+    end
+  end
+  
+  it "should know jtables attributes" do
+    Person.jtable_basic_attributes.should eql([:first_name, :last_name, :age, :date_of_birth, :gender, :alive])
+  end
+  
+  it "should load initial set" do
+    Person.jtable_basic_query(@params).to_json.should eql(Person.all.to_json)
+  end
+  
+  it "should paginate" do
+    Person.jtable_basic_query(@params).jtable_basic_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(0).to_json)
+    @params[:offset] = 5
+    Person.jtable_basic_query(@params).jtable_basic_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(5).to_json)
+  end
+  
+  it "should search" do
+    person_1 = Fabricate(:person)
+    person_2 = Fabricate(:person)
+    person_1.first_name = "John"
+    person_1.last_name = "Smith"
+    person_1.save
+    person_2.first_name = "Johnathan"
+    person_2.last_name = "Smith"
+    person_2.save
+    @params[:search] = "john smith"
+    Person.jtable_basic_query(@params).to_json.should eql(Person.where(['(first_name LIKE ? OR last_name LIKE ?) AND (first_name LIKE ? OR last_name LIKE ?)', "%john%", "%john%", "%smith%", "%smith%"]).to_json)
+  end
+  
+  it "should single column search" do
+    person_1 = Fabricate(:person)
+    person_2 = Fabricate(:person)
+    person_1.first_name = "John"
+    person_1.save
+    person_2.first_name = "Johnathan"
+    person_2.save
+    @params[:column_search][:first_name] = "john"
+    Person.jtable_basic_query(@params).to_json.should eql(Person.where(['(first_name LIKE ?)', "%john%"]).to_json)
+  end
+  
+  it "should order" do
+    @params[:sort_column] = "age"
+    @params[:sort_direction] = "ASC"
+    Person.jtable_basic_query(@params).to_json.should eql(Person.order('age ASC').to_json)
+  end
+  
+  it "should format an item for jtable" do
+    person = Fabricate(:person, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago, :gender => "Male", :alive => true)
+    person.jtable_basic_item.should eql({:id => person.id, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago.strftime("%m/%d/%Y %I:%M%P"), :gender => "Male", :alive => true})
+  end
+end

data/spec/model_specs/one_to_one_spec.rb

@@ -0,0 +1,64 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "OneToOne" do
+  before(:each) do
+    10.times do |i|
+      Fabricate(:person, :place => Fabricate(:place))
+    end
+    
+    @params = {
+      :searchable_columns => ["first_name", "last_name", "age", "date_of_birth", "gender", "place_address", "place_city", "place_state"],
+      :column_search => {},
+      :limit => "5",
+      :offset => "0",
+      :search => "",
+      :sort_column => "",
+      :sort_direction => ""
+    }
+  end
+  
+  it "Person should load initial set with nested Place" do
+    Person.jtable_one_to_one_query(@params).collect(&:jtable_one_to_one_item).to_json.should eql(Person.all.collect(&:jtable_one_to_one_item).to_json)
+  end
+  
+  it "should paginate" do
+    Person.jtable_one_to_one_query(@params).jtable_one_to_one_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(0).to_json)
+    @params[:offset] = 5
+    Person.jtable_one_to_one_query(@params).jtable_one_to_one_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(5).to_json)
+  end
+  
+  it "should search on top level object" do
+    person_1 = Fabricate(:person, :place => Fabricate(:place))
+    person_2 = Fabricate(:person, :place => Fabricate(:place))
+    person_1.first_name = "John"
+    person_1.last_name = "Smith"
+    person_1.save
+    person_2.first_name = "Johnathan"
+    person_2.last_name = "Smith"
+    person_2.save
+    @params[:search] = "john smith"
+    Person.jtable_one_to_one_query(@params).to_json.should eql(Person.where(['(first_name LIKE ? OR last_name LIKE ?) AND (first_name LIKE ? OR last_name LIKE ?)', "%john%", "%john%", "%smith%", "%smith%"]).to_json)
+  end
+  
+  it "should search on nested object" do
+    place_1 = Person.first.place
+    place_2 = Person.last.place
+    place_1.state = "Alabama"
+    place_1.save
+    place_2.state = "Alaska"
+    place_2.save
+    @params[:search] = "ala"
+    Person.jtable_one_to_one_query(@params).to_json.should eql(Person.joins(:place).where(['"places".state LIKE ?', "%ala%"]).to_json)
+  end
+  
+  it "should order on nested object" do
+    @params[:sort_column] = "place_state"
+    @params[:sort_direction] = "DESC"
+    Person.jtable_one_to_one_query(@params).to_json.should eql(Person.joins(:place).order('"places".state DESC').to_json)
+  end
+  
+  it "Person should format an item for jtable with nested place" do
+    person = Fabricate(:person, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago, :gender => "Male", :alive => true, :place => Fabricate(:place, :address => "100 Infinite Loop", :city => "Mountain View", :state => "California"))
+    person.jtable_one_to_one_item.should eql({:id => person.id, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago.strftime("%m/%d/%Y %I:%M%P"), :gender => "Male", :alive => true, :place_address => "100 Infinite Loop", :place_city => "Mountain View", :place_state => "California"})
+  end
+end

data/spec/support/rails_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/yelvert/projects/jtable/jtable-rails
   specs:
-    jtable-rails (0.1.3)
+    jtable-rails (0.1.4)
       rails (= 3.0.5)
 
 GEM

data/spec/support/rails_app/app/controllers/places_controller.rb

@@ -0,0 +1,83 @@
+class PlacesController < ApplicationController
+  # GET /places
+  # GET /places.xml
+  def index
+    @places = Place.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @places }
+    end
+  end
+
+  # GET /places/1
+  # GET /places/1.xml
+  def show
+    @place = Place.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @place }
+    end
+  end
+
+  # GET /places/new
+  # GET /places/new.xml
+  def new
+    @place = Place.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @place }
+    end
+  end
+
+  # GET /places/1/edit
+  def edit
+    @place = Place.find(params[:id])
+  end
+
+  # POST /places
+  # POST /places.xml
+  def create
+    @place = Place.new(params[:place])
+
+    respond_to do |format|
+      if @place.save
+        format.html { redirect_to(@place, :notice => 'Place was successfully created.') }
+        format.xml  { render :xml => @place, :status => :created, :location => @place }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @place.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /places/1
+  # PUT /places/1.xml
+  def update
+    @place = Place.find(params[:id])
+
+    respond_to do |format|
+      if @place.update_attributes(params[:place])
+        format.html { redirect_to(@place, :notice => 'Place was successfully updated.') }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @place.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /places/1
+  # DELETE /places/1.xml
+  def destroy
+    @place = Place.find(params[:id])
+    @place.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(places_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

data/spec/support/rails_app/app/helpers/places_helper.rb

@@ -0,0 +1,2 @@
+module PlacesHelper
+end

data/spec/support/rails_app/app/models/person.rb

@@ -1,3 +1,7 @@
 class Person < ActiveRecord::Base
-  jtable :first_name, :last_name, :age, :date_of_birth, :gender, :alive
+  has_one :place
+  
+  jtable :basic, :first_name, :last_name, :age, :date_of_birth, :gender, :alive
+  
+  jtable :one_to_one, :first_name, :last_name, :age, :date_of_birth, :gender, :alive, {:place => [:address, :city, :state]}
 end

data/spec/support/rails_app/app/models/place.rb

@@ -0,0 +1,3 @@
+class Place < ActiveRecord::Base
+  belongs_to :person
+end

data/spec/support/rails_app/app/views/places/_form.html.erb

@@ -0,0 +1,29 @@
+<%= form_for(@place) do |f| %>
+  <% if @place.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@place.errors.count, "error") %> prohibited this place from being saved:</h2>
+
+      <ul>
+      <% @place.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :address %><br />
+    <%= f.text_field :address %>
+  </div>
+  <div class="field">
+    <%= f.label :city %><br />
+    <%= f.text_field :city %>
+  </div>
+  <div class="field">
+    <%= f.label :state %><br />
+    <%= f.text_field :state %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/support/rails_app/app/views/places/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing place</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @place %> |
+<%= link_to 'Back', places_path %>

data/spec/support/rails_app/app/views/places/index.html.erb

@@ -0,0 +1,27 @@
+<h1>Listing places</h1>
+
+<table>
+  <tr>
+    <th>Address</th>
+    <th>City</th>
+    <th>State</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @places.each do |place| %>
+  <tr>
+    <td><%= place.address %></td>
+    <td><%= place.city %></td>
+    <td><%= place.state %></td>
+    <td><%= link_to 'Show', place %></td>
+    <td><%= link_to 'Edit', edit_place_path(place) %></td>
+    <td><%= link_to 'Destroy', place, :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Place', new_place_path %>

data/spec/support/rails_app/app/views/places/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New place</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', places_path %>

data/spec/support/rails_app/app/views/places/show.html.erb

@@ -0,0 +1,20 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Address:</b>
+  <%= @place.address %>
+</p>
+
+<p>
+  <b>City:</b>
+  <%= @place.city %>
+</p>
+
+<p>
+  <b>State:</b>
+  <%= @place.state %>
+</p>
+
+
+<%= link_to 'Edit', edit_place_path(@place) %> |
+<%= link_to 'Back', places_path %>

data/spec/support/rails_app/config/application.rb

@@ -38,5 +38,8 @@ module RailsApp
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    
+    ActiveRecord::Base.include_root_in_json = false
+    ActiveSupport.escape_html_entities_in_json = true
   end
 end

data/spec/support/rails_app/config/routes.rb

@@ -1,4 +1,6 @@
 RailsApp::Application.routes.draw do
+  resources :places
+
   resources :people
 
   # The priority is based upon order of creation:

data/spec/support/rails_app/db/migrate/20110302024653_create_places.rb

@@ -0,0 +1,16 @@
+class CreatePlaces < ActiveRecord::Migration
+  def self.up
+    create_table :places do |t|
+      t.integer :person_id
+      t.string :address
+      t.string :city
+      t.string :state
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :places
+  end
+end

data/spec/support/rails_app/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110207142623) do
+ActiveRecord::Schema.define(:version => 20110302024653) do
 
   create_table "people", :force => true do |t|
     t.string   "first_name"
@@ -23,4 +23,13 @@ ActiveRecord::Schema.define(:version => 20110207142623) do
     t.datetime "updated_at"
   end
 
+  create_table "places", :force => true do |t|
+    t.integer  "person_id"
+    t.string   "address"
+    t.string   "city"
+    t.string   "state"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end

data/spec/support/rails_app/test/fixtures/places.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  address: MyString
+  city: MyString
+  state: MyString
+
+two:
+  address: MyString
+  city: MyString
+  state: MyString

data/spec/support/rails_app/test/functional/places_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class PlacesControllerTest < ActionController::TestCase
+  setup do
+    @place = places(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:places)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create place" do
+    assert_difference('Place.count') do
+      post :create, :place => @place.attributes
+    end
+
+    assert_redirected_to place_path(assigns(:place))
+  end
+
+  test "should show place" do
+    get :show, :id => @place.to_param
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, :id => @place.to_param
+    assert_response :success
+  end
+
+  test "should update place" do
+    put :update, :id => @place.to_param, :place => @place.attributes
+    assert_redirected_to place_path(assigns(:place))
+  end
+
+  test "should destroy place" do
+    assert_difference('Place.count', -1) do
+      delete :destroy, :id => @place.to_param
+    end
+
+    assert_redirected_to places_path
+  end
+end

data/spec/support/rails_app/test/unit/helpers/places_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PlacesHelperTest < ActionView::TestCase
+end

data/spec/support/rails_app/test/unit/place_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class PlaceTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Taylor Yelverton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -06:00
+date: 2011-04-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,8 +100,21 @@ dependencies:
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: ruby-debug19
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -113,7 +126,7 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: A Rails gem to power the jTable jQuery plugin
 email: tny5357@gmail.com
 executables: []
@@ -140,9 +153,11 @@ files:
 - lib/jtable-rails/railtie.rb
 - lib/jtable-rails/version.rb
 - lib/tasks/jtable_rails.rake
-- spec/controller_specs/people_controller_spec.rb
+- spec/controller_specs/basic_controller_spec.rb
 - spec/fabricators/person.rb
-- spec/model_specs/person_spec.rb
+- spec/fabricators/place.rb
+- spec/model_specs/basic_spec.rb
+- spec/model_specs/one_to_one_spec.rb
 - spec/spec_helper.rb
 - spec/support/rails_app/.DS_Store
 - spec/support/rails_app/.gitignore
@@ -151,15 +166,23 @@ files:
 - spec/support/rails_app/Rakefile
 - spec/support/rails_app/app/controllers/application_controller.rb
 - spec/support/rails_app/app/controllers/people_controller.rb
+- spec/support/rails_app/app/controllers/places_controller.rb
 - spec/support/rails_app/app/helpers/application_helper.rb
 - spec/support/rails_app/app/helpers/people_helper.rb
+- spec/support/rails_app/app/helpers/places_helper.rb
 - spec/support/rails_app/app/models/person.rb
+- spec/support/rails_app/app/models/place.rb
 - spec/support/rails_app/app/views/layouts/application.html.erb
 - spec/support/rails_app/app/views/people/_form.html.erb
 - spec/support/rails_app/app/views/people/edit.html.erb
 - spec/support/rails_app/app/views/people/index.html.erb
 - spec/support/rails_app/app/views/people/new.html.erb
 - spec/support/rails_app/app/views/people/show.html.erb
+- spec/support/rails_app/app/views/places/_form.html.erb
+- spec/support/rails_app/app/views/places/edit.html.erb
+- spec/support/rails_app/app/views/places/index.html.erb
+- spec/support/rails_app/app/views/places/new.html.erb
+- spec/support/rails_app/app/views/places/show.html.erb
 - spec/support/rails_app/config.ru
 - spec/support/rails_app/config/application.rb
 - spec/support/rails_app/config/boot.rb
@@ -176,6 +199,7 @@ files:
 - spec/support/rails_app/config/locales/en.yml
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/migrate/20110207142623_create_people.rb
+- spec/support/rails_app/db/migrate/20110302024653_create_places.rb
 - spec/support/rails_app/db/schema.rb
 - spec/support/rails_app/db/seeds.rb
 - spec/support/rails_app/public/images/jTable-icons.png
@@ -184,6 +208,10 @@ files:
 - spec/support/rails_app/public/stylesheets/jTable.css
 - spec/support/rails_app/public/stylesheets/scaffold.css
 - spec/support/rails_app/script/rails
+- spec/support/rails_app/test/fixtures/places.yml
+- spec/support/rails_app/test/functional/places_controller_test.rb
+- spec/support/rails_app/test/unit/helpers/places_helper_test.rb
+- spec/support/rails_app/test/unit/place_test.rb
 - spec/support/rails_app/tmp/.DS_Store
 - spec/support/rails_app/tmp/jtable.zip
 has_rdoc: true
@@ -200,7 +228,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2776022680366934975
+      hash: -183630829231020060
       segments: 
       - 0
       version: "0"
@@ -220,15 +248,20 @@ signing_key:
 specification_version: 3
 summary: A Rails gem to power the jTable jQuery plugin
 test_files: 
-- spec/controller_specs/people_controller_spec.rb
+- spec/controller_specs/basic_controller_spec.rb
 - spec/fabricators/person.rb
-- spec/model_specs/person_spec.rb
+- spec/fabricators/place.rb
+- spec/model_specs/basic_spec.rb
+- spec/model_specs/one_to_one_spec.rb
 - spec/spec_helper.rb
 - spec/support/rails_app/app/controllers/application_controller.rb
 - spec/support/rails_app/app/controllers/people_controller.rb
+- spec/support/rails_app/app/controllers/places_controller.rb
 - spec/support/rails_app/app/helpers/application_helper.rb
 - spec/support/rails_app/app/helpers/people_helper.rb
+- spec/support/rails_app/app/helpers/places_helper.rb
 - spec/support/rails_app/app/models/person.rb
+- spec/support/rails_app/app/models/place.rb
 - spec/support/rails_app/config/application.rb
 - spec/support/rails_app/config/boot.rb
 - spec/support/rails_app/config/environment.rb
@@ -242,5 +275,9 @@ test_files:
 - spec/support/rails_app/config/initializers/session_store.rb
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/migrate/20110207142623_create_people.rb
+- spec/support/rails_app/db/migrate/20110302024653_create_places.rb
 - spec/support/rails_app/db/schema.rb
 - spec/support/rails_app/db/seeds.rb
+- spec/support/rails_app/test/functional/places_controller_test.rb
+- spec/support/rails_app/test/unit/helpers/places_helper_test.rb
+- spec/support/rails_app/test/unit/place_test.rb

data/spec/model_specs/person_spec.rb

@@ -1,85 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe "Person" do
-  before(:each) do
-    10.times do |i|
-      Fabricate(:person)
-    end
-    
-    @params = {
-      :searchable_columns => ["first_name", "last_name", "age", "date_of_birth", "gender"],
-      :column_search => {},
-      :limit => "5",
-      :offset => "0",
-      :search => "",
-      :sort_column => "",
-      :sort_direction => ""
-    }
-  end
-  
-  it "should have the jtable scopes and methods" do
-    Person.respond_to?(:jtable).should be_true
-    Person.respond_to?(:jtable_search).should be_true
-    Person.respond_to?(:jtable_single_search).should be_true
-    Person.respond_to?(:jtable_order).should be_true
-    Person.respond_to?(:jtable_paginate).should be_true
-    Person.respond_to?(:jtable_default).should be_true
-    Person.respond_to?(:jtable_query).should be_true
-    [:first_name, :last_name, :age, :date_of_birth, :gender, :alive].each do |attribute|
-      Person.respond_to?("jtable_search_#{attribute}").should be_true
-      Person.respond_to?("jtable_order_#{attribute}").should be_true
-      Person.respond_to?("jtable_attributes").should be_true
-      Person.new.respond_to?("jtable_attribute_#{attribute}").should be_true
-      Person.new.respond_to?("jtable_item").should be_true
-    end
-  end
-  
-  it "should know jtables attributes" do
-    Person.jtable_attributes.should eql([:first_name, :last_name, :age, :date_of_birth, :gender, :alive])
-  end
-  
-  it "should load initial set" do
-    Person.jtable_query(@params).to_json.should eql(Person.all.to_json)
-  end
-  
-  it "should paginate" do
-    Person.jtable_query(@params).jtable_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(0).to_json)
-    @params[:offset] = 5
-    Person.jtable_query(@params).jtable_paginate(@params[:limit], @params[:offset]).to_json.should eql(Person.limit(5).offset(5).to_json)
-  end
-  
-  it "should search" do
-    person_1 = Person.first
-    person_2 = Person.last
-    person_1.first_name = "John"
-    person_1.last_name = "Smith"
-    person_1.save
-    person_2.first_name = "Johnathan"
-    person_2.last_name = "Smith"
-    person_2.save
-    @params[:search] = "john smith"
-    Person.jtable_query(@params).to_json.should eql(Person.where(['(first_name LIKE ? OR last_name LIKE ?) AND (first_name LIKE ? OR last_name LIKE ?)', "%john%", "%john%", "%smith%", "%smith%"]).to_json)
-  end
-  
-  it "should single column search" do
-    person_1 = Person.first
-    person_2 = Person.last
-    person_1.first_name = "John"
-    person_1.save
-    person_2.first_name = "Johnathan"
-    person_2.save
-    @params[:column_search][:first_name] = "john"
-    Person.jtable_query(@params).to_json.should eql(Person.where(['(first_name LIKE ?)', "%john%"]).to_json)
-  end
-  
-  it "should order" do
-    @params[:sort_column] = "age"
-    @params[:sort_direction] = "ASC"
-    Person.jtable_query(@params).to_json.should eql(Person.order('age ASC').to_json)
-  end
-  
-  it "should format an item for jtable" do
-    person = Fabricate(:person, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago, :gender => "Male", :alive => true)
-    person.jtable_item.should eql({:id => person.id, :first_name => "John", :last_name => "Smith", :age => 21, :date_of_birth => 21.years.ago.strftime("%m/%d/%Y %I:%M%P"), :gender => "Male", :alive => true})
-  end
-end