api_resource 0.3.3 → 0.3.4

data/.rspec

@@ -1,3 +1,4 @@
 --color
 --format nested
 --backtrace
+--fail-fast

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/api_resource.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "api_resource"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ethan Langevin"]

data/lib/api_resource/attributes.rb

@@ -12,7 +12,7 @@ module ApiResource
       
       class_attribute :attribute_names, :public_attribute_names, :protected_attribute_names, :attribute_types
       
-      cattr_accessor :valid_typecasts; self.valid_typecasts = [:date, :time, :float, :integer, :int, :fixnum, :string]
+      cattr_accessor :valid_typecasts; self.valid_typecasts = [:date, :time, :float, :integer, :int, :fixnum, :string, :array]
 
       attr_reader :attributes
       
@@ -47,7 +47,7 @@ module ApiResource
           # Override the setter for dirty tracking
           self.class_eval <<-EOE, __FILE__, __LINE__ + 1
             def #{arg}
-              attributes[:#{arg}]
+              attribute_with_default(:#{arg})
             end
           
             def #{arg}=(val)
@@ -80,7 +80,7 @@ module ApiResource
           self.class_eval <<-EOE, __FILE__, __LINE__ + 1
 
             def #{arg}
-              self.attributes[:#{arg}]
+              self.attribute_with_default(:#{arg})
             end
           
             def #{arg}=(val)
@@ -171,6 +171,20 @@ module ApiResource
     end
     
     protected
+    
+    def attribute_with_default(field)
+      self.attributes[field].nil? ? self.default_value_for_field(field) : self.attributes[field]
+    end
+
+    def default_value_for_field(field)
+      case self.class.attribute_types[field.to_sym]
+        when :array
+          return []
+        else
+          return nil
+      end
+    end
+
     def typecast_attribute(field, val)
       return val unless self.class.attribute_types.include?(field)
       case self.class.attribute_types[field.to_sym]
@@ -184,6 +198,8 @@ module ApiResource
           return val.class == Float ? val.dup : val.to_f rescue val
         when :string
           return val.class == String ? val.dup : val.to_s rescue val
+        when :array
+          return val.class == Array ? val.dup : Array.wrap(val)
         else
           # catches the nil case and just leaves it alone
           return val.dup rescue val

data/spec/lib/attributes_spec.rb

@@ -15,6 +15,68 @@ describe "Attributes" do
       TestResource.attribute?(:attr2).should be_true
     end
     
+
+    describe "Determining Attributes, Scopes, and Associations from the server" do
+
+      it "should determine it's attributes when the class loads" do
+        tst = TestResource.new
+        tst.attribute?(:name).should be_true
+        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 typecast data if a format is specified" do
+        tst = TestResource.new(:roles => [:role1, :role2])
+        tst.roles.should be_a Array
+      end
+
+      it "should default array fields to a blank array" do
+        tst = TestResource.new
+        tst.roles.should be_a Array
+      end
+
+      it "should determine it's associations when the class loads" do
+        tst = TestResource.new
+        tst.association?(:has_many_objects).should be_true
+        tst.association?(:belongs_to_object).should be_true
+      end
+      
+      it "should be able to determine scopes when the class loads" do
+        tst = TestResource.new
+        tst.scope?(:paginate).should be_true
+        tst.scope?(:active).should be_true
+      end
+
+    end
+
+    context "Attributes" do
+      before(:all) do
+        TestResource.define_attributes :attr1, :attr2
+        TestResource.define_protected_attributes :attr3
+      end
+    
+      it "should set attributes for the data loaded from a hash" do
+        tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2"})
+        tst.attr1?.should be_true
+        tst.attr1.should eql("attr1")
+        tst.attr1 = "test"
+        tst.attr1.should eql("test")
+      end
+    
+      it "should create protected attributes for unknown attributes trying to be loaded" do
+        tst = TestResource.new({:attr1 => "attr1", :attr3 => "attr3"})
+        tst.attr3?.should be_true
+        tst.attr3.should eql("attr3")
+        lambda {
+          tst.attr3 = "test"
+        }.should raise_error
+      end
+    end
+
     it "should define methods for testing for reading and writing known attributes" do
       TestResource.define_attributes :attr1, :attr2
       tst = TestResource.new

data/spec/lib/base_spec.rb

@@ -11,56 +11,6 @@ describe "Base" do
   
   describe "Loading data from a hash" do
     
-    describe "Determining Attributes, Scopes, and Associations from the server" do
-
-      it "should determine it's attributes when the class loads" do
-        tst = TestResource.new
-        tst.attribute?(:name).should be_true
-        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
-        tst.association?(:belongs_to_object).should be_true
-      end
-      
-      it "should be able to determine scopes when the class loads" do
-        tst = TestResource.new
-        tst.scope?(:paginate).should be_true
-        tst.scope?(:active).should be_true
-      end
-
-    end
-    context "Attributes" do
-      before(:all) do
-        TestResource.define_attributes :attr1, :attr2
-        TestResource.define_protected_attributes :attr3
-      end
-    
-      it "should set attributes for the data loaded from a hash" do
-        tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2"})
-        tst.attr1?.should be_true
-        tst.attr1.should eql("attr1")
-        tst.attr1 = "test"
-        tst.attr1.should eql("test")
-      end
-    
-      it "should create protected attributes for unknown attributes trying to be loaded" do
-        tst = TestResource.new({:attr1 => "attr1", :attr3 => "attr3"})
-        tst.attr3?.should be_true
-        tst.attr3.should eql("attr3")
-        lambda {
-          tst.attr3 = "test"
-        }.should raise_error
-      end
-    end
-    
     context "Associations" do
       before(:all) do
         TestResource.has_many :has_many_objects
@@ -390,7 +340,7 @@ describe "Base" do
         it "should include nil attributes when creating if include_nil_attributes_on_create is true" do
           ApiResource::Connection.any_instance.expects(:post).with(
             "/test_resources.json", 
-            "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null}}", 
+            "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null,\"roles\":[]}}", 
             TestResource.headers
           )
 
@@ -514,7 +464,7 @@ describe "Base" do
       it "should include all attributes if include_all_attributes_on_update is true" do  
         ApiResource::Connection.any_instance.expects(:put).with(
           "/test_resources/1.json", 
-          "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null}}", 
+          "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null,\"roles\":[]}}", 
           TestResource.headers
         )
 

data/spec/support/mocks/test_resource_mocks.rb

@@ -8,6 +8,7 @@ Mocks.define do
   
   endpoint("/test_resources") do
     post(HashDealer.roll(:test_resource).merge(:id => 1), :params => {:test_resource => HashDealer.roll(:test_resource).matcher})
+    post(HashDealer.roll(:test_resource).merge(:id => 1), :params => {:test_resource => HashDealer.roll(:test_resource_with_roles).matcher})
     get((0..4).to_a.collect{HashDealer.roll(:test_resource)})
     get((0..4).to_a.collect{HashDealer.roll(:test_resource)}, :params => {:active => true})
   end

data/spec/support/requests/test_resource_requests.rb

@@ -1,7 +1,7 @@
 HashDealer.define(:new_test_object) do
   attributes({
     :protected => [:id],
-    :public => [:name, :age, [:bday, :date]],
+    :public => [:name, :age, [:bday, :date], [:roles, :array]]
   })
   scopes({
     :active => {:active => true},
@@ -19,6 +19,12 @@ HashDealer.define(:test_resource) do
   age("age")
 end
 
+HashDealer.define(:test_resource_with_roles) do
+  name("name")
+  age("age")
+  roles([])
+end
+
 HashDealer.define(:test_resource_errors) do
   errors({
     :name => ["can't be blank"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70243820953360 !ruby/object:Gem::Requirement
+  requirement: &70173231121040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820953360
+  version_requirements: *70173231121040
 - !ruby/object:Gem::Dependency
   name: hash_dealer
-  requirement: &70243820952500 !ruby/object:Gem::Requirement
+  requirement: &70173231120060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820952500
+  version_requirements: *70173231120060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70243820951640 !ruby/object:Gem::Requirement
+  requirement: &70173231118740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820951640
+  version_requirements: *70173231118740
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &70243820950760 !ruby/object:Gem::Requirement
+  requirement: &70173231117920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820950760
+  version_requirements: *70173231117920
 - !ruby/object:Gem::Dependency
   name: differ
-  requirement: &70243820949980 !ruby/object:Gem::Requirement
+  requirement: &70173231116760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820949980
+  version_requirements: *70173231116760
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &70243820949180 !ruby/object:Gem::Requirement
+  requirement: &70173231115920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820949180
+  version_requirements: *70173231115920
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70243820948300 !ruby/object:Gem::Requirement
+  requirement: &70173231114900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70243820948300
+  version_requirements: *70173231114900
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70243820947520 !ruby/object:Gem::Requirement
+  requirement: &70173231113720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820947520
+  version_requirements: *70173231113720
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &70243820946820 !ruby/object:Gem::Requirement
+  requirement: &70173231112620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820946820
+  version_requirements: *70173231112620
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70243820946200 !ruby/object:Gem::Requirement
+  requirement: &70173231111600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820946200
+  version_requirements: *70173231111600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70243820945540 !ruby/object:Gem::Requirement
+  requirement: &70173231110520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820945540
+  version_requirements: *70173231110520
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70243820944720 !ruby/object:Gem::Requirement
+  requirement: &70173231109640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820944720
+  version_requirements: *70173231109640
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70243820943760 !ruby/object:Gem::Requirement
+  requirement: &70173231108700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820943760
+  version_requirements: *70173231108700
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70243820943100 !ruby/object:Gem::Requirement
+  requirement: &70173231107700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820943100
+  version_requirements: *70173231107700
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70243820942420 !ruby/object:Gem::Requirement
+  requirement: &70173231106960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820942420
+  version_requirements: *70173231106960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70243820941720 !ruby/object:Gem::Requirement
+  requirement: &70173231105660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820941720
+  version_requirements: *70173231105660
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70243820941160 !ruby/object:Gem::Requirement
+  requirement: &70173231104920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820941160
+  version_requirements: *70173231104920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70243820940600 !ruby/object:Gem::Requirement
+  requirement: &70173231104280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820940600
+  version_requirements: *70173231104280
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70243820939980 !ruby/object:Gem::Requirement
+  requirement: &70173231103600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820939980
+  version_requirements: *70173231103600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70243820939320 !ruby/object:Gem::Requirement
+  requirement: &70173231102860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820939320
+  version_requirements: *70173231102860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70243820938580 !ruby/object:Gem::Requirement
+  requirement: &70173231100620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820938580
+  version_requirements: *70173231100620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70243820937700 !ruby/object:Gem::Requirement
+  requirement: &70173231099920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70243820937700
+  version_requirements: *70173231099920
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70243820936520 !ruby/object:Gem::Requirement
+  requirement: &70173231099300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70243820936520
+  version_requirements: *70173231099300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70243820935580 !ruby/object:Gem::Requirement
+  requirement: &70173231098500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -274,7 +274,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243820935580
+  version_requirements: *70173231098500
 description: A replacement for ActiveResource for RESTful APIs that handles associated
   object and multiple data sources
 email: ejl6266@gmail.com
@@ -361,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 711129040468791614
+      hash: -1534545171276670473
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: