dm-extjs 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.3
1
+ 0.1.4
data/dm-extjs.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{dm-extjs}
8
- s.version = "0.1.3"
8
+ s.version = "0.1.4"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Alex Gibbons"]
12
- s.date = %q{2011-06-28}
12
+ s.date = %q{2011-07-08}
13
13
  s.description = %q{A DataMapper plugin that will serialize and provide meta data descriptions for resources and collections. Compatible with ExtJS and Sencha Touch}
14
14
  s.email = %q{alex.gibbons [a] gmail [dot] com}
15
15
  s.extra_rdoc_files = [
@@ -3,13 +3,14 @@ module DataMapper
3
3
  module Collection
4
4
 
5
5
  def to_extjs (options={})
6
- {
6
+ ret = {
7
7
  :metaData => model.ext_meta(options[:methods]),
8
8
  :success => options.has_key?(:success) ? options[:success] : true,
9
9
  :message => options.has_key?(:message) ? options[:message] : '',
10
10
  :total => count,
11
11
  :results => self.to_json(options.merge(:to_json => false))
12
- }.to_json
12
+ }
13
+ options.fetch(:to_json, true) ? ret.to_json : ret
13
14
  end
14
15
 
15
16
  end
@@ -8,7 +8,8 @@ module DataMapper
8
8
  :success => options.has_key?(:success) ? options[:success] : (saved? && clean?),
9
9
  :message => (ext_errors << (options[:message] || '')).join("\n"),
10
10
  :results => self.to_json(options.merge(:to_json => false))
11
- }.to_json
11
+ }
12
+ options.fetch(:to_json, true) ? ret.to_json : ret
12
13
  end
13
14
 
14
15
  def ext_errors
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-extjs
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
4
+ hash: 19
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 1
9
- - 3
10
- version: 0.1.3
9
+ - 4
10
+ version: 0.1.4
11
11
  platform: ruby
12
12
  authors:
13
13
  - Alex Gibbons
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-06-28 00:00:00 -07:00
18
+ date: 2011-07-08 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency