mogli 0.0.15 → 0.0.16

data/lib/mogli/action.rb

@@ -1,6 +1,12 @@
 module Mogli
   class Action < Model
     define_properties :name, :link
-    
+
+    # simple implementation of to_json, ignoring options like :only, :except,
+    # :include, :methods because this is primarily intended for being submitted
+    # to facebook
+    def to_json(options = nil)
+      "{\"name\":\"#{name}\",\"link\":\"#{link}\"}"
+    end
   end
-end
+end

data/lib/mogli/application.rb

@@ -0,0 +1,13 @@
+module Mogli
+  class Application < Model
+
+    define_properties :id, :name, :description, :category, :subcategory, :link
+
+    has_association :feed, "Post"
+    has_association :posts, "Post"
+    has_association :albums, "Album"
+    has_association :insights, "Insight"
+
+
+  end
+end

data/lib/mogli/client.rb

@@ -11,10 +11,12 @@ module Mogli
     include Mogli::Client::Event
     include Mogli::Client::User
 
-    class UnrecognizeableClassError < Exception; end
-    class QueryParseException < Exception; end
-    class OAuthAccessTokenException < Exception; end
-    class OAuthUnauthorizedClientException < Exception; end
+    class ClientException < Exception; end
+    class UnrecognizeableClassError < ClientException; end
+    class QueryParseException < ClientException; end
+    class OAuthAccessTokenException < ClientException; end
+    class OAuthUnauthorizedClientException < ClientException; end
+    class OAuthException < ClientException; end
 
     def api_path(path)
       "https://graph.facebook.com/#{path}"
@@ -38,6 +40,9 @@ module Mogli
 
     def self.create_from_code_and_authenticator(code,authenticator)
       post_data = get(authenticator.access_token_url(code))
+      if (response_is_error?(post_data))
+        raise_client_exception(post_data)
+      end        
       parts = post_data.split("&")
       hash = {}
       parts.each do |p| (k,v) = p.split("=")
@@ -45,6 +50,22 @@ module Mogli
       end
       new(hash["access_token"],hash["expires"].to_s.to_i)
     end
+    
+    def self.raise_client_exception(post_data)
+      type=post_data["error"]["type"]
+      message=post_data["error"]["message"]
+      if Mogli::Client.const_defined?(type)
+        raise Mogli::Client.const_get(type).new(message) 
+      else
+        raise ClientException.new("#{type}: #{message}")      
+      end
+    end
+    
+    def self.response_is_error?(post_data)
+      post_data.is_a?(HTTParty::Response) and
+       post_data.parsed_response.kind_of?(Hash) and
+       !post_data.parsed_response["error"].blank?
+    end
 
     def self.create_from_session_key(session_key, client_id, secret)
       authenticator = Mogli::Authenticator.new(client_id, secret, nil)
@@ -140,7 +161,7 @@ module Mogli
           type = data["error"]["type"]
           message = data["error"]["message"]
           raise Mogli::Client.const_get(type).new(message) if Mogli::Client.const_defined?(type)
-          raise Exception.new("#{type}: #{message}")
+          raise ClientException.new("#{type}: #{message}")
         end
       end
     end

data/lib/mogli/group.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Group < Model
     set_search_type
-    define_properties :id, :name, :description, :link, :privacy, :updated_time
+    define_properties :id, :name, :description, :link, :privacy, :updated_time, :version, :administrator
 
     hash_populating_accessor :owner, "User", "Page"
     hash_populating_accessor :venue, "Address"

data/lib/mogli/insight.rb

@@ -0,0 +1,6 @@
+module Mogli
+  class Insight < Model
+    define_properties :id, :name
+    
+  end
+end

data/lib/mogli/model.rb

@@ -25,7 +25,23 @@ module Mogli
       post_params = {}
       self.class.creation_keys.each do |key|
         post_params[key] = self[key]
+
+        # make sure actions and any other creation_properties that aren't just
+        # hash entries get added...
+        if post_params[key].nil? &&
+           self.respond_to?(key.to_sym) && !self.send(key.to_sym).nil?
+
+          val = self.send(key.to_sym)
+          post_params[key] = if val.respond_to?(:to_json)
+                               val.to_json
+                             elsif val.is_a?(Array)
+                               "[#{val.map { |v| v.respond_to?(:to_json) ? v.to_json : nil }.compact.join(',')}]"
+                             else
+                               nil
+                             end
+        end
       end
+
       post_params
     end
 
@@ -100,7 +116,7 @@ module Mogli
 
     def fetch()
       raise ArgumentError.new("You cannot fetch models without a populated id attribute") if id.nil?
-      other = self.class.find(id,client) 
+      other = self.class.find(id,client)
       merge!(other) if other
     end
 
@@ -116,5 +132,3 @@ module Mogli
 
   end
 end
-
-

data/lib/mogli/movie.rb

@@ -1,6 +1,6 @@
 module Mogli
   class Movie < Model
-    define_properties :name, :category, :id
+    define_properties :name, :category, :id, :created_time
     
   end
 end

data/lib/mogli/post.rb

@@ -1,16 +1,18 @@
+require 'json'
+
 module Mogli
   class Post < Model
-        
-    define_properties :id, :to, :message, :picture, :link, :name, :caption, 
+
+    define_properties :id, :to, :message, :picture, :link, :name, :caption,
       :description, :source, :icon, :attribution, :actions, :likes,
       :created_time, :updated_time, :privacy, :type
-    
-    creation_properties :message, :picture, :link, :name, :description, :caption, :source
-        
+
+    creation_properties :message, :picture, :link, :name, :description, :caption, :source, :actions
+
     hash_populating_accessor :actions, "Action"
     has_association :comments, "Comment"
     hash_populating_accessor :from, "User"
-    
+
     def likes_create
       client.post("#{id}/likes",nil,{})
     end

data/lib/mogli/profile.rb

@@ -14,14 +14,31 @@ module Mogli
     has_association :links, "Link"
     has_association :statuses, "Status"
     has_association :checkins, "Checkin"
-    
+
     hash_populating_accessor :location, "Location"
+
+    # Facebook's defaults image url, which seems to be the same as square_image_url at this time
     def image_url
       "https://graph.facebook.com/#{id}/picture"
     end
 
+    # 50x50 pixel image url
+    def square_image_url
+      "#{image_url}?type=square"
+    end
+
+    # 50 pixels wide, variable height image url
+    def small_image_url
+      "#{image_url}?type=small"
+    end
+
+    # About 200 pixels wide, variable height image url
+    def large_image_url
+      "#{image_url}?type=large"
+    end
+
     def to_s
       name
     end
   end
-end
+end

data/lib/mogli/television.rb

@@ -1,6 +1,6 @@
 module Mogli
   class Television < Model
-    define_properties :name, :category, :id
+    define_properties :name, :category, :id, :created_time
     
   end
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  hash: 63
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Mike Mangino
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hashie
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 4
+        - 3
         version: 0.4.3
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Simple library for accessing the facebook Open Graph API
 email: mmangino@elevatedrails.com
 executables: []
@@ -45,6 +63,7 @@ files:
 - lib/mogli/activity.rb
 - lib/mogli/address.rb
 - lib/mogli/album.rb
+- lib/mogli/application.rb
 - lib/mogli/authenticator.rb
 - lib/mogli/book.rb
 - lib/mogli/checkin.rb
@@ -56,6 +75,7 @@ files:
 - lib/mogli/event.rb
 - lib/mogli/fetching_array.rb
 - lib/mogli/group.rb
+- lib/mogli/insight.rb
 - lib/mogli/interest.rb
 - lib/mogli/link.rb
 - lib/mogli/location.rb
@@ -84,21 +104,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Open Graph Library for Ruby