social 0.0.11 → 0.3.0

data/lib/social/network/graph/tail.rb

@@ -1,23 +1,17 @@
-module Social
-  module Network
-    module Graph
-      module Tail
+module Social::Network::Graph::Tail
         
-        def root=(root_instance)
-          @root = root_instance
-        end
-        
-        protected
-        
-          def rate
-            root.rate
-          end
-          
-          def root
-            @root
-          end
-    
-      end
-    end
+  def root=(root_instance)
+    @root = root_instance
+  end
+  
+  protected
+  
+  def rate
+    root.rate
+  end
+  
+  def root
+    @root
   end
+
 end

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

@@ -1,6 +1,2 @@
-module Social
-  module Network
-    class Vk
-    end
-  end
+module Social::Network::Graph::Vk
 end

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

@@ -1,41 +1,35 @@
-module Social
-  module Network
-    module Graph
-      module Vk
-        class Base
-          
-          include Social::Network::Graph::Tail
-          include Social::Config::Vk
+module Social::Network::Graph::Vk
+  class Base
+            
+    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 = http_query(query)
-            JSON.load(data)['response']
-          end
+    def http_query(query)
+      Net::HTTP.start("api.vkontakte.ru", 80).get(query)
+    end
 
-          def process_secure(params)
-            process(params.merge('random' => (rand * 10_000).to_i, 'timestamp' => Time.now.to_i))
-          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 = http_query(query)
+      JSON.load(data)['response']
+    end
 
-          private
-          
-            def default_options
-              {:v => '3.0', :format  => 'JSON', :api_id => config['app_id'] }
-            end
+    def process_secure(params)
+      process(params.merge('random' => (rand * 10_000).to_i, 'timestamp' => Time.now.to_i))
+    end
 
-            def form_signature(params)
-              str = params.sort.map{|pair| "#{pair[0]}=#{pair[1]}"}.join('') + config['key']
-              Digest::MD5.hexdigest(str)
-            end
+    private
+    
+    def default_options
+      {:v => '3.0', :format  => 'JSON', :api_id => config['app_id'] }
+    end
 
-        end
-      end
+    def form_signature(params)
+      str = params.sort.map{|pair| "#{pair[0]}=#{pair[1]}"}.join('') + config['key']
+      Digest::MD5.hexdigest(str)
     end
+
   end
 end

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

@@ -1,21 +1,15 @@
-module Social
-  module Network
-    module Graph
-      module Vk
-        class Notification < Social::Network::Graph::Vk::Base
+module Social::Network::Graph::Vk
+  class Notification < Base
           
-          def send(options = {})
-            params = { "method" => 'secure.sendNotification', :uids => options[:uids], :message => options[:message] }
-            result = self.process_secure(params)
-            
-            #result = deliver('method' => 'secure.sendNotification', 'text' => options[:message], 'uid' => options[:uids])
-            
-            return result unless block_given?
-            yield(result) if block_given?
-          end
-          
-        end
-      end
+    def send(options = {})
+      params = { "method" => 'secure.sendNotification', :uids => options[:uids], :message => options[:message] }
+      result = self.process_secure(params)
+      
+      #result = deliver('method' => 'secure.sendNotification', 'text' => options[:message], 'uid' => options[:uids])
+      
+      return result unless block_given?
+      yield(result) if block_given?
     end
+
   end
 end

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

@@ -1,70 +1,64 @@
-module Social
-  module Network
-    module Graph
-      module Vk
-        class User < Social::Network::Graph::Vk::Base
+module Social::Network::Graph::Vk
+  class User < Base
           
-          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(*args)
-            uids = Array.wrap(args)
-            
-            params = { "method" => 'getProfiles', "fields" => FIELDS, :uids => uids.join(",")}
-            
-            results = send(:process, params)
+    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(*args)
+      uids = Array.wrap(args)
+      
+      params = { "method" => 'getProfiles', "fields" => FIELDS, :uids => uids.join(",")}
+      
+      results = send(:process, params)
 
-            results.each_with_index { |result, i|
-              results[i]['birthday'] = result['bdate'] || result['birthday']
-            }
-            
-            return results unless block_given?
-            yield(results) if block_given?
-          end
-          
-          def get_friends(uid)
-            throw 'Not give uid for friends request' unless uid
+      results.each_with_index { |result, i|
+        results[i]['birthday'] = result['bdate'] || result['birthday']
+      }
+      
+      return results unless block_given?
+      yield(results) if block_given?
+    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)
+      params = { "method" => 'friends.get', :uid => uid, "fields" => FIELDS}
+      result = send(:process_secure, params)
 
-            return result unless block_given?
-            yield(result) if block_given?
-          end
-          
-          def balance(uid)
-            throw 'Not give uid for balance request' unless uid
+      return result unless block_given?
+      yield(result) if block_given?
+    end
+    
+    def get_friends_profiles(uid)
+      
+      friend_uids = get_friends_uids(uid)
+      friend_profiles = friend_uids.map { |uid| get_info(uid) }.flatten.compact
+      
+      return friend_profiles unless block_given?
+      yield(friend_profiles) if block_given?
+    end
 
-            params = { "method" => 'secure.getBalance', :uid => uid }
-            result = send(:process_secure, params)
-            result = ((result / 100).to_f.round(2) * root.rate)
-            
-            return result unless block_given?
-            yield(result) if block_given?
-          end
-          
-          def charge_off_balance(uid, balance)
-            amount = (((balance).floor / root.rate.to_f).round(2) * 100).round
-            params = { "method" => 'secure.withdrawVotes', :uid => uid, :votes => amount }
-            result = send(:process_secure, params)
-            
-            return result unless block_given?
-            yield(result) if block_given?
-          end
+    def charge_off_balance(uid, balance)
+      amount = (((balance).floor / root.rate.to_f).round(2) * 100).round
+      params = { "method" => 'secure.withdrawVotes', :uid => uid, :votes => amount }
+      result = send(:process_secure, params)
+      
+      return result unless block_given?
+      yield(result) if block_given?
+    end
 
-          def get_friends_profiles(uid)
-            
-            friend_uids = get_friends_uids(uid)
-            friend_profiles = friend_uids.map { |uid| get_info(uid) }.flatten.compact
-            
-            return friend_profiles unless block_given?
-            yield(friend_profiles) if block_given?
-          end
-          
-          alias :get_friends_uids :get_friends
-          alias :get_friends_info :get_friends_profiles
-          
-        end
-      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)
+      
+      return result unless block_given?
+      yield(result) if block_given?
     end
+    
+    alias :get_friends_uids :get_friends
+    alias :get_friends_info :get_friends_profiles
+
   end
 end

data/lib/social/network/ok.rb

@@ -1,21 +1,13 @@
-module Social
-  module Network
-    class Ok
-      include Singleton
-      include Social::Network::Base
-      include Social::Config::Ok
-      
-      def rate
-        1
-      end
+class Social::Network
+  class Ok < Base
+    include Social::Config::Ok
+    
+    def rate
+      1
+    end
 
-      def initialize(params = nil)
-        
-        #require File.join(File.dirname(__FILE__), 'graph', 'ok', 'user')
-        #require File.join(File.dirname(__FILE__), 'graph', 'ok', 'notification')
-        
-        super('ok', [ :user, :notification ], params)
-      end
+    def initialize(params = nil)
+      super('ok', [ :user, :notification ], params)
     end
   end
 end

data/lib/social/network/stub.rb

@@ -1,9 +1,4 @@
-module Social
-  module Network
-    class Stub
-      include Singleton
-      include Social::Network::Graph
-      include Social::Network::Params
-    end
+class Social::Network
+  class Stub < Base
   end
 end

data/lib/social/network/vk.rb

@@ -1,21 +1,13 @@
-module Social
-  module Network
-    class Vk
-      include Singleton
-      include Social::Network::Base
-      include Social::Config::Vk
-      
-      def rate
-        6
-      end
+class Social::Network
+  class Vk < Base
+    include Social::Config::Vk
+    
+    def rate
+      6
+    end
 
-      def initialize(params = nil)
-        
-        #require File.join(File.dirname(__FILE__), 'graph', 'vk', 'user')
-        #require File.join(File.dirname(__FILE__), 'graph', 'vk', 'notification')
-        
-        super('vk', [ :user, :notification ], params)
-      end
+    def initialize(params = nil)
+      super('vk', [ :user, :notification ], params)
     end
   end
 end

data/lib/social/version.rb

@@ -1,3 +1,3 @@
 module Social
-  VERSION = "0.0.11"
+  VERSION = "0.3.0"
 end

data/social.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry", "~> 0.9.8.4"
   s.add_development_dependency 'activesupport', "~> 3.1.3"
   s.add_development_dependency 'i18n', '~> 0.6.0'
+  s.add_development_dependency 'rake'
   #s.add_development_dependency 'multi_json', '= 1.1.0'
 end

data/spec/lib/social/ok_api_spec.rb

@@ -45,7 +45,7 @@ describe 'Спецификация OkApi' do
         :uids => @uids.join(",")
       }
 
-      @api.user.should_receive(:deliver).with(params).exactly(3).and_return([])
+      mock(@api.user).deliver(params).times(3) { [] }
       @api.user.get_info(*@uids)
       @api.user.get_info(@uids)
       @api.user.get_info([@uids])
@@ -60,7 +60,7 @@ describe 'Спецификация OkApi' do
         :session_secret_key => @secret
       }
 
-      @api.user.should_receive(:deliver).with(params).exactly(3).and_return([])
+      mock(@api.user).deliver(params).times(3) { [] }
       @api.user.get_info(@uids, { :secret => @secret })
       @api.user.get_info([@uids], { :secret => @secret })
       @api.user.get_info(*@uids, { :secret => @secret })
@@ -75,7 +75,7 @@ describe 'Спецификация OkApi' do
         :session_secret_key => @secret
       }
 
-      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      mock(@api.user).deliver(params) { [] }
       @api.user.get_info(@uids, { :secret => @secret, :fields => @fields })
     end
 
@@ -90,7 +90,7 @@ describe 'Спецификация OkApi' do
 
       uncorrect_fields = @fields + [ "uncorrect_field 1", "uncorrect_field 2" ]
 
-      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      mock(@api.user).deliver(params) { [] }
       @api.user.get_info(@uids, { :secret => @secret, :fields => uncorrect_fields })
     end
 
@@ -105,7 +105,7 @@ describe 'Спецификация OkApi' do
 
       uncorrect_fields = [ "uncorrect_field 1", "uncorrect_field 2" ]
 
-      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      mock(@api.user).deliver(params) { [] }
       @api.user.get_info(@uids, { :secret => @secret, :fields => uncorrect_fields })
     end
 
@@ -116,7 +116,7 @@ describe 'Спецификация OkApi' do
         :uids => @uids.join(",")
       }
 
-      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      mock(@api.user).deliver(params) { [] }
       @api.user.get_info(@uids, nil)
     end
 
@@ -127,13 +127,13 @@ describe 'Спецификация OkApi' do
         :uids => @uids.join(",")
       }
 
-      @api.user.should_receive(:deliver).with(params).exactly(1).and_return([])
+      mock(@api.user).deliver(params) { [] }
       @api.user.get_info(@uids, {})
     end
 
     it "данные по пользователю должны возвращаться в известном формате" do
       data = @make_fake_datas.call(1)
-      @api.user.stub!(:http_query).and_return([200, data.to_json])
+      stub(@api.user).http_query { [200, data.to_json] }
       results = @api.user.get_info(1234567890)
       results.should be_a_kind_of Array
       results.first.should be_a_kind_of Hash

data/spec/lib/social/vk_api_spec.rb

@@ -41,7 +41,7 @@ describe 'Спецификация VkApi' do
         :uids    => uids.join(',')
       }
 
-      @api.user.should_receive(:process).with(params).exactly(3).and_return([])
+      mock(@api.user).process(params).times(3) { [] }
       @api.user.get_info(*uids)
       @api.user.get_info(uids)
       @api.user.get_info([uids])
@@ -50,7 +50,7 @@ describe 'Спецификация VkApi' do
 
     it "данные по пользователю должны возвращаться в известном формате" do
       data = @make_fake_datas.call(1)
-      @api.user.stub!(:http_query).and_return([200, { :response => data }.to_json])
+      stub(@api.user).http_query { [200, { :response => data }.to_json] }
       results = @api.user.get_info(1234567890)
       results.should be_a_kind_of Array
       results.first.should be_a_kind_of Hash