fb_graph 2.2.2 → 2.2.3

data/Gemfile.lock

@@ -1,35 +1,34 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.2.1)
+    fb_graph (2.2.2)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.1.1)
-      activemodel (= 3.1.1)
-      activesupport (= 3.1.1)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
+      rack (~> 1.3.5)
       rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.2)
-    activemodel (3.1.1)
-      activesupport (= 3.1.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activesupport (3.1.1)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
-    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
-    configatron (2.8.3)
+    configatron (2.8.4)
       yamler (>= 0.1.0)
     cover_me (1.2.0)
       configatron
@@ -41,8 +40,6 @@ GEM
     hike (1.2.1)
     httpclient (2.2.3)
     i18n (0.6.0)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
     json (1.6.1)
     multi_json (1.0.3)
     rack (1.3.5)
@@ -73,13 +70,12 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    webmock (1.7.7)
+    webmock (1.7.8)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     yamler (0.1.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

data/lib/fb_graph/album.rb

@@ -39,7 +39,7 @@ module FbGraph
       end
 
       # cached connection
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collection attributes, :comments
     end
 
     def picture_with_access_token(size = nil)

data/lib/fb_graph/connections/comments.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module Comments
       def comments(options = {})
-        comments = if @_comments_ && options.blank?
-          self.connection(:comments, options.merge(:cached_collection => @_comments_))
-        else
-          self.connection(:comments, options)
-        end
+        comments = self.connection(:comments, options)
         comments.map! do |comment|
           Comment.new(comment[:id], comment.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/former_participants.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module FormerParticipants
       def former_participants(options = {})
-        users = if @_former_participants_ && options.blank?
-          self.connection(:former_participants, options.merge(:cached_collection => @_former_participants_))
-        else
-          self.connection(:former_participants, options)
-        end
+        users = self.connection(:former_participants, options)
         users.map! do |user|
           User.new(user[:id], user.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/likes.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module Likes
       def likes(options = {})
-        likes = if @_likes_ && options.blank?
-          self.connection(:likes, options.merge(:cached_collection => @_likes_))
-        else
-          self.connection(:likes, options)
-        end
+        likes = self.connection(:likes, options)
         likes.map! do |like|
           like.merge!(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/messages.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module Messages
       def messages(options = {})
-        messages = if @_messages_ && options.blank?
-          self.connection(:messages, options.merge(:cached_collection => @_messages_))
-        else
-          self.connection(:messages, options)
-        end
+        messages = self.connection(:messages, options)
         messages.map! do |message|
           Message.new(message[:id], message.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/participants.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module Participants
       def participants(options = {})
-        users = if @_participants_ && options.blank?
-          self.connection(:participants, options.merge(:cached_collection => @_participants_))
-        else
-          self.connection(:participants, options)
-        end
+        users = self.connection(:participants, options)
         users.map! do |user|
           User.new(user[:id], user.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/question_options.rb

@@ -1,12 +1,8 @@
 module FbGraph
   module Connections
     module QuestionOptions
-      def options(opts = {})
-        question_options = if @_options_ && opts.blank?
-          self.connection(:question_options, opts.merge(:cached_collection => @_options_))
-        else
-          self.connection(:question_options, opts)
-        end
+      def question_options(opts = {})
+        question_options = self.connection(:question_options, opts)
         question_options.map! do |option|
           QuestionOption.new(option[:id], option.merge(
             :access_token => opts[:access_token] || self.access_token

data/lib/fb_graph/connections/senders.rb

@@ -2,11 +2,7 @@ module FbGraph
   module Connections
     module Senders
       def senders(options = {})
-        users = if @_senders_ && options.blank?
-          self.connection(:senders, options.merge(:cached_collection => @_senders_))
-        else
-          self.connection(:senders, options)
-        end
+        users = self.connection(:senders, options)
         users.map! do |user|
           User.new(user[:id], user.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/connections/tags.rb

@@ -2,15 +2,14 @@ module FbGraph
   module Connections
     module Tags
       def tags(options = {})
-        tags = if @_tags_ && options.blank?
-          return @_tags_ if @_tags_.first.is_a?(Tag)
-          self.connection(:tags, options.merge(:cached_collection => @_tags_))
+        tags = self.connection(:tags, options)
+        if tags.first.is_a?(Tag)
+          tags
         else
-          self.connection(:tags, options)
-        end
-        tags.map! do |tag|
-          tag[:access_token] ||= options[:access_token] || self.access_token
-          Tag.new(tag)
+          tags.map! do |tag|
+            tag[:access_token] ||= options[:access_token] || self.access_token
+            Tag.new(tag)
+          end
         end
       end
 

data/lib/fb_graph/link.rb

@@ -26,7 +26,7 @@ module FbGraph
       end
 
       # cached connection
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collection attributes, :comments
     end
   end
 end

data/lib/fb_graph/message.rb

@@ -24,7 +24,7 @@ module FbGraph
       end
 
       # cached connection
-      @_tags_ = Collection.new(attributes[:tags])
+      cache_collection attributes, :tags
     end
   end
 end

data/lib/fb_graph/node.rb

@@ -7,9 +7,10 @@ module FbGraph
     attr_accessor :identifier, :endpoint, :access_token
 
     def initialize(identifier, options = {})
-      @identifier   = identifier
-      @endpoint     = File.join(ROOT_URL, identifier.to_s)
-      @access_token = options[:access_token]
+      @identifier         = identifier
+      @endpoint           = File.join(ROOT_URL, identifier.to_s)
+      @access_token       = options[:access_token]
+      @cached_collections = {}
     end
 
     def fetch(options = {})
@@ -24,16 +25,21 @@ module FbGraph
     end
 
     def connection(connection, options = {})
-      collection = options[:cached_collection] || Collection.new(get(options.merge(:connection => connection)))
-      Connection.new(self, connection, options.merge(:collection => collection))
+      Connection.new(
+        self,
+        connection,
+        options.merge(
+          :collection => collection_for(connection, options)
+        )
+      )
     end
 
     def update(options = {})
-      post(options)
+      post options
     end
 
     def destroy(options = {})
-      delete(options)
+      delete options
     end
 
     protected
@@ -68,6 +74,25 @@ module FbGraph
 
     private
 
+    def collection_for(connection, options = {})
+      collection = if @cached_collections.has_key?(connection) && options.blank?
+        @cached_collections[connection]
+      else
+        get options.merge(:connection => connection)
+      end
+      Collection.new collection
+    end
+
+    def cache_collections(attributes, *connections)
+      if (attributes.keys - [:access_token]).present?
+        connections.each do |connection|
+          attribute_key, connection = connection.to_a.flatten if connection.is_a?(Hash)
+          @cached_collections[connection] = attributes[attribute_key || connection]
+        end
+      end
+    end
+    alias_method :cache_collection, :cache_collections
+
     def build_endpoint(params = {})
       File.join([self.endpoint, params.delete(:connection), params.delete(:connection_scope)].compact.collect(&:to_s))
     end

data/lib/fb_graph/note.rb

@@ -26,7 +26,7 @@ module FbGraph
       @icon = attributes[:icon]
 
       # cached connection
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collection attributes, :comments
     end
   end
 end

data/lib/fb_graph/open_graph/action.rb

@@ -30,8 +30,7 @@ module FbGraph
         end
 
         # cached connection
-        @_likes_ = Collection.new(attributes[:likes])
-        @_comments_ = Collection.new(attributes[:comments])
+        cache_collections attributes, :comments, :likes
       end
     end
   end

data/lib/fb_graph/page.rb

@@ -22,11 +22,11 @@ module FbGraph
     include Connections::Videos
     extend Searchable
 
-    attr_accessor :name, :username, :category, :like_count
+    attr_accessor :name, :username, :category, :like_count, :talking_about_count
 
     def initialize(identifier, attributes = {})
       super
-      [:name, :username, :category].each do |key|
+      [:name, :username, :category, :talking_about_count].each do |key|
         self.send :"#{key}=", attributes[key]
       end
       @like_count = attributes[:likes] || attributes[:fan_count]

data/lib/fb_graph/photo.rb

@@ -42,8 +42,7 @@ module FbGraph
       end
 
       # cached connection
-      @_tags_ = Collection.new(attributes[:tags])
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collections attributes, :comments, :tags
     end
   end
 end

data/lib/fb_graph/post.rb

@@ -105,8 +105,7 @@ module FbGraph
       end
 
       # cached connection
-      @_likes_ = Collection.new(attributes[:likes])
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collections attributes, :comments, :likes
     end
   end
 end

data/lib/fb_graph/question.rb

@@ -17,10 +17,8 @@ module FbGraph
         Time.parse(attributes[:updated_time]).utc
       end
 
-      @_options_ = if attributes[:options]
-        # cached options
-       Collection.new(attributes[:options])
-      end
+      # cached connection
+      cache_collection attributes, :options => :question_options
     end
   end
 end

data/lib/fb_graph/searchable.rb

@@ -23,9 +23,10 @@ module FbGraph
 
     # The majority of Graph API searches use 'q' but some, like AdKeywordSuggestion
     # use an alternate search query param
-    def search_query_param
+    def self.search_query_param
       :q
     end
+    delegate :search_query_param, :to => Searchable
   end
 end
 

data/lib/fb_graph/status.rb

@@ -21,8 +21,7 @@ module FbGraph
       end
 
       # cached connection
-      @_comments_ = Collection.new(attributes[:comments])
-      @_likes_ = Collection.new(attributes[:likes])
+      cache_collections attributes, :comments, :likes
     end
   end
 end

data/lib/fb_graph/thread.rb

@@ -18,11 +18,7 @@ module FbGraph
       end
 
       # cached connection
-      @_messages_ = Collection.new(attributes[:messages])
-      @_participants_ = Collection.new(attributes[:participants])
-      @_former_participants_ = Collection.new(attributes[:former_articipants])
-      @_senders_ = Collection.new(attributes[:senders])
-      @_tags_ = Collection.new(attributes[:tags])
+      cache_collections attributes, :messages, :participants, :former_participants, :senders, :tags
     end
 
     # NOTE:
@@ -52,18 +48,16 @@ module FbGraph
         end
         @unread = attributes[:unread] == 1
         @unseen = attributes[:unseen] == 1
-        @_messages_ = Collection.new(attributes[:comments])
+
+        # cached connection
+        cache_collection attributes, :comments
       end
 
       # NOTE:
       #  This is a connection named "comments" but returns "messages" and different from normal "comments" connection.
       #  Therefore I put this connection here not under FbGraph::Connections.
       def messages(options = {})
-        messages = if @_messages_ && options.blank?
-          self.connection(:comments, options.merge(:cached_collection => @_messages_))
-        else
-          self.connection(:comments, options)
-        end
+        messages = self.connection(:comments, options)
         messages.map! do |message|
           Message.new(message[:id], message.merge(
             :access_token => options[:access_token] || self.access_token

data/lib/fb_graph/user_achievement.rb

@@ -24,8 +24,7 @@ module FbGraph
       end
 
       # cached connection
-      @_likes_ = Collection.new(attributes[:likes])
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collections attributes, :comments, :likes
     end
 
     def destroy(options = {})

data/lib/fb_graph/video.rb

@@ -35,7 +35,7 @@ module FbGraph
       end
 
       # cached connection
-      @_comments_ = Collection.new(attributes[:comments])
+      cache_collections attributes, :comments
     end
   end
 end

data/spec/fb_graph/connections/comments_spec.rb

@@ -8,16 +8,32 @@ describe FbGraph::Connections::Comments, '#comments' do
       end
     end
 
-    it 'should use cached @_comments_ as default' do
-      lambda do
-        post.comments
-      end.should_not request_to "#{post.identifier}/comments"
-    end
+    describe 'cached comments' do
+      context 'when cached' do
+        it 'should use cache' do
+          lambda do
+            post.comments
+          end.should_not request_to "#{post.identifier}/comments"
+        end
+
+        context 'when options are specified' do
+          it 'should not use cache' do
+            lambda do
+              post.comments(:no_cache => true)
+            end.should request_to "#{post.identifier}/comments?no_cache=true"
+          end
+        end
+      end
 
-    it 'should ignore cached @_comments_ when options are given' do
-      lambda do
-        post.comments(:no_cache => true)
-      end.should request_to "#{post.identifier}/comments"
+      context 'otherwise' do
+        let(:post) { FbGraph::Post.new(12345, :access_token => 'access_token') }
+
+        it 'should not use cache' do
+          lambda do
+            post.comments
+          end.should request_to '12345/comments?access_token=access_token'
+        end
+      end
     end
   end
 end
@@ -45,10 +61,6 @@ describe FbGraph::Connections::Comments, '#comment!' do
     end
 
     context 'when valid access_token is given' do
-      before do
-        
-      end
-
       it 'should return generated comment' do
         mock_graph :post, '12345/comments', 'posts/comments/post_with_valid_access_token' do
           comment = FbGraph::Post.new('12345', :access_token => 'valid').comment!(:message => 'hello')

data/spec/fb_graph/connections/former_participants_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::FormerParticipants, '#former_participants' do
-  it 'should use cached contents as default' do
-    lambda do
-      FbGraph::Thread.new(12345, :access_token => 'access_token').former_participants
-    end.should_not request_to '12345/former_participants?access_token=access_token'
-  end
-
-  it 'should not use cached contents when options are specified' do
-    lambda do
-      FbGraph::Thread.new(12345).former_participants(:no_cache => true)
-    end.should request_to '12345/former_participants?no_cache=true'
-  end
-
   it 'should return former_participants as FbGraph::User' do
     mock_graph :get, '12345/former_participants', 'thread/former_participants/private', :access_token => 'access_token', :params => {
       :no_cache => 'true'
@@ -23,4 +11,34 @@ describe FbGraph::Connections::FormerParticipants, '#former_participants' do
       end
     end
   end
+
+  describe 'cached messages' do
+    context 'when cached' do
+      let(:thread) { FbGraph::Thread.new(12345, :access_token => 'access_token', :former_participants => {}) }
+
+      it 'should use cache' do
+        lambda do
+          thread.former_participants
+        end.should_not request_to '12345/former_participants?access_token=access_token'
+      end
+
+      context 'when options are specified' do
+        it 'should not use cache' do
+          lambda do
+            thread.former_participants(:no_cache => true)
+          end.should request_to '12345/former_participants?access_token=access_token&no_cache=true'
+        end
+      end
+    end
+
+    context 'otherwise' do
+      let(:thread) { FbGraph::Thread.new(12345, :access_token => 'access_token') }
+
+      it 'should not use cache' do
+        lambda do
+          thread.former_participants
+        end.should request_to '12345/former_participants?access_token=access_token'
+      end
+    end
+  end
 end

data/spec/fb_graph/connections/likes_spec.rb

@@ -12,6 +12,38 @@ describe FbGraph::Connections::Likes do
       end
     end
 
+    context 'when included by FbGraph::Post' do
+      let(:post) { FbGraph::Post.new('post_id', :access_token => 'access_token', :likes => {}) }
+
+      describe 'cached likes' do
+        context 'when cached' do
+          it 'should use cache' do
+            lambda do
+              post.likes
+            end.should_not request_to 'post_id/likes?access_token=access_token'
+          end
+
+          context 'when options are specified' do
+            it 'should not use cache' do
+              lambda do
+                post.likes(:no_cache => true)
+              end.should request_to 'post_id/likes?access_token=access_token&no_cache=true'
+            end
+          end
+        end
+
+        context 'otherwise' do
+          let(:post) { FbGraph::Post.new(12345, :access_token => 'access_token') }
+
+          it 'should not use cache' do
+            lambda do
+              post.likes
+            end.should request_to '12345/likes?access_token=access_token'
+          end
+        end
+      end
+    end
+
     context 'when included by FbGraph::Status' do
       context 'when cached collection exists' do
         before do

data/spec/fb_graph/connections/messages_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::Messages, '#messages' do
-  it 'should use cached contents as default' do
-    lambda do
-      FbGraph::Thread.new(12345, :access_token => 'access_token').messages
-    end.should_not request_to '12345/messages?access_token=access_token'
-  end
-
-  it 'should not use cached contents when options are specified' do
-    lambda do
-      FbGraph::Thread.new(12345).messages(:no_cache => true)
-    end.should request_to '12345/messages?no_cache=true'
-  end
-
   it 'should return threads as FbGraph::Message' do
     mock_graph :get, '12345/messages', 'thread/messages/private', :params => {:no_cache => 'true'}, :access_token => 'access_token' do
       messages = FbGraph::Thread.new(12345, :access_token => 'access_token').messages(:no_cache => true)
@@ -21,4 +9,34 @@ describe FbGraph::Connections::Messages, '#messages' do
       end
     end
   end
+
+  describe 'cached messages' do
+    context 'when cached' do
+      let(:thread) { FbGraph::Thread.new(12345, :access_token => 'access_token', :messages => {}) }
+
+      it 'should use cache' do
+        lambda do
+          thread.messages
+        end.should_not request_to '12345/messages?access_token=access_token'
+      end
+
+      context 'when options are specified' do
+        it 'should not use cache' do
+          lambda do
+            thread.messages(:no_cache => true)
+          end.should request_to '12345/messages?access_token=access_token&no_cache=true'
+        end
+      end
+    end
+
+    context 'otherwise' do
+      let(:thread) { FbGraph::Thread.new(12345, :access_token => 'access_token') }
+
+      it 'should not use cache' do
+        lambda do
+          thread.messages
+        end.should request_to '12345/messages?access_token=access_token'
+      end
+    end
+  end
 end