fb_graph 2.1.5 → 2.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.1.4)
+    fb_graph (2.1.5)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 
@@ -28,8 +28,8 @@ GEM
       multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
-    bcrypt-ruby (3.0.0)
-    bcrypt-ruby (3.0.0-java)
+    bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     crack (0.1.8)
@@ -40,15 +40,14 @@ GEM
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
-    json (1.5.4)
-    json (1.5.4-java)
+    json (1.6.0)
     multi_json (1.0.3)
     rack (1.3.2)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-oauth2 (0.9.5)
+    rack-oauth2 (0.10.1)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.1.6

data/lib/fb_graph/connections/inbox.rb

@@ -4,12 +4,15 @@ module FbGraph
       def inbox(options = {})
         threads = self.connection(:inbox, options)
         threads.map! do |thread|
-          # NOTE:
-          #  Inbox API doesn't return thread object until their message platform becomes broadly available.
-          #  Use Post instead of Thread for now.
-          Post.new(thread[:id], thread.merge(
-            :access_token => options[:access_token] || self.access_token
-          ))
+          if thread[:message]
+            Thread::BeforeTransition.new(thread[:id], thread.merge(
+              :access_token => options[:access_token] || self.access_token
+            ))
+          else
+            Thread.new(thread[:id], thread.merge(
+              :access_token => options[:access_token] || self.access_token
+            ))
+          end
         end
       end
     end

data/lib/fb_graph/connections/outbox.rb

@@ -4,12 +4,15 @@ module FbGraph
       def outbox(options = {})
         threads = self.connection(:outbox, options)
         threads.map! do |thread|
-          # NOTE:
-          #  Inbox API doesn't return thread object until their message platform becomes broadly available.
-          #  Use Post instead of Thread for now.
-          Post.new(thread[:id], thread.merge(
-            :access_token => options[:access_token] || self.access_token
-          ))
+          if thread[:message]
+            Thread::BeforeTransition.new(thread[:id], thread.merge(
+              :access_token => options[:access_token] || self.access_token
+            ))
+          else
+            Thread.new(thread[:id], thread.merge(
+              :access_token => options[:access_token] || self.access_token
+            ))
+          end
         end
       end
     end

data/lib/fb_graph/thread.rb

@@ -24,5 +24,54 @@ module FbGraph
       @_senders_ = Collection.new(attributes[:senders])
       @_tags_ = Collection.new(attributes[:tags])
     end
+
+    # NOTE:
+    #  Facebook is under transision of their message platform.
+    #  This is current thread model in Graph API.
+    #  In near future, this will be replaced with FbGraph::Thread model.
+    class BeforeTransition < Node
+      attr_accessor :subject, :message, :from, :to, :unread, :unseen, :updated_time
+
+      def initialize(identifier, attributes = {})
+        super
+        @subject = attributes[:subject]
+        @message = attributes[:message]
+        if (from = attributes[:from])
+          @from = if from[:start_time]
+            Event.new(from[:id], from)
+          else
+            User.new(from[:id], from)
+          end
+        end
+        @to = []
+        Collection.new(attributes[:to]).each do |to|
+          @to << User.new(to[:id], to)
+        end
+        if attributes[:updated_time]
+          @created_time = Time.parse(attributes[:updated_time]).utc
+        end
+        @unread = attributes[:unread] == 1
+        @unseen = attributes[:unseen] == 1
+        @_messages_ = Collection.new(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.map! do |message|
+          Message.new(message[:id], message.merge(
+            :access_token => options[:access_token] || self.access_token
+          ))
+        end
+      end
+      # for pagination, a method which name is same as the connection name is needed.
+      alias_method :comments, :messages
+    end
   end
 end

data/spec/fb_graph/connections/inbox_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::Inbox, '#inbox' do
-  # NOTE:
-  #  This connection returns Post instead of Thread for now.
-  #  See inbox.rb for more details.
-  it 'should return threads as FbGraph::Post' do
-    mock_graph :get, 'me/inbox', 'users/inbox/me_private', :access_token => 'access_token' do
-      threads = FbGraph::User.me('access_token').inbox
-      threads.each do |thread|
-        thread.should be_instance_of(FbGraph::Post)
+  context 'before message platform transition' do
+    it 'should return threads as FbGraph::Thread::BeforeTransition' do
+      mock_graph :get, 'me/inbox', 'users/inbox/before_transition', :access_token => 'access_token' do
+        threads = FbGraph::User.me('access_token').inbox
+        threads.each do |thread|
+          thread.should be_instance_of(FbGraph::Thread::BeforeTransition)
+        end
       end
     end
   end
+
+  # TODO: after transition, check JSON format and put test here
 end

data/spec/fb_graph/connections/outbox_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe FbGraph::Connections::Outbox, '#outbox' do
-  # NOTE:
-  #  This connection returns Post instead of Thread for now.
-  #  See outbox.rb for more details.
-  it 'should return threads as FbGraph::Post' do
-    mock_graph :get, 'me/outbox', 'users/outbox/me_private', :access_token => 'access_token' do
-      threads = FbGraph::User.me('access_token').outbox
-      threads.each do |thread|
-        thread.should be_instance_of(FbGraph::Post)
+  context 'before message platform transition' do
+    it 'should return threads as FbGraph::Thread::BeforeTransition' do
+      mock_graph :get, 'me/outbox', 'users/outbox/me_private', :access_token => 'access_token' do
+        threads = FbGraph::User.me('access_token').outbox
+        threads.each do |thread|
+          thread.should be_instance_of(FbGraph::Thread::BeforeTransition)
+        end
       end
     end
   end
+
+  # TODO: after transition, check JSON format and put test here
 end

data/spec/fb_graph/thread_spec.rb

@@ -83,4 +83,34 @@ describe FbGraph::Thread, '.new' do
       FbGraph::User.new('1575327134', :name => 'Nov Matake', :email => 'abc@facebook.com')
     ]
   end
+
+
+  describe FbGraph::Thread::BeforeTransition do
+    describe '#messages' do
+      it 'should use cached contents as default' do
+        lambda do
+          FbGraph::Thread::BeforeTransition.new(12345, :access_token => 'access_token').messages
+        end.should_not request_to '12345/comments?access_token=access_token'
+      end
+
+      it 'should not use cached contents when options are specified' do
+        lambda do
+          FbGraph::Thread::BeforeTransition.new(12345).messages(:no_cache => true)
+        end.should request_to '12345/comments?no_cache=true'
+      end
+
+      it 'should return threads as FbGraph::Message' do
+        mock_graph :get, '12345/comments', 'thread/messages/private', :params => {:no_cache => 'true'}, :access_token => 'access_token' do
+          messages = FbGraph::Thread::BeforeTransition.new(12345, :access_token => 'access_token').messages(:no_cache => true)
+          messages.each do |message|
+            message.should be_instance_of(FbGraph::Message)
+          end
+          lambda do
+            messages.next
+          end.should request_to '12345/comments'
+        end
+      end
+    end
+  end
+
 end

data/spec/mock_json/users/inbox/{me_private.json → before_transition.json}

@@ -1,5 +1,26 @@
 {
    "data": [
+      {
+          "id": "1234567890",
+          "from": {
+              "name": "Some Event",
+              "start_time": "2011-08-19T21:00:00",
+              "end_time": "2011-08-20T04:00:00",
+              "location": "Somewhere",
+              "id": "1234567890"
+          },
+          "to": {
+              "data": [{
+                  "name": "Nov",
+                  "id": "579612276"
+              }]
+          },
+          "subject": "Subject",
+          "message": "Message",
+          "updated_time": "2011-08-21T08:24:30+0000",
+          "unread": 1,
+          "unseen": 0
+      },
       {
          "id": "1390404535644",
          "from": {

metadata

@@ -2,7 +2,7 @@
 name: fb_graph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httpclient
@@ -468,7 +468,7 @@ files:
 - spec/mock_json/users/home/me_private_next.json
 - spec/mock_json/users/home/me_private_previous.json
 - spec/mock_json/users/home/me_public.json
-- spec/mock_json/users/inbox/me_private.json
+- spec/mock_json/users/inbox/before_transition.json
 - spec/mock_json/users/interests/matake_private.json
 - spec/mock_json/users/likes/arjun_private.json
 - spec/mock_json/users/likes/arjun_public.json
@@ -759,7 +759,7 @@ test_files:
 - spec/mock_json/users/home/me_private_next.json
 - spec/mock_json/users/home/me_private_previous.json
 - spec/mock_json/users/home/me_public.json
-- spec/mock_json/users/inbox/me_private.json
+- spec/mock_json/users/inbox/before_transition.json
 - spec/mock_json/users/interests/matake_private.json
 - spec/mock_json/users/likes/arjun_private.json
 - spec/mock_json/users/likes/arjun_public.json