storage_room 0.3.18 → 0.3.19

data/History.txt

@@ -1,3 +1,6 @@
+== Version 0.3.19
+* Add eql?, == and hash methods to Resources to compare them
+
 == Version 0.3.18
 * Rescue NameErrors when finding classes
 

data/VERSION

@@ -1 +1 @@
-0.3.18
+0.3.19

data/examples/manual_entry_definition.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby -rubygems
+
+require File.join(File.dirname(__FILE__), 'authentication')
+
+# define the class that's used for Collection with entry_type "Restaurant"
+class Restaurant < StorageRoom::Entry
+  key :name
+  key :body
+  key :rating
+  
+  one :location # A LocationField, any embedded Resource or a To-One Association
+  
+  many :tags # ArrayField, or a To-Many Association
+end

data/lib/storage_room/accessors.rb

@@ -91,10 +91,7 @@ module StorageRoom
 
         hash
       end
-    end# ==========
-    # = Banner =
-    # ==========
-    
+    end
 
     # Optionally pass attributes to set up the object
     def initialize(hash={})     
@@ -177,6 +174,17 @@ module StorageRoom
       false
     end
     
+    # Compare Resources by comparing their attributes
+    def eql?(object)
+      self.class.equal?(object.class) && attributes == object.attributes
+    end
+    
+    alias == eql?  
+    
+    def hash
+      self.class.hash ^ self.attributes.hash
+    end
+    
     protected
       # Helper to not call to_hash with the wrong number of arguments
       def call_method_with_optional_parameters(object, method_name, parameters)

data/spec/fixtures/webhook_call.json

@@ -10,7 +10,16 @@
       "@updated_at": "2011-07-14T18:25:42Z", 
       "@url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000062\/entries\/4e1f3259425071435e00004a", 
       "@version": 2, 
-      "text": "WEBHOOK TEST"
+      "text": "WEBHOOK TEST",
+      "location": {
+        "@type": "Location",
+        "lat": 1.2,
+        "lng": 2.3
+      },
+      "shop": {
+        "@type": "Shop",
+        "url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000063\/entries\/4e1f3259425071435e000099"
+      }
     }, 
     "@event": "update", 
     "@last_attempt_at": null, 

data/spec/fixtures/webhook_call_association.json

@@ -0,0 +1,13 @@
+{
+  "entry": {
+    "@created_at": "2011-07-14T18:25:42Z", 
+    "@collection_url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000063", 
+    "@created_at": "2011-07-14T18:15:53Z", 
+    "@type": "Shop", 
+    "@trash": false,
+    "@updated_at": "2011-07-14T18:25:42Z", 
+    "@url": "http:\/\/api.storageroomapp.com\/accounts\/4e1e9c234250712eba000052\/collections\/4e1e9c234250712eba000063\/entries\/4e1f3259425071435e000099", 
+    "@version": 2, 
+    "name": "SHOP"
+  }
+}

data/spec/storage_room/accessors_spec.rb

@@ -164,6 +164,54 @@ describe StorageRoom::TestAccessors do
       end
     end
     
+    describe "#eql?" do
+      it "should return true for same class and same attributes but different object ids" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        
+        one.eql?(two).should be_true
+      end
+      
+      it "should return false for same class and different attributes" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => 1, :test5 => {:key => 'value'})
+        
+        one.eql?(two).should be_false
+      end
+      
+      it "should return false for different classes" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors2.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        
+        one.eql?(two).should be_false
+        one.eql?('asdf').should be_false
+      end
+    end
+    
+    describe "#hash" do
+      it "should return same hash for same class and same attributes" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        
+        one.hash.should == two.hash
+      end
+      
+      it "should return different hash for same class and different attributes" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => 1, :test5 => {:key => 'value'})
+        
+        one.hash.should_not == two.hash
+      end
+      
+      it "should return different hash for different classes" do
+        one = StorageRoom::TestAccessors3.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        two = StorageRoom::TestAccessors2.new(:test => 1, :test2 => '2', :test3 => ['tag1', 'tag2'], :test4 => nil, :test5 => {:key => 'value'})
+        
+        one.hash.should_not == two.hash
+        one.hash.should_not == 'asdf'.hash
+      end
+    end
+    
     describe "#reset!" do
       it "should reset" do  
         @test.response_data = {'test' => 1}      

data/spec/storage_room/webhook_call_spec.rb

@@ -2,6 +2,13 @@ require 'spec_helper'
 
 class Announcement < StorageRoom::Entry
   key :text
+  
+  one :location
+  one :shop
+end
+
+class Shop < StorageRoom::Entry
+  key :name
 end
 
 describe StorageRoom::WebhookCall do
@@ -19,6 +26,20 @@ describe StorageRoom::WebhookCall do
       webhook_call[:@event].should == 'update'
       webhook_call.entry.should be_an_instance_of(Announcement)
       webhook_call.entry.text.should == 'WEBHOOK TEST'
+      
+      webhook_call.entry.location.should be_an_instance_of(StorageRoom::Location)
+      webhook_call.entry.location.lat.should == 1.2
+      webhook_call.entry.location.lng.should == 2.3
+
+      stub_request(:get, "http://APPLICATION_API_KEY:X@api.storageroomapp.com/accounts/4e1e9c234250712eba000052/collections/4e1e9c234250712eba000063/entries/4e1f3259425071435e000099").
+        to_return(:status => 200, :body => fixture_file('webhook_call_association.json'))
+      
+      shop = webhook_call.entry.shop
+      shop.loaded?.should be_false
+      shop.should be_an_instance_of(Shop)
+      shop.loaded?.should be_true      
+      shop['@url'].should == 'http://api.storageroomapp.com/accounts/4e1e9c234250712eba000052/collections/4e1e9c234250712eba000063/entries/4e1f3259425071435e000099'
+      shop.name.should == 'SHOP'
     end
   end
 end

data/storage_room.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "storage_room"
-  s.version = "0.3.18"
+  s.version = "0.3.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sascha Konietzke"]
-  s.date = "2012-02-02"
+  s.date = "2012-02-08"
   s.description = "StorageRoom is a CMS system for Mobile Applications (iPhone, Android, BlackBerry, ...). This library gives you an ActiveModel-like interface to your data."
   s.email = "sascha@thriventures.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "examples/get_collections.rb",
     "examples/guidebooks.csv",
     "examples/import_csv.rb",
+    "examples/manual_entry_definition.rb",
     "examples/pagination.rb",
     "examples/search_entries.rb",
     "examples/update_entry.rb",
@@ -84,6 +85,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/image.png",
     "spec/fixtures/validation_error.json",
     "spec/fixtures/webhook_call.json",
+    "spec/fixtures/webhook_call_association.json",
     "spec/spec_helper.rb",
     "spec/storage_room/accessors_spec.rb",
     "spec/storage_room/array_spec.rb",
@@ -138,6 +140,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0.6.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
@@ -148,6 +152,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0.6.1"])
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<activemodel>, [">= 3.0.0"])
@@ -159,6 +165,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0.6.1"])
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<activemodel>, [">= 3.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: storage_room
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000 Z
+date: 2012-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: storage_room
-  requirement: &70251337126420 !ruby/object:Gem::Requirement
+  requirement: &70319313153340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251337126420
+  version_requirements: *70319313153340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251337124560 !ruby/object:Gem::Requirement
+  requirement: &70319313152860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70251337124560
+  version_requirements: *70319313152860
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70251337139920 !ruby/object:Gem::Requirement
+  requirement: &70319313152380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251337139920
+  version_requirements: *70319313152380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251337139260 !ruby/object:Gem::Requirement
+  requirement: &70319313151900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70251337139260
+  version_requirements: *70319313151900
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70251337138720 !ruby/object:Gem::Requirement
+  requirement: &70319313151420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251337138720
+  version_requirements: *70319313151420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70319313150940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+  type: :development
+  prerelease: false
+  version_requirements: *70319313150940
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70319313150460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70319313150460
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70251337138080 !ruby/object:Gem::Requirement
+  requirement: &70319313149980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70251337138080
+  version_requirements: *70319313149980
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70251337137560 !ruby/object:Gem::Requirement
+  requirement: &70319313165860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251337137560
+  version_requirements: *70319313165860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70251337137060 !ruby/object:Gem::Requirement
+  requirement: &70319313165380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70251337137060
+  version_requirements: *70319313165380
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70251337136580 !ruby/object:Gem::Requirement
+  requirement: &70319313164900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251337136580
+  version_requirements: *70319313164900
 description: StorageRoom is a CMS system for Mobile Applications (iPhone, Android,
   BlackBerry, ...). This library gives you an ActiveModel-like interface to your data.
 email: sascha@thriventures.com
@@ -136,6 +158,7 @@ files:
 - examples/get_collections.rb
 - examples/guidebooks.csv
 - examples/import_csv.rb
+- examples/manual_entry_definition.rb
 - examples/pagination.rb
 - examples/search_entries.rb
 - examples/update_entry.rb
@@ -186,6 +209,7 @@ files:
 - spec/fixtures/image.png
 - spec/fixtures/validation_error.json
 - spec/fixtures/webhook_call.json
+- spec/fixtures/webhook_call_association.json
 - spec/spec_helper.rb
 - spec/storage_room/accessors_spec.rb
 - spec/storage_room/array_spec.rb