extjsizable 1.0.0.alpha → 1.0.0.alpha1

data/README.rdoc

@@ -57,6 +57,8 @@ When to_extjs is called from ActiveRecord (or hashes) collections, Ext JS expect
 It is generated executing
  Post.all.to_extjs
 
+Parameters accepted are the same as <b>as_json</b> from Array, nesting into each record.
+
 == TODO
  
 * Tests, tests, tests....

data/Rakefile

@@ -18,7 +18,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/ungue/extjsizable"
   gem.license = "MIT"
   gem.summary = %Q{Allow your models and collections to generate the JSON structure accepted by Ext JS 4}
-  gem.description = %Q{You can create REST services to be used for Ext JS 4 in a easy manner by calling to_extjs in your models or arrays.}
+  gem.description = %Q{You can create REST services to be used for Ext JS 4 in an easy manner by calling to_extjs in your models or arrays.}
   gem.email = "ungue79@yahoo.es"
   gem.authors = ["Ungue"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha
+1.0.0.alpha1

data/extjsizable.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{extjsizable}
-  s.version = "1.0.0.alpha"
+  s.version = "1.0.0.alpha1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ungue"]
-  s.date = %q{2011-08-03}
-  s.description = %q{You can create REST services to be used for Ext JS 4 in a easy manner by calling to_extjs in your models or arrays.}
+  s.date = %q{2011-08-04}
+  s.description = %q{You can create REST services to be used for Ext JS 4 in an easy manner by calling to_extjs in your models or arrays.}
   s.email = %q{ungue79@yahoo.es}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/lib/extjsizable/core_ext/array/extjs.rb

@@ -16,61 +16,9 @@ module Extjsizable
           # }
           
           def to_extjs(options = {})
-            options.reverse_merge!(
-              :methods  => [],
-              :total    => self.length,
-              :only     => [],
-              :except   => [],
-              :include  => {}
-            ) 
-
-            result = self.map do |r|
-              case r
-              when Hash
-                record_from_hash(r, options)
-              when ::ActiveRecord::Base
-                record_from_model(r, options)
-              else
-                r 
-              end
-            end
-
-            { :total => options[:total], :data => result }
+            { :total => (options.delete(:total) || self.length), :data => as_json(options) }.with_indifferent_access
           end
 
-          private
-    
-
-          def record_from_model(reg, options)
-            options.reverse_merge!(
-              :methods  => [],
-              :only     => [],
-              :except   => [],
-              :include  => {}
-            )
-            
-            data  = []
-
-            attrs = options[:only].empty? ? reg.attributes.symbolize_keys.keys - options[:except] : options[:only]
-            attrs.each do |attr|
-              data << ["#{attr}", reg.send(attr)] if reg.respond_to? attr
-            end
-    
-            options[:methods].each do |method|
-              data << ["#{method}", reg.send(method)] if reg.respond_to? method
-            end
-
-            options[:include].each do |(k, v)|
-              data.concat record_from_model(reg.send(k), v).map { |l| ["#{k}_#{l.first}", l.last] } if reg.respond_to?(k) && reg.send(k)
-            end
-
-            Hash[*data.flatten(1)]
-          end
-
-          def record_from_hash(reg, options)
-            attrs = options[:only] || reg.keys - options[:except]
-            reg.delete_if { |k,v| attrs.member? k}
-          end
         end
       end
     end

data/spec/extjsizable_spec.rb

@@ -61,6 +61,7 @@ describe "Extjsizable" do
 
     describe "not valid" do
       before do
+        Category.delete_all
         @category = Category.new
         @category.save
       end
@@ -85,6 +86,8 @@ describe "Extjsizable" do
   end
 
   describe Array do
+    before(:all) { ActiveRecord::Base.include_root_in_json = false }
+
     describe 'empty' do
       before do
         @array = []
@@ -99,9 +102,18 @@ describe "Extjsizable" do
       end
     end
     
-    describe 'with 4 categories' do
+    describe 'with 4 categories with some products each' do
       before do
-        @array = Array.new(4) { |i| Category.create :name => "Category #{i}" }
+        Product.delete_all
+        Category.delete_all
+
+        4.times do |i|
+          c = Category.new :name => "Category #{i}"
+          c.products = Array.new(2) { |j| Product.new :name => "Product #{j}" }
+          c.save
+        end
+
+        @array = Category.all
       end
 
       it 'should return { :total => 4, :data => [{ "id" => ..., "name" => "Category ..."}, ...] }' do
@@ -116,6 +128,48 @@ describe "Extjsizable" do
           h.should have_key('name')
         end
       end
+
+      it 'should return only id attributes when called with :only => :id ' do
+        json_hash = @array.to_extjs :only => :id
+        json_hash.should have_key(:total)
+        json_hash[:total].should == 4
+
+        json_hash.should have_key(:data)
+        json_hash[:data].should have(4).categories
+        json_hash[:data].each do |h| 
+          h.should have_key('id')
+          h.should_not have_key('name')
+        end
+      end
+      
+      it 'should return only name attributes when called with :except => :id ' do
+        json_hash = @array.to_extjs :except => :id
+        json_hash.should have_key(:total)
+        json_hash[:total].should == 4
+
+        json_hash.should have_key(:data)
+        json_hash[:data].should have(4).categories
+        json_hash[:data].each do |h| 
+          h.should have_key('name')
+          h.should_not have_key('id')
+        end
+      end
+      
+      it 'should return only related data attributes with :include => :products ' do
+        json_hash = @array.to_extjs :include => :products
+        json_hash.should have_key(:total)
+        json_hash[:total].should == 4
+
+        json_hash.should have_key(:data)
+        json_hash[:data].should have(4).categories
+        json_hash[:data].each do |h| 
+          h.should have_key('name')
+          h.should have_key('id')
+          h.should have_key('products')
+          h[:products].should have(2).items
+        end
+      end
+
     end
   end
 

data/spec/spec_helper.rb

@@ -44,5 +44,4 @@ class Product < ActiveRecord::Base
 end
 
 RSpec.configure do |config|
-  
 end

metadata

@@ -2,7 +2,7 @@
 name: extjsizable
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha1
 platform: ruby
 authors: 
 - Ungue
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 +02:00
+date: 2011-08-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id006
-description: You can create REST services to be used for Ext JS 4 in a easy manner by calling to_extjs in your models or arrays.
+description: You can create REST services to be used for Ext JS 4 in an easy manner by calling to_extjs in your models or arrays.
 email: ungue79@yahoo.es
 executables: []
 
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -676178687
+      hash: -759270289
       segments: 
       - 0
       version: "0"