fb_graph 1.2.5 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.3.0

data/fb_graph.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fb_graph}
-  s.version = "1.2.5"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]

data/lib/fb_graph/location.rb

@@ -10,7 +10,7 @@ module FbGraph
       @longitude = attriutes[:longitude]
     end
 
-    def to_hash
+    def to_hash(options = {})
       {
         :latitude  => self.latitude,
         :longitude => self.longitude

data/lib/fb_graph/node.rb

@@ -33,7 +33,7 @@ module FbGraph
     protected
 
     def get(params = {})
-      _params_ = stringfy_access_token(params)
+      _params_ = stringfy_params(params)
       _endpoint_ = build_endpoint(_params_.merge!(:method => :get))
       handle_response do
         RestClient.get(_endpoint_)
@@ -41,7 +41,7 @@ module FbGraph
     end
 
     def post(params = {})
-      _params_ = stringfy_access_token(params)
+      _params_ = stringfy_params(params)
       _endpoint_ = build_endpoint(_params_.merge!(:method => :post))
       handle_response do
         RestClient.post(_endpoint_, _params_)
@@ -49,7 +49,7 @@ module FbGraph
     end
 
     def delete(params = {})
-      _params_ = stringfy_access_token(params)
+      _params_ = stringfy_params(params)
       _endpoint_ = build_endpoint(_params_.merge!(:method => :delete))
       handle_response do
         RestClient.delete(_endpoint_)
@@ -69,12 +69,17 @@ module FbGraph
       _endpoint_
     end
 
-    def stringfy_access_token(params)
+    def stringfy_params(params)
       _params_ = params.dup
       _params_[:access_token] ||= self.access_token
       if access_token.is_a?(OAuth2::AccessToken)
         _params_[:access_token] = _params_[:access_token].token
       end
+      _params_.each do |key, value|
+        if value.present? && ![Symbol, String, Numeric, IO].any? { |klass| value.is_a? klass }
+          _params_[key] = value.to_json
+        end
+      end
       _params_
     end
 

data/lib/fb_graph/photo.rb

@@ -17,7 +17,11 @@ module FbGraph
       @tags = []
       if attributes[:tags]
         Collection.new(attributes[:tags]).each do |tag|
-          @tags << Tag.new(tag)
+          @tags << if tag.is_a?(Tag)
+            tag
+          else
+            Tag.new(tag)
+          end
         end
       end
       # NOTE:

data/lib/fb_graph/post.rb

@@ -37,7 +37,7 @@ module FbGraph
       @actions     = []
       if attributes[:actions]
         attributes[:actions].each do |action|
-          @actions << FbGraph::Action.new(action)
+          @actions << Action.new(action)
         end
       end
       @like_count  = attributes[:likes]

data/lib/fb_graph/privacy.rb

@@ -14,7 +14,7 @@ module FbGraph
       @deny        = attriutes[:deny]
     end
 
-    def to_hash
+    def to_hash(options = {})
       {
         :value => self.value,
         :friends => self.friends,

data/lib/fb_graph/query.rb

@@ -18,7 +18,7 @@ module FbGraph
 
     ENDPOINT = 'https://api.facebook.com/method/fql.query'
     def build_endpoint
-      params = stringfy_access_token(
+      params = stringfy_params(
         :query => self.query,
         :access_token => self.access_token,
         :format => :json

data/lib/fb_graph/serialization.rb

@@ -1,15 +1,19 @@
 module FbGraph
   module Serialization
-    def to_hash
+    def to_hash(options = {})
       raise "Define #{self.class}#to_hash!"
     end
 
-    def to_json
-      hash = self.to_hash
+    def as_json(options = {})
+      hash = self.to_hash options
       hash.delete_if do |k, v|
         v.blank?
       end
-      hash.to_json
+      hash
+    end
+
+    def to_json(options = {})
+      as_json.to_json options
     end
   end
 end

data/lib/fb_graph/tag.rb

@@ -1,6 +1,7 @@
 module FbGraph
   class Tag
     include Comparison
+    include Serialization
 
     attr_accessor :user, :name, :x, :y, :created_time
 
@@ -15,5 +16,15 @@ module FbGraph
       end
       @name = attributes[:name]
     end
+
+    def to_hash(options = {})
+      hash = {
+        :tag_text => self.name,
+        :x => self.x,
+        :y => self.y
+      }
+      hash[:tag_uid] = self.user.identifier if self.user
+      hash
+    end
   end
 end

data/lib/fb_graph/targeting.rb

@@ -11,7 +11,7 @@ module FbGraph
       @locale  = attriutes[:locale]
     end
 
-    def to_hash
+    def to_hash(options = {})
       {
         :country => self.country,
         :city    => self.city,

data/lib/fb_graph/venue.rb

@@ -4,11 +4,11 @@ module FbGraph
 
     def initialize(attriutes = {})
       super
-      @street    = attriutes[:street]
-      @city      = attriutes[:city]
-      @state     = attriutes[:state]
-      @zip       = attriutes[:zip]
-      @country   = attriutes[:country]
+      @street  = attriutes[:street]
+      @city    = attriutes[:city]
+      @state   = attriutes[:state]
+      @zip     = attriutes[:zip]
+      @country = attriutes[:country]
     end
   end
 end

data/lib/fb_graph.rb

@@ -2,11 +2,7 @@ require 'rubygems'
 require 'json'
 require 'restclient'
 require 'oauth2'
-
-# NOTE:
-# For some reason, ActiveSupport 3.0.0 doesn'tj load whole code.
-# Load needed extention directly for now.
-require 'active_support/core_ext'
+require 'active_support/all'
 
 module FbGraph
   ROOT_URL = "https://graph.facebook.com"

data/spec/fb_graph/connections/photos_spec.rb

@@ -29,4 +29,13 @@ describe FbGraph::Connections::Photos, '#photo!' do
     photo.name.should == 'Hello, where is photo?'
     photo.access_token.should == 'valid'
   end
+
+  it 'should support Tag' do
+    photo = FbGraph::Album.new('12345', :access_token => 'valid').photo!(
+      :image => Tempfile.new('image_file'),
+      :message => 'Hello, where is photo?',
+      :tags => [FbGraph::Tag.new(:id => 12345, :name => 'me', :x => 0, :y => 10)]
+    )
+    photo.tags.should == [FbGraph::Tag.new(:id => 12345, :name => 'me', :x => 0, :y => 10)]
+  end
 end

data/spec/fb_graph/node_spec.rb

@@ -12,11 +12,19 @@ describe FbGraph::Node, '.new' do
 
 end
 
-describe FbGraph::Node, '#stringfy_access_token' do
+describe FbGraph::Node, '#stringfy_params' do
+  it 'should make all values to JSON' do
+    client = OAuth2::Client.new('client_id', 'client_secret')
+    node = FbGraph::Node.new('identifier')
+    params = node.send :stringfy_params, {:hash => {:a => :b}, :array => [:a, :b]}
+    params[:hash].should == '{"a":"b"}'
+    params[:array].should == '["a","b"]'
+  end
+
   it 'should support OAuth2::AccessToken' do
     client = OAuth2::Client.new('client_id', 'client_secret')
     node = FbGraph::Node.new('identifier', :access_token => OAuth2::AccessToken.new(client, 'token', 'secret'))
-    params = node.send :stringfy_access_token, {}
+    params = node.send :stringfy_params, {}
     params[:access_token].should == 'token'
   end
 end

data/spec/fb_graph/seriarization_spec.rb

@@ -6,7 +6,7 @@ class Klass1
 end
 
 class Klass2 < Klass1
-  def to_hash
+  def to_hash(options = {})
     {:att1 => self.att1, :att2 => self.att2}
   end
 end

data/spec/fb_graph/tag_spec.rb

@@ -18,4 +18,17 @@ describe FbGraph::Tag, '.new' do
     tag.created_time.should == Time.parse("2010-04-22T08:24:26+0000")
   end
 
+  it 'should not setup user if id is blank' do
+    attributes = {
+      :id => "",
+      :name => "Arjun Banker",
+      :x => 32.5,
+      :y => 27.7778,
+      :created_time => "2010-04-22T08:24:26+0000"
+    }
+    tag = FbGraph::Tag.new(attributes)
+    tag.user.should be_nil
+    tag.name.should == 'Arjun Banker'
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb_graph
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - nov matake