social 0.0.8 → 0.0.9

data/lib/social/auth/controller.rb

@@ -128,7 +128,7 @@ module Social
           
           def ie_hack
             response.headers["P3P"]='CP="CAO PSA OUR"'
-            #header('P3P: CP="NOI ADM DEV COM NAV OUR STP"');
+            #header('P3P: CP="NOI ADM DEV COM NAV OUR STP"P3P: CP="NOI ADM DEV COM NAV OUR STP"');
           end
 
           def store_location

data/lib/social/network/graph/ok/base.rb

@@ -1,3 +1,30 @@
+module Rack
+  module Utils # :nodoc:
+
+    def universal_build(value, prefix = nil)
+      case value.class.to_s
+      when Array.to_s
+        value.map do |v|
+          unless unescape(prefix) =~ /\[\]$/
+            prefix = "#{prefix}[]"
+          end
+          universal_build(v, "#{prefix}")
+        end.join("&")
+      when Hash.to_s
+        value.map do |k, v|
+          universal_build(v, prefix ? "#{prefix}[#{escape(k)}]" : escape(k))
+        end.join("&")
+      when NilClass.to_s
+        prefix.to_s
+      else
+        "#{prefix}=#{escape(value.to_s)}"
+      end
+    end
+
+    module_function :universal_build
+  end
+end
+
 module Social
   module Network
     module Graph
@@ -16,26 +43,33 @@ module Social
             msg
           end
 
-          def deliver(params)
+          def http_query(query)
+            result = []
             url = URI.parse(config['api_server'])
             retries = 0
-            begin
-              res = Net::HTTP.start(url.host, url.port) { |http|
-                http.read_timeout = 10
-                request_params = build_request_params(params)
-                http.get("/fb.do?#{Rack::Utils.universal_build(request_params)}")
-              }
-            rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
-              retries += 1
-              retry if retries < 3
-            end
-  
-            rescue => e
-              #Rails.logger.warn "Send problem"
-              #Rails.logger.warn params.inspect
-              #Rails.logger.warn e.inspect
-            ensure
-            res
+            result = Net::HTTP.start(url.host, url.port) { |http|
+              http.read_timeout = 10
+              http.get(query)
+            }
+          rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+            retries += 1
+            retry if retries < 3
+          ensure
+            result
+          end
+
+          def deliver(params)
+            result = []
+            request_params = build_request_params(params)
+            query = "/fb.do?#{Rack::Utils.universal_build(request_params)}"
+            result = self.http_query(query)
+          rescue => e
+            puts "====== Send problem"
+            puts params.inspect
+            puts e.to_s
+            puts e.backtrace
+          ensure
+            result
           end
 
           def build_sig(params, key)

data/lib/social/network/graph/ok/user.rb

@@ -6,15 +6,34 @@ module Social
           
           FIELDS = 'uid,first_name,last_name,gender,birthday,pic_1,pic_2,pic_3,pic_4,url_profile,location,current_location,age,url_profile,current_status'
           
-          def get_info(uids, secret = nil, options = nil)
-            fields = Array.wrap(options.try(:[], :fields)).join(',')
-            fields = fields.present? ? fields : FIELDS
-            
-            params = { "method" => 'users.getInfo', "fields" => fields, 
-              :uids => Array.wrap(uids).join(","), :session_secret_key => secret }
-            response = self.send(:deliver, params)
-            result = response.present? ? ActiveSupport::JSON.decode(response.body) : []
-            result = result.is_a?(Hash) && result['error_msg'] ? nil : result
+          def get_info(*args)
+
+            args.pop if args.last.nil?
+
+            if args.last.kind_of?(Hash)
+              options = args.pop #.with_indefferend_access
+              secret = options[:secret]
+              fields = options[:fields]
+              
+              fields = fields.join(',') if fields.kind_of?(Array)
+              
+              if fields
+                avalible_fields = FIELDS.split(',')
+                fields = fields.split(',').select { |field| 
+                  avalible_fields.include?(field)
+                }.sort.join(',')
+                fields = nil if fields.empty?
+              end
+            end
+
+            uids = Array.wrap(args)
+            params = { "method" => 'users.getInfo', "fields" => (fields || FIELDS), 
+              :uids => uids.join(",") }
+            params[:session_secret_key] = secret if secret
+
+            code, response = self.deliver(params)
+            result = response.present? ? MultiJson.load(response) : { 'error_msg' => 'Empty response' }
+            result = result.is_a?(Hash) && result['error_msg'] ? [] : result['response']
             
             return result unless block_given?
             yield(result) if block_given?
@@ -38,6 +57,16 @@ module Social
             return friend_profiles unless block_given?
             yield(friend_profiles) if block_given?
           end
+
+          def charge_off_balance(uid, balance)
+            return [] unless block_given?
+            yield([]) if block_given?
+          end
+
+          def balance(uid)
+            return nil unless block_given?
+            yield(nil) if block_given?
+          end
           
           alias :get_friends_uids :get_friends
           alias :get_friends_info :get_friends_profiles

data/lib/social/network/graph/vk/base.rb

@@ -7,12 +7,16 @@ module Social
           include Social::Network::Graph::Tail
           include Social::Config::Vk
 
+          def http_query(query)
+            Net::HTTP.start("api.vkontakte.ru", 80).get(query)
+          end
+
           def process(params)
             params = default_options.merge(params).with_indifferent_access
             params.merge!({'sig' => form_signature(params)})
             query = "/api.php?#{Rack::Utils.build_query(params)}"
-            status, data = Net::HTTP.start("api.vkontakte.ru", 80).get(query)
-            ActiveSupport::JSON.decode(data)['response']
+            status, data = http_query(query)
+            MultiJson.load(data)['response']
           end
 
           def process_secure(params)

data/lib/social/network/graph/vk/user.rb

@@ -6,14 +6,15 @@ module Social
           
           FIELDS = 'uid,first_name,last_name,nickname,domain,sex,birthdate,city,country,timezone,photo,photo_medium,photo_big,has_mobile,rate,contacts,education'
           
-          def get_info(uids)
+          def get_info(*args)
+            uids = Array.wrap(args)
+            
+            params = { "method" => 'getProfiles', "fields" => FIELDS, :uids => uids.join(",")}
             
-            params = { "method" => 'getProfiles', "fields" => FIELDS, :uids => Array.wrap(uids).join(",")}
             results = send(:process, params)
 
-            results = results.map { |result|
-              result['birthday'] = result['bdate']
-              result
+            results.each_with_index { |result, i|
+              results[i]['birthday'] = result['bdate'] || result['birthday']
             }
             
             return results unless block_given?
@@ -21,6 +22,8 @@ module Social
           end
           
           def get_friends(uid)
+            throw 'Not give uid for friends request' unless uid
+
             params = { "method" => 'friends.get', :uid => uid, "fields" => FIELDS}
             result = send(:process_secure, params)
 
@@ -29,6 +32,8 @@ module Social
           end
           
           def balance(uid)
+            throw 'Not give uid for balance request' unless uid
+
             params = { "method" => 'secure.getBalance', :uid => uid }
             result = send(:process_secure, params)
             result = ((result / 100).to_f.round(2) * root.rate)
@@ -38,7 +43,7 @@ module Social
           end
           
           def charge_off_balance(uid, balance)
-            amount = (((balance).floor / root.rate).to_f.round(2) * 100).round
+            amount = (((balance).floor / root.rate.to_f).round(2) * 100).round
             params = { "method" => 'secure.withdrawVotes', :uid => uid, :votes => amount }
             result = send(:process_secure, params)
             

data/lib/social/version.rb

@@ -1,3 +1,3 @@
 module Social
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/social.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rspec-core", "~> 2.0"
+  s.add_development_dependency "rspec-mocks"
   s.add_development_dependency "rspec-expectations", "~> 2.0"
   s.add_development_dependency 'rack', '~> 1.4.1'
   s.add_development_dependency 'rack-test', '~> 0.6.1'

data/spec/lib/social/config_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Config' do
+
+  before do
+    @vk_api = Social::Network(:vk)
+    @ok_api = Social::Network(:ok)  
+  end
+
+  it "must load config to vk" do
+    @vk_api.config.should_not be_nil
+    @vk_api.config['key'].should_not be_nil
+    @vk_api.config['app_id'].should_not be_nil
+  end
+
+  it "must load config to ok" do
+    @ok_api.config.should_not be_nil
+    @ok_api.config['api_server'].should_not be_nil
+    @ok_api.config['application_key'].should_not be_nil
+    @ok_api.config['secret_key'].should_not be_nil
+  end
+
+  it "valid safe config data for vk" do
+    avalible_keys = [ :app_id , :logged_user_id ]
+    @vk_api.safe_config.keys.should =~ avalible_keys
+  end
+
+  it "valid safe config data for ok" do
+    avalible_keys = [ :api_server , :application_key, :logged_user_id ]
+    @ok_api.safe_config.keys.should =~ avalible_keys
+  end
+end

data/spec/lib/social/ok_api_spec.rb

@@ -0,0 +1,142 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Спецификация OkApi' do
+
+  context "функция user.get_info" do
+
+    before do
+      @api = Social::Network(:ok)
+
+      fake_data_index = 1
+      @make_fake_data = lambda do
+        fake_data_index += 1
+
+        return {
+          :nickname => "fake data #{fake_data_index}",
+          :first_name => "fake data #{fake_data_index}",
+          :last_name => "fake data #{fake_data_index}",
+          :location => "fake data #{fake_data_index}",
+          :location => "fake data #{fake_data_index}",
+          :birthday => "fake data #{fake_data_index}",
+          :url_profile => "fake data #{fake_data_index}",
+          :pic_1 => "fake data #{fake_data_index}",
+          :gender => "fake data #{fake_data_index}"
+        }
+      end
+
+      @make_fake_datas = lambda do |quantity|
+        datas = []
+        quantity.times { datas.push(@make_fake_data.call) }
+        datas
+      end 
+
+      @uids = [ 1,2,3,4 ]
+      @secret = 'session_secret_key'
+      @fields = [ 'uid', 'first_name', 'last_name' ]
+
+    end
+
+
+    it "вне зависимости от способа передачи uids запрос должен формироваться стандартно" do
+      params = {
+        "method" => 'users.getInfo', 
+        "fields" => Social::Network::Graph::Ok::User::FIELDS, 
+        :uids => @uids.join(",")
+      }
+
+      @api.user.should_receive(:deliver).with(params).exactly(3).and_return([])
+      @api.user.get_info(*@uids)
+      @api.user.get_info(@uids)
+      @api.user.get_info([@uids])
+    end
+
+    it "передача сессионного secret_key" do
+
+      params = {
+        "method" => 'users.getInfo', 
+        "fields" => Social::Network::Graph::Ok::User::FIELDS, 
+        :uids => @uids.join(","),
+        :session_secret_key => @secret
+      }
+
+      @api.user.should_receive(:deliver).with(params).exactly(3).and_return([])
+      @api.user.get_info(@uids, { :secret => @secret })
+      @api.user.get_info([@uids], { :secret => @secret })
+      @api.user.get_info(*@uids, { :secret => @secret })
+    end
+
+    it "передача полей" do
+
+      params = {
+        "method" => 'users.getInfo', 
+        "fields" => @fields.sort.join(','),
+        :uids => @uids.join(","),
+        :session_secret_key => @secret
+      }
+
+      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      @api.user.get_info(@uids, { :secret => @secret, :fields => @fields })
+    end
+
+    it "передача некоторых не корректных полей" do
+
+      params = {
+        "method" => 'users.getInfo', 
+        "fields" => @fields.sort.join(','),
+        :uids => @uids.join(","),
+        :session_secret_key => @secret
+      }
+
+      uncorrect_fields = @fields + [ "uncorrect_field 1", "uncorrect_field 2" ]
+
+      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      @api.user.get_info(@uids, { :secret => @secret, :fields => uncorrect_fields })
+    end
+
+    it "передача всех не корректных полей" do
+
+      params = {
+        "method" => 'users.getInfo',
+        "fields" => Social::Network::Graph::Ok::User::FIELDS,
+        :uids => @uids.join(","),
+        :session_secret_key => @secret
+      }
+
+      uncorrect_fields = [ "uncorrect_field 1", "uncorrect_field 2" ]
+
+      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      @api.user.get_info(@uids, { :secret => @secret, :fields => uncorrect_fields })
+    end
+
+    it "вызов с неопределенными опциями" do
+      params = {
+        "method" => 'users.getInfo',
+        "fields" => Social::Network::Graph::Ok::User::FIELDS,
+        :uids => @uids.join(",")
+      }
+
+      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      @api.user.get_info(@uids, nil)
+    end
+
+    it "вызов с пустыми опциями" do
+      params = {
+        "method" => 'users.getInfo',
+        "fields" => Social::Network::Graph::Ok::User::FIELDS,
+        :uids => @uids.join(",")
+      }
+
+      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      @api.user.get_info(@uids, {})
+    end
+
+    it "данные по пользователю должны возвращаться в известном формате" do
+      data = @make_fake_datas.call(1)
+      @api.user.stub!(:http_query).and_return([200, { :response => data }.to_json])
+      results = @api.user.get_info(1234567890)
+      results.should == MultiJson.load(data.to_json)
+    end
+    
+  end
+end

data/spec/lib/social/vk_api_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe 'Спецификация VkApi' do
+
+  context "функция user.get_info" do
+
+    before do
+      @api = Social::Network(:vk)
+
+      fake_data_index = 1
+      @make_fake_data = lambda do
+        fake_data_index += 1
+
+        return {
+          :nickname => "fake data #{fake_data_index}",
+          :first_name => "fake data #{fake_data_index}",
+          :last_name => "fake data #{fake_data_index}",
+          :location => "fake data #{fake_data_index}",
+          :location => "fake data #{fake_data_index}",
+          :birthday => "fake data #{fake_data_index}",
+          :url_profile => "fake data #{fake_data_index}",
+          :pic_1 => "fake data #{fake_data_index}",
+          :gender => "fake data #{fake_data_index}"
+        }
+      end
+
+      @make_fake_datas = lambda do |quantity|
+        datas = []
+        quantity.times { datas.push(@make_fake_data.call) }
+        datas
+      end 
+
+    end
+
+    it "вне зависимости от способа передачи uids запрос должен формироваться стандартно" do
+      uids = [ 1,2,3,4 ]
+      params = { 
+        "method" => 'getProfiles', 
+        "fields" => Social::Network::Graph::Vk::User::FIELDS, 
+        :uids    => uids.join(',')
+      }
+
+      @api.user.should_receive(:process).with(params).exactly(3).and_return([])
+      @api.user.get_info(*uids)
+      @api.user.get_info(uids)
+      @api.user.get_info([uids])
+    end
+
+
+    it "данные по пользователю должны возвращаться в известном формате" do
+      data = @make_fake_datas.call(1)
+      @api.user.stub!(:http_query).and_return([200, { :response => data }.to_json])
+      results = @api.user.get_info(1234567890)
+      results.should == MultiJson.load(data.to_json)
+    end
+
+  
+  end
+
+end

data/spec/lib/social_spec.rb

@@ -12,26 +12,4 @@ describe Social do
     Social::Network(:vk).rate.should_not be_nil
   end
 
-  it "must load config to vk" do
-    Social::Network(:vk).config.should_not be_nil
-    Social::Network(:vk).config['key'].should_not be_nil
-    Social::Network(:vk).config['app_id'].should_not be_nil
-  end
-
-  it "must load config to ok" do
-    Social::Network(:ok).config.should_not be_nil
-    Social::Network(:ok).config['api_server'].should_not be_nil
-    Social::Network(:ok).config['application_key'].should_not be_nil
-    Social::Network(:ok).config['secret_key'].should_not be_nil
-  end
-
-  it "valid safe config data for vk" do
-    avalible_keys = [ :app_id , :logged_user_id ]
-    Social::Network(:vk).safe_config.keys.should =~ avalible_keys
-  end
-
-  it "valid safe config data for ok" do
-    avalible_keys = [ :api_server , :application_key, :logged_user_id ]
-    Social::Network(:ok).safe_config.keys.should =~ avalible_keys
-  end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ require "bundler"
 Bundler.require :default, :development
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-  config.mock_with :rr
+  #config.treat_symbols_as_metadata_keys_with_true_values = true
+  #config.run_all_when_everything_filtered = true
+  #config.filter_run :focus
+  #config.mock_with :rr
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
+date: 2012-05-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &2156339140 !ruby/object:Gem::Requirement
+  requirement: &2156101640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156339140
+  version_requirements: *2156101640
+- !ruby/object:Gem::Dependency
+  name: rspec-mocks
+  requirement: &2156100920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156100920
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &2156338540 !ruby/object:Gem::Requirement
+  requirement: &2156100180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156338540
+  version_requirements: *2156100180
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2156337960 !ruby/object:Gem::Requirement
+  requirement: &2156099520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *2156337960
+  version_requirements: *2156099520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156337400 !ruby/object:Gem::Requirement
+  requirement: &2156098900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156337400
+  version_requirements: *2156098900
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2156336820 !ruby/object:Gem::Requirement
+  requirement: &2156098300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156336820
+  version_requirements: *2156098300
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2156336240 !ruby/object:Gem::Requirement
+  requirement: &2156097700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 0.9.8.4
   type: :development
   prerelease: false
-  version_requirements: *2156336240
+  version_requirements: *2156097700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156335580 !ruby/object:Gem::Requirement
+  requirement: &2156097080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 3.1.3
   type: :development
   prerelease: false
-  version_requirements: *2156335580
+  version_requirements: *2156097080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156335000 !ruby/object:Gem::Requirement
+  requirement: &2156096440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156335000
+  version_requirements: *2156096440
 description: ! "This is social networks api wrapper and authorization tools for social
   applications. \n    Now it is a compilation of code from various projects in production.
   Without tests. =( NOT RECOMMENDED USE IN PRODUCTION."
@@ -148,6 +159,9 @@ files:
 - lib/social/provider.rb
 - lib/social/version.rb
 - social.gemspec
+- spec/lib/social/config_spec.rb
+- spec/lib/social/ok_api_spec.rb
+- spec/lib/social/vk_api_spec.rb
 - spec/lib/social_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/realb0t/social
@@ -175,5 +189,8 @@ signing_key:
 specification_version: 3
 summary: Social API wrapper and Tools
 test_files:
+- spec/lib/social/config_spec.rb
+- spec/lib/social/ok_api_spec.rb
+- spec/lib/social/vk_api_spec.rb
 - spec/lib/social_spec.rb
 - spec/spec_helper.rb