vkontakte_api 1.1 → 1.2

data/spec/vkontakte_api/api_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe VkontakteApi::API do
   def create_connection
-    @result = {'response' => {'key' => 'value'}}
+    @result = { 'response' => { 'key' => 'value' } }
     
     @connection = Faraday.new do |builder|
       builder.response :mashify
-      builder.response :oj, :preserve_raw => true
+      builder.response :oj, preserve_raw: true
       builder.adapter  :test do |stub|
         stub.post('/apiMethod') do
           [200, {}, Oj.dump(@result)]
@@ -23,8 +23,8 @@ describe VkontakteApi::API do
     
     context "called with a token parameter" do
       it "sends it to .connection" do
-        subject.should_receive(:connection).with(:url => VkontakteApi::API::URL_PREFIX, :token => 'token')
-        subject.call('apiMethod', {:some => :params}, 'token')
+        subject.should_receive(:connection).with(url: VkontakteApi::API::URL_PREFIX, token: 'token')
+        subject.call('apiMethod', { some: :params }, 'token')
       end
     end
     
@@ -33,10 +33,10 @@ describe VkontakteApi::API do
     end
     
     it "uses an HTTP verb from VkontakteApi.http_verb" do
-      http_verb = stub("HTTP verb")
+      http_verb = double("HTTP verb")
       VkontakteApi.http_verb = http_verb
       
-      response = stub("Response", :body => stub)
+      response = double("Response", body: double)
       @connection.should_receive(:send).with(http_verb, 'apiMethod', {}).and_return(response)
       subject.call('apiMethod')
     end
@@ -48,11 +48,11 @@ describe VkontakteApi::API do
   
   describe ".connection" do
     it "uses the :url parameter and VkontakteApi.faraday_options" do
-      faraday_options = stub("Faraday options")
+      faraday_options = double("Faraday options")
       VkontakteApi.stub(:faraday_options).and_return(faraday_options)
-      url = stub("URL")
+      url = double("URL")
       Faraday.should_receive(:new).with(url, faraday_options)
-      connection = subject.connection(:url => url)
+      connection = subject.connection(url: url)
     end
     
     context "without a token" do
@@ -64,11 +64,11 @@ describe VkontakteApi::API do
     
     context "with a token" do
       before(:each) do
-        @token = stub("Token")
+        @token = double("Token")
       end
       
       it "creates a connection with an oauth2 middleware" do
-        connection = subject.connection(:token => @token)
+        connection = subject.connection(token: @token)
         handler = connection.builder.handlers.first
         handler.name.should == 'FaradayMiddleware::OAuth2'
         handler.instance_variable_get(:@args).should == [@token]

data/spec/vkontakte_api/authorization_spec.rb

@@ -2,21 +2,21 @@ require 'spec_helper'
 
 describe VkontakteApi::Authorization do
   before(:each) do
-    @app_id = stub("App id")
+    @app_id = double("App id")
     VkontakteApi.stub(:app_id).and_return(@app_id)
-    @app_secret = stub("App secret")
+    @app_secret = double("App secret")
     VkontakteApi.stub(:app_secret).and_return(@app_secret)
-    @redirect_uri = stub("Redirect uri")
+    @redirect_uri = double("Redirect uri")
     VkontakteApi.stub(:redirect_uri).and_return(@redirect_uri)
     
-    @url   = stub("Authorization url")
-    @token = stub("Token")
+    @url   = double("Authorization url")
+    @token = double("Token")
     
-    @auth_code          = stub("Authorization code strategy", :get_token => @token, :authorize_url => @url)
-    @implicit           = stub("Implicit strategy",           :authorize_url => @url)
-    @client_credentials = stub("Client credentials strategy", :get_token => @token)
+    @auth_code          = double("Authorization code strategy", get_token: @token, authorize_url: @url)
+    @implicit           = double("Implicit strategy",           authorize_url: @url)
+    @client_credentials = double("Client credentials strategy", get_token: @token)
     
-    @client = stub("OAuth2::Client instance", :auth_code => @auth_code, :implicit => @implicit, :client_credentials => @client_credentials)
+    @client = double("OAuth2::Client instance", auth_code: @auth_code, implicit: @implicit, client_credentials: @client_credentials)
     OAuth2::Client.stub(:new).and_return(@client)
     
     @auth = Object.new
@@ -30,34 +30,34 @@ describe VkontakteApi::Authorization do
     
     context "with a site type" do
       it "returns a valid authorization url" do
-        @auth_code.should_receive(:authorize_url).with(:redirect_uri => @redirect_uri)
-        @auth.authorization_url(:type => :site).should == @url
+        @auth_code.should_receive(:authorize_url).with(redirect_uri: @redirect_uri)
+        @auth.authorization_url(type: :site).should == @url
       end
     end
     
     context "with a client type" do
       it "returns a valid authorization url" do
-        @implicit.should_receive(:authorize_url).with(:redirect_uri => @redirect_uri)
-        @auth.authorization_url(:type => :client).should == @url
+        @implicit.should_receive(:authorize_url).with(redirect_uri: @redirect_uri)
+        @auth.authorization_url(type: :client).should == @url
       end
     end
     
     context "given a redirect_uri" do
       it "prefers the given uri over VkontakteApi.redirect_uri" do
         redirect_uri = 'http://example.com/oauth/callback'
-        @auth_code.should_receive(:authorize_url).with(:redirect_uri => redirect_uri)
-        @auth.authorization_url(:redirect_uri => redirect_uri)
+        @auth_code.should_receive(:authorize_url).with(redirect_uri: redirect_uri)
+        @auth.authorization_url(redirect_uri: redirect_uri)
       end
     end
     
     context "given a scope" do
       it "sends it to VkontakteApi::Utils.flatten_argument" do
-        scope = stub("Scope")
-        flat_scope = stub("Flat scope")
+        scope = double("Scope")
+        flat_scope = double("Flat scope")
         
         VkontakteApi::Utils.should_receive(:flatten_argument).with(scope).and_return(flat_scope)
-        @auth_code.should_receive(:authorize_url).with(:redirect_uri => @redirect_uri, :scope => flat_scope)
-        @auth.authorization_url(:scope => scope)
+        @auth_code.should_receive(:authorize_url).with(redirect_uri: @redirect_uri, scope: flat_scope)
+        @auth.authorization_url(scope: scope)
       end
     end
   end
@@ -65,33 +65,33 @@ describe VkontakteApi::Authorization do
   describe "#authorize" do
     context "with a site type" do
       before(:each) do
-        @code = stub("Authorization code")
+        @code = double("Authorization code")
         @auth_code.stub(:get_token).and_return(@token)
       end
       
       it "gets the token" do
-        @auth_code.should_receive(:get_token).with(@code, {:redirect_uri => @redirect_uri})
-        @auth.authorize(:type => :site, :code => @code)
+        @auth_code.should_receive(:get_token).with(@code, redirect_uri: @redirect_uri)
+        @auth.authorize(type: :site, code: @code)
       end
     end
     
     context "with an app_server type" do
       it "gets the token" do
-        @client_credentials.should_receive(:get_token).with({:redirect_uri => @redirect_uri}, subject::OPTIONS[:client_credentials])
-        @auth.authorize(:type => :app_server)
+        @client_credentials.should_receive(:get_token).with({ redirect_uri: @redirect_uri }, subject::OPTIONS[:client_credentials])
+        @auth.authorize(type: :app_server)
       end
     end
     
     context "with an unknown type" do
       it "raises an ArgumentError" do
         expect {
-          @auth.authorize(:type => :unknown)
+          @auth.authorize(type: :unknown)
         }.to raise_error(ArgumentError)
       end
     end
     
     it "builds a VkontakteApi::Client instance with the received token" do
-      client = stub("VkontakteApi::Client instance")
+      client = double("VkontakteApi::Client instance")
       VkontakteApi::Client.should_receive(:new).with(@token).and_return(client)
       @auth.authorize.should == client
     end

data/spec/vkontakte_api/client_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe VkontakteApi::Client do
   before(:each) do
-    @user_id      = stub("User id")
-    @string_token = stub("Access token as a String")
+    @user_id      = double("User id")
+    @string_token = double("Access token as a String")
     @expires_at   = Time.now - 2 * 60 * 60 # 2.hours.ago
     
-    @oauth2_token = stub("Access token as an OAuth2::AccessToken")
+    @oauth2_token = double("Access token as an OAuth2::AccessToken")
     @oauth2_token.stub(:token).and_return(@string_token)
     @oauth2_token.stub(:params).and_return('user_id' => @user_id)
     @oauth2_token.stub(:expires_at).and_return(@expires_at)

data/spec/vkontakte_api/error_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 describe VkontakteApi::Error do
   before(:each) do
     @error_data = Hashie::Mash.new(
-      :error_code      => 5,
-      :error_msg       => 'User authorization failed: invalid access_token.',
-      :request_params  => [
+      error_code:     5,
+      error_msg:      'User authorization failed: invalid access_token.',
+      request_params: [
         {
-          :key   => 'oauth',
-          :value => '1'
+          key:   'oauth',
+          value: '1'
         },
         {
-          :key   => 'method',
-          :value => 'unknownMethod'
+          key:   'method',
+          value: 'unknownMethod'
         },
         {
-          :key   => 'access_token',
-          :value => '123'
+          key:   'access_token',
+          value: '123'
         }
       ]
     )
@@ -40,7 +40,7 @@ describe VkontakteApi::Error do
     
     context "with parameters" do
       before(:each) do
-        @error_data[:request_params] << Hashie::Mash.new(:key => 'some', :value => 'params')
+        @error_data[:request_params] << Hashie::Mash.new(key: 'some', value: 'params')
         @e = VkontakteApi::Error.new(@error_data)
       end
       

data/spec/vkontakte_api/logger_spec.rb

@@ -5,11 +5,11 @@ describe VkontakteApi::Logger do
     @success_response = Oj.dump('a' => 1, 'b' => 2)
     @fail_response    = Oj.dump('error' => 404)
     
-    @connection = Faraday.new(:url => 'http://example.com') do |builder|
+    @connection = Faraday.new(url: 'http://example.com') do |builder|
       builder.request  :url_encoded
       builder.response :vk_logger
       builder.response :mashify
-      builder.response :oj, :preserve_raw => true
+      builder.response :oj, preserve_raw: true
       
       builder.adapter :test do |stub|
         stub.get('/success') do
@@ -24,7 +24,7 @@ describe VkontakteApi::Logger do
       end
     end
     
-    @logger = stub("Logger").as_null_object
+    @logger = double("Logger").as_null_object
     VkontakteApi.logger = @logger
     
     VkontakteApi.log_requests  = false
@@ -46,7 +46,7 @@ describe VkontakteApi::Logger do
       it "logs the request URL and the request body" do
         @logger.should_receive(:debug).with('POST http://example.com/success')
         @logger.should_receive(:debug).with('body: "param=1"')
-        @connection.post('/success', :param => 1)
+        @connection.post('/success', param: 1)
       end
     end
   end

data/spec/vkontakte_api/method_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe VkontakteApi::Method do
   describe "#call" do
     before(:each) do
-      @full_name = stub("Full method name")
-      @args      = stub("Method arguments")
-      @token     = stub("Access token")
+      @full_name = double("Full method name")
+      @args      = double("Method arguments")
+      @token     = double("Access token")
       
       @method = VkontakteApi::Method.new('some_name')
       @method.stub(:full_name).and_return(@full_name)
@@ -19,9 +19,9 @@ describe VkontakteApi::Method do
     end
     
     it "sends the response to Result.process" do
-      response = stub("VK response")
+      response = double("VK response")
       VkontakteApi::API.stub(:call).and_return(response)
-      type = stub("Type")
+      type = double("Type")
       @method.stub(:type).and_return(type)
       
       VkontakteApi::Result.should_receive(:process).with(response, type, nil)
@@ -31,9 +31,9 @@ describe VkontakteApi::Method do
   
   describe "#full_name" do
     before(:each) do
-      resolver = Hashie::Mash.new(:name => 'name_space')
+      resolver = Hashie::Mash.new(name: 'name_space')
       @name = 'name'
-      @method = VkontakteApi::Method.new(@name, :resolver => resolver)
+      @method = VkontakteApi::Method.new(@name, resolver: resolver)
     end
     
     it "sends each part to #camelize" do

data/spec/vkontakte_api/resolvable_spec.rb

@@ -9,11 +9,11 @@ describe VkontakteApi::Resolvable do
   
   describe "#initialize" do
     it "should save name and resolver" do
-      name     = stub("Name")
-      token    = stub("Token")
-      resolver = Hashie::Mash.new(:token => token)
+      name     = double("Name")
+      token    = double("Token")
+      resolver = Hashie::Mash.new(token: token)
       
-      resolvable = @class.new(name, :resolver => resolver)
+      resolvable = @class.new(name, resolver: resolver)
       resolvable.name.should  == name
       resolvable.token.should == token
     end

data/spec/vkontakte_api/resolver_spec.rb

@@ -14,7 +14,7 @@ describe VkontakteApi::Resolver do
   describe "#method_missing" do
     before(:each) do
       @resolver = @class.new(:trololo)
-      @token = stub("Token")
+      @token = double("Token")
       @resolver.stub(:token).and_return(@token)
     end
     
@@ -27,28 +27,42 @@ describe VkontakteApi::Resolver do
     
     context "called with a method" do
       before(:each) do
-        @result = stub("Result")
-        @method = stub("Method", :call => @result)
+        @result = double("Result")
+        @method = double("Method", call: @result)
         VkontakteApi::Method.stub(:new).and_return(@method)
       end
       
       it "creates a Method instance" do
-        VkontakteApi::Method.should_receive(:new).with('get', :resolver => @resolver.resolver)
-        @resolver.get(:id => 1)
+        VkontakteApi::Method.should_receive(:new).with('get', resolver: @resolver.resolver)
+        @resolver.get(id: 1)
       end
       
       it "calls Method#call and returns the result" do
-        @method.should_receive(:call).with(:id => 1)
-        @resolver.get(:id => 1).should == @result
+        @method.should_receive(:call).with(id: 1)
+        @resolver.get(id: 1).should == @result
       end
     end
   end
   
+  describe "#send" do
+    before(:each) do
+      @resolver = @class.new('trololo')
+      @token = double("Token")
+      @resolver.stub(:token).and_return(@token)
+    end
+    
+    it "gets into #method_missing" do
+      method = double("Method", call: nil)
+      VkontakteApi::Method.should_receive(:new).with('send', resolver: @resolver.resolver).and_return(method)
+      @resolver.send(message: 'hello')
+    end
+  end
+  
   describe "#resolver" do
     before(:each) do
-      @name     = stub("Name")
+      @name     = double("Name")
       @resolver = @class.new(@name)
-      @token    = stub("Token")
+      @token    = double("Token")
       @resolver.stub(:token).and_return(@token)
     end
     
@@ -59,7 +73,7 @@ describe VkontakteApi::Resolver do
     end
     
     it "caches the result" do
-      @mash = stub("Mash", :name => @name, :token => @token)
+      @mash = double("Mash", name: @name, token: @token)
       Hashie::Mash.should_receive(:new).once.and_return(@mash)
       5.times { @resolver.resolver }
     end
@@ -72,9 +86,9 @@ describe VkontakteApi::Resolver do
     
     context "on first call" do
       it "loads namespaces from a file" do
-        filename = stub("Filename")
+        filename = double("Filename")
         File.should_receive(:expand_path).and_return(filename)
-        namespaces = stub("Namespaces list")
+        namespaces = double("Namespaces list")
         YAML.should_receive(:load_file).with(filename).and_return(namespaces)
         
         VkontakteApi::Resolver.namespaces

data/spec/vkontakte_api/result_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe VkontakteApi::Result do
   describe ".process" do
     before(:each) do
-      @response = stub("Response")
-      @result = stub("Result")
+      @response = double("Response")
+      @result = double("Result")
       subject.stub(:extract_result).and_return(@result)
     end
     
@@ -15,8 +15,8 @@ describe VkontakteApi::Result do
     
     context "with a non-enumerable result" do
       before(:each) do
-        @type = stub("Type")
-        @typecasted_value = stub("Typecasted value")
+        @type = double("Type")
+        @typecasted_value = double("Typecasted value")
         subject.stub(:typecast).and_return(@typecasted_value)
       end
       
@@ -27,7 +27,7 @@ describe VkontakteApi::Result do
       
       context "when block_given?" do
         it "yields the #typecast-ed value and returns the result of the block" do
-          block_result = stub("Block result")
+          block_result = double("Block result")
           @typecasted_value.should_receive(:result_method).and_return(block_result)
           block = proc(&:result_method)
           
@@ -38,8 +38,8 @@ describe VkontakteApi::Result do
     
     context "with an enumerable result" do
       before(:each) do
-        @element1 = stub("First element")
-        @element2 = stub("Second element")
+        @element1 = double("First element")
+        @element2 = double("Second element")
         @enumerable_result = [@element1, @element2]
         subject.stub(:extract_result).and_return(@enumerable_result)
       end
@@ -50,8 +50,8 @@ describe VkontakteApi::Result do
       
       context "when block_given?" do
         it "yields each element untouched to the block" do
-          result1 = stub("First element after result_method")
-          result2 = stub("Second element after result_method")
+          result1 = double("First element after result_method")
+          result2 = double("Second element after result_method")
           @element1.should_receive(:result_method).and_return(result1)
           @element2.should_receive(:result_method).and_return(result2)
           block = proc(&:result_method)
@@ -64,13 +64,13 @@ describe VkontakteApi::Result do
   
   describe ".extract_result" do
     before(:each) do
-      @result_response  = {'key' => 'value'}
-      @result_error     = {'request_params' => [{'key' => 'error', 'value' => 'description'}]}
+      @result_response  = { 'key' => 'value' }
+      @result_error     = { 'request_params' => [{ 'key' => 'error', 'value' => 'description' }] }
     end
     
     context "with a successful response" do
       before(:each) do
-        @result = Hashie::Mash.new(:response => @result_response)
+        @result = Hashie::Mash.new(response: @result_response)
       end
       
       it "returns the response part" do
@@ -80,7 +80,7 @@ describe VkontakteApi::Result do
     
     context "with an error response" do
       before(:each) do
-        @result = Hashie::Mash.new(:error => @result_error)
+        @result = Hashie::Mash.new(error: @result_error)
       end
       
       it "raises a VkontakteApi::Error" do