mogli 0.0.44 → 0.0.45

data/lib/mogli/authenticator.rb

@@ -62,7 +62,7 @@ module Mogli
     end
 
     def raise_exception_if_required(response)
-      raise Mogli::Client::HTTPException if response.code != 200
+      raise Mogli::Client::HTTPException, response.body if response.code != 200
     end
 
   end

data/lib/mogli/client.rb

@@ -11,7 +11,7 @@ module Mogli
     include Mogli::Client::Event
     include Mogli::Client::User
 
-    class ClientException < Exception; end
+    class ClientException < StandardError; end
     class UnrecognizeableClassError < ClientException; end
     class QueryParseException < ClientException; end
     class OAuthAccessTokenException < ClientException; end

data/lib/mogli/friendlist.rb

@@ -1,10 +1,11 @@
 module Mogli
-  
+
   # requires read_friendlists permission
   # https://developers.facebook.com/docs/reference/api/FriendList/
-  
+
   class FriendList < Model
     define_properties :name, :list_type, :id
-    
+
+    has_association :members, "User"
   end
-end
+end

data/lib/mogli/model.rb

@@ -109,6 +109,7 @@ module Mogli
       end
 
       add_creation_method(method_name,klass)
+      (@populating_accessors ||= []) << method_name
     end
 
     def self.hash_populating_accessor_with_default_field(method_name,default_field,*klass)
@@ -121,6 +122,7 @@ module Mogli
       end
 
       add_creation_method(method_name,klass)
+      (@populating_accessors ||= []) << method_name
     end
 
     def self.add_creation_method(name,klass)
@@ -146,11 +148,12 @@ module Mogli
       end
 
       add_creation_method(name,klass)
+      (@associations ||= []) << name
     end
 
-    def fetch()
+    def fetch(*fields)
       raise ArgumentError.new("You cannot fetch models without a populated id attribute") if id.nil?
-      other = self.class.find(id,client)
+      other = self.class.find(id,client,fields)
       merge!(other) if other
       self
     end
@@ -161,6 +164,12 @@ module Mogli
     
     def merge!(other)
       @_values.merge!(other.instance_variable_get("@_values"))
+      # We need to copy not only root values, but, for example, user.location
+      ( (self.class.instance_variable_get("@populating_accessors") || []) +
+        (self.class.instance_variable_get("@associations") || [])).each do |var_name|
+
+        instance_variable_set("@#{var_name}", other.instance_variable_get("@#{var_name}"))
+      end
     end
     
     def self.recognize?(data)

data/lib/mogli/page.rb

@@ -30,7 +30,7 @@ module Mogli
       hash.has_key?("category")
     end
 
-    class MissingAccessToken < Exception
+    class MissingAccessToken < StandardError
     end
 
   end

data/lib/mogli/user.rb

@@ -33,13 +33,14 @@ module Mogli
     has_association :home, "Post"
     has_association :accounts, "Page"
     has_association :apprequests, "AppRequest"
+    has_association :friendlists, "FriendList"
 
     has_association :events, "Event"
 
     attr_reader :extended_permissions
 
     # raised when asked to check for a permission that mogli doesn't know about
-    class UnrecognizedExtendedPermissionException < Exception; end
+    class UnrecognizedExtendedPermissionException < StandardError; end
 
     # the entire list of extended permissions the user is able to grant the
     # application. the list should be kept in sync with

data/spec/authenticator_spec.rb

@@ -95,7 +95,8 @@ describe Mogli::Authenticator do
   it "raises an error if not a 200" do
     response = mock('HTTParty::Response',
       :parsed_response => "access_token=123456|3SDdfgdfgv0bbEvYjBH5tJtl-dcBdsfgo",
-      :code => 500)
+      :code => 500,
+      :body => 'error')
 
     Mogli::Client.should_receive(:post).and_return(response)
     lambda do

data/spec/client_spec.rb

@@ -114,7 +114,7 @@ describe Mogli::Client do
       Mogli::Client.should_receive(:get).with("url").and_return(mock_response)
       begin 
         client = Mogli::Client.create_from_code_and_authenticator("code",mock("auth",:access_token_url=>"url"))
-      rescue Exception => e
+      rescue => e
         e.message.should == "#{err_type}: #{err_msg}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mogli
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -64,23 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Open Graph Library for Ruby