mogli 0.0.14 → 0.0.15

data/lib/mogli.rb

@@ -1,5 +1,5 @@
 module Mogli
-  
+
 end
 
 require "httparty"
@@ -34,4 +34,4 @@ require "mogli/television"
 require "mogli/video"
 require "mogli/work"
 require "mogli/user"
-require "mogli/client"
+require "mogli/client"

data/lib/mogli/album.rb

@@ -1,12 +1,12 @@
 module Mogli
   class Album < Model
     
-    define_properties :id, :name, :description, :link, :count, :created_time, :updated_time
-    creation_properties :name, :message
+    define_properties :id, :name, :description, :location, :privacy, :link, :count, :created_time, :updated_time
+    creation_properties :name, :description
     
     hash_populating_accessor :from, "User","Page"
     has_association :photos, "Photo"
     has_association :comments, "Comment"
     
   end
-end
+end

data/lib/mogli/checkin.rb

@@ -6,4 +6,4 @@ module Mogli
     hash_populating_accessor :place, "Page"
     hash_populating_accessor :application, "Page"
   end
-end
+end

data/lib/mogli/client.rb

@@ -10,7 +10,11 @@ module Mogli
     include HTTParty
     include Mogli::Client::Event
     include Mogli::Client::User
+
     class UnrecognizeableClassError < Exception; end
+    class QueryParseException < Exception; end
+    class OAuthAccessTokenException < Exception; end
+    class OAuthUnauthorizedClientException < Exception; end
 
     def api_path(path)
       "https://graph.facebook.com/#{path}"
@@ -37,7 +41,7 @@ module Mogli
       parts = post_data.split("&")
       hash = {}
       parts.each do |p| (k,v) = p.split("=")
-        hash[k]=v
+        hash[k]=CGI.unescape(v)
       end
       new(hash["access_token"],hash["expires"].to_s.to_i)
     end
@@ -66,6 +70,7 @@ module Mogli
 
     def get_and_map(path,klass=nil,body_args = {})
       data = self.class.get(api_path(path),:query=>default_params.merge(body_args))
+      data = data.values if body_args.key?(:ids) && !data.key?('error')
       map_data(data,klass)
     end
 
@@ -124,6 +129,7 @@ module Mogli
     end
 
     def determine_class(klass_or_klasses,data)
+      return constantize_string(data['type']) if data.key?('type') && klass_or_klasses == Mogli::Model
       klasses = Array(klass_or_klasses).map { |k| constantize_string(k)}
       klasses.detect {|klass| klass.recognize?(data)} || klasses.first
     end
@@ -133,6 +139,7 @@ module Mogli
         if data.keys.size == 1 and data["error"]
           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}")
         end
       end

data/lib/mogli/education.rb

@@ -1,10 +1,10 @@
 module Mogli
   class Education < Model
-    
+
     define_properties :start_date, :end_date, :degree
-    
+
     hash_populating_accessor :school, "Page"
     hash_populating_accessor :year, "Page"
     hash_populating_accessor :concentration, "Page"
   end
-end
+end

data/lib/mogli/event.rb

@@ -1,15 +1,16 @@
 module Mogli
   class Event < Model
+    set_search_type
     define_properties :id, :name, :description, :start_time, :end_time, :location, :privacy, :updated_time
     creation_properties :start_time, :end_time, :link, :name, :description, :privacy
-    
+
     hash_populating_accessor :venue, "Address"
     hash_populating_accessor :owner, "User", "Page"
     has_association :noreply, "User"
-    has_association :mabye, "User"
+    has_association :maybe, "User"
     has_association :invited, "User"
     has_association :attending, "User"
     has_association :declined, "User"
     has_association :feed, "Post"
   end
-end
+end

data/lib/mogli/group.rb

@@ -1,11 +1,12 @@
 module Mogli
   class Group < Model
+    set_search_type
     define_properties :id, :name, :description, :link, :privacy, :updated_time
-    
+
     hash_populating_accessor :owner, "User", "Page"
     hash_populating_accessor :venue, "Address"
-    
+
     has_association :feed, "Post"
     has_association :members, "User"
   end
-end
+end

data/lib/mogli/link.rb

@@ -1,9 +1,10 @@
 module Mogli
   class Link < Model
-    define_properties :link, :message, :id, :name, :page, :created_time, :icon, :picture, :description
+    define_properties :link, :message, :id, :name, :page, :created_time, :updated_time,
+      :icon, :picture, :description, :caption
     creation_properties :link, :message
 
     hash_populating_accessor :comments, "Comment"
     hash_populating_accessor :from, "User"
   end
-end
+end

data/lib/mogli/model.rb

@@ -1,8 +1,13 @@
+require 'mogli/model/search'
+
 module Mogli
   class Model < Hashie::Dash
-    
+    extend Mogli::Model::Search
+
+    set_search_type :all
+
     attr_accessor :type
-    
+
     def client=(val)
       @client=val
     end
@@ -105,7 +110,11 @@ module Mogli
 
     def self.find(id,client=nil, *fields)
       body_args = fields.empty? ? {} : {:fields => fields}
+      (id, body_args[:ids] = "", id.join(',')) if id.is_a?(Array)
       (client||Mogli::Client.new).get_and_map(id,self, body_args)
     end
+
   end
 end
+
+

data/lib/mogli/model/search.rb

@@ -0,0 +1,21 @@
+module Mogli
+  class Model < Hashie::Dash
+    module Search
+      attr_reader :search_type
+
+      def search(pattern="", client=nil, args={})
+        raise(NoMethodError.new("Can't search for #{self.to_s}")) unless search_type
+        args.merge!({:q => pattern})
+        args.merge!(:type => self.search_type) unless search_type == 'all'
+        (client||Mogli::Client.new).get_and_map('search', self, args)
+      end
+
+      protected
+
+      def set_search_type(type=nil)
+        @search_type = type.nil? ? self.to_s.gsub('Mogli::','').downcase : type.to_s
+      end
+
+    end
+  end
+end

data/lib/mogli/page.rb

@@ -1,34 +1,35 @@
 module Mogli
   class Page < Profile
-        
+    set_search_type
+
     define_properties :id, :name, :category, :username, :access_token
-    
+
     # General
     define_properties :fan_count, :link, :picture, :has_added_app
 
     # Retail
     define_properties :founded, :products, :mission, :company_overview
-    
+
     # Musicians
     define_properties :record_label, :hometown, :band_members, :genre
-    
-    # As a like 
+
+    # As a like
     define_properties :created_time
-    
-  	def client_for_page
-  	  if access_token.blank?
-  	    raise MissingAccessToken.new("You can only get a client for this page if an access_token has been provided. i.e. via /me/accounts")
+
+    def client_for_page
+      if access_token.blank?
+        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)
     end
-  
+
     def self.recognize?(hash)
       hash.has_key?("category")
     end
 
     class MissingAccessToken < Exception
     end
-    
+
   end
-  
+
 end

data/lib/mogli/photo.rb

@@ -3,7 +3,7 @@ module Mogli
     define_properties :id, :name, :picture, :source, :height, :width, :link, :icon,
       :created_time, :updated_time
     creation_properties :message
-    
+
     hash_populating_accessor :from, "User","Page"
   end
-end
+end

data/lib/mogli/post.rb

@@ -8,7 +8,7 @@ module Mogli
     creation_properties :message, :picture, :link, :name, :description, :caption, :source
         
     hash_populating_accessor :actions, "Action"
-    hash_populating_accessor :comments, "Comment"
+    has_association :comments, "Comment"
     hash_populating_accessor :from, "User"
     
     def likes_create

data/lib/mogli/status.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Status < Model
-    define_properties :id, :message, :updated_time
-    
+    define_properties :id, :message, :updated_time, :created_time
+
     hash_populating_accessor :from, "User", "Page"
   end
-end
+end

data/lib/mogli/user.rb

@@ -1,21 +1,22 @@
-
 module Mogli
   class User < Profile
-    
+    set_search_type
+
     define_properties :first_name, :last_name, :link, :about, :birthday, :gender,
-          :email, :website, :timezone, :updated_time, :verified, :political, :relationship_status, :locale
-    
+          :email, :website, :timezone, :updated_time, :verified, :political, 
+          :relationship_status, :locale, :religion, :quotes
+
     def self.recognize?(hash)
       !hash.has_key?("category")
     end
-    
+
     hash_populating_accessor :work, "Work"
     hash_populating_accessor :education, "Education"
-    
+
     hash_populating_accessor :location, "Page"
     hash_populating_accessor :hometown, "Page"
 
-    has_association :activities,"Activity"
+    has_association :activities, "Activity"
     has_association :friends, "User"
     has_association :interests, "Interest"
     has_association :music, "Music"
@@ -26,4 +27,4 @@ module Mogli
     has_association :home, "Post"
     has_association :accounts, "Page"
   end
-end
+end

data/lib/mogli/video.rb

@@ -1,11 +1,12 @@
 module Mogli
   class Video < Model
-    
-    define_properties :id, :message, :name, :description, :length, :created_time, :updated_time, :icon, :picture, :embed_html
-    
+
+    define_properties :id, :message, :name, :description, :length, :created_time,
+      :updated_time, :icon, :picture, :embed_html, :caption, :link, :source, :likes
+
     hash_populating_accessor :from, "User", "Page"
-    
+
     has_association :comments, "Comment"
-    
+
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Mike Mangino
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 -04:00
+date: 2010-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ files:
 - lib/mogli/interest.rb
 - lib/mogli/link.rb
 - lib/mogli/location.rb
+- lib/mogli/model/search.rb
 - lib/mogli/model.rb
 - lib/mogli/movie.rb
 - lib/mogli/music.rb