Skip to content

Commit

Permalink
Add app_request and fix the capitalization of fql names
Browse files Browse the repository at this point in the history
  • Loading branch information
mmangino committed Feb 1, 2011
1 parent b010c06 commit 32e2db9
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 22 deletions.
10 changes: 0 additions & 10 deletions Todo.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@

*) move all model related tests to model_spec.rb
*) handle picture attributes
*) allow embedding into other classes, example:

class User < ActiveRecord::Base
acts_as_ogli :id=>:facebook_id,:class=>Ogli::User
end

allows user.facebook.activities
or user.facebook_unpopulated.activities

2) Start working on update handling
5 changes: 4 additions & 1 deletion lib/mogli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ module Mogli
require "mogli/activity"
require "mogli/address"
require "mogli/album"
require "mogli/application"
require "mogli/app_request"
require "mogli/book"
require "mogli/checkin"
require "mogli/comment"
require "mogli/education"
require "mogli/event"
require "mogli/group"
require "mogli/insight"
require "mogli/insight_value"
require "mogli/interest"
require "mogli/link"
require "mogli/location"
Expand All @@ -36,4 +40,3 @@ module Mogli
require "mogli/user"
require "mogli/client"
require "mogli/app_client"
require "mogli/apprequest"
10 changes: 10 additions & 0 deletions lib/mogli/app_request.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module Mogli
class AppRequest < Model

define_properties :id, :data, :message, :created_time
hash_populating_accessor :application, "Application"
hash_populating_accessor :from, "Profile"
hash_populating_accessor :to, "Profile"

end
end
7 changes: 0 additions & 7 deletions lib/mogli/apprequest.rb

This file was deleted.

6 changes: 5 additions & 1 deletion lib/mogli/client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,13 @@ def create_instance(klass,data)
end
klass_to_create.new(data,self)
end

def capitalize_if_required(string)
string.downcase == string ? string.capitalize : string
end

def constantize_string(klass)
klass.is_a?(String) ? Mogli.const_get(klass.capitalize) : klass
klass.is_a?(String) ? Mogli.const_get(capitalize_if_required(klass)) : klass
end

def determine_class(klass_or_klasses,data)
Expand Down
4 changes: 2 additions & 2 deletions lib/mogli/insight.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Mogli
class Insight < Model
define_properties :id, :name

define_properties :id, :name, :period
hash_populating_accessor :values, "InsightValue"
end
end
5 changes: 5 additions & 0 deletions lib/mogli/insight_value.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Mogli
class InsightValue < Model
define_properties :value, :end_time
end
end
2 changes: 1 addition & 1 deletion lib/mogli/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def self.recognize?(hash)
has_association :likes, "Page"
has_association :home, "Post"
has_association :accounts, "Page"
has_association :apprequests, "Apprequest"
has_association :apprequests, "AppRequest"

attr_reader :extended_permissions

Expand Down

0 comments on commit 32e2db9

Please sign in to comment.