to_net_me_api 0.4 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd730f66ada69ddbd416ca29cc66b19633006970
-  data.tar.gz: 6b928259bf196e6461c86c5bc7c559f525c4f60e
+  metadata.gz: 2799f15b5571a8a6afb255ed1dbffb8e751daae1
+  data.tar.gz: 1acc8dc70cb7b48de9139c93ef3824512a464c43
 SHA512:
-  metadata.gz: 8137e91e55ece85c4d08b497a0ff260b6242434c512f84a0269a468572618d874da1c1c56a333dcb0be30376fdf81d4dff33e766db8ae618c9168d5eadbcd243
-  data.tar.gz: 227e5b435a7f9ea8bd59ae67ff30ea1800eb3a0587e3f094d4ab026a4f2acf16f04a28446dba622925a5ee18e2f3cd75da132de45fde567165b0382319056a6f
+  metadata.gz: 9f0caac5068a6137a294a4f5921b36d1b47b51240922f6a4a947f219c2bc59f8256214352ee18f9a0c902cda8c54d924b2df8e624d853266d2222d4ffc9d6bba
+  data.tar.gz: e82d83b88ab8d1c9b009e903c788812551787cbcee11924ee662c7fd3363073329b6d9b6f1a8741bbc060fe1c3c09f27e591339b3772473d4385735728ad8e4d

data/README.md

@@ -63,6 +63,31 @@ groups.parsed_response #=> {"message"=>{"vk"=>[7389, {"gid"=>52734067, "name"=>"
 @to_net_me.search.groups_by_id(:gids=>['2net_me',37856556,38019449],:soc=>'vk')
 ```
 
+### Обработка капчи vkontakte
+``` ruby
+# с помощью методов ToNetMeApi::Error.captcha_img и ToNetMeApi::Error.captcha_sid
+# можно обработать ситуацию когда vk вернул нам 14 код
+# пример
+
+to_net_me = ToNetMeApi::Client.new(current_user.auth_key)
+puts to_net_me.authorized?.inspect
+begin
+  vk = to_net_me.test.captcha(:vk=>true)
+  puts vk.inspect
+rescue ToNetMeApi::Error => e
+  if e.error_code == 14
+  	# показываем юзеру картинку, URL которой
+    # можно получить методом e.captcha_img,
+    # и после этого снова вызываем метод:
+    vk = to_net_me.test.captcha(:vk=>true,:captcha_sid=>"тут должен быть sid",:captcha_key=>"тут должна быть капча с картинки")
+    puts vk.inspect
+  else
+     puts "Ошибка: " + e.error_code.to_s
+  end
+```
+
+
+
 ### Конфигурация
 ``` ruby
 # для смены адреса запроса api например на sandbox.api

data/lib/to_net_me_api.rb

@@ -10,6 +10,8 @@ require 'to_net_me_api/resolvable'
 require 'to_net_me_api/client'
 require 'to_net_me_api/namespace'
 require 'to_net_me_api/method'
+require 'to_net_me_api/error'
+require 'to_net_me_api/result'
 
 
 # Main module.
@@ -19,7 +21,7 @@ module ToNetMeApi
   class << self
     # Creates a short alias `TNM` for `ToNetMeApi` module.
     def register_alias
-      Object.const_set(:TNM, ToNetMeApi)
+      Object.const_set(:TNMG, ToNetMeApi)
     end
     
     # Removes the `TNM` alias.
@@ -27,4 +29,4 @@ module ToNetMeApi
       Object.send(:remove_const, :TNM) if defined?(TNM)
     end
   end
-end
+end

data/lib/to_net_me_api/api.rb

@@ -5,11 +5,12 @@ module ToNetMeApi
     class << self
     
       def set_api_core
-        unless ToNetMeApi.api_core
-          ToNetMeApi.reset
-        else
-          ToNetMeApi.api_core
-        end
+        "http://sandbox.api.2net.me/"
+        # unless ToNetMeApi.api_core
+        #   ToNetMeApi.reset
+        # else
+        #   ToNetMeApi.api_core
+        # end
       end
 
       def call(attrs,options={},auth_key = nil)
@@ -17,6 +18,8 @@ module ToNetMeApi
         options.merge!(@auth)
         HTTParty.get(set_api_core+attrs,:query => options)
       end
+
+
       
     end
   end

data/lib/to_net_me_api/client.rb

@@ -73,3 +73,57 @@ module ToNetMeApi
     end
   end
 end
+
+# ToNetMeApi.configure {|config| config.api_core='http://sandbox.api.2net.me/'}
+# to_net_me = ToNetMeApi::Client.new('01qw621sa14')
+# puts to_net_me.authorized?.inspect
+# begin
+#   vk = to_net_me.test.captcha(:gids=>'my_bikes',:vk=>1742410)
+#   puts vk.inspect
+# rescue ToNetMeApi::Error => e
+#   if e.error_code == 14
+#     puts e.message
+#     puts e.error_code
+#     puts e.captcha_img
+#     vk = to_net_me.search.groupsbyid(:gids=>'my_bikes',:vk=>1742410,:captcha_sid=>"",:captcha_key=>"")
+#     # показываем юзеру картинку, URL которой
+#     # можно получить методом e.captcha_img,
+#     # и после этого снова вызываем метод:
+#     # puts vk.inspect
+#     # vk.wall.edit(post_id: 12345, message: 'hello world', captcha_sid: e.captcha_sid, captcha_key: params[:captcha])
+#   else
+#      puts "no 14"
+#   end
+# end
+
+# begin
+#   vk = to_net_me.search.groupsbyid(:gids=>'my_bikes',:vk=>1742410)
+#   puts vk.inspect
+# rescue ToNetMeApi::Error => e
+#   if e.error_code == 14
+#     puts e.message
+#     puts e.error_code
+#     puts e.captcha_img
+#     vk = to_net_me.search.groupsbyid(:gids=>'my_bikes',:vk=>1742410,:captcha_sid=>"",:captcha_key=>"")
+#     # показываем юзеру картинку, URL которой
+#     # можно получить методом e.captcha_img,
+#     # и после этого снова вызываем метод:
+#     # puts vk.inspect
+#     # vk.wall.edit(post_id: 12345, message: 'hello world', captcha_sid: e.captcha_sid, captcha_key: params[:captcha])
+#   else
+#      puts "no 14"
+#   end
+# end
+
+
+
+
+
+
+
+
+
+
+
+
+

data/lib/to_net_me_api/error.rb

@@ -14,31 +14,31 @@ module ToNetMeApi
     # An exception is initialized by the data from response mash.
     # @param [Hash] data Error data.
     def initialize(data)
-      @error_code = data.error_code
-      @error_msg  = data.error_msg
+      @error_code = data["error_code"]
+      @error_msg  = data["error_msg"]
       
-      request_params = parse_params(data.request_params)
+      request_params = parse_params(data["request_params"])
       
-      @method_name  = request_params.delete('method')
-      @access_token = request_params.delete('access_token')
-      @oauth        = request_params.delete('oauth')
-      @params       = request_params
+      # @method_name  = request_params.delete('method')
+      # @access_token = request_params.delete('access_token')
+      # @oauth        = request_params.delete('oauth')
+      # @params       = request_params
       
-      @captcha_sid  = data.captcha_sid
-      @captcha_img  = data.captcha_img
+      @captcha_sid  = data["captcha_sid"]
+      @captcha_img  = data["captcha_img"]
     end
     
     # A full description of the error.
     # @return [String]
     def message
       message = "VKontakte returned an error #{@error_code}: '#{@error_msg}'"
-      message << " after calling method '#{@method_name}'"
+      # message << " after calling method '#{@method_name}'"
       
-      if @params.empty?
-        message << " without parameters."
-      else
-        message << " with parameters #{@params.inspect}."
-      end
+      # if @params.empty?
+      #   message << " without parameters."
+      # else
+      #   message << " with parameters #{@params.inspect}."
+      # end
       
       message
     end

data/lib/to_net_me_api/method.rb

@@ -12,9 +12,8 @@ module ToNetMeApi
     def call(args = {}, &block)
       # raise full_name.inspect
       response = API.call(full_name, args, auth_key)
-      # raise type.inspect
       # когда ответ бует стандартизирован тогда нужно будет делать вывод результата иобработку ошибок
-      # Result.process(response, type, block)
+      Result.process(response, type, block)
     end
     
   private

data/lib/to_net_me_api/namespaces.yml

@@ -5,3 +5,4 @@
 - users
 - index
 - help
+- test

data/lib/to_net_me_api/resolvable.rb

@@ -1,5 +1,6 @@
 module ToNetMeApi
 
+
   module Resolvable
     attr_reader :name
     

data/lib/to_net_me_api/resolver.rb

@@ -1,3 +1,4 @@
+require 'hashie'
 module ToNetMeApi
   # A mixin for classes that will resolve other classes' objects via `#method_missing`.
   module Resolver

data/lib/to_net_me_api/result.rb

@@ -11,7 +11,6 @@ module ToNetMeApi
       # @return [Array, Hashie::Mash] The processed result.
       # @raise [ToNetMeApi::Error] raised when VKontakte returns an error response.
       def process(response, type, block)
-        raise response['error_code'].inspect
         result = extract_result(response)
         
         if result.respond_to?(:each)
@@ -28,10 +27,10 @@ module ToNetMeApi
       
     private
       def extract_result(response)
-        if response.error?
-          raise ToNetMeApi::Error.new(response.error)
+        if error?(response)
+          raise ToNetMeApi::Error.new(response["message"]["error"])
         else
-          response.response
+          response
         end
       end
       
@@ -44,6 +43,10 @@ module ToNetMeApi
           parameter
         end
       end
+
+      def error?(response)
+        response["message"].include?("error")
+      end
     end
   end
 end

data/lib/to_net_me_api/version.rb

@@ -1,4 +1,4 @@
 module ToNetMeApi
   # Library version.
-  VERSION = '0.4'
+  VERSION = '0.6'
 end

data/to_net_me_api.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   
-  s.required_ruby_version = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
   
   s.add_runtime_dependency 'httparty',                     '~> 0.11'
   s.add_runtime_dependency 'hashie',                       '~> 2.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: to_net_me_api
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.6'
 platform: ruby
 authors:
 - Sergey Chechaev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -46,10 +46,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
 - README.md
+- lib/.DS_Store
 - lib/to_net_me_api.rb
 - lib/to_net_me_api/api.rb
 - lib/to_net_me_api/client.rb
@@ -75,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for api.2net.me