vk 0.0.2 → 0.0.3

data/.yardopts

@@ -0,0 +1,4 @@
+--title 'Vk gem — vk.com API wrapper'
+lib/**/*.rb
+-
+README.markdown

data/README.markdown

@@ -2,6 +2,12 @@
 
 Vk is a wrapper for vk.com API
 
+* [Documentation](http://rubydoc.info/gems/vk)
+* [Source](http://github.com/alsemyonov/vk)
+* [Issues](http://github.com/alsemyonov/vk/issues)
+* [Wiki](http://github.com/alsemyonov/vk/wiki)
+* [Documentation for unreleased gem version](http://rubydoc.info/github/alsemyonov/vk)
+
 ## Installation
 
     $ gem install vk
@@ -32,7 +38,7 @@ View methods list at {Vk::DSL}.
 
 ### Usage with object oriented DSL
 
-Currently implemented classes: {Vk::User}, {Vk::City}, {Vk::Country}.
+Currently implemented classes: {Vk::User}, {Vk::City}, {Vk::Country}, {Vk::Post}.
 
     user = Vk::User.find 12345
     user                    # #<Vk::User:12345 @attributes={first_name: 'Ivan', last_name: 'Ivanov', uid: 12345}>
@@ -43,6 +49,7 @@ Currently implemented classes: {Vk::User}, {Vk::City}, {Vk::Country}.
     user.country            # #<Vk::Country:1 @attributes={name: 'Russia', cid: 1}>
     user.friends            # [#<Vk::User:1 @attributes={first_name: "Pavel", last_name: "Durov", uid: 1}>, ...]
     user.friends.first.city # #<Vk::City:1 @attributes={name: 'Moscow', cid: 1}>
+    user.posts.first        # #<Vk::Post:1_123 @attributes={text: 'Preved!11'}>
 
 ## License
 

data/lib/vk.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/object/try'
+
 module Vk
   extend self
 
@@ -8,16 +10,28 @@ module Vk
   autoload :User,     'vk/user'
   autoload :City,     'vk/city'
   autoload :Country,  'vk/country'
+  autoload :Post,     'vk/post'
 
   class << self
-    attr_accessor :app_id, :app_secret
+    attr_accessor :app_id, :app_secret, :logger
   end
 
+  # Request to vk.com API
+  # @return [Vk::Request] Request object
   def request
     @request ||= Request.new
   end
 
+  def log(text, severity = :debug)
+    Vk.logger.try(severity, text)
+  end
+
   def dsl!
     Request.dsl!
   end
+
+  def log!
+    require 'logger'
+    self.logger = Logger.new STDOUT
+  end
 end

data/lib/vk/base.rb

@@ -3,11 +3,14 @@ require 'vk'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/hash_with_indifferent_access'
+require 'active_support/memoizable'
 
 module Vk
   dsl! # require DSL methods in Vk::Request
 
   class Base
+    extend ActiveSupport::Memoizable
+
     class_attribute :identity_map, :loader, :key_field, :fields
     self.loader = Vk.request
 
@@ -26,6 +29,7 @@ module Vk
           end
         end
       end
+      alias [] find
 
       def method_missing(method, *args)
         if identity_map.respond_to?(method)
@@ -59,7 +63,7 @@ module Vk
     end
 
     def id
-      @attributes[key_field]
+      @attributes[key_field].to_i
     end
 
     def read_attribute(name)
@@ -71,7 +75,9 @@ module Vk
 
     def method_missing(method, *args)
       if @attributes.key?(method)
-        @attributes[method.to_s]
+        @attributes[method]
+      elsif self.class.fields.include?(name.to_sym)
+        read_attribute(name)
       else
         super
       end

data/lib/vk/dsl.rb

@@ -80,7 +80,16 @@ module Vk
     # @option options [:owner, :others, :all] :filter (:all) what kind of statuses to request
     # @return [Array<Fixnum, *Hash>] count of statuses and each status in hash
     def get_wall(uid, options = {})
+      options[:filter] ||= :all
       request('wall.get', options.merge(owner_id: uid))
     end
+
+    def get_wall_statuses(posts)
+      request('wall.getById', posts: posts)
+    end
+
+    def get_wall_status(id)
+      get_wall_statuses(id)[0]
+    end
   end
 end

data/lib/vk/post.rb

@@ -0,0 +1,86 @@
+require 'vk/base'
+
+module Vk
+  class Post < Base
+    autoload :Wall, 'vk/post/wall'
+
+    self.key_field = :post_id
+    self.fields = [:id, :from_id, :to_id, :date, :text, :attachment, :comments, :likes, :copy_owner_id, :copy_post_id]
+
+    class << self
+      def find(*ids)
+        options = ids.extract_options!
+        if ids.count == 1
+          id = ids.first
+          identity_map[id] ||= new(id, options)
+        else
+          loaded_ids = ids & identity_map.keys
+          ids_to_load = ids - loaded_ids
+          identity_map.values_at(*loaded_ids).tap do |result|
+            if ids_to_load.any?
+              result << loader.get_wall_statuses(ids_to_load).map do |post|
+                new(id_for(post), data: post)
+              end
+            end
+          end
+        end
+      end
+
+      def id_for(post)
+        "#{post['to_id']}_#{post['id']}"
+      end
+    end
+
+    def id
+      @attributes[key_field]
+    end
+
+    def post_id
+      "#{to_id}_#{id}"
+    end
+    memoize :post_id
+
+    def to
+      Vk::User.find(read_attribute(:to_id))
+    end
+    memoize :to
+
+    def from
+      Vk::User.find(read_attribute(:from_id))
+    end
+    memoize :from
+
+    def date
+      Time.at(read_attribute(:date))
+    end
+    memoize :date
+
+    def copy_owner
+      Vk::User.find(read_attribute(:copy_owner_id))
+    end
+    memoize :copy_owner
+
+    def copy_post
+      Vk::Post.find(read_attribute(:copy_owner_id))
+    end
+    memoize :copy_post
+
+    def comments_count
+      read_attribute(:comments)['count']
+    end
+
+    def likes_count
+      read_attribute(:likes)['count']
+    end
+
+    def to_s
+      text
+    end
+
+    protected
+
+    def load_data(options = {})
+      @attributes = @attributes.merge(loader.get_wall_status(id))
+    end
+  end
+end

data/lib/vk/post/wall.rb

@@ -0,0 +1,67 @@
+require 'vk/post'
+
+require 'delegate'
+
+module Vk
+  class Post
+    class Wall
+      extend ActiveSupport::Memoizable
+
+      attr_accessor :uid, :count, :posts
+
+      def initialize(uid, count, posts)
+        self.uid, self.count, self.posts = uid, count, posts
+      end
+
+      def user
+        Vk::User.find(uid)
+      end
+      memoize :user
+
+      def [](index)
+        raise "Post #{index} is not exist"  if index > count + 1
+        load_posts_to(index)                if index >= loaded_posts
+        if post = posts[index]
+          Vk::Post.find(Vk::Post.id_for(post), data: post)
+        end
+      end
+
+      def first; self[0]; end
+
+      def each(&block)
+        load_all_posts
+        0.upto(count) do |index|
+          block.call(self[index])
+        end
+      end
+
+      def method_missing(method, *args)
+        if posts.respond_to?(method)
+          posts.send(method, *args)
+        else
+          super
+        end
+      end
+
+      protected
+
+      def load_post(index)
+        count, *new_posts = Vk::Base.loader.get_wall(uid, offset: loaded_posts, count: index - loaded_posts + 1)
+        self.posts += new_posts
+        posts[index]
+      end
+
+      def load_posts_to(count)
+        load_post(loaded_posts + 100) while loaded_posts < count
+      end
+
+      def load_all_posts
+        load_posts_to(count)
+      end
+
+      def loaded_posts
+        posts.size
+      end
+    end
+  end
+end

data/lib/vk/request.rb

@@ -42,10 +42,11 @@ module Vk
         method: method_name,
         v:      VERSION
       )
+      Vk.log(data)
       url           = URI.parse("#{SCHEME}://#{HOST}:#{PORT}#{PATH}?#{data.to_query}&sig=#{signature(data)}")
       http_response = Net::HTTP.get_response(url).body
       json_response = JSON.parse(http_response)
-      puts(json_response)
+      Vk.log(json_response)
       json_response['response']
     end
 

data/lib/vk/user.rb

@@ -11,7 +11,7 @@ module Vk
         ids_to_load = ids - loaded_ids
         identity_map.values_at(*loaded_ids).tap do |results|
           if ids_to_load.any?
-            results << loader.get_profiles(ids - loaded_ids, options).map do |profile|
+            results += loader.get_profiles(ids_to_load, options).map do |profile|
               new(profile['uid'], data: profile)
             end
           end
@@ -19,9 +19,12 @@ module Vk
       end
     end
 
+    attr_accessor :posts_count
+
     def name
       "#{first_name} #{last_name}"
     end
+    memoize :name
 
     def city_id
       read_attribute(:city)
@@ -30,6 +33,7 @@ module Vk
     def city
       Vk::City.find(city_id)
     end
+    memoize :city
 
     def country_id
       read_attribute(:country)
@@ -38,20 +42,35 @@ module Vk
     def country
       Vk::Country.find(country_id)
     end
+    memoize :country
 
     def friend_ids
-      @friend_ids ||= loader.get_friends(uid)
+      loader.get_friends(uid)
     end
+    memoize :friend_ids
 
     def friends(options = {})
-      @friends ||= User.find_all(friend_ids, options)
+      User.find_all(friend_ids, options)
     end
+    memoize :friends
 
     def to_s
       name
     end
 
+    def wall(options = {})
+      count, *posts = loader.get_wall(id, options)
+      Vk::Post::Wall.new(id, count, posts)
+    end
+    memoize :wall
+    alias posts wall
+
+    def posts_count
+      wall.count
+    end
+
     protected
+
     def load_data(options = {})
       @attributes = @attributes.merge(loader.get_profile(id, options))
     end

data/lib/vk/version.rb

@@ -1,3 +1,3 @@
 module Vk
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +06:00
+date: 2011-05-05 00:00:00 +06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .yardopts
 - Gemfile
 - README.markdown
 - Rakefile
@@ -95,6 +96,8 @@ files:
 - lib/vk/city.rb
 - lib/vk/country.rb
 - lib/vk/dsl.rb
+- lib/vk/post.rb
+- lib/vk/post/wall.rb
 - lib/vk/request.rb
 - lib/vk/user.rb
 - lib/vk/version.rb