fgraph 0.5.0 → 0.5.1

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.add_dependency("httparty", ">= 0.5.0")
     
     gem.add_development_dependency("shoulda", "~> 2.10.0")
-    gem.add_development_dependency("jnunemaker-matchy", "~> 0.4.0")
     gem.add_development_dependency("mocha", "~> 0.9.0")
     gem.add_development_dependency("fakeweb", "~> 1.2.0")
   end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 0
-:major: 0
+:patch: 1
 :build: 
+:major: 0
 :minor: 5

data/test/fgraph_test.rb

@@ -12,13 +12,13 @@ class FGraphTest < Test::Unit::TestCase
     should "return 'id' if input 'id' is not a Hash" do
       test_id = '123'
       id = FGraph.get_id(test_id)
-      id.should == test_id
+      assert_equal test_id, id
     end
     
     should "return 'id' value from hash object if input 'id' is a Hash" do
       test_id = { 'name' => 'Anthony', 'id' => '123' }
       id = FGraph.get_id(test_id)
-      id.should == test_id['id']
+      assert_equal test_id['id'], id
     end
   end
   
@@ -27,8 +27,8 @@ class FGraphTest < Test::Unit::TestCase
       stub_get('/cocacola', 'object_cocacola.json')
       object = FGraph.object('cocacola')
       
-      object.should_not be_nil
-      object['name'].should == 'Coca-Cola'
+      assert !object.nil?
+      assert_equal 'Coca-Cola', object['name']
     end
     
     should "call handle_response" do
@@ -117,8 +117,8 @@ class FGraphTest < Test::Unit::TestCase
         :redirect_uri => FACEBOOK_OAUTH_REDIRECT_URI, 
         :code => FACEBOOK_OAUTH_CODE)
       
-      token['access_token'].should == 'thisisanaccesstoken'
-      token['expires'].should == '4000'
+      assert_equal 'thisisanaccesstoken', token['access_token']
+      assert_equal '4000', token['expires']
     end
   end
   
@@ -203,33 +203,33 @@ class FGraphTest < Test::Unit::TestCase
     end
     
     should "raise no method error if missing method name does not start with object_ or me_" do
-      lambda do
+      assert_raise NoMethodError do 
         FGraph.xyz_photos
-      end.should raise_error(NoMethodError)
+      end
     end
   end
   
   context "FGraph.format_url" do
     should "return URL without query string" do
       formatted_url = FGraph.format_url('/test')
-      formatted_url.should == "https://graph.facebook.com/test"
+      assert_equal "https://graph.facebook.com/test", formatted_url
     end
     
     should "return URL with query string with escaped value" do
       formatted_url = FGraph.format_url('/test',  {:username => 'john lim'})
-      formatted_url.should == "https://graph.facebook.com/test?username=john+lim"
+      assert_equal "https://graph.facebook.com/test?username=john+lim", formatted_url
     end
 
     should "return URL with multiple options" do
       formatted_url = FGraph.format_url('/test', {:username => 'john', :age => 20})
-      formatted_url.should =~ /username=john/
-      formatted_url.should =~ /age=20/
-      formatted_url.should =~ /&/
+      assert formatted_url =~ /username=john/
+      assert formatted_url =~ /age=20/
+      assert formatted_url =~ /&/
     end
 
     should "return URL without empty options" do
       formatted_url = FGraph.format_url('/test', {:username => 'john', :age => nil})
-      formatted_url.should == "https://graph.facebook.com/test?username=john"
+      assert_equal "https://graph.facebook.com/test?username=john", formatted_url
     end
   end
   
@@ -237,7 +237,7 @@ class FGraphTest < Test::Unit::TestCase
     should "return response object if there's no error" do
       fb_response = {'name' => 'test'}
       response = FGraph.handle_response(fb_response)
-      response.should == fb_response
+      assert_equal fb_response, response
     end
     
     should "convert to FGraph::Collection object if response contain 'data' value" do
@@ -252,32 +252,32 @@ class FGraphTest < Test::Unit::TestCase
       }
       
       collection = FGraph.handle_response(fb_response)
-      collection.class.should == FGraph::Collection
-      collection.length.should == fb_response['data'].length
+      assert_equal FGraph::Collection, collection.class
+      assert_equal fb_response['data'].length, collection.length
     end
     
     should "raise QueryParseError" do
-      lambda do
+      assert_raise FGraph::QueryParseError do
         object = FGraph.handle_response(response_error('QueryParseException'))
-      end.should raise_error(FGraph::QueryParseError)
+      end
     end
     
     should "raise GraphMethodError" do
-      lambda do
+      assert_raise FGraph::GraphMethodError do
         object = FGraph.handle_response(response_error('GraphMethodException'))
-      end.should raise_error(FGraph::GraphMethodError)
+      end
     end
     
     should "raise OAuthError" do
-      lambda do
+      assert_raise FGraph::OAuthError do
         object = FGraph.handle_response(response_error('OAuthException'))
-      end.should raise_error(FGraph::OAuthError)
+      end
     end
     
     should "raise OAuthAccessTokenError" do
-      lambda do
+      assert_raise FGraph::OAuthAccessTokenError do 
         object = FGraph.handle_response(response_error('OAuthAccessTokenException'))
-      end.should raise_error(FGraph::OAuthAccessTokenError)
+      end
     end
   end
   
@@ -295,12 +295,12 @@ class FGraphTest < Test::Unit::TestCase
       }
       
       collection = FGraph::Collection.new(response)
-      collection.length.should == response['data'].length
-      collection.first.should == response['data'].first
-      collection.next_url.should == response['paging']['next']
-      collection.previous_url.should == response['paging']['previous']
-      collection.previous_options.should == {'offset' => '0', 'limit' => '2', 'access_token' => '101507589896698'}
-      collection.next_options.should == {'offset' => '4', 'limit' => '2', 'access_token' => '101507589896698'}
+      assert_equal response['data'].length, collection.length
+      assert_equal response['data'].first, collection.first
+      assert_equal response['paging']['next'], collection.next_url
+      assert_equal response['paging']['previous'], collection.previous_url
+      assert_equal({'offset' => '0', 'limit' => '2', 'access_token' => '101507589896698'}, collection.previous_options)
+      assert_equal({'offset' => '4', 'limit' => '2', 'access_token' => '101507589896698'}, collection.next_options)
     end
   end
   

data/test/test_helper.rb

@@ -1,6 +1,5 @@
 require 'test/unit'
 require 'shoulda'
-require 'matchy'
 require 'mocha'
 require 'fakeweb'
 require 'pp'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fgraph
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Herryanto Siatono
@@ -50,26 +50,10 @@ dependencies:
         version: 2.10.0
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +65,11 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,7 +81,7 @@ dependencies:
         - 0
         version: 1.2.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: Ruby Facebook Graph API
 email: herryanto@gmail.com
 executables: []