fb_graph2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2611fb2baed301de340cfdbfa644d4f0253ad59a
-  data.tar.gz: 19d3d36952bc4ddfaef0d53c9e7615274a0937c1
+  metadata.gz: 0aada3bb0f27460fa19a74601046d482a0d08117
+  data.tar.gz: 5c7342702b69f58154689439912e73afca059111
 SHA512:
-  metadata.gz: 3e35b7fd13586d1fff033a477b8778f9f1081f8f6488bc26d0d0ab3eeb135c507a2099a599e9baea5e86bffb3af9d0f6d647750a353abc688555a7fed7eee57d
-  data.tar.gz: aa88f0f71ebe57734aa1612dae49e32031faa369810959bcd552fc1c16b48456d01751e57acd726403d2dec9544ae7780101a17a195e6a0b82a26e7662463c9f
+  metadata.gz: a44c71b1317b8e3c537e17e7511a6a023f355fc7916a5620e113f0e2ee8c8643d990650e4e4bb18b7447570a41891ea201260d21b6d13bc8fe14039ec914b94e
+  data.tar.gz: 3956dcb25143d937db3b10597e79fbf72083b0348a7ec81ebe58ad6d271ea68857e2bea5113b868d5409fe7598ef6f3da7280a73e18b2d7c958929ac0d12e28d

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/fb_graph2/achievement.rb

@@ -1,5 +1,8 @@
 module FbGraph2
   class Achievement < Node
+    include Edge::Comments
+    include Edge::Likes::LikeeContext
+
     register_attributes(
       raw: [:type, :no_feed_story],
       time: [:publish_time],

data/lib/fb_graph2/album.rb

@@ -1,5 +1,11 @@
 module FbGraph2
   class Album < Node
+    include Edge::Comments
+    include Edge::Likes::LikeeContext
+    include Edge::Picture
+    include Edge::Photos
+    include Edge::SharedPosts
+
     register_attributes(
       raw: [:can_upload, :count, :cover_photo, :description, :link, :location, :name, :privacy, :type],
       time: [:created_time, :updated_time],

data/lib/fb_graph2/attribute_assigner.rb

@@ -19,8 +19,8 @@ module FbGraph2
       self.raw_attributes = attributes
       Array(self.class.registered_attributes).each do |type, keys|
         keys.each do |key|
-          raw = attributes[key]
-          if raw.present?
+          if attributes.include? key
+            raw = attributes[key]
             value = case type
             when :raw
               raw
@@ -30,22 +30,38 @@ module FbGraph2
               Time.parse raw
             when :timestamp
               Time.at raw
+            when :actions
+              Collection.new(raw).collect do |_raw_|
+                Struct::Action.new _raw_
+              end
+            when :album
+              Album.new raw[:id], raw
             when :application
               Application.new raw[:id], raw
+            when :comment
+              Comment.new raw[:id], raw
+            when :group
+              Group.new raw[:id], raw
+            when :image_sources
+              Collection.new(raw).collect do |_raw_|
+                Struct::ImageSource.new _raw_
+              end
             when :page
               Page.new raw[:id], raw
             when :pages
               Collection.new(raw).collect do |_raw_|
                 Page.new _raw_[:id], _raw_
               end
+            when :photo
+              Photo.new raw[:id], raw
+            when :picture
+              Struct::Picture.new raw[:data]
             when :profile
               as_profile raw
             when :profiles
               Collection.new(raw).collect do |_raw_|
                 as_profile _raw_
               end
-            when :application
-              Application.new raw[:id], raw
             when :user
               User.new raw[:id], raw
             else

data/lib/fb_graph2/comment.rb

@@ -0,0 +1,17 @@
+module FbGraph2
+  class Comment < Node
+    register_attributes(
+      raw: [:can_comment, :can_remove, :comment_count, :like_count, :message, :user_likes],
+      time: [:created_time],
+      user: [:from],
+      comment: [:parent],
+      profiles: [:message_tags],
+      custom: [:attachment]
+    )
+
+    def initialize(id, attributes = {})
+      super
+      # TODO: handle custom attributes.
+    end
+  end
+end

data/lib/fb_graph2/edge/comments.rb

@@ -0,0 +1,17 @@
+module FbGraph2
+  class Edge
+    module Comments
+      def comments(params = {})
+        comments = self.edge :comments, params
+        comments.collect do |comment|
+          Comment.new(comment[:id], comment).authenticate self.access_token
+        end
+      end
+
+      def comment!(params = {})
+        comment = self.post params, edge: :comments
+        Comment.new(comment[:id], comment.merge(params)).authenticate self.access_token
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/invitable_friends.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module InvitableFriends
+      def invitable_friends(params = {})
+        invitable_friends = self.edge :invitable_friends, params
+        invitable_friends.collect do |invitable_friend|
+          Struct::InvitableFriend.new invitable_friend
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/likes.rb

@@ -1,16 +1,35 @@
 module FbGraph2
   class Edge
     module Likes
-      def likes(params = {})
-        pages = self.edge :likes, params
-        pages.collect do |page|
-          Page.new(page[:id], page).authenticate self.access_token
+      module LikerContext
+        def likes(params = {})
+          pages = self.edge :likes, params
+          pages.collect do |page|
+            Page.new(page[:id], page).authenticate self.access_token
+          end
+        end
+
+        def liked?(page_id, params = {})
+          pages = self.edge :likes, params, edge_scope: page_id
+          pages.present?
         end
       end
 
-      def liked?(page_id, params = {})
-        pages = self.edge :likes, params, edge_scope: page_id
-        pages.present?
+      module LikeeContext
+        def likes(params = {})
+          users = self.edge :likes, params
+          users.collect do |user|
+            User.new(user[:id], user).authenticate self.access_token
+          end
+        end
+
+        def like!(params = {})
+          self.post params, edge: :likes
+        end
+
+        def unlike!(params = {})
+          self.delete params, edge: :likes
+        end
       end
     end
   end

data/lib/fb_graph2/edge/notifications.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module Notifications
+      def notifications(params = {})
+        notifications = self.edge :notifications, params
+        notifications.collect do |notification|
+          Notification.new notification[:id], notification
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/permissions.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module Permissions
+      def permissions(params = {})
+        permissions = self.edge :permissions, params
+        permissions.collect do |permission|
+          Struct::Permission.new permission
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/photos.rb

@@ -0,0 +1,18 @@
+module FbGraph2
+  class Edge
+    module Photos
+      def photos(*args)
+        params = args.extract_options!
+        photos = self.edge :photos, params, edge_scope: args.first
+        photos.collect do |photo|
+          Photo.new(photo[:id], photo).authenticate self.access_token
+        end
+      end
+
+      def photo!(params = {})
+        photo = post params, edge: :photos
+        Photo.new(photo[:id], params.merge(photo)).authenticate self.access_token
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/picture.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module Picture
+      def picture(*args)
+        params = args.extract_options!
+        params[:type] = args.first if args.first
+        picture = self.get params.merge(redirect: false), edge: :picture
+        Struct::Picture.new picture[:data]
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/pokes.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module Pokes
+      def pokes(params = {})
+        pokes = self.edge :pokes, params
+        pokes.collect do |poke|
+          Struct::Poke.new poke
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/scores.rb

@@ -0,0 +1,12 @@
+module FbGraph2
+  class Edge
+    module Scores
+      def scores(params = {})
+        scores = self.edge :scores, params
+        scores.collect do |score|
+          Struct::Score.new score
+        end
+      end
+    end
+  end
+end

data/lib/fb_graph2/edge/shared_posts.rb

@@ -0,0 +1,13 @@
+module FbGraph2
+  class Edge
+    module SharedPosts
+      def shared_posts(params = {})
+        posts = self.edge :posts, params
+        posts.collect do |post|
+          Post.new(post[:id], post).authenticate self.access_token
+        end
+      end
+      alias_method :sharedposts, :shared_posts
+    end
+  end
+end

data/lib/fb_graph2/edge/videos.rb

@@ -0,0 +1,18 @@
+module FbGraph2
+  class Edge
+    module Videos
+      def videos(*args)
+        params = args.extract_options!
+        videos = self.edge :videos, params, edge_scope: args.first
+        videos.collect do |video|
+          Video.new(video[:id], video).authenticate self.access_token
+        end
+      end
+
+      def video!(params = {})
+        video = post params, edge: :videos
+        Video.new(video[:id], params.merge(video)).authenticate self.access_token
+      end
+    end
+  end
+end

data/lib/fb_graph2/event.rb

@@ -4,12 +4,9 @@ module FbGraph2
       raw: [:description, :is_date_only, :location, :name, :privacy, :ticket_uri, :timezone],
       time: [:end_time, :start_time, :updated_time],
       page: [:venue],
-      custom: [:cover, :owner, :parent_group]
+      profile: [:owner],
+      group: [:parent_group],
+      photo: [:cover]
     )
-
-    def initialize(id, attributes = {})
-      super
-      # TODO: handle custom attributes.
-    end
   end
 end

data/lib/fb_graph2/group.rb

@@ -7,12 +7,8 @@ module FbGraph2
         :administrator, :bookmark_order, :unread
       ],
       time: [:updated_time],
-      custom: [:cover, :owner, :parent]
+      profile: [:owner, :parent],
+      photo: [:cover]
     )
-
-    def initialize(id, attributes = {})
-      super
-      # TODO: handle custom attributes.
-    end
   end
 end

data/lib/fb_graph2/node.rb

@@ -8,7 +8,7 @@ module FbGraph2
 
     def initialize(id, attributes = {})
       self.id = id
-      assign attributes if respond_to?(:assign)
+      assign attributes if respond_to? :assign
     end
 
     def authenticate(access_token)
@@ -36,6 +36,10 @@ module FbGraph2
       )
     end
 
+    def destroy(params = {}, options = {})
+      delete params, options
+    end
+
     protected
 
     def http_client
@@ -54,6 +58,12 @@ module FbGraph2
       end
     end
 
+    def delete(params = {}, options = {})
+      handle_response do
+        http_client.delete build_endpoint(options), build_params(params)
+      end
+    end
+
     private
 
     def edge_for(edge, params = {}, options = {})
@@ -75,7 +85,8 @@ module FbGraph2
 
     def handle_response
       response = yield
-      _response_ = MultiJson.load(response.body).with_indifferent_access
+      _response_ = MultiJson.load response.body
+      _response_ = _response_.with_indifferent_access if _response_.respond_to? :with_indifferent_access
       case response.status
       when 200...300
         _response_
@@ -84,7 +95,8 @@ module FbGraph2
         raise response.body
       end
     rescue MultiJson::DecodeError
-      raise Exception.new(response.status, "Unparsable Response: #{response.body}")
+      # TODO: better exception structure
+      raise response.body
     end
   end
 end

data/lib/fb_graph2/notification.rb

@@ -0,0 +1,17 @@
+module FbGraph2
+  class Notification < Node
+    register_attributes(
+      raw: [:title, :link, :unread],
+      time: [:created_time, :updated_time],
+      profile: [:from],
+      user: [:to],
+      application: [:application],
+      custom: [:object]
+    )
+
+    def initialize(id, attributes = {})
+      super
+      # TODO: handle custom attributes.
+    end
+  end
+end

data/lib/fb_graph2/page.rb

@@ -12,8 +12,9 @@ module FbGraph2
       time: [:created_time],
       date: [:birthday],
       page: [:best_page],
+      photo: [:cover],
       custom: [
-        :category_list, :cover, :context, :hours, :location, :parking, :price_range, :restaurant_services,
+        :category_list, :context, :hours, :location, :parking, :price_range, :restaurant_services,
         :restaurant_specialties
       ]
     )

data/lib/fb_graph2/photo.rb

@@ -0,0 +1,17 @@
+module FbGraph2
+  class Photo < Node
+    register_attributes(
+      raw: [
+        :backdated_time_granularity, :height, :icon, :link, :name, :page_story_id, :picture, :position, :source, :width,
+        # NOTE: as cover photo
+        :offset_y, :offset_x
+      ],
+      time: [:backdated_time, :created_time, :updated_time],
+      page: [:place],
+      profile: [:from],
+      album: [:album],
+      image_sources: [:images],
+      custom: [:name_tags]
+    )
+  end
+end

data/lib/fb_graph2/post.rb

@@ -1,5 +1,7 @@
 module FbGraph2
   class Post < Node
+    include Edge::Likes::LikeeContext
+
     register_attributes(
       raw: [
         :caption, :description, :icon, :is_hidden, :link, :message, :name, :object_id, :picture,
@@ -10,8 +12,9 @@ module FbGraph2
       page: [:place],
       profile: [:from],
       profiles: [:to, :with_tags],
+      actions: [:actions],
       custom: [
-        :actions, :message_tags, :privacy, :properties, :shares, :status_type, :type
+        :message_tags, :privacy, :properties, :shares, :status_type, :type
       ]
     )
 

data/lib/fb_graph2/struct.rb

@@ -0,0 +1,15 @@
+module FbGraph2
+  class Struct
+    def self.inherited(klass)
+      klass.include AttributeAssigner
+    end
+
+    def initialize(attributes = {})
+      assign attributes if respond_to? :assign
+    end
+  end
+end
+
+Dir[File.join(__dir__, 'struct/*.rb')].each do |file|
+  require file
+end

data/lib/fb_graph2/struct/action.rb

@@ -0,0 +1,9 @@
+module FbGraph2
+  class Struct
+    class Action < Struct
+      register_attributes(
+        raw: [:name, :link]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/image_source.rb

@@ -0,0 +1,9 @@
+module FbGraph2
+  class Struct
+    class ImageSource < Struct
+      register_attributes(
+        raw: [:height, :source, :width]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/invitable_friend.rb

@@ -0,0 +1,10 @@
+module FbGraph2
+  class Struct
+    class InvitableFriend < Struct
+      register_attributes(
+        raw: [:id, :name],
+        picture: [:picture]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/permission.rb

@@ -0,0 +1,9 @@
+module FbGraph2
+  class Struct
+    class Permission < Struct
+      register_attributes(
+        raw: [:permission, :status]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/picture.rb

@@ -0,0 +1,9 @@
+module FbGraph2
+  class Struct
+    class Picture < Struct
+      register_attributes(
+        raw: [:url, :is_silhouette, :height, :width]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/poke.rb

@@ -0,0 +1,10 @@
+module FbGraph2
+  class Struct
+    class Poke < Struct
+      register_attributes(
+        time: [:created_time],
+        user: [:from, :to]
+      )
+    end
+  end
+end

data/lib/fb_graph2/struct/score.rb

@@ -0,0 +1,11 @@
+module FbGraph2
+  class Struct
+    class Score < Struct
+      register_attributes(
+        raw: [:score],
+        user: [:user],
+        application: [:application]
+      )
+    end
+  end
+end

data/lib/fb_graph2/user.rb

@@ -13,14 +13,22 @@ module FbGraph2
     include Edge::Games
     include Edge::Home
     include Edge::Interests
-    include Edge::Likes
+    include Edge::InvitableFriends
+    include Edge::Likes::LikerContext
     include Edge::Links
     include Edge::Movies
     include Edge::Music
+    include Edge::Notifications
+    include Edge::Permissions
+    include Edge::Picture
+    include Edge::Photos
+    include Edge::Pokes
     include Edge::Posts
+    include Edge::Scores
     include Edge::Statuses
     include Edge::Tagged
     include Edge::Television
+    include Edge::Videos
 
     register_attributes(
       raw: [
@@ -35,7 +43,8 @@ module FbGraph2
       page: [:hometown, :location],
       pages: [:favorite_athletes, :favorite_teams, :inspirational_people, :languages],
       user: [:significant_other],
-      custom: [:age_range, :context, :cover, :currency, :education, :work]
+      photo: [:cover],
+      custom: [:age_range, :context, :currency, :education, :work]
     )
 
     def initialize(id, attributes = {})

data/lib/fb_graph2/video.rb

@@ -0,0 +1,10 @@
+module FbGraph2
+  class Video < Node
+    register_attributes(
+      raw: [:description, :embed_html, :icon, :length, :name, :picture, :source],
+      time: [:created_time, :updated_time],
+      profile: [:from],
+      custom: [:format, :thumbnails]
+    )
+  end
+end

data/spec/fb_graph2/node_spec.rb

@@ -9,6 +9,14 @@ describe FbGraph2::Node do
     it { should_not respond_to :register_attributes }
     it { should_not respond_to :registered_attributes }
     it { should_not respond_to :registered_attributes= }
+
+    describe '.fetch' do
+      it 'should call API' do
+        expect do
+          klass.fetch 'foo'
+        end.to request_to '/foo'
+      end
+    end
   end
 
   context 'instance' do
@@ -25,5 +33,35 @@ describe FbGraph2::Node do
       before { instance.authenticate 'access_token' }
       its(:access_token) { should == 'access_token' }
     end
+
+    describe '#handle_response' do
+      context 'when error' do
+        context 'when valid json' do
+          it 'should raise' do
+            expect do
+              mock_graph :get, 'identifier', 'error/400/2500', status: 400 do
+                instance.fetch
+              end
+            end.to raise_error { |e|
+              e.should be_instance_of RuntimeError
+              e.message.should == mock_json('error/400/2500')
+            }
+          end
+        end
+
+        context 'when invalid json' do
+          it 'should raise' do
+            expect do
+              mock_graph :get, 'identifier', 'error/invalid_format', status: 400 do
+                instance.fetch
+              end
+            end.to raise_error { |e|
+              e.should be_instance_of RuntimeError
+              e.message.should == mock_json('error/invalid_format')
+            }
+          end
+        end
+      end
+    end
   end
 end

data/spec/mock_json/error/400/2500.json

@@ -0,0 +1,7 @@
+{
+  "error": {
+    "message": "An active access token must be used to query information about the current user.",
+    "type": "OAuthException",
+    "code": 2500
+  }
+}

data/spec/mock_json/error/invalid_format.json

@@ -0,0 +1 @@
+NOT FOUND

data/spec/spec_helper/mock_graph.rb

@@ -22,6 +22,10 @@ module MockGraph
     end
   end
 
+  def mock_json(response_path)
+    response_for(response_path)[:body].read
+  end
+
   def request_to(path, method = :get)
     raise_error { |e|
       e.should be_instance_of WebMock::NetConnectNotAllowedError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -142,12 +142,14 @@ files:
 - lib/fb_graph2/application.rb
 - lib/fb_graph2/attribute_assigner.rb
 - lib/fb_graph2/collection.rb
+- lib/fb_graph2/comment.rb
 - lib/fb_graph2/edge.rb
 - lib/fb_graph2/edge/accounts.rb
 - lib/fb_graph2/edge/achievements.rb
 - lib/fb_graph2/edge/activities.rb
 - lib/fb_graph2/edge/albums.rb
 - lib/fb_graph2/edge/books.rb
+- lib/fb_graph2/edge/comments.rb
 - lib/fb_graph2/edge/events.rb
 - lib/fb_graph2/edge/family.rb
 - lib/fb_graph2/edge/feed.rb
@@ -157,23 +159,43 @@ files:
 - lib/fb_graph2/edge/groups.rb
 - lib/fb_graph2/edge/home.rb
 - lib/fb_graph2/edge/interests.rb
+- lib/fb_graph2/edge/invitable_friends.rb
 - lib/fb_graph2/edge/likes.rb
 - lib/fb_graph2/edge/links.rb
 - lib/fb_graph2/edge/movies.rb
 - lib/fb_graph2/edge/music.rb
+- lib/fb_graph2/edge/notifications.rb
+- lib/fb_graph2/edge/permissions.rb
+- lib/fb_graph2/edge/photos.rb
+- lib/fb_graph2/edge/picture.rb
+- lib/fb_graph2/edge/pokes.rb
 - lib/fb_graph2/edge/posts.rb
+- lib/fb_graph2/edge/scores.rb
+- lib/fb_graph2/edge/shared_posts.rb
 - lib/fb_graph2/edge/statuses.rb
 - lib/fb_graph2/edge/tagged.rb
 - lib/fb_graph2/edge/television.rb
+- lib/fb_graph2/edge/videos.rb
 - lib/fb_graph2/event.rb
 - lib/fb_graph2/friend_list.rb
 - lib/fb_graph2/group.rb
 - lib/fb_graph2/node.rb
+- lib/fb_graph2/notification.rb
 - lib/fb_graph2/page.rb
+- lib/fb_graph2/photo.rb
 - lib/fb_graph2/post.rb
 - lib/fb_graph2/request_filter/authenticator.rb
 - lib/fb_graph2/request_filter/debugger.rb
+- lib/fb_graph2/struct.rb
+- lib/fb_graph2/struct/action.rb
+- lib/fb_graph2/struct/image_source.rb
+- lib/fb_graph2/struct/invitable_friend.rb
+- lib/fb_graph2/struct/permission.rb
+- lib/fb_graph2/struct/picture.rb
+- lib/fb_graph2/struct/poke.rb
+- lib/fb_graph2/struct/score.rb
 - lib/fb_graph2/user.rb
+- lib/fb_graph2/video.rb
 - spec/fb_graph2/edge/accounts_spec.rb
 - spec/fb_graph2/edge/feed_spec.rb
 - spec/fb_graph2/node_spec.rb
@@ -181,6 +203,8 @@ files:
 - spec/fb_graph2/page_spec.rb
 - spec/fb_graph2/user_spec.rb
 - spec/fb_graph2_spec.rb
+- spec/mock_json/error/400/2500.json
+- spec/mock_json/error/invalid_format.json
 - spec/mock_json/success_with_id.json
 - spec/mock_json/user/accounts.json
 - spec/mock_json/user/me.json
@@ -206,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Facebook Graph API v2.0 Wrapper in Ruby