fb_graph2 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6036910e798a2dc8d32f03de1fec4d99bcd197eb
-  data.tar.gz: 3cc301a00712616e7165541d2fd5fecd9b27fa7c
+  metadata.gz: 27eba51717bb5b667d0e6c6f4919c4d896c7c444
+  data.tar.gz: 51dc48b5d3239da4c9573c217d95e85c4825e13f
 SHA512:
-  metadata.gz: ed9daa2f3139f01b5611797a49fe172609c9981431409e5f95567597bdf4f4bfd877df9a55d1e765ff27ea462cfe07787e180260d12f4e372075fa7a53cc3c24
-  data.tar.gz: 6fe6cdf6b25d1b88c0efcf20fdceed25ba59c52a5592bb644948f04c0c91e0ad4cb26914cde97d665cf5bf72bb47bc09d81a724a000c5a7dac11922d2601f0f5
+  metadata.gz: 322128ddffe2d900508098b9098b1d71a1c492d755cea87c3be3d9d6ccfa0de945433f51fe4532234b4d1d3b5d39615b1b3404284ee21a661bd46387efe6d368
+  data.tar.gz: 9c2eaae75431949e4b659ded3a719483df74cb0d5000449050acac8519bd32e9f580b5d68b70114c567d911a5c8240ae888bba885293f4a4b930f618cdd0d424

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/lib/fb_graph2/event.rb

@@ -9,6 +9,7 @@ module FbGraph2
     include Edge::Picture
     include Edge::Photos
     include Edge::Videos
+    extend Searchable
 
     register_attributes(
       raw: [:description, :is_date_only, :location, :name, :privacy, :ticket_uri, :timezone],

data/lib/fb_graph2/group.rb

@@ -5,6 +5,7 @@ module FbGraph2
     include Edge::Feed
     include Edge::Files
     include Edge::Members
+    extend Searchable
 
     register_attributes(
       raw: [

data/lib/fb_graph2/page.rb

@@ -20,6 +20,7 @@ module FbGraph2
     include Edge::Statuses
     include Edge::Tagged
     include Edge::Videos
+    extend Searchable
 
     register_attributes(
       raw: [

data/lib/fb_graph2/place.rb

@@ -0,0 +1,4 @@
+module FbGraph2
+  class Place < Page
+  end
+end

data/lib/fb_graph2/searchable/result.rb

@@ -0,0 +1,32 @@
+module FbGraph2
+  module Searchable
+    class Result < Collection
+      attr_accessor :query, :access_token, :klass, :collection, :options
+
+      def initialize(query, access_token, klass, options = {})
+        @klass = klass
+        @access_token = access_token
+        @query = query
+        @options = options
+        @collection = options.delete(:collection) || Collection.new
+        replace @collection
+      end
+
+      def next(_options_ = {})
+        if collection.next.present?
+          klass.search query, access_token, options.merge(_options_).merge(collection.next)
+        else
+          self.class.new query, access_token, klass
+        end
+      end
+
+      def previous(_options_ = {})
+        if collection.previous.present?
+          klass.search query, access_token, options.merge(_options_).merge(collection.previous)
+        else
+          self.class.new query, access_token, klass
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/searchable.rb

@@ -0,0 +1,27 @@
+module FbGraph2
+  module Searchable
+    def self.search(query, access_token, options = {})
+      klass = options.delete(:class) || Searchable
+      collection = Collection.new(
+        Node.new(:search).authenticate(
+          access_token
+        ).send(:get, options.merge(q: query))
+      )
+      yield collection if block_given?
+      Searchable::Result.new(query, access_token, klass, options.merge(:collection => collection))
+    end
+
+    def search(query, access_token, options = {})
+      type = self.to_s.split('::').last.underscore
+      Searchable.search(query, access_token, options.merge(:type => type, :class => self)) do |collection|
+        collection.map! do |obj|
+          self.new(obj[:id], obj.merge(
+            :access_token => options[:access_token]
+          ))
+        end
+      end
+    end
+  end
+end
+
+require 'fb_graph2/searchable/result'

data/lib/fb_graph2/struct/education.rb

@@ -3,9 +3,9 @@ module FbGraph2
     class Education < Struct
       register_attributes(
         raw: [:type],
-        page: [:school, :year],
+        page: [:school, :year, :degree],
         pages: [:classes, :concentration]
       )
     end
   end
-end
+end

data/lib/fb_graph2/user.rb

@@ -37,6 +37,7 @@ module FbGraph2
     include Edge::TaggedPlaces
     include Edge::Television
     include Edge::Videos
+    extend Searchable
 
     register_attributes(
       raw: [

data/lib/fb_graph2.rb

@@ -43,6 +43,7 @@ end
 require 'fb_graph2/attribute_assigner'
 require 'fb_graph2/node'
 require 'fb_graph2/collection'
+require 'fb_graph2/searchable'
 require 'fb_graph2/edge'
 [
   '.',

data/spec/fb_graph2/searchable_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe FbGraph2::Searchable do
+  describe 'search' do
+    context 'User' do
+      it 'should return users' do
+        users = mock_graph :get, 'search', 'search/user', access_token: 'token', params: {
+          q: 'nov.matake',
+          type: 'user'
+        } do
+          FbGraph2::User.search 'nov.matake', 'token'
+        end
+        users.should be_instance_of FbGraph2::Searchable::Result
+        users.should_not be_empty
+        users.each do |user|
+          user.should be_instance_of FbGraph2::User
+        end
+      end
+    end
+  end
+
+  describe 'pagination' do
+    context 'when first page' do
+      let :page1 do
+         mock_graph :get, 'search', 'search/user', access_token: 'token', params: {
+          q: 'nov.matake',
+          type: 'user'
+        } do
+          FbGraph2::User.search 'nov.matake', 'token'
+        end
+      end
+
+      it 'should have next' do
+        mock_graph :get, 'search', 'blank_collection', access_token: 'token', params: {
+          q: 'nov.matake',
+          type: 'user',
+          __after_id: 'enc_AeyyBJc7uo9gY-nHN9-LM0yG_IKBN5nCmqdkG8b4Ql-COLTnpQ-2NUc-xSDK6VwPhsq2W9Ktnr0zf7dD25Bc9eKT',
+          limit: 5000,
+          offset: 5000
+        } do
+          page1.next
+        end
+      end
+
+      it 'should have no previous' do
+        page1.previous.should be_blank
+      end
+    end
+  end
+end

data/spec/fb_graph2_spec.rb

@@ -8,7 +8,7 @@ describe FbGraph2 do
     its(:logger) { should be_a Logger }
     its(:api_version) { should == 'v2.0' }
     its(:root_url) { should == 'https://graph.facebook.com' }
-    its(:object_classes) { should contain_exactly *FbGraph2::Node.subclasses }
+    its(:object_classes) { should contain_exactly *FbGraph2::Node.subclasses + [FbGraph2::Place] }
     it { should_not be_debugging }
   end
 

data/spec/mock_json/search/user.json

@@ -0,0 +1,9 @@
+{
+  "data": [{
+    "name": "Nov Matake",
+    "id": "426118390869327"
+  }],
+  "paging": {
+    "next": "https:\/\/graph.facebook.com\/v2.0\/search?type=user&q=nov.matake&limit=5000&offset=5000&__after_id=enc_AeyyBJc7uo9gY-nHN9-LM0yG_IKBN5nCmqdkG8b4Ql-COLTnpQ-2NUc-xSDK6VwPhsq2W9Ktnr0zf7dD25Bc9eKT"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph2
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -247,12 +247,15 @@ files:
 - lib/fb_graph2/page_category.rb
 - lib/fb_graph2/payment.rb
 - lib/fb_graph2/photo.rb
+- lib/fb_graph2/place.rb
 - lib/fb_graph2/place_tag.rb
 - lib/fb_graph2/post.rb
 - lib/fb_graph2/request.rb
 - lib/fb_graph2/request_filter/authenticator.rb
 - lib/fb_graph2/request_filter/debugger.rb
 - lib/fb_graph2/review.rb
+- lib/fb_graph2/searchable.rb
+- lib/fb_graph2/searchable/result.rb
 - lib/fb_graph2/struct.rb
 - lib/fb_graph2/struct/action.rb
 - lib/fb_graph2/struct/age_range.rb
@@ -346,6 +349,7 @@ files:
 - spec/fb_graph2/page_spec.rb
 - spec/fb_graph2/request_filter/authenticator_spec.rb
 - spec/fb_graph2/request_filter/debugger_spec.rb
+- spec/fb_graph2/searchable_spec.rb
 - spec/fb_graph2/token_metadata_spec.rb
 - spec/fb_graph2/user_spec.rb
 - spec/fb_graph2/util_spec.rb
@@ -380,6 +384,7 @@ files:
 - spec/mock_json/post/liked_and_commented.json
 - spec/mock_json/post/likes.json
 - spec/mock_json/post/shared_posts.json
+- spec/mock_json/search/user.json
 - spec/mock_json/success_true.json
 - spec/mock_json/success_with_id.json
 - spec/mock_json/token_metadata/app_token.json
@@ -443,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Facebook Graph API v2.0 Wrapper in Ruby