mogli 0.0.32 → 0.0.33

data/lib/mogli/album.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Album < Model
     
-    define_properties :id, :name, :description, :location, :privacy, :link, :count, :created_time, :updated_time
+    define_properties :id, :name, :description, :location, :cover_photo, :privacy, :link, :count, :created_time, :updated_time
     creation_properties :name, :description
     
     hash_populating_accessor :from, "User","Page"

data/lib/mogli/authenticator.rb

@@ -17,22 +17,26 @@ module Mogli
     end
 
     def access_token_url(code)
-      "https://graph.facebook.com/oauth/access_token?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url) if !callback_url.blank?}&client_secret=#{secret}&code=#{CGI.escape(code)}"
+      "https://graph.facebook.com/oauth/access_token?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url) unless callback_url.nil? || callback_url.empty?}&client_secret=#{secret}&code=#{CGI.escape(code)}"
     end
 
     def get_access_token_for_session_key(session_keys)
       keystr = session_keys.is_a?(Array) ?
                  session_keys.join(',') : session_keys
       client = Mogli::Client.new
-      response = client.post("oauth/exchange_sessions", nil,
-                  {:type => 'client_cred',
-                   :client_id => client_id,
-                   :client_secret => secret,
-                   :sessions => keystr})
+      response = client.class.post(client.api_path("oauth/exchange_sessions"),
+        :body => {
+          :type => 'client_cred',
+          :client_id => client_id,
+          :client_secret => secret,
+          :sessions => keystr
+        }
+      )
       raise_exception_if_required(response)
-      response
+      tokens = response.parsed_response
+      session_keys.is_a?(Array) ? tokens : tokens.first
     end
-    
+
     def get_access_token_for_application
       client = Mogli::Client.new
       response = client.class.post(client.api_path('oauth/access_token'),
@@ -43,9 +47,9 @@ module Mogli
         }
       )
       raise_exception_if_required(response)
-      response.to_s.split("=").last
+      response.parsed_response.split("=").last
     end
-    
+
     def raise_exception_if_required(response)
       raise Mogli::Client::HTTPException if response.code != 200
     end

data/lib/mogli/client.rb

@@ -84,7 +84,7 @@ module Mogli
 
     def self.response_is_error?(post_data)
        post_data.kind_of?(Hash) and
-       !post_data["error"].blank?
+       !post_data["error"].empty?
     end
 
     def self.create_from_session_key(session_key, client_id, secret)
@@ -92,12 +92,12 @@ module Mogli
       access_data = authenticator.get_access_token_for_session_key(session_key)
       new(access_token_from_access_data(access_data),expiration_from_access_data(access_data))
     end
-    
+
     def self.access_token_from_access_data(access_data)
       return nil if access_data.nil?
       access_data['access_token']
     end
-    
+
     def self.expiration_from_access_data(access_data)
       return nil if access_data.nil? or access_data['expires'].nil?
       Time.now.to_i + access_data['expires'].to_i

data/lib/mogli/fetching_array.rb

@@ -1,21 +1,21 @@
 module Mogli
   class FetchingArray < Array
     attr_accessor :next_url, :previous_url, :client, :classes
-    
+
     def fetch_next
-      return [] if next_url.blank?
+      return [] if next_url.nil? || next_url.empty?
       additions = client.get_and_map_url(next_url,classes)
       self.next_url = additions.next_url
       self.concat(additions)
       additions
     end
-    
+
     def fetch_previous
-      return [] if previous_url.blank?
+      return [] if previous_url.nil? || previous_url.empty?
       additions = client.get_and_map_url(previous_url,classes)
       self.previous_url = additions.previous_url
       self.unshift(*additions)
       additions
     end
   end
-end
+end

data/lib/mogli/page.rb

@@ -17,7 +17,7 @@ module Mogli
     define_properties :created_time
 
     def client_for_page
-      if access_token.blank?
+      if access_token.nil? || access_token.empty?
         raise MissingAccessToken.new("You can only get a client for this page if an access_token has been provided. i.e. via /me/accounts")
       end
       Client.new(access_token)

data/lib/mogli/photo.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Photo < Model
-    define_properties :id, :name, :picture, :source, :height, :width, :link, :icon,
-      :created_time, :updated_time
+    define_properties :id, :name, :tags, :picture, :source, :height, :width, :images, :link, :icon,
+      :created_time, :updated_time, :position, :comments
     creation_properties :message
 
     hash_populating_accessor :from, "User","Page"

data/spec/authenticator_spec.rb

@@ -30,8 +30,12 @@ describe Mogli::Authenticator do
   end
 
   it "can trade session_keys for access_tokens" do
-    response = [{"access_token" => "myaccesstoken",   "expires" => 5000},
-                {"access_token" => "youraccesstoken", "expires" => 5000}]
+    response = mock('HTTParty::Response',
+      :parsed_response => [
+          {"access_token" => "myaccesstoken",   "expires" => 5000},
+          {"access_token" => "youraccesstoken", "expires" => 5000}
+        ],
+      :code => 200)
     response.stub!(:code).and_return(200)
 
     Mogli::Client.should_receive(:post).
@@ -47,23 +51,33 @@ describe Mogli::Authenticator do
                  {"access_token" => "youraccesstoken", "expires" => 5000}]
   end
 
-  it "can trade one session_key for an access_tokens" do
-    response = {"access_token" => "myaccesstoken", "expires" => 5000}
-    response.stub!(:code).and_return(200)
+  it "can trade one session_key for an access_token" do
+    response = mock('HTTParty::Response',
+      :parsed_response => [
+          {"access_token" => "myaccesstoken", "expires" => 5000}
+        ],
+      :code => 200)
+
     Mogli::Client.should_receive(:post).
       with("https://graph.facebook.com/oauth/exchange_sessions",
-           :body => {:type => "client_cred", :client_id => "123456",
-                     :client_secret => "secret", :sessions => "mysessionkey"}).
+           :body => {
+             :type => "client_cred",
+             :client_id => "123456",
+             :client_secret => "secret",
+             :sessions => "mysessionkey"
+          }).
       and_return(response)
 
     authenticator.
       get_access_token_for_session_key("mysessionkey").
       should == {"access_token" => "myaccesstoken", "expires" => 5000}
   end
-  
+
   it "can ask for an application token" do
-    response = "access_token=123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo"
-    response.stub!(:code).and_return(200)
+    response = mock('HTTParty::Response',
+      :parsed_response => "access_token=123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo",
+      :code => 200)
+
     Mogli::Client.should_receive(:post).
       with("https://graph.facebook.com/oauth/access_token",
            :body=> {
@@ -72,20 +86,22 @@ describe Mogli::Authenticator do
              :client_secret => "secret"
            }).
       and_return(response)
-      
-      
+
+
       token = authenticator.get_access_token_for_application
       token.should =="123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo"
   end
-  
+
   it "raises an error if not a 200" do
-    response = "access_token=123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo"
-    response.stub!(:code).and_return(500)
+    response = mock('HTTParty::Response',
+      :parsed_response => "access_token=123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo",
+      :code => 500)
+
     Mogli::Client.should_receive(:post).and_return(response)
     lambda do
       token = authenticator.get_access_token_for_application
     end.should raise_error(Mogli::Client::HTTPException)
-    
+
   end
 
   context "Oauth2" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: false
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -04:00
+date: 2011-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency