dm-extjs 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/dm-extjs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-extjs}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Gibbons"]
-  s.date = %q{2011-07-08}
+  s.date = %q{2011-08-24}
   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/model.rb

@@ -50,18 +50,15 @@ module DataMapper
       # provides property descriptions needed by ext
       def property_description (property) 
         ret = {:name => property.name}
+        ext_type = EXT_TYPE_TRANSLATIONS[property.primitive.to_s] || EXT_TYPE_TRANSLATIONS["String"]
         
-        if property.respond_to?(:custom?) && property.custom?
-          if property.respond_to? :flag_map
-            ret[:type] = EXT_TYPE_TRANSLATIONS["String"][:type]
-          else
-            ret[:type] = property.class.name.split('::').last.downcase
-          end
-        elsif type = EXT_TYPE_TRANSLATIONS[property.primitive.to_s][:type]
-          ret[:type] = type
+        if property.respond_to? :flag_map
+          ret[:type] = EXT_TYPE_TRANSLATIONS["String"][:type]
+        else
+          ret[:type] = ext_type[:type]
         end
-
-        if dateFormat = EXT_TYPE_TRANSLATIONS[property.primitive.to_s][:dateFormat]
+        
+        if dateFormat = ext_type[:dateFormat]
           ret[:dateFormat] = dateFormat
         end
         ret

metadata

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