api_resource 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/api_resource.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "api_resource"
-  s.version = "0.2.4"
+  s.name = %q{api_resource}
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ethan Langevin"]
-  s.date = "2012-01-13"
-  s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
-  s.email = "ejl6266@gmail.com"
+  s.authors = [%q{Ethan Langevin}]
+  s.date = %q{2012-01-20}
+  s.description = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
+  s.email = %q{ejl6266@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -76,11 +76,11 @@ Gem::Specification.new do |s|
     "spec/support/requests/test_resource_requests.rb",
     "spec/support/test_resource.rb"
   ]
-  s.homepage = "http://github.com/ejlangev/resource"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
-  s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
+  s.homepage = %q{http://github.com/ejlangev/resource}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.8}
+  s.summary = %q{A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/api_resource/attributes.rb

@@ -10,13 +10,16 @@ module ApiResource
       
       alias_method_chain :save, :dirty_tracking
       
-      class_inheritable_accessor :attribute_names, :public_attribute_names, :protected_attribute_names
+      class_inheritable_accessor :attribute_names, :public_attribute_names, :protected_attribute_names, :attribute_types
+      
+      cattr_accessor :valid_typecasts; self.valid_typecasts = [:date, :time, :float, :integer, :int, :fixnum, :string]
       
       attr_reader :attributes
       
       self.attribute_names = []
       self.public_attribute_names = []
       self.protected_attribute_names = []
+      self.attribute_types = {}.with_indifferent_access
       
       define_method(:attributes) do
         return @attributes if @attributes
@@ -37,6 +40,11 @@ module ApiResource
         # but we need to override all the setters so we do dirty tracking
         define_attribute_methods args
         args.each do |arg|
+          if arg.is_a?(Array)
+            self.define_attribute_type(arg.first, arg.second)
+            arg = arg.first
+          end
+          
           self.attribute_names << arg.to_sym
           self.public_attribute_names << arg.to_sym
           
@@ -47,8 +55,9 @@ module ApiResource
             end
           
             def #{arg}=(val)
-              #{arg}_will_change! unless self.#{arg} == val
-              self.attributes[:#{arg}] = val
+              real_val = typecast_attribute(:#{arg}, val)
+              #{arg}_will_change! unless self.#{arg} == real_val
+              self.attributes[:#{arg}] = real_val
             end
             
             def #{arg}?
@@ -86,6 +95,12 @@ module ApiResource
         self.protected_attribute_names.uniq!
       end
       
+      def define_attribute_type(field, type)
+        raise "#{type} is not a valid type" unless self.valid_typecasts.include?(type.to_sym)
+        self.attribute_types[field] = type.to_sym
+      end
+      
+      
       def attribute?(name)
         self.attribute_names.include?(name.to_sym)
       end
@@ -155,6 +170,26 @@ module ApiResource
         end
         super
       end
+      
+      protected
+      def typecast_attribute(field, val)
+        return val unless self.class.attribute_types.include?(field)
+        case self.class.attribute_types[field.to_sym]
+          when :date
+            return val.class == Date ? val.dup : Date.parse(val)
+          when :time
+            return val.class == Time ? val.dup : Time.parse(val)
+          when :integer, :int, :fixnum
+            return val.class == Fixnum ? val.dup : val.to_i rescue val
+          when :float
+            return val.class == Float ? val.dup : val.to_f rescue val
+          when :string
+            return val.class == String ? val.dup : val.to_s rescue val
+          else
+            # catches the nil case and just leaves it alone
+            return val.dup rescue val
+        end
+      end
     end
     
   end

data/lib/api_resource/base.rb

@@ -454,7 +454,7 @@ module ApiResource
             elsif self.association?(key)
               raise ArgumentError, "Expected a hash value or nil, got: #{value.inspect}"
             else
-              value.dup rescue value
+              typecast_attribute(key, value)
             end
           when Hash
             if self.has_many?(key)
@@ -462,7 +462,7 @@ module ApiResource
             elsif self.association?(key)
               SingleObjectProxy.new(self.association_class_name(key), value)
             else
-              value.dup rescue value
+              typecast_attribute(key, value)
             end
           when NilClass
             # If it's nil and an association then create a blank object
@@ -473,7 +473,7 @@ module ApiResource
             end
           else
             raise ArgumentError, "expected an array or a hash for the association #{key}, got: #{value.inspect}" if self.association?(key)
-            value.dup rescue value
+            typecast_attribute(key, value)
         end
       end
       return self

data/spec/lib/base_spec.rb

@@ -19,6 +19,11 @@ describe "Base" do
         tst.attribute?(:age).should be_true
       end
       
+      it "should typecast data if a format is specified" do
+        tst = TestResource.new(:bday => Date.today.to_s)
+        tst.bday.should be_a Date
+      end
+      
       it "should determine it's associations when the class loads" do
         tst = TestResource.new
         tst.association?(:has_many_objects).should be_true

data/spec/support/requests/test_resource_requests.rb

@@ -1,7 +1,7 @@
 HashDealer.define(:new_test_object) do
   attributes({
     :protected => [:id],
-    :public => [:name, :age],
+    :public => [:name, :age, [:bday, :date]],
   })
   scopes({
     :active => {:active => true},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165858340 !ruby/object:Gem::Requirement
+  requirement: &2159188660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2165858340
+  version_requirements: *2159188660
 - !ruby/object:Gem::Dependency
   name: hash_dealer
-  requirement: &2165857680 !ruby/object:Gem::Requirement
+  requirement: &2159188140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165857680
+  version_requirements: *2159188140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2165857040 !ruby/object:Gem::Requirement
+  requirement: &2159187640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165857040
+  version_requirements: *2159187640
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &2165856420 !ruby/object:Gem::Requirement
+  requirement: &2159187100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165856420
+  version_requirements: *2159187100
 - !ruby/object:Gem::Dependency
   name: differ
-  requirement: &2165855800 !ruby/object:Gem::Requirement
+  requirement: &2159186620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165855800
+  version_requirements: *2159186620
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2165855320 !ruby/object:Gem::Requirement
+  requirement: &2159186140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165855320
+  version_requirements: *2159186140
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165854780 !ruby/object:Gem::Requirement
+  requirement: &2159185660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165854780
+  version_requirements: *2159185660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165854160 !ruby/object:Gem::Requirement
+  requirement: &2159185180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165854160
+  version_requirements: *2159185180
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2165853580 !ruby/object:Gem::Requirement
+  requirement: &2159177840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165853580
+  version_requirements: *2159177840
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &2165852940 !ruby/object:Gem::Requirement
+  requirement: &2159177160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165852940
+  version_requirements: *2159177160
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2165852300 !ruby/object:Gem::Requirement
+  requirement: &2159176520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165852300
+  version_requirements: *2159176520
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2165851660 !ruby/object:Gem::Requirement
+  requirement: &2159175880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165851660
+  version_requirements: *2159175880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2165851040 !ruby/object:Gem::Requirement
+  requirement: &2159175220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165851040
+  version_requirements: *2159175220
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &2165850400 !ruby/object:Gem::Requirement
+  requirement: &2159174520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165850400
+  version_requirements: *2159174520
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2165849760 !ruby/object:Gem::Requirement
+  requirement: &2159173900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165849760
+  version_requirements: *2159173900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2165849100 !ruby/object:Gem::Requirement
+  requirement: &2159173240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165849100
+  version_requirements: *2159173240
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2165848500 !ruby/object:Gem::Requirement
+  requirement: &2159172660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165848500
+  version_requirements: *2159172660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165847880 !ruby/object:Gem::Requirement
+  requirement: &2159172040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,10 +208,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165847880
+  version_requirements: *2159172040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165847240 !ruby/object:Gem::Requirement
+  requirement: &2159171560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2165847240
+  version_requirements: *2159171560
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165846580 !ruby/object:Gem::Requirement
+  requirement: &2159171080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -230,10 +230,10 @@ dependencies:
         version: 3.0.9
   type: :development
   prerelease: false
-  version_requirements: *2165846580
+  version_requirements: *2159171080
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165846040 !ruby/object:Gem::Requirement
+  requirement: &2159170600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165846040
+  version_requirements: *2159170600
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 email: ejl6266@gmail.com
@@ -324,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3650647940058164359
+      hash: 1395135479107090038
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: A replacement for ActiveResource for RESTful APIs that handles associated