mogli 0.0.2 → 0.0.3

data/lib/mogli.rb

@@ -15,6 +15,7 @@ require "mogli/address"
 require "mogli/album"
 require "mogli/book"
 require "mogli/comment"
+require "mogli/education"
 require "mogli/event"
 require "mogli/group"
 require "mogli/interest"
@@ -26,5 +27,6 @@ require "mogli/photo"
 require "mogli/post"
 require "mogli/television"
 require "mogli/video"
+require "mogli/work"
 require "mogli/user"
 require "mogli/client"

data/lib/mogli/action.rb

@@ -1,6 +1,6 @@
 module Mogli
-  class Action < Hashie::Mash
-    include Model
+  class Action < Model
+    define_properties :name, :link
     
   end
 end

data/lib/mogli/activity.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Activity < Hashie::Mash
-    include Model
-    
+  class Activity < Model
+    define_properties :name, :category, :id
   end
 end

data/lib/mogli/address.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Address < Hashie::Dash
-    include Model
+  class Address < Model
     
     define_properties :street, :city, :state, :zip, :country, :latitude, :longitude
   end

data/lib/mogli/album.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Album < Hashie::Dash
-    include Model
+  class Album < Model
     
     define_properties :id, :name, :description, :link, :count, :created_time, :updated_time
     

data/lib/mogli/authenticator.rb

@@ -9,8 +9,10 @@ module Mogli
       @callback_url = callback_url
     end
     
-    def authorize_url
-      "https://graph.facebook.com/oauth/authorize?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url)}"
+    def authorize_url(*scopes)
+      scopes = scopes.flatten
+      scope_part = "&scope=#{scopes.join(",")}" unless scopes.blank?
+      "https://graph.facebook.com/oauth/authorize?client_id=#{client_id}&redirect_uri=#{CGI.escape(callback_url)}#{scope_part}"
     end
     
     def access_token_url(code)

data/lib/mogli/book.rb

@@ -1,6 +1,7 @@
 module Mogli
-  class Book < Hashie::Mash
-    include Model
+  class Book < Model
+    define_properties :name, :category, :id
+    
     
   end
 end

data/lib/mogli/client.rb

@@ -5,6 +5,7 @@ module Mogli
   class Client
     attr_reader :access_token
     attr_reader :default_params
+    attr_reader :expiration
     
     include HTTParty
     include Mogli::Client::User   
@@ -14,23 +15,24 @@ module Mogli
       "http://graph.facebook.com/#{path}"
     end
     
-    def initialize(access_token = nil)
+    def initialize(access_token = nil,expiration=nil)
       @access_token = access_token
+      @expiration = Time.now + expiration if expiration
       @default_params = @access_token ? {:access_token=>access_token} : {}
     end
     
-    def self.get_access_token_for_code_and_authenticator(code,authenticator)
+    def expired?
+      expiration and expiration < Time.now
+    end
+        
+    def self.create_from_code_and_authenticator(code,authenticator)
       post_data = get(authenticator.access_token_url(code))
       parts = post_data.split("&")
       hash = {}
       parts.each do |p| (k,v) = p.split("=")
         hash[k]=v
       end
-      hash["access_token"]      
-    end
-    
-    def self.create_from_code_and_authenticator(code,authenticator)
-      new(get_access_token_for_code_and_authenticator(code,authenticator))
+      new(hash["access_token"],hash["expires"].to_s.to_i)
     end
     
     def get_and_map(path,klass=nil)
@@ -92,7 +94,7 @@ module Mogli
     
     def determine_class(klass_or_klasses,data)
       klasses = Array(klass_or_klasses).map { |k| constantize_string(k)}
-      klasses.detect {|klass| klass.recognize?(data)}
+      klasses.detect {|klass| klass.recognize?(data)} || klasses.first
     end
     
     def raise_error_if_necessary(data)
@@ -104,5 +106,31 @@ module Mogli
         end
       end
     end
+    
+    def fields_to_serialize
+      [:access_token,:default_params,:expiration]
+    end
+    
+    # Only serialize the bare minimum to recreate the session.
+    def marshal_load(variables)#:nodoc:
+      fields_to_serialize.each_with_index{|field, index| instance_variable_set("@#{field}", variables[index])}
+    end
+
+    # Only serialize the bare minimum to recreate the session.    
+    def marshal_dump#:nodoc:
+      fields_to_serialize.map{|field| send(field)}
+    end
+
+    # Only serialize the bare minimum to recreate the session. 
+    def to_yaml( opts = {} )#nodoc
+      YAML::quick_emit(self.object_id, opts) do |out|
+        out.map(taguri) do |map|
+          fields_to_serialize.each do |field|
+            map.add(field, send(field))
+          end
+        end
+      end
+    end
+    
   end
 end

data/lib/mogli/comment.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Comment < Hashie::Dash
-    include Model
+  class Comment < Model
     
     define_properties :id, :message, :created_time
     

data/lib/mogli/education.rb

@@ -0,0 +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

data/lib/mogli/event.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Event < Hashie::Dash
-    include Model
+  class Event < Model
     define_properties :id, :name, :description, :start_time, :end_time, :location, :privacy, :updated_time
     
     hash_populating_accessor :venue, "Address"

data/lib/mogli/group.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Group < Hashie::Dash
-    include Model
+  class Group < Model
     define_properties :id, :name, :description, :link, :privacy, :updated_time
     
     hash_populating_accessor :owner, "User", "Page"

data/lib/mogli/interest.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Interest < Hashie::Mash
-    include Model
-    
+  class Interest < Model
+    define_properties :id, :name
   end
 end

data/lib/mogli/model.rb

@@ -1,5 +1,5 @@
 module Mogli
-  module Model
+  class Model < Hashie::Dash
     def client=(val)
       @client=val
     end
@@ -10,49 +10,56 @@ module Mogli
 
     def initialize(hash={},client=nil)
       self.client=client
-      super(hash)
+      super(hash||{})
     end
     
     def self.included(other)
       other.extend(ClassMethods)
     end
 
-    
-    module ClassMethods
-      
-      
-      def define_properties(*args)
-        args.each do |arg|
-          property arg
-        end
+    def method_missing(method, *args)
+      method_as_s = method.to_s
+      if method_as_s.to_s[-1].chr == "="
+        warn_about_invalid_property(method_as_s.chop)
+      else 
+        super
       end
-      
-      def hash_populating_accessor(method_name,*klass)
-        define_method "#{method_name}=" do |hash|
-          instance_variable_set("@#{method_name}",client.map_data(hash,klass))
-        end
-        define_method "#{method_name}" do
-          instance_variable_get "@#{method_name}"
-        end
+    end
+    def warn_about_invalid_property(property)
+      puts "Warning: property #{property} doesn't exist for class #{self.class.name}"
+    end
+          
+    def self.define_properties(*args)
+      args.each do |arg|
+        property arg
       end
-      
-      def has_association(name,klass)
-        define_method name do
-          if (ret=instance_variable_get("@#{name}")).nil?
-            ret = client.get_and_map("/#{id}/#{name}",klass)
-            instance_variable_set("@#{name}",ret)
-          end
-          return ret
-        end
+    end
+    
+    def self.hash_populating_accessor(method_name,*klass)
+      define_method "#{method_name}=" do |hash|
+        instance_variable_set("@#{method_name}",client.map_data(hash,klass))
       end
-      
-      def recognize?(data)
-        true
+      define_method "#{method_name}" do
+        instance_variable_get "@#{method_name}"
       end
-      
-      def find(id,client=nil)
-        (client||Mogli::Client.new).get_and_map(id,self)
+    end
+    
+    def self.has_association(name,klass)
+      define_method name do
+        if (ret=instance_variable_get("@#{name}")).nil?
+          ret = client.get_and_map("/#{id}/#{name}",klass)
+          instance_variable_set("@#{name}",ret)
+        end
+        return ret
       end
     end
+    
+    def self.recognize?(data)
+      true
+    end
+    
+    def self.find(id,client=nil)
+      (client||Mogli::Client.new).get_and_map(id,self)
+    end
   end
 end

data/lib/mogli/movie.rb

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

data/lib/mogli/music.rb

@@ -1,6 +1,6 @@
 module Mogli
-  class Music < Hashie::Mash
-    include Model
+  class Music < Model
+    define_properties :name, :category, :id
     
   end
 end

data/lib/mogli/note.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Note < Hashie::Dash
-    include Model
+  class Note < Model
     
     define_properties :id, :subject, :message, :created_time, :updated_time, :icon
     

data/lib/mogli/page.rb

@@ -1,15 +1,21 @@
 module Mogli
-  class Page < Hashie::Dash
+  class Page < Model
         
-    include Model
     define_properties :id, :name, :category
     
     hash_populating_accessor :albums, "Album"
     hash_populating_accessor :photos, "Photo"
+    hash_populating_accessor :feed, "Post"
+    hash_populating_accessor :posts, "Post"
+    hash_populating_accessor :events, "Event"
+    hash_populating_accessor :videos, "Video"
     
     def self.recognize?(hash)
       hash.has_key?("category")
     end
     
+    def to_s
+      name
+    end
   end
 end

data/lib/mogli/photo.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Photo < Hashie::Dash
-    include Model
+  class Photo < Model
     define_properties :id, :name, :picture, :source, :height, :width, :link, :icon,
       :created_time, :updated_time
     

data/lib/mogli/post.rb

@@ -1,10 +1,9 @@
 module Mogli
-  class Post < Hashie::Dash
+  class Post < Model
         
-    include Model
     define_properties :id, :to, :message, :picture, :link, :name, :caption, 
       :description, :source, :icon, :attribution, :actions, :likes,
-      :created_time, :updated_time
+      :created_time, :updated_time, :privacy
     
     hash_populating_accessor :actions, "Action"
     hash_populating_accessor :comments, "Comment"

data/lib/mogli/television.rb

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

data/lib/mogli/user.rb

@@ -1,12 +1,17 @@
 
 module Mogli
-  class User < Hashie::Mash
-    include Model
+  class User < Model
+    
+    define_properties :id, :first_name, :last_name, :name, :link, :about, :birthday, 
+          :email, :website, :timezone, :updated_time, :verified
     
     def self.recognize?(hash)
       !hash.has_key?("category")
     end
     
+    hash_populating_accessor :work, "Work"
+    hash_populating_accessor :education, "Education"
+
     has_association :activities,"Activity"
     has_association :albums,"Album"
     has_association :friends, "User"
@@ -16,5 +21,6 @@ module Mogli
     has_association :movies, "Movie"
     has_association :television, "Television"
     has_association :posts, "Post"
+    has_association :feed, "Post"
   end
 end

data/lib/mogli/video.rb

@@ -1,6 +1,5 @@
 module Mogli
-  class Video < Hashie::Dash
-    include Model
+  class Video < Model
     
     define_properties :id, :message, :name, :description, :length, :created_time, :updated_time, :icon, :picture, :embed_html
     

data/lib/mogli/work.rb

@@ -0,0 +1,10 @@
+module Mogli
+  class Work < Model
+    
+    define_properties :start_date, :end_date
+    
+    hash_populating_accessor :employer, "Page"
+    hash_populating_accessor :location, "Page"
+    hash_populating_accessor :position, "Page"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mike Mangino
@@ -50,6 +50,7 @@ files:
 - lib/mogli/client/user.rb
 - lib/mogli/client.rb
 - lib/mogli/comment.rb
+- lib/mogli/education.rb
 - lib/mogli/event.rb
 - lib/mogli/fetching_array.rb
 - lib/mogli/group.rb
@@ -64,6 +65,7 @@ files:
 - lib/mogli/television.rb
 - lib/mogli/user.rb
 - lib/mogli/video.rb
+- lib/mogli/work.rb
 - lib/mogli.rb
 has_rdoc: true
 homepage: http://developers.facebook.com/docs/api