jtable-rails 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/jtable-rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jtable-rails}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor Yelverton"]

data/lib/jtable-rails/action_controller.rb

@@ -2,7 +2,8 @@ module JTable
   module ActionController
     def jtable_for_json(rel, jtable_params)
       jtable_params = HashWithIndifferentAccess.new(jtable_params)
-      {:total_items => rel.count, :items => rel.jtable_paginate(jtable_params[:limit], jtable_params[:offset])}
+      items = rel.jtable_paginate(jtable_params[:limit], jtable_params[:offset])
+      {:total_items => rel.count, :items => items.collect(&:jtable_item)}
     end
   end
 end

data/lib/jtable-rails/active_record.rb

@@ -7,7 +7,7 @@ module JTable
           self
         end
         fields.each do |field|
-          metaclass.instance_eval do 
+          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
@@ -17,11 +17,33 @@ module JTable
                 end
               end
             end
-        
+            
             define_method "jtable_order_#{field}" do |direction|
               "#{field} #{direction}"
             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)
+            end
+          end
+        end
+        
+        metaclass.instance_eval do
+          define_method "jtable_attributes" do
+            fields
+          end
+        end
+        
+        define_method "jtable_item" do
+          item_hash = {}
+          item_hash[:id] = self.id
+          fields.each do |field|
+            item_hash[field.to_sym] = self.send("jtable_attribute_#{field}")
+          end
+          item_hash
         end
         
         scope :jtable_search, lambda { |jtable_params|

data/spec/controller_specs/people_controller_spec.rb

@@ -25,6 +25,7 @@ describe "PeopleController" do
   
   it "should return the appropriate json" do
     people = Person.jtable_query(@params)
-    @people_controller.jtable_for_json(people, @params).to_json.should eql({:total_items => people.count, :items => people.jtable_paginate(@params[:limit], @params[:offset])}.to_json)
+    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)
   end
 end

data/spec/model_specs/person_spec.rb

@@ -28,9 +28,16 @@ describe "Person" do
     [: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
@@ -70,4 +77,9 @@ describe "Person" do
     @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

data/spec/support/rails_app/Gemfile.lock

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Taylor Yelverton
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3208820710179703731
+      hash: 626560608574340471
       segments: 
       - 0
       version: "0"