dm-extjs 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/dm-extjs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-extjs}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Gibbons"]
-  s.date = %q{2011-06-28}
+  s.date = %q{2011-07-08}
   s.description = %q{A DataMapper plugin that will serialize and provide meta data descriptions for resources and collections. Compatible with ExtJS and Sencha Touch}
   s.email = %q{alex.gibbons [a] gmail [dot] com}
   s.extra_rdoc_files = [

data/lib/dm-extjs/collection.rb

@@ -3,13 +3,14 @@ module DataMapper
     module Collection
   
       def to_extjs (options={})
-        {
+        ret = {
           :metaData => model.ext_meta(options[:methods]),
           :success => options.has_key?(:success) ? options[:success] : true,
           :message => options.has_key?(:message) ? options[:message] : '',
           :total => count,
           :results => self.to_json(options.merge(:to_json => false))
-        }.to_json
+        }
+        options.fetch(:to_json, true) ? ret.to_json : ret
       end
     
     end

data/lib/dm-extjs/resource.rb

@@ -8,7 +8,8 @@ module DataMapper
           :success => options.has_key?(:success) ? options[:success] : (saved? && clean?),
           :message => (ext_errors << (options[:message] || '')).join("\n"),
           :results => self.to_json(options.merge(:to_json => false))
-        }.to_json
+        }
+        options.fetch(:to_json, true) ? ret.to_json : ret
       end
     
       def ext_errors

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dm-extjs
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alex Gibbons
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency