fb_graph 2.2.0.alpha2 → 2.2.0.beta

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.2.0.alpha)
+    fb_graph (2.2.0.alpha2)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.9.4)
 
@@ -44,7 +44,6 @@ GEM
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.6.1)
-    json (1.6.1-java)
     multi_json (1.0.3)
     rack (1.3.5)
     rack-cache (1.1)

data/Rakefile

@@ -6,13 +6,8 @@ RSpec::Core::RakeTask.new(:spec)
 
 if RUBY_VERSION >= '1.9'
   require 'cover_me'
-  RSpec::Core::RakeTask.new(:cover) do
-    CoverMe.config do |c|
-      c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
-    end
-    at_exit do
-      CoverMe.complete!
-    end
+  CoverMe.config do |c|
+    c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
   end
 else
   RSpec::Core::RakeTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-2.2.0.alpha2
+2.2.0.beta

data/lib/fb_graph/album.rb

@@ -3,6 +3,7 @@ module FbGraph
     include Connections::Photos
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
     include Connections::Picture
 
     attr_accessor :from, :name, :description, :location, :link, :cover_photo, :privacy, :count, :type, :created_time, :updated_time

data/lib/fb_graph/checkin.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Checkin < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
     extend Searchable
 
     attr_accessor :from, :tags, :place, :message, :application, :created_time

data/lib/fb_graph/comment.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class Comment < Node
     include Connections::Likes
+    include Connections::Likes::Likable
 
     attr_accessor :from, :message, :created_time, :like_count
 

data/lib/fb_graph/connections/likes.rb

@@ -19,12 +19,14 @@ module FbGraph
         end
       end
 
-      def like!(options = {})
-        post(options.merge(:connection => :likes))
-      end
+      module Likable
+        def like!(options = {})
+          post(options.merge(:connection => :likes))
+        end
 
-      def unlike!(options = {})
-        destroy(options.merge(:connection => :likes))
+        def unlike!(options = {})
+          destroy(options.merge(:connection => :likes))
+        end
       end
     end
   end

data/lib/fb_graph/link.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Link < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
 
     attr_accessor :from, :link, :name, :description, :icon, :picture, :message, :created_time
 

data/lib/fb_graph/node.rb

@@ -114,19 +114,16 @@ module FbGraph
       when 'null'
         nil
       else
-        # NOTE: User#app_request! returns ID as a JSON string not as a JSON object..
         if response.body.gsub('"', '').to_i.to_s == response.body.gsub('"', '')
-          return response.body.gsub('"', '')
-        end
-
-        _response_ = JSON.parse(response.body)
-        _response_ = case _response_
-        when Array
-          _response_.map!(&:with_indifferent_access)
-        when Hash
-          _response_ = _response_.with_indifferent_access
-          Exception.handle_httpclient_error(_response_, response.headers) if _response_[:error]
-          _response_
+          # NOTE: User#app_request! returns ID as a JSON string not as a JSON object..
+          response.body.gsub('"', '')
+        else
+          _response_ = JSON.parse(response.body).with_indifferent_access
+          if (200...300).include?(response.status)
+            _response_
+          else
+            Exception.handle_httpclient_error(_response_, response.headers)
+          end
         end
       end
     rescue JSON::ParserError

data/lib/fb_graph/note.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Note < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
 
     attr_accessor :from, :subject, :message, :created_time, :updated_time, :icon
 

data/lib/fb_graph/open_graph/action.rb

@@ -3,6 +3,7 @@ module FbGraph
     class Action < Node
       include Connections::Comments
       include Connections::Likes
+      include Connections::Likes::Likable
 
       attr_accessor :type, :application, :from, :objects, :start_time, :end_time, :publish_time
       attr_accessor :raw_attributes

data/lib/fb_graph/page.rb

@@ -8,6 +8,7 @@ module FbGraph
     include Connections::Feed
     include Connections::Groups
     include Connections::Insights
+    include Connections::Likes
     include Connections::Links
     include Connections::Notes
     include Connections::Photos

data/lib/fb_graph/photo.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Photo < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
     include Connections::Picture
     include Connections::Tags
     include Connections::Tags::Taggable

data/lib/fb_graph/post.rb

@@ -3,6 +3,7 @@ module FbGraph
     include Connections::Comments
     include Connections::Insights
     include Connections::Likes
+    include Connections::Likes::Likable
     extend Searchable
 
     attr_accessor :from, :to, :with_tags, :message, :message_tags, :picture, :link, :name, :caption, :description, :source, :properties, :icon, :actions, :privacy, :type, :graph_object_id, :application, :targeting, :created_time, :updated_time, :story, :story_tags

data/lib/fb_graph/status.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Status < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
 
     attr_accessor :from, :message, :updated_time
 

data/lib/fb_graph/user.rb

@@ -18,6 +18,7 @@ module FbGraph
     include Connections::Home
     include Connections::Inbox
     include Connections::Interests
+    include Connections::Likes
     include Connections::Links
     include Connections::Movies
     include Connections::Music

data/lib/fb_graph/user_achievement.rb

@@ -2,6 +2,7 @@ module FbGraph
   class UserAchievement < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
 
     attr_accessor :from, :created_time, :application, :achievement
 

data/lib/fb_graph/video.rb

@@ -2,6 +2,7 @@ module FbGraph
   class Video < Node
     include Connections::Comments
     include Connections::Likes
+    include Connections::Likes::Likable
     include Connections::Picture
 
     attr_accessor :from, :tags, :name, :description, :embed_html, :icon, :source, :created_time, :updated_time

data/spec/fb_graph/{query/core_spec.rb → query_spec.rb}

@@ -29,7 +29,7 @@ describe FbGraph::Query do
         mock_fql raw_query, 'query/user/with_invalid_token', :access_token => 'invalid', :status => [400, 'Bad Request'] do
           lambda do
             query.fetch('invalid')
-          end.should raise_error(FbGraph::Exception)
+          end.should raise_error FbGraph::Exception
         end
       end
     end

data/spec/helpers/webmock_helper.rb

@@ -28,7 +28,7 @@ module WebMockHelper
     stub_request(:get, FbGraph::Query.new(query).endpoint).with(
       request_for(:get, options)
     ).to_return(
-      response_for(response_file)
+      response_for(response_file, options)
     )
     res = yield
     a_request(:get, FbGraph::Query.new(query).endpoint).with(

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 if RUBY_VERSION >= '1.9'
   require 'cover_me'
+  at_exit do
+    CoverMe.complete!
+  end
 end
 
 require 'fb_graph'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.2.0.alpha2
+  version: 2.2.0.beta
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000Z
+date: 2011-11-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70242145049700 !ruby/object:Gem::Requirement
+  requirement: &70282942842620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70242145049700
+  version_requirements: *70282942842620
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
-  requirement: &70242145048900 !ruby/object:Gem::Requirement
+  requirement: &70282942840260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70242145048900
+  version_requirements: *70282942840260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242145048200 !ruby/object:Gem::Requirement
+  requirement: &70282942837740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70242145048200
+  version_requirements: *70282942837740
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70242145047540 !ruby/object:Gem::Requirement
+  requirement: &70282942835880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70242145047540
+  version_requirements: *70282942835880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242145046600 !ruby/object:Gem::Requirement
+  requirement: &70282942834140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70242145046600
+  version_requirements: *70282942834140
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70242145045320 !ruby/object:Gem::Requirement
+  requirement: &70282942833180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70242145045320
+  version_requirements: *70282942833180
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70242145044840 !ruby/object:Gem::Requirement
+  requirement: &70282942819620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 3.0.6
   type: :development
   prerelease: false
-  version_requirements: *70242145044840
+  version_requirements: *70282942819620
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []
@@ -368,7 +368,7 @@ files:
 - spec/fb_graph/post_spec.rb
 - spec/fb_graph/privacy_spec.rb
 - spec/fb_graph/project_spec.rb
-- spec/fb_graph/query/core_spec.rb
+- spec/fb_graph/query_spec.rb
 - spec/fb_graph/reach_estimate_spec.rb
 - spec/fb_graph/searchable_spec.rb
 - spec/fb_graph/seriarization_spec.rb
@@ -703,7 +703,7 @@ test_files:
 - spec/fb_graph/post_spec.rb
 - spec/fb_graph/privacy_spec.rb
 - spec/fb_graph/project_spec.rb
-- spec/fb_graph/query/core_spec.rb
+- spec/fb_graph/query_spec.rb
 - spec/fb_graph/reach_estimate_spec.rb
 - spec/fb_graph/searchable_spec.rb
 - spec/fb_graph/seriarization_spec.rb