rvk 0.1.5 → 0.1.6

data/README.md

@@ -18,4 +18,10 @@ Example
     u = Vkontakte::User.new email, password # or Vkontakte::User.new session
 
     u.add_note title, body
-    u.set_status status
+    u.set_status status
+    
+Authors
+-------
+
+Alexander Zykov <alexandrz@gmail.com>
+Andrey Sitnik <andrey@sitnik.ru>

data/lib/rvk.rb

@@ -3,10 +3,11 @@ require 'net/http'
 
 $KCODE = 'u'
 
-require 'rvk/status'
-require 'rvk/note'
-require 'rvk/user'
+dir = File.dirname(__FILE__)
+require File.join(dir, 'rvk/status')
+require File.join(dir, 'rvk/note')
+require File.join(dir, 'rvk/user')
 
 module Vkontakte
   class VkontakteError < Exception; end;
-end
+end

data/lib/rvk/status.rb

@@ -1,7 +1,16 @@
 module Vkontakte
   module Status
+    def set_status(text)
+      request = open('http://vk.com/profile.php', 'Cookie' => "remixsid=#{self.session}")
+      @profile = request.read.to_s
+      if @profile =~ /<input type='hidden' id='activityhash'/
+        set_old_status(text)
+      else
+        set_microblog_status(text)
+      end
+    end
     
-    def set_status text
+    def set_old_status(text)
       url = URI.parse('http://vk.com/profile.php')
       request = Net::HTTP::Post.new(url.path)
       request.set_form_data({'setactivity' => text, 'activityhash' => self.fetch_activityhash})
@@ -11,14 +20,35 @@ module Vkontakte
     end
     
     def fetch_activityhash
-      request = open('http://vk.com/profile.php', 'Cookie' => "remixsid=#{self.session}")
-      profile = request.read.to_s
-      if match = profile.match(/<input type='hidden' id='activityhash' value='([^']+)'>/)
+      if match = @profile.match(/<input type='hidden' id='activityhash' value='([^']+)'>/)
         match[1]
       else
         raise VkontakteError, "Could not find status hash"
       end
     end
     
+    def set_microblog_status(text)
+      url = URI.parse('http://vk.com/wall.php')
+      request = Net::HTTP::Post.new(url.path)
+      request.set_form_data({
+        'act'      => 'a_post_wall',
+        'message'  => text,
+        'reply_to' => -1
+      }.merge(fetch_microblog_data))
+      request['cookie'] = "remixsid=#{self.session}"
+
+      Net::HTTP.new(url.host, url.port).start { |http| http.request(request) }
+    end
+    
+    def fetch_microblog_data
+      if match = @profile.match(/postStatus\((\d+), '([^']+)'\)/)
+        hash = match[2]
+        decoded_hash = (hash[-5..-1] + hash[4..hash.length-9]).reverse
+        { 'to_id' => match[1], 'hash' => decoded_hash }
+      else
+        raise VkontakteError, "Could not find status hash"
+      end
+    end
+    
   end
-end
+end

data/lib/rvk/user.rb

@@ -9,22 +9,21 @@ module Vkontakte
       if (args.size == 1)
         self.session = args.first
       else
-        self.session = self.fetch_session args
+        self.session = self.fetch_session *args
       end      
     end
     
-    def fetch_session args
-      (email, password) = args
+    def fetch_session(email, password)
       resource = Net::HTTP.post_form(URI.parse('http://login.vk.com/'), 
           { 'email' => email, 'pass' => password, 'vk' => '', 'act' => 'login' })
       if resource.body.empty?
         raise VkontakteError, "Could not fetch session"
       end
-      if match = resource.body.match(/id='s' value='([a-z0-9]+)'/)
+      if match = resource.body.match(/name='s' value='([a-z0-9]+)'/)
         match[1]
       else
         raise VkontakteError, "Could not find session"
       end
     end
   end
-end
+end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: rvk
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Alexandr Zykov
+- Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 +01:00
+date: 2010-08-15 00:00:00 +04:00
 default_executable: 
 dependencies: []