mogli 0.0.37 → 0.0.38

data/lib/mogli/app_client.rb

@@ -32,9 +32,5 @@ module Mogli
     def post(path, klass, query)
       super("#{application_id}/#{path}", klass, query)
     end
-    
-    def get_and_map(path, klass, query)
-      super("#{application_id}/#{path}", klass, query)
-    end
   end
 end

data/lib/mogli/application.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Application < Model
 
-    define_properties :id, :name, :description, :category, :subcategory, :link, :canvas_name, :namespace, :icon_url, :logo_url, :weekly_active_users, :monthly_active_users
+    define_properties :id, :name, :description, :category, :subcategory, :link, :canvas_name, :namespace, :icon_url, :logo_url, :weekly_active_users, :monthly_active_users, :daily_active_users
 
     has_association :feed, "Post"
     has_association :posts, "Post"

data/lib/mogli/client.rb

@@ -159,12 +159,16 @@ module Mogli
     def extract_hash_or_array(hash_or_array,klass)
       hash_or_array = hash_or_array.parsed_response if hash_or_array.respond_to?(:parsed_response)
       return nil if hash_or_array == false
+      return []  if hash_or_array == {"count" => 0}
       return hash_or_array if hash_or_array.nil? or hash_or_array.kind_of?(Array)
       return extract_fetching_array(hash_or_array,klass) if is_fetching_array?(hash_or_array)
+      # Facebook doesn't return numbers or booleans in an object or list
+      # container; this will catch the number, "true" and "false" response case
       return hash_or_array
     end
 
     def is_fetching_array?(hash)
+      return false unless hash.respond_to? :has_key?
       hash.has_key?("data") and hash["data"].instance_of?(Array)
     end
 
@@ -173,6 +177,7 @@ module Mogli
       f.concat(hash["data"])
       f.client = self
       f.classes = Array(klass)
+      f.total_count = hash["count"]
       if paging=hash["paging"]
         f.next_url = URI.encode paging["next"] unless paging["next"].nil?
         f.previous_url = URI.encode paging["previous"] unless paging["previous"].nil?
@@ -206,7 +211,10 @@ module Mogli
     end
 
     def determine_class(klass_or_klasses,data)
-      return constantize_string(data['type']) if data.key?('type') && klass_or_klasses == Mogli::Model
+      if data.respond_to?(:has_key?) && data.has_key?('type') &&
+                                         klass_or_klasses == Mogli::Model
+        return constantize_string(data['type'])
+      end
       klasses = Array(klass_or_klasses).map { |k| constantize_string(k)}
       klasses.detect {|klass| klass.recognize?(data)} || klasses.first
     end

data/lib/mogli/fetching_array.rb

@@ -1,6 +1,6 @@
 module Mogli
   class FetchingArray < Array
-    attr_accessor :next_url, :previous_url, :client, :classes
+    attr_accessor :next_url, :previous_url, :client, :classes, :total_count
 
     def fetch_next
       return [] if next_url.nil? || next_url.empty?

data/lib/mogli/fql_multiquery.rb

@@ -32,7 +32,10 @@ module Mogli
         # Default value is empty array
         res[query] = []
         # Find subquery by name in response
-        vals = response.find{|r| r['name'] == query.to_s}
+        vals = response.find{|r|
+          return false unless r.is_a? Hash
+          r['name'] == query.to_s
+        }
         if vals && vals.has_key?('fql_result_set')
           res[query] = @client.map_to_class(vals['fql_result_set'], @queries[query][1])
         end
@@ -40,4 +43,4 @@ module Mogli
       end
     end
   end
-end
+end

data/lib/mogli/model.rb

@@ -116,7 +116,7 @@ module Mogli
 
     def self.has_association(name,klass)
       define_method name do |*fields|
-        body_args = fields.empty? ? {} : {:fields => fields}
+        body_args = fields.empty? ? {} : {:fields => fields.join(',')}
         if (ret=instance_variable_get("@#{name}")).nil?
           ret = client.get_and_map("#{id}/#{name}",klass, body_args)
           instance_variable_set("@#{name}",ret)

data/lib/mogli/photo.rb

@@ -1,7 +1,7 @@
 module Mogli
   class Photo < Model
     define_properties :id, :name, :tags, :picture, :source, :height, :width, :images, :link, :icon,
-      :created_time, :updated_time, :position, :comments
+      :created_time, :updated_time, :position, :comments, :likes
     creation_properties :message
 
     hash_populating_accessor :from, "User","Page"

data/lib/mogli/subscription.rb

@@ -0,0 +1,5 @@
+module Mogli
+  class Subscription < Model
+    define_properties :callback_url, :fields, :active, :object
+  end
+end

data/lib/mogli/user.rb

@@ -4,8 +4,8 @@ module Mogli
 
     define_properties :username, :first_name, :last_name, :link, :about, :birthday, :gender,
           :email, :website, :timezone, :updated_time, :verified, :political, :bio,
-          :relationship_status, :locale, :religion, :quotes, :third_party_id,
-          :inspirational_people, :sports, :with, :middle_name, :category
+          :interested_in, :relationship_status, :locale, :religion, :quotes, :third_party_id,
+          :inspirational_people, :sports, :with, :middle_name, :category, :installed
 
     def self.recognize?(hash)
       !hash.has_key?("category")
@@ -34,6 +34,8 @@ module Mogli
     has_association :accounts, "Page"
     has_association :apprequests, "AppRequest"
 
+    has_association :events, "Event"
+
     attr_reader :extended_permissions
 
     # raised when asked to check for a permission that mogli doesn't know about

data/spec/user_spec.rb

@@ -25,15 +25,16 @@ describe Mogli::User do
 
     it "finds optional fields for a user" do
       Mogli::Client.should_receive(:get).with("https://graph.facebook.com/1",
-        :query=>{:fields => "birthday,gender"}).and_return({:id=>1, :birthday=>'09/15', :gender => 'male'})
-      user = Mogli::User.find(1, nil, :birthday, :gender)
+        :query=>{:fields => "birthday,gender,installed"}).and_return({:id=>1, :birthday=>'09/15', :gender => 'male', :installed => true})
+      user = Mogli::User.find(1, nil, :birthday, :gender, :installed)
       user.birthday.should == '09/15'
       user.gender.should == 'male'
+      user.installed.should == true
     end
 
     it "finds a user's friends with optional fields" do
       mock_client.should_receive(:get_and_map).with(
-        "1/friends", "User", {:fields => [:birthday, :gender]}).and_return(
+        "1/friends", "User", {:fields => 'birthday,gender'}).and_return(
         [Mogli::User.new(:id=>2, :birthday=>'09/15', :gender => 'male')])
       friends = user_1.friends(:birthday, :gender)
       friends.size.should == 1

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mogli
 version: !ruby/object:Gem::Version 
-  hash: 85
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 37
-  version: 0.0.37
+  - 38
+  version: 0.0.38
 platform: ruby
 authors: 
 - Mike Mangino
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 Z
+date: 2012-06-12 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -37,11 +35,9 @@ dependencies:
   name: httmultiparty
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 3
@@ -53,11 +49,9 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 4
@@ -69,27 +63,29 @@ dependencies:
   name: multi_json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 1
         - 0
         - 3
         version: 1.0.3
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -99,11 +95,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,11 +107,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -167,24 +159,14 @@ files:
 - lib/mogli/post.rb
 - lib/mogli/profile.rb
 - lib/mogli/status.rb
+- lib/mogli/subscription.rb
 - lib/mogli/television.rb
 - lib/mogli/test_user.rb
 - lib/mogli/user.rb
 - lib/mogli/video.rb
 - lib/mogli/work.rb
 - lib/mogli.rb
-- spec/app_client_spec.rb
-- spec/authenticator_spec.rb
-- spec/client/client_event_spec.rb
-- spec/client/client_user_spec.rb
-- spec/client_spec.rb
-- spec/fetching_array_spec.rb
-- spec/model_spec.rb
-- spec/page_spec.rb
-- spec/profile_spec.rb
-- spec/spec_helper.rb
-- spec/test_user_spec.rb
-- spec/user_spec.rb
+has_rdoc: true
 homepage: http://developers.facebook.com/docs/api
 licenses: []
 
@@ -194,27 +176,23 @@ 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"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Open Graph Library for Ruby