mambanation 0.1.19 → 0.1.20

data/Rakefile

@@ -6,7 +6,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary       = %Q{wrapper for mambanation-api}
   gem.email         = ["jeremyvdw@gmail.com", "sbellity@gmail.com", "tian.jiang01@gmail.com"]
   gem.homepage      = "https://github.com/mimesis/mambanation-wrapper"
-  gem.authors       = ["Jeremy Van de Wyngaert", "Stéphane Bellity", "Tian Jiang"]
+  gem.authors       = ["Jérémy Van de Wyngaert", "Stéphane Bellity", "Tian Jiang"]
   gem.files         = FileList["[A-Z]*", "{lib,test}/**/*"]
 
   gem.add_dependency("hashie", "= 0.4.0")

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 1
-:patch: 19
+:patch: 20
 :build: 
 :major: 0

data/lib/mambanation/base.rb

@@ -11,6 +11,11 @@ module MambaNation
       @fbs_cookies = fbs_cookies
     end
     
+    # Class method to fetch current user based on cookie
+    def self.current_user(client, fbs_cookies)
+      MambaNation::Base.new(client, fbs_cookies).current_user
+    end
+    
     #
     # Famous
     #
@@ -18,8 +23,8 @@ module MambaNation
       perform_get("/users/famous.json", :query => query)
     end
     
-    def current_user
-      perform_get("/users/me") unless fbs_cookies.nil?
+    def current_user(query = {})
+      perform_get("/users/me", :query => query) unless fbs_cookies.nil?
     end
     
     def user_by_facebook_id(facebook_id, query = {})
@@ -30,21 +35,20 @@ module MambaNation
       perform_get("/users/find_by?facebook_id=#{email}", :query => query)
     end
     
-    # Options: user_id, facebook_id
     def user(id, query = {})
       perform_get("/users/#{id.to_i}.json", :query => query)
     end
     alias_method :user_by_id, :user
     
-    def user_set_websession(id, credentials)
-      perform_post("/users/#{id.to_i}/update_websession", :body => { :user => { :user_credentials => credentials }})
+    def user_set_websession(id, credentials, query = {})
+      perform_post("/users/#{id.to_i}/update_websession", :body => { :user => { :user_credentials => credentials } }.merge(query))
     end
     
     #
     # User actions
     #
-    def user_last_login(id)
-      perform_get("/users/#{id.to_i}/last_login.json")
+    def user_last_login(id, query = {})
+      perform_get("/users/#{id.to_i}/last_login.json", :query => query)
     end
     
     def user_chats(id, query = {})
@@ -73,7 +77,7 @@ module MambaNation
     
     # Options: user_id, :limit
     def user_media(id, query = {})
-      perform_get("/users/#{id.to_i}/media.json", :query => query)
+      perform_get("/users/#{id.to_i}/media.json", :query => {}.merge(query))
     end
     
     # Options: user_id, facebook_id
@@ -85,8 +89,8 @@ module MambaNation
     # Facets
     #
     # Options: facet_id
-    def facet(id)
-      perform_get("/facets/#{id.to_i}.json")
+    def facet(id, query = {})
+      perform_get("/facets/#{id.to_i}.json", :query => query)
     end
     
     def famous_facets(query = {})
@@ -120,9 +124,8 @@ module MambaNation
     #
     # Mission Statuses
     #
-    
-    def mission_status user_id, mission_id, query = {}
-      perform_get("/users/#{user_id.to_i}/mission_status/#{mission_id}.json", :query => query)
+    def mission_status(id, mission_id, query = {})
+      perform_get("/users/#{id.to_i}/mission_status/#{mission_id}.json", :query => query)
     end
     
     def mission_statuses(id, query = {})
@@ -133,8 +136,8 @@ module MambaNation
       perform_get("/users/#{id.to_i}/missions_family_statuses.json", :query => query)
     end
     
-    def mission_start!(id, mission_id)
-      perform_put("/users/#{id.to_i}/mission_statuses/#{mission_id.to_i}/start")
+    def mission_start!(id, mission_id, query = {})
+      perform_put("/users/#{id.to_i}/mission_statuses/#{mission_id.to_i}/start", :query => {}.merge(query))
     end
     
     #
@@ -148,19 +151,19 @@ module MambaNation
       perform_get("/users/#{id.to_i}/posts.json", :query => { :application_id => application_id }.merge(query))
     end
     
-    def create_post(id, post, application_id)
-      perform_post("/posts", :body => { :user_id => id, :post => post, :application_id => application_id })
+    def create_post(id, post, application_id, query = {})
+      perform_post("/posts", :body => { :user_id => id, :post => post, :application_id => application_id }.merge(query))
     end
     
-    def publish_post(id, stream_id)
-      perform_post("/posts/#{id}/publish.json", :body => { :post => { :stream_id => stream_id } })
+    def publish_post(id, stream_id, query = {})
+      perform_post("/posts/#{id}/publish.json", :body => { :post => { :stream_id => stream_id } }.merge(query))
     end
     
     #
     # Roles
     #
-    def user_roles(id)
-      perform_get("/users/#{id.to_i}/roles.json")
+    def user_roles(id, query = {})
+      perform_get("/users/#{id.to_i}/roles.json", :query => query)
     end
     
     #
@@ -174,8 +177,8 @@ module MambaNation
       perform_get("/users/#{id.to_i}/unread_system_messages.json", :query => query)
     end
     
-    def read_user_message(id, message_id)
-      perform_post("/users/#{id.to_i}/messages/#{message_id.to_i}/read.json", :body => {})
+    def read_user_message(id, message_id, query = {})
+      perform_post("/users/#{id.to_i}/messages/#{message_id.to_i}/read.json", :body => {}.merge(query))
     end
 
     #
@@ -199,11 +202,11 @@ module MambaNation
         else 'application/octet-stream'
       end
     end
-
+    
     def mime_type(f) self.class.mime_type(f) end
-
+      
     CRLF = "\r\n"
-
+    
     def self.build_multipart_bodies(parts)
       boundary = Time.now.to_i.to_s(16)
       body = ""
@@ -225,7 +228,7 @@ module MambaNation
         :headers => {"Content-Type" => "multipart/form-data; boundary=#{boundary}"}
       }
     end
-      
+    
     def build_multipart_bodies(parts) self.class.build_multipart_bodies(parts) end
     
     private

data/lib/mambanation/httpauth.rb

@@ -1,49 +1,48 @@
 module MambaNation
   class HTTPAuth
     include HTTParty
-
+    
     format :plain
-
+    
     attr_reader :username, :password, :options
-
+    
     def initialize(username, password, options={})
       
       @username, @password = username, password
       @options = { :ssl => false, :timeout => 100 }.merge(options)
       options[:api_endpoint] ||= "api.mambanation.com"
-
+      
       if options[:api_version] == false
         version_path = "2"
       else
         options[:api_version] ||= API_VERSION
         version_path = "#{options[:api_version]}"
       end
-
+      
       self.class.base_uri "http#{'s' if options[:ssl]}://#{options[:api_endpoint]}/v#{version_path}"
       self.class.default_timeout options[:timeout] if options[:timeout]
     end
-
+    
     def get(uri, headers={})
       self.class.get(uri, :headers => headers, :basic_auth => basic_auth)
     end
-
+    
     def post(uri, body={}, headers={})
       self.class.post(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
-
+    
     def put(uri, body={}, headers={})
       self.class.put(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
-
+    
     def delete(uri, body={}, headers={})
       self.class.delete(uri, :body => body, :headers => headers, :basic_auth => basic_auth)
     end
-
+    
     private
-
+    
     def basic_auth
       @basic_auth ||= {:username => @username, :password => @password}
     end
-
   end
 end

data/lib/mambanation/request.rb

@@ -1,72 +1,71 @@
 module MambaNation
   class Request
     extend Forwardable
-
+    
     def self.get(client, path, options={})
       new(client, :get, path, options).perform
     end
-
+    
     def self.post(client, path, options={})
       new(client, :post, path, options).perform
     end
-
+    
     def self.put(client, path, options={})
       options[:body] ||= ""
       new(client, :put, path, options).perform
     end
-
+    
     def self.delete(client, path, options={})
       new(client, :delete, path, options).perform
     end
-
+    
     attr_reader :client, :method, :path, :options
-
+    
     def_delegators :client, :get, :post, :put, :delete
-
+    
     def initialize(client, method, path, options={})
       @client, @method, @path, @options = client, method, path, options
     end
-
+    
     def uri
       @uri ||= begin
         uri = URI.parse(path)
-
+        
         if options[:query] && options[:query] != {}
           uri.query = to_query(options[:query])
         end
-
+        
         uri.to_s
       end
     end
-
+    
     def perform
       MambaNation.make_friendly(send("perform_#{method}"))
     end
-
+    
     private
-
+    
     def perform_get
       get(uri, options[:headers])
     end
-
+    
     def perform_post
       post(uri, options[:body], options[:headers])
     end
-
+    
     def perform_put
       put(uri, options[:body], options[:headers])
     end
-
+    
     def perform_delete
       delete(uri, options[:headers])
     end
-
+    
     def to_query(options)
       options.inject([]) do |collection, opt|
         collection << "#{opt[0]}=#{opt[1]}"
         collection
       end * '&'
     end
-
   end
-end
+end

data/lib/mambanation.rb

@@ -6,7 +6,6 @@ require "yajl"
 module MambaNation
   include HTTParty
   API_VERSION = "2".freeze
-  format :json
   
   class MambaNationError < StandardError
     attr_reader :data
@@ -70,11 +69,11 @@ module MambaNation
         raise Unavailable, "(#{response.code}): #{response.message}"
     end
   end
-
+  
   def self.parse(response)
     Yajl::Parser.parse(response.body)
   end
-
+  
   def self.mash(obj)
     if obj.is_a?(Array)
       obj.map{|item| make_mash_with_consistent_hash(item)}
@@ -84,7 +83,7 @@ module MambaNation
       obj
     end
   end
-
+  
   # Lame workaround for the fact that mash doesn't hash correctly
   def self.make_mash_with_consistent_hash(obj)
     m = Hashie::Mash.new(obj)

data/test/fixtures/mission_families.json

@@ -1,5 +1,5 @@
 {
-  "total_entries": 35,
+  "total_entries": 1,
   "total_pages": 1,
   "page": 1,
   "entries" : [

data/test/fixtures/mission_statuses.json

@@ -1,5 +1,5 @@
 {
-  "total_entries": 35,
+  "total_entries": 4,
   "total_pages": 1,
   "page": 1,
   "entries" : [

data/test/fixtures/posts.json

@@ -1,32 +1,32 @@
 {
-    "created_at": 1267107614,
-    "published_streams": {
-        "100000436786256": "100000436786256_105254089499150"
-    },
-    "updated_at": 1267107616,
-    "action_links": {
-        "0": {
-            "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
-            "text": "Reply !"
-        }
-    },
-    "attachment": {
-        "href": "http://api.sandbox.mambanation.com:3001/v1/",
-        "name": "NEWYEAR",
-        "media": [{
-            "expanded_width": "320",
-            "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
-            "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
-            "type": "flash",
-            "expanded_height": "260"
-        }]
-    },
-    "_id": "4b86871ed45037109900001c",
-    "fb_application_id": "293415521400",
-    "uid": "100000436786256",
-    "other": {
-        "example": "1234"
-    },
-    "message": "hihihi",
-    "target_ids": ["100000436786256"]
+  "created_at": 1267107614,
+  "published_streams": {
+    "100000436786256": "100000436786256_105254089499150"
+  },
+  "updated_at": 1267107616,
+  "action_links": {
+    "0": {
+      "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
+      "text": "Reply !"
+    }
+  },
+  "attachment": {
+    "href": "http://api.sandbox.mambanation.com:3001/v1/",
+    "name": "NEWYEAR",
+    "media": [{
+      "expanded_width": "320",
+      "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
+      "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
+      "type": "flash",
+      "expanded_height": "260"
+    }]
+  },
+  "_id": "4b86871ed45037109900001c",
+  "fb_application_id": "293415521400",
+  "uid": "100000436786256",
+  "other": {
+    "example": "1234"
+  },
+  "message": "hihihi",
+  "target_ids": ["100000436786256"]
 }

data/test/fixtures/publish_post.json

@@ -1,6 +1,6 @@
 {
-  message: 'message perso',
-  attachment: {
+  "message": 'message perso',
+  "attachment": {
     'name': 'titre',
     'href': 'url',
     'caption': 'sous-titre',
@@ -21,22 +21,22 @@
       'expanded_height': '200'
     }]
   },
-  action_links : [{
+  "action_links" : [{
     'text':'action_links_text',
     'href':'link_appli'
   }],
-  uid: MambaNation.userId,
-  target_ids: {
-    uid001 : {
+  "uid": MambaNation.userId,
+  "target_ids": {
+    "uid001" : {
       VAR_1 : 'Texte de remplacement',
       VAR_2 : 'UserSpecificVar'
     },
-    uid002 : {
+    "uid002" : {
       VAR_1 : 'Texte de remplacement',
       VAR_2 : 'UserSpecificVar'
     }
   },
-  other: { 
+  "other": { 
     'anythingelse' : 'some_text_to_save',
     'anythingelse' : 'some_text_to_save'
   }

data/test/fixtures/user.json

@@ -1 +1,32 @@
-{"mamba_level":1,"facebook_id":1474761574,"points_to_next_level":150,"websession_id":4,"applications":{},"avatar":{"name":"b1276619510847471","updated_at":1276619510,"gender":null,"id":4,"type":null,"fingerprint":null},"gender":null,"id":4,"media":[],"percent_of_current_level":0,"blings":0,"last_name":null,"posts":{"count_received":0,"count_sent":0},"mamba_points":0,"status":"active","vibes":"-","email":"tian.jiang01@gmail.com","first_name":null}
+{
+  "mamba_level": 1,
+  "facebook_id": 1474761574,
+  "points_to_next_level": 150,
+  "websession_id": 4,
+  "applications": {
+  },
+  "avatar": {
+    "name": "b1276619510847471",
+    "updated_at": 1276619510,
+    "gender": null,
+    "id": 4,
+    "type": null,
+    "fingerprint": null
+  },
+  "gender": null,
+  "id": 4,
+  "media": [
+  ],
+  "percent_of_current_level": 0,
+  "blings": 0,
+  "last_name": null,
+  "posts": {
+    "count_received": 0,
+    "count_sent": 0
+  },
+  "mamba_points": 0,
+  "status": "active",
+  "vibes": "-",
+  "email": "tian.jiang01@gmail.com",
+  "first_name": null
+}

data/test/fixtures/user_error.json

@@ -1,5 +1,5 @@
 {
-  errors:
+  "errors":
     [
       ["email", "too_short"],
       ["email", "invalid"],

data/test/fixtures/user_posts.json

@@ -1,70 +1,70 @@
 {
-  sent: [
+  "sent": [
     {
-        "created_at": 1267107614,
-        "published_streams": {
-            "100000436786256": "100000436786256_105254089499150"
-        },
-        "updated_at": 1267107616,
-        "action_links": {
-            "0": {
-                "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
-                "text": "Reply !"
-            }
-        },
-        "attachment": {
-            "href": "http://api.sandbox.mambanation.com:3001/v1/",
-            "name": "NEWYEAR",
-            "media": [{
-                "expanded_width": "320",
-                "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
-                "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
-                "type": "flash",
-                "expanded_height": "260"
-            }]
-        },
-        "_id": "4b86871ed45037109900001c",
-        "fb_application_id": "293415521400",
-        "uid": "100000436786256",
-        "other": {
-            "example": "1234"
-        },
-        "message": "hihihi",
-        "target_ids": ["100000436786256"]
+      "created_at": 1267107614,
+      "published_streams": {
+        "100000436786256": "100000436786256_105254089499150"
+      },
+      "updated_at": 1267107616,
+      "action_links": {
+        "0": {
+          "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
+          "text": "Reply !"
+        }
+      },
+      "attachment": {
+        "href": "http://api.sandbox.mambanation.com:3001/v1/",
+        "name": "NEWYEAR",
+        "media": [{
+          "expanded_width": "320",
+          "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
+          "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
+          "type": "flash",
+          "expanded_height": "260"
+        }]
+      },
+      "_id": "4b86871ed45037109900001c",
+      "fb_application_id": "293415521400",
+      "uid": "100000436786256",
+      "other": {
+        "example": "1234"
+      },
+      "message": "hihihi",
+      "target_ids": ["100000436786256"]
     }
   ], // list of posts sent by the user
-  received: [
+  "received": [
     {
-        "created_at": 1267107614,
-        "published_streams": {
-            "100000436786256": "100000436786256_105254089499150"
-        },
-        "updated_at": 1267107616,
-        "action_links": {
-            "0": {
-                "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
-                "text": "Reply !"
-            }
-        },
-        "attachment": {
-            "href": "http://api.sandbox.mambanation.com:3001/v1/",
-            "name": "NEWYEAR",
-            "media": [{
-                "expanded_width": "320",
-                "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
-                "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
-                "type": "flash",
-                "expanded_height": "260"
-            }]
-        },
-        "_id": "4b86871ed45037109900001c",
-        "fb_application_id": "293415521400",
-        "uid": "100000436786256",
-        "other": {
-            "example": "1234"
-        },
-        "message": "hihihi",
-        "target_ids": ["100000436786256"]
+      "created_at": 1267107614,
+      "published_streams": {
+        "100000436786256": "100000436786256_105254089499150"
+      },
+      "updated_at": 1267107616,
+      "action_links": {
+        "0": {
+          "href": "http://apps.facebook.com/mambatemplate?post_id={{post_id}}",
+          "text": "Reply !"
+        }
+      },
+      "attachment": {
+        "href": "http://api.sandbox.mambanation.com:3001/v1/",
+        "name": "NEWYEAR",
+        "media": [{
+          "expanded_width": "320",
+          "swfsrc": "http://api.sandbox.mambanation.com/flv_player.swf?flv=http://d387vg9sga25dr.cloudfront.net/video/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.flv",
+          "imgsrc": "http://d387vg9sga25dr.cloudfront.net/preview/1da41a11cf6570642ba9d7c91f2c48_NEWYEAR.png",
+          "type": "flash",
+          "expanded_height": "260"
+        }]
+      },
+      "_id": "4b86871ed45037109900001c",
+      "fb_application_id": "293415521400",
+      "uid": "100000436786256",
+      "other": {
+        "example": "1234"
+      },
+      "message": "hihihi",
+      "target_ids": ["100000436786256"]
     }
   ] // list of posts received by the user
 }

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: mambanation
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
-- Jeremy Van de Wyngaert
+- "J\xC3\xA9r\xC3\xA9my Van de Wyngaert"
 - "St\xC3\xA9phane Bellity"
 - Tian Jiang
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-10 00:00:00 +02:00
+date: 2010-09-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency