oa-vkontakte 0.2.0 → 0.2.1

data/README.rdoc

@@ -20,6 +20,10 @@
 
   <%= vkontakte_login_button %>
 
+Если хотите свою красивую картинку вместо дефолтной вконтактовской кнопки, делайте так:
+
+  <%= vkontakte_login_button(link_to_function( image_tag("/path/to/image"), "vkLogin.doLogin()" )) %>
+
 Также кнопка доступна по адресу /auth/vkontakte, но форма там передается GET-запросом. Можно пропробовать встроить её как iframe.
 
 После клика на кнопку и разрешения добавления приложения, будет совершен POST-запрос на /auth/vkontakte/callback.
@@ -75,4 +79,4 @@ OmniAuth: http://github.com/intridea/omniauth
 
 == Copyright
 
-Copyright (c) 2010 Nick Recobra. See LICENSE for details.
+Copyright (c) 2010-2011 Nick Recobra. See LICENSE for details.

data/lib/oa-vkontakte/version.rb

@@ -1,5 +1,5 @@
 module Oa
   module Vkontakte
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/omniauth/strategies/vkontakte/view_helper.rb

@@ -22,16 +22,21 @@ module OmniAuth
 HEADER
           end
           
-          def vkontakte_login_button
-<<-BUTTON
-<div id="vk_api_transport"></div>
+          def vkontakte_login_button control = nil
+            default_control = false
+            control ||= begin
+              default_control = true
+              '<div id="vk_login" onclick="vkLogin.doLogin();"></div>'
+            end
+            button= <<-BUTTON
+<div id="vk_api_transport" style="float:left"></div>
 <script type="text/javascript">
   window.vkAsyncInit = function() {
     VK.init({
       apiId: '#{OmniAuth.config.vkontakte_app_id}',
       nameTransportPath: "/xd_receiver.html"
     });
-    VK.UI.button('vk_login');
+    #{ "VK.UI.button('vk_login');" if default_control }
   };
   vkLogin = {
     doLogin: function() {
@@ -114,8 +119,9 @@ HEADER
     document.getElementById("vk_api_transport").appendChild(el);
   }());
 </script>
-<div id="vk_login" onclick="vkLogin.doLogin();"></div>
+#{ control }
 BUTTON
+            button.respond_to?(:html_safe) ? button.html_safe : button
           end
 
           def vkontakte_footer

data/lib/omniauth/strategies/vkontakte.rb

@@ -34,8 +34,6 @@ module OmniAuth
         sig_index = args.index { |arg| arg =~ /^sig=/ }
         return fail!(:invalid_credentials) unless sig_index
         sig = args.delete_at(sig_index)
-        puts Digest::MD5.new.hexdigest(args.sort.join('') + OmniAuth.config.vkontakte_app_key)
-        puts sig
         return fail!(:invalid_credentials) unless Digest::MD5.new.hexdigest(args.sort.join('') + OmniAuth.config.vkontakte_app_key) == sig[4..-1]
         super
       end

data/spec/omniauth/strategires/vkontakte_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe OmniAuth::Strategies::Vkontakte, :type => :strategy do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: oa-vkontakte
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Nick Recobra
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +03:00
+date: 2011-03-06 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 1
-        - 6
         version: 0.1.6
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
         version: 2.1.0
   type: :development
   version_requirements: *id002
@@ -58,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -72,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 5
-        - 6
         version: 0.5.6
   type: :development
   version_requirements: *id004
@@ -117,23 +94,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: oa-vkontakte
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: OmniAuth extension for vkontakte.ru authentication