joey 0.1.0 → 0.1.1

data/joey.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{joey}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Waseem Ahmad"]
-  s.date = %q{2010-07-07}
+  s.date = %q{2010-08-22}
   s.description = %q{Object wrappers for nodes in the Facebook OpenGraph}
   s.email = %q{talk.to.waseem@gmail.com}
   s.extra_rdoc_files = ["README.md", "lib/joey.rb", "lib/joey/action.rb", "lib/joey/affiliation.rb", "lib/joey/album.rb", "lib/joey/comment.rb", "lib/joey/education.rb", "lib/joey/education_history.rb", "lib/joey/fetching_array.rb", "lib/joey/hs_info.rb", "lib/joey/location.rb", "lib/joey/model.rb", "lib/joey/page.rb", "lib/joey/parser_helpers.rb", "lib/joey/photo.rb", "lib/joey/post.rb", "lib/joey/privacy.rb", "lib/joey/profile.rb", "lib/joey/relative.rb", "lib/joey/rest_api.rb", "lib/joey/status.rb", "lib/joey/television.rb", "lib/joey/user.rb", "lib/joey/version.rb", "lib/joey/work.rb", "lib/joey/work_history.rb"]

data/lib/joey/action.rb

@@ -1,5 +1,15 @@
 module Joey
   class Action < Model
     define_properties :name, :link
+
+    def validate
+      errors << { :message => "name should String but is #{name.inspect}" } unless name.is_a?(String)
+      errors << { :message => "link should String but is #{link.inspect}" } unless link.is_a?(String)
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/affiliation.rb

@@ -1,5 +1,14 @@
 module Joey
   class Affiliation < Model
     define_properties :type, :year, :name, :nid, :status
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/album.rb

@@ -7,7 +7,15 @@ module Joey
     hash_populating_accessor :from, "User", "Page"
     hash_populating_accessor :comments, "Comment"
     has_association :photos, "Photo"
-    #has_association :comments, "Comment"
+    has_association :comments, "Comment"
     
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/comment.rb

@@ -1,7 +1,19 @@
 module Joey
   class Comment < Model
-    define_properties :id, :message, :created_time
+    define_properties :id, :message, :created_time, :count
     #creation_properties :message
     hash_populating_accessor :from, "User","Page"
+
+    def validate
+      created_time.to_time rescue errors << { :message => 'created_time is not compatible' }
+      updated_time.to_time rescue errors << { :message => 'updated_time is not compatible' }
+      errors << { :message => 'id should not be nil' } if id.nil?
+      errors << { :message => 'from is not a Joey::User or Joey::Page' } unless from.is_a?(Joey::User) || from.is_a?(Joey::Page)
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/education.rb

@@ -6,5 +6,14 @@ module Joey
     hash_populating_accessor :school, "Page"
     hash_populating_accessor :year, "Page"
     hash_populating_accessor :concentration, "Page"
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/education_history.rb

@@ -1,5 +1,14 @@
 module Joey
   class EducationHistory < Model
     define_properties :name, :degree, :year, :school_type, :concentrations
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/hs_info.rb

@@ -1,5 +1,14 @@
 module Joey
   class HsInfo < Model
     define_properties :hs1_name, :hs2_name, :grad_year
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/location.rb

@@ -1,5 +1,16 @@
 module Joey
   class Location < Model
     define_properties :name, :zip, :country, :id, :state, :city
+
+    def validate
+      valid = true
+      errors << { :message => "country should be string but is #{country.inspect}" } unless country.is_a?(String)
+      errors << { :message => "city should be string but is #{city.inspect}" } unless city.is_a?(String)
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/model.rb

@@ -3,10 +3,12 @@ module Joey
 
     class KoalaClientRequiredError < Exception; end
 
-    attr_accessor :client
+    attr_accessor :client, :errors
 
     def initialize(hash = {}, client = nil)
       self.client = client
+      self.errors = []
+
       super(hash || {})
     end
 
@@ -54,8 +56,10 @@ module Joey
       #add_creation_method(name, klass)
     end
 
-    def self.find(id, client = nil)
-      client.get_and_map(id, self)
+    ##
+    # Get some information of a node in the Graph.
+    def self.find(id, client = nil, args = {})
+      client.get_and_map(id, self, args)
     end
 
   end

data/lib/joey/page.rb

@@ -16,5 +16,15 @@ module Joey
       hash.has_key?("category")
     end
     
+    def validate
+      valid = true
+      errors << { :message => 'id should not be nil' } if id.nil?
+      errors << { :message => "name should be string but is #{name.inspect}" } unless name.is_a?(String)
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/photo.rb

@@ -5,5 +5,17 @@ module Joey
     #creation_properties :message
     
     hash_populating_accessor :from, "User","Page"
+    hash_populating_accessor :comments, "Comment"
+    hash_populating_accessor :tags, "Tag"
+    #has_association :comments, "Comment"
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/post.rb

@@ -1,20 +1,64 @@
 module Joey
   class Post < Model
-        
+
     define_properties :id, :message, :picture, :link, :name, :caption, 
       :description, :source, :icon, :attribution, :actions, :likes,
       :created_time, :updated_time, :type
-    
+
     #creation_properties :message, :picture, :link, :name, :description
-        
+
     hash_populating_accessor :actions, "Action"
     hash_populating_accessor :comments, "Comment"
-    hash_populating_accessor :from, "User"
-    hash_populating_accessor :to, "User"
+    hash_populating_accessor :from, "User", "Page"
+    hash_populating_accessor :to, "User", "Page"
     hash_populating_accessor :privacy, "Privacy"
-    
+
+    def validate
+      created_time.to_time rescue errors << { :message => 'created_time is not compatible' }
+      updated_time.to_time rescue errors << { :message => 'updated_time is not compatible' }
+      errors << { :message => 'id should not be nil' } if id.nil?
+      errors << { :message => "name is neither string nor nil but is #{name.inspect}" } unless name.is_a?(String) || name.nil?
+      errors << { :message => "message is neither string nor nil but is #{message.inspect}" } unless message.is_a?(String) || message.nil?
+      errors << { :message => "likes is neither string nor nil but is #{likes.inspect}" } unless likes.is_a?(Integer) || likes.nil?
+      errors << { :message => "icon is neither string nor nil but is #{icon.inspect}" } unless icon.is_a?(String) || icon.nil?
+      errors << { :message => "attribution is neither string nor nil but is #{attribution.inspect}" } unless attribution.is_a?(String) || attribution.nil?
+
+      unless ['music', 'photo', 'video', 'status', 'link'].include?(type)
+        errors << { :message => "type should be one of 'music', 'video', 'status', or 'link' but is #{type}" }
+      end
+
+      if type == 'picture' && !picture.is_a?(String)
+        errors << { :message => "picture is not present for picture post and is #{picture.inspect}" }
+      end
+
+      if type == 'link' && !link.is_a?(String)
+        errors << { :message => "picture is not present for picture post and is #{picture.inspect}" }
+      end
+
+      errors << { :message => "from is not a Joey::User or Joey::Page and is #{from.inspect}" } unless from.is_a?(Joey::User) || from.is_a?(Joey::Page)
+
+      errors << { :message => "to is neither an array nor nil and is #{to.inspect}" }  unless to.is_a?(Array) || to.nil?
+      if to.is_a?(Array) && !(to.collect(&:class).uniq - [Joey::User, Joey::Page]).empty?
+        errors << { :message => 'to is not an array of Joey::User or Joey::Page' }
+      end
+
+      # TODO: Explore following approach.
+      # errors << { :message => 'Comments is not valid' }, unless comment.nil? || (comments.collect(&:valid?).uniq - [true]).empty?
+
+      # Sometimes comments is a single Joey::Comment object
+      errors << { :message => "comments is not an array nor nil and is #{comments.inspect}" } unless comments.is_a?(Array) || comments.nil?
+      if comments.is_a?(Array) && !(comments.collect(&:class).uniq - [Joey::Comment]).empty?
+        errors << { :message => 'comments is not an array of Joey::Comment' }
+      end
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
+
     #def likes_create
-      #client.post("#{id}/likes",nil,{})
+    #client.post("#{id}/likes",nil,{})
     #end
   end
 end

data/lib/joey/privacy.rb

@@ -1,5 +1,14 @@
 module Joey
   class Privacy < Model
     define_properties :value, :description, :allow, :friends, :deny
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/profile.rb

@@ -17,5 +17,14 @@ module Joey
     def to_s
       name
     end
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/relative.rb

@@ -1,5 +1,14 @@
 module Joey
   class Relative < Model
-    define_properties :uid, :relationship
+    define_properties :uid, :relationship, :name
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/rest_api.rb

@@ -21,8 +21,8 @@ module Joey
 
     # path can be some node id in the Facebook Graph e.g. 'me', 'me/feed', '1234567890/feed'.
     # klass is wrapper class for that node.
-    def get_and_map(path, klass = nil)
-      data = self.get_object(path)
+    def get_and_map(path, klass = nil, args = {})
+      data = self.get_object(path, args)
       map_data(data, klass)
     end
 
@@ -37,6 +37,8 @@ module Joey
       raise_error_if_necessary(data)
       hash_or_array = extract_hash_or_array(data, klass)
       hash_or_array = map_to_class(hash_or_array, klass) if klass
+      # TODO: Validate an object here.
+      #hash_or_array.validate and puts hash_or_array.class.inspect if hash_or_array.is_a?(Model)
       hash_or_array
     end
 
@@ -66,6 +68,7 @@ module Joey
       else
         hash_or_array = create_instance(klass, hash_or_array)
       end
+      hash_or_array
     end
 
     def create_instance(klass, data)
@@ -77,7 +80,9 @@ module Joey
     end
     
     def constantize_string(klass)
-      klass.is_a?(String) ? Joey.const_get(klass) : klass
+      # FIXME: cost_get is buggy on some versions of Ruby
+      # klass.is_a?(String) ? Joey.const_get(klass) : klass
+      klass.is_a?(String) ? (klass =~ /Joey/ ? klass.constantize : ("Joey::"+ klass).constantize) : klass
     end
     
     def determine_class(klass_or_klasses, data)

data/lib/joey/status.rb

@@ -1,5 +1,14 @@
 module Joey
   class Status < Model
     define_properties :time, :status_id, :message
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/television.rb

@@ -2,5 +2,13 @@ module Joey
   class Television < Model
     define_properties :name, :category, :id
     
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/user.rb

@@ -1,25 +1,25 @@
 module Joey
   class User < Profile
     include ParserHelpers
-    
+
     define_properties :first_name, :last_name, :middle_name, :link, :about, :about_me, :birthday, :gender,
-          :email, :website, :timezone, :updated_time, :verified, :religion, :political
+      :email, :website, :timezone, :updated_time, :verified, :religion, :political
     define_properties :pic_small, :pic_big, :pic_square, :pic, :pic_big_with_logo, :pic_small_with_logo,
-          :pic_square_with_logo, :pic_with_logo
+      :pic_square_with_logo, :pic_with_logo, :picture
     define_properties :is_app_user, :books, :username, :significant_other_id, :meeting_for, :tv, :meeting_sex, :relationship_status
-    define_properties :wall_count, :uid, :movies, :sex, :birthday_date, :notes_count, :activities, :profile_blurb, :music, :music, :locale
-    define_properties :profile_url, :profile_update_time, :interests, :is_blocked, :quotes
-    
+    define_properties :wall_count, :uid, :movies, :sex, :birthday_date, :notes_count, :activities, :profile_blurb, :music, :locale
+    define_properties :profile_url, :profile_update_time, :interests, :is_blocked, :quotes, :interested_in, :bio
+
     def self.recognize?(hash)
       !hash.has_key?("category")
     end
-    
+
     hash_populating_accessor :status, "Status"
     hash_populating_accessor :work, "Work"
     hash_populating_accessor :work_history, "WorkHistory"
     hash_populating_accessor :education, "Education"
     hash_populating_accessor :education_history, "EducationHistory"
-    
+
     hash_populating_accessor :location, "Page"
     hash_populating_accessor :current_location, "Location"
     hash_populating_accessor :hometown, "Page"
@@ -37,21 +37,41 @@ module Joey
     #has_association :movies, "Movie"
     has_association :television, "Television"
     has_association :likes, "Page"
-    
+
     def has_app_permission?(ext_perm)
       boolianize(client.rest_call("users.hasAppPermission", :ext_perm => ext_perm.to_s))
     end
 
     def friends!(ids)
       data = self.client.rest_call('users.getInfo', :uids => ids, :fields =>
-                                                'about_me,activities,affiliations,books,birthday,birthday_date,current_location,education_history,
+                                   'about_me,activities,affiliations,books,birthday,birthday_date,current_location,education_history,
                                                  email,family,first_name,hometown_location,hs_info,interests,is_app_user,is_blocked,last_name,
                                                  locale,meeting_for,meeting_sex,movies,music,name,notes_count,pic,pic_big,pic_small,pic_square,
                                                  pic_with_logo,pic_big_with_logo,pic_small_with_logo,pic_square_with_logo,
                                                  political,profile_blurb,profile_update_time,profile_url,quotes,relationship_status,religion,sex,
                                                  significant_other_id,status,timezone,tv,username,wall_count,website,work_history')
-    self.client.map_data(data, self.class)
-  end
+     self.client.map_data(data, self.class)
+    end
+
+    def info(args)
+      data = self.client.rest_call('users.getInfo', :uids => self.id, :fields => args.join(','))
+      user = self.client.map_data(data, self.class).first
+      user.id = user.uid
+      user
+    end
 
+    def validate
+      errors << { :message => 'id should not be nil' } if id.nil?
+      errors << { :message => "name should be string but is #{name.inspect}" } unless name.is_a?(String)
+      errors << { :message => "gender should be 'male' or 'female' but is #{gender.inspect}" } unless ['male', 'female'].include?(gender)
+      errors << { :message => "pic big is neither string nor nil but is #{pic_big.inspect}" } unless pic_big.is_a?(String) || pic_big.nil?
+      errors << { :message => "current location is neither Joey::Location nor nil but is #{current_location.inspect}" } unless current_location.is_a?(Joey::Location) || current_location.nil?
+      updated_time.to_time rescue errors << { :message => 'updated_time is not compatible' }
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/version.rb

@@ -2,7 +2,7 @@ module Joey #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/joey/work.rb

@@ -1,10 +1,19 @@
 module Joey
   class Work < Model
     
-    define_properties :start_date, :end_date
+    define_properties :start_date, :end_date, :description
     
     hash_populating_accessor :employer, "Page"
     hash_populating_accessor :location, "Page"
     hash_populating_accessor :position, "Page"
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
   end
 end

data/lib/joey/work_history.rb

@@ -3,5 +3,15 @@ module Joey
     define_properties :start_date, :position, :company_name, :description, :end_date
 
     hash_populating_accessor :location, "Location"
+
+    def validate
+      valid = true
+    end
+
+    def valid?
+      self.validate
+      self.errors.empty?
+    end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Waseem Ahmad
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 +05:30
+date: 2010-08-22 00:00:00 +05:30
 default_executable: 
 dependencies: []