mogli 0.0.39 → 0.0.40

data/lib/mogli.rb

@@ -20,6 +20,7 @@ require "mogli/comment"
 require "mogli/domain"
 require "mogli/education"
 require "mogli/event"
+require "mogli/friendlist"
 require "mogli/group"
 require "mogli/insight"
 require "mogli/insight_value"
@@ -31,6 +32,7 @@ require "mogli/music"
 require "mogli/note"
 require "mogli/page"
 require "mogli/photo"
+require "mogli/place"
 require "mogli/post"
 require "mogli/status"
 require "mogli/television"
@@ -41,3 +43,4 @@ require "mogli/test_user"
 require "mogli/client"
 require "mogli/app_client"
 require "mogli/fql_multiquery"
+require "mogli/permissions"

data/lib/mogli/client.rb

@@ -27,7 +27,7 @@ module Mogli
     end
 
     def fql_path
-      "https://api.facebook.com/method/fql.query"
+      "https://graph.facebook.com/fql"
     end
 
     def fql_multiquery_path
@@ -137,9 +137,9 @@ module Mogli
     end
 
     def fql_query(query,klass=nil,format="json")
-      data = self.class.post(fql_path,:body=>default_params.merge({:query=>query,:format=>format}))
+      data = self.class.get(fql_path,:query=>default_params.merge({:q=>query,:format=>format})).parsed_response
       return data unless format=="json"
-      map_data(data,klass)
+      map_data(data["data"],klass)
     end
 
     def fql_multiquery(queries)
@@ -161,6 +161,11 @@ module Mogli
     def map_data(data,klass=nil)
       raise_error_if_necessary(data)
       hash_or_array = extract_hash_or_array(data,klass)
+      if hash_or_array.is_a?(Array) && hash_or_array.size == 2 && hash_or_array[1].is_a?(Hash) && hash_or_array[1]['body']
+          # responses from batch queries are buried inside a
+          # completely different data structure
+          hash_or_array = JSON.parse(hash_or_array[1]['body'].first).values
+      end
       hash_or_array = map_to_class(hash_or_array,klass) if klass
       hash_or_array
     end

data/lib/mogli/event.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Event < Model
     set_search_type
-    define_properties :id, :name, :description, :start_time, :end_time, :location, :privacy, :updated_time
+    define_properties :id, :name, :description, :start_time, :end_time, :location, :privacy, :updated_time, :rsvp_status
     creation_properties :start_time, :end_time, :link, :name, :description, :privacy
 
     hash_populating_accessor :venue, "Address"
@@ -12,5 +12,7 @@ module Mogli
     has_association :attending, "User"
     has_association :declined, "User"
     has_association :feed, "Post"
+
+    fql_mapping :eid=>:id
   end
 end

data/lib/mogli/friendlist.rb

@@ -0,0 +1,10 @@
+module Mogli
+  
+  # requires read_friendlists permission
+  # https://developers.facebook.com/docs/reference/api/FriendList/
+  
+  class FriendList < Model
+    define_properties :name, :list_type, :id
+    
+  end
+end

data/lib/mogli/model.rb

@@ -20,10 +20,11 @@ module Mogli
       @_values = {}
       self.client=client
       hash.each do |k,v|
-        self.send("#{k}=",v)
+        self.send("#{self.class.fql_mapping[k]||k}=",v)
       end
     end
 
+
     def post_params
       post_params = {}
       self.class.creation_keys.each do |key|
@@ -54,6 +55,12 @@ module Mogli
       other.extend(ClassMethods)
     end
 
+    def self.fql_mapping(hash=nil)
+      if hash
+        @fql_mapping = hash
+      end
+      @fql_mapping || {}
+    end
     def method_missing(method, *args)
       method_as_s = method.to_s
       if method_as_s.to_s[-1].chr == "="

data/lib/mogli/permissions.rb

@@ -0,0 +1,80 @@
+module Mogli
+  class Permissions < Model
+    
+    define_properties \
+    :user_about_me,
+    :user_activities,
+    :user_birthday,
+    :user_checkins,
+    :user_education_history,
+    :user_events,
+    :user_games_activity,
+    :user_groups,
+    :user_hometown,
+    :user_interests,
+    :user_likes,
+    :user_location,
+    :user_notes,
+    :user_online_presence,
+    :user_photo_video_tags,
+    :user_photos,
+    :user_relationship_details,
+    :user_relationships,
+    :user_religion_politics,
+    :user_status,
+    :user_subscriptions,
+    :user_videos,
+    :user_website,
+    :user_work_history,
+    :friends_about_me,
+    :friends_activities,
+    :friends_birthday,
+    :friends_checkins,
+    :friends_education_history,
+    :friends_events,
+    :friends_games_activity,
+    :friends_groups,
+    :friends_hometown,
+    :friends_interests,
+    :friends_likes,
+    :friends_location,
+    :friends_notes,
+    :friends_online_presence,
+    :friends_photo_video_tags,
+    :friends_photos,
+    :friends_relationship_details,
+    :friends_relationships,
+    :friends_religion_politics,
+    :friends_status,
+    :friends_subscriptions,
+    :friends_videos,
+    :friends_website,
+    :friends_work_history,
+    :ads_management,
+    :create_event,
+    :create_note,
+    :email,
+    :export_stream,
+    :manage_friendlists,
+    :manage_notifications,
+    :manage_pages,
+    :offline_access,
+    :photo_upload,
+    :publish_actions,
+    :publish_checkins,
+    :publish_stream,
+    :read_friendlists,
+    :read_insights,
+    :read_mailbox,
+    :read_requests,
+    :read_stream,
+    :rsvp_event,
+    :share_item,
+    :sms,
+    :status_update,
+    :video_upload,
+    :xmpp_login
+
+
+  end
+end

data/lib/mogli/place.rb

@@ -0,0 +1,40 @@
+
+module Mogli
+  class Place < Model
+    
+    define_properties :id, :name, :category, :username, :can_post, :phone, :website, :checkins, :link, :public_transit, :likes, :picture
+    hash_populating_accessor :location, "Address"
+    hash_populating_accessor :restaurant_services, "RestaurantServices"
+    hash_populating_accessor :restaurant_specialties, "RestaurantSpecialties"
+    hash_populating_accessor :parking, "Parking"
+    hash_populating_accessor :payment_options, "PaymentOptions"
+    hash_populating_accessor :hours, "Hours"
+  end
+  
+  class RestaurantServices < Model
+    define_properties :groups, :catering, :waiter, :kids, :outdoor, :reserve, :walkins, :delivery, :takeout
+  end
+
+  class RestaurantSpecialties < Model
+    define_properties :drinks, :coffee, :breakfast, :dinner, :lunch
+  end
+
+  class Parking < Model
+    define_properties :valet, :street, :lot
+  end
+
+  class PaymentOptions < Model
+    define_properties :mastercard, :amex, :cash_only, :visa, :discover
+  end
+
+  class Hours < Model
+    define_properties :sun_1_open, :sun_1_close, :sun_2_open, :sun_2_close
+    define_properties :mon_1_open, :mon_1_close, :mon_2_open, :mon_2_close
+    define_properties :tue_1_open, :tue_1_close, :tue_2_open, :tue_2_close
+    define_properties :wed_1_open, :wed_1_close, :wed_2_open, :wed_2_close
+    define_properties :thu_1_open, :thu_1_close, :thu_2_open, :thu_2_close
+    define_properties :fri_1_open, :fri_1_close, :fri_2_open, :fri_2_close
+    define_properties :sat_1_open, :sat_1_close, :sat_2_open, :sat_2_close
+  end
+
+end

data/lib/mogli/user.rb

@@ -108,6 +108,11 @@ module Mogli
       extended_permissions[permission]
     end
 
+    # revoke all permissions for this user
+    def revoke_permission
+      client.delete("#{id}/permissions")
+    end
+    
     private
 
     # queries all extended permissions for this user for the current application

data/spec/client_spec.rb

@@ -205,31 +205,52 @@ describe Mogli::Client do
 
   describe "fql queries" do 
     it "defaults to json" do
-      Mogli::Client.should_receive(:post).with("https://api.facebook.com/method/fql.query",:body=>{:query=>"query",:format=>"json",:access_token=>"1234"})
+      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"json",:access_token=>"1234"}).and_return({:data=>[]})
       client = Mogli::Client.new("1234")
       client.fql_query("query")
     end
 
     it "supports xml" do 
-      Mogli::Client.should_receive(:post).with("https://api.facebook.com/method/fql.query",:body=>{:query=>"query",:format=>"xml",:access_token=>"1234"})
+      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"xml",:access_token=>"1234"}).and_return({:data=>[]})
       client = Mogli::Client.new("1234")
       client.fql_query("query",nil,"xml")  
     end
 
     it "creates objects if given a class" do
-      Mogli::Client.should_receive(:post).and_return({"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
+      Mogli::Client.should_receive(:get).and_return({:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" }})
       client = Mogli::Client.new("1234")
       client.fql_query("query","user").should be_an_instance_of(Mogli::User)
     end
 
+    it "Maps the fields if necessary" do
+      Mogli::Client.should_receive(:get).and_return({:data=>
+     [
+      {
+         :eid=> 182880348415052,
+         :name=> "Eeyores 48th Birthday Party"
+      },
+      {
+         :eid=> 172962332756022,
+         :name=> "Cake Walk - Featuring the Artwork of Emily Pelton"
+      }
+   ]
+})
+      client = Mogli::Client.new("1234")
+      events = client.fql_query("query","event")
+      events.first.should be_an_instance_of(Mogli::Event)
+      events.first.id.should == 182880348415052
+
+    end
+
+
     it "returns a hash if no class is given" do
-      Mogli::Client.should_receive(:post).and_return({"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
+      Mogli::Client.should_receive(:get).and_return(:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
       client = Mogli::Client.new("1234")
       client.fql_query("query").should be_an_instance_of(Hash)
     end
 
     it "doesn't create objects if the format is xml" do 
-      Mogli::Client.should_receive(:post).and_return({"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
+      Mogli::Client.should_receive(:get).and_return(:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
       client = Mogli::Client.new("1234")
       client.fql_query("query","user","xml").should be_an_instance_of(Hash)    
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mogli
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -154,6 +154,7 @@ files:
 - lib/mogli/event.rb
 - lib/mogli/fetching_array.rb
 - lib/mogli/fql_multiquery.rb
+- lib/mogli/friendlist.rb
 - lib/mogli/group.rb
 - lib/mogli/insight.rb
 - lib/mogli/insight_value.rb
@@ -166,7 +167,9 @@ files:
 - lib/mogli/music.rb
 - lib/mogli/note.rb
 - lib/mogli/page.rb
+- lib/mogli/permissions.rb
 - lib/mogli/photo.rb
+- lib/mogli/place.rb
 - lib/mogli/post.rb
 - lib/mogli/profile.rb
 - lib/mogli/status.rb