mogli 0.0.43 → 0.0.44

data/lib/mogli/model.rb

@@ -109,7 +109,18 @@ module Mogli
       end
 
       add_creation_method(method_name,klass)
+    end
 
+    def self.hash_populating_accessor_with_default_field(method_name,default_field,*klass)
+      define_method "#{method_name}=" do |hash|
+        hash={default_field=>hash} if hash.is_a?(String)
+        instance_variable_set("@#{method_name}",client.map_data(hash,klass))
+      end
+      define_method "#{method_name}" do
+        instance_variable_get "@#{method_name}"
+      end
+
+      add_creation_method(method_name,klass)
     end
 
     def self.add_creation_method(name,klass)

data/lib/mogli/place.rb

@@ -3,7 +3,7 @@ module Mogli
   class Place < Model
     
     define_properties :id, :name, :category, :username, :can_post, :phone, :website, :checkins, :link, :public_transit, :likes, :picture
-    hash_populating_accessor :location, "Address"
+    hash_populating_accessor_with_default_field :location, "street", "Address"
     hash_populating_accessor :restaurant_services, "RestaurantServices"
     hash_populating_accessor :restaurant_specialties, "RestaurantSpecialties"
     hash_populating_accessor :parking, "Parking"

data/lib/mogli/post.rb

@@ -4,7 +4,7 @@ require 'json'
 module Mogli
   class Post < Model
 
-    define_properties :id, :to, :message, :picture, :link, :name, :caption,
+    define_properties :id, :from, :to, :story, :message, :picture, :link, :name, :caption,
       :description, :source, :icon, :attribution, :actions, :likes,
       :created_time, :updated_time, :privacy, :type, :object_id, :properties
 

data/spec/client_spec.rb

@@ -204,26 +204,35 @@ describe Mogli::Client do
 
 
   describe "fql queries" do 
+
+    def wrap_in_parsed_response(data)
+      stub(:parsed_response=>data)
+    end
+
+    let(:blank_response) {
+      wrap_in_parsed_response({"data"=>[]})
+    }
+
     it "defaults to json" do
-      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"json",:access_token=>"1234"}).and_return({:data=>[]})
+      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"json",:access_token=>"1234"}).and_return(blank_response)
       client = Mogli::Client.new("1234")
       client.fql_query("query")
     end
 
     it "supports xml" do 
-      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"xml",:access_token=>"1234"}).and_return({:data=>[]})
+      Mogli::Client.should_receive(:get).with("https://graph.facebook.com/fql",:query=>{:q=>"query",:format=>"xml",:access_token=>"1234"}).and_return(blank_response)
       client = Mogli::Client.new("1234")
       client.fql_query("query",nil,"xml")  
     end
 
     it "creates objects if given a class" do
-      Mogli::Client.should_receive(:get).and_return({:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" }})
+      Mogli::Client.should_receive(:get).and_return(wrap_in_parsed_response({"data"=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" }}))
       client = Mogli::Client.new("1234")
       client.fql_query("query","user").should be_an_instance_of(Mogli::User)
     end
 
     it "Maps the fields if necessary" do
-      Mogli::Client.should_receive(:get).and_return({:data=>
+      Mogli::Client.should_receive(:get).and_return(wrap_in_parsed_response({"data"=>
      [
       {
          :eid=> 182880348415052,
@@ -234,7 +243,7 @@ describe Mogli::Client do
          :name=> "Cake Walk - Featuring the Artwork of Emily Pelton"
       }
    ]
-})
+}))
       client = Mogli::Client.new("1234")
       events = client.fql_query("query","event")
       events.first.should be_an_instance_of(Mogli::Event)
@@ -244,13 +253,13 @@ describe Mogli::Client do
 
 
     it "returns a hash if no class is given" do
-      Mogli::Client.should_receive(:get).and_return(:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
+      Mogli::Client.should_receive(:get).and_return(wrap_in_parsed_response("data"=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" }))
       client = Mogli::Client.new("1234")
       client.fql_query("query").should be_an_instance_of(Hash)
     end
 
     it "doesn't create objects if the format is xml" do 
-      Mogli::Client.should_receive(:get).and_return(:data=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" })
+      Mogli::Client.should_receive(:get).and_return(wrap_in_parsed_response("data"=>{"id"=>12451752, "first_name"=>"Mike", "last_name"=>"Mangino" }))
       client = Mogli::Client.new("1234")
       client.fql_query("query","user","xml").should be_an_instance_of(Hash)    
     end

data/spec/model_spec.rb

@@ -6,6 +6,7 @@ class TestModel < Mogli::Model
   has_association :comments, "Comment"
 
   hash_populating_accessor :from, "User"
+  hash_populating_accessor_with_default_field :location,:street, "Location"
   hash_populating_accessor :activities, "Activity"
   hash_populating_accessor :actions, "Action"
 end
@@ -54,6 +55,11 @@ describe Mogli::Model do
     model.comments.last.message.should == "second"
   end
 
+  it "Can handle defaults" do
+    model = TestModel.new("id"=>1, :location=>"address")
+    model.location.street.should == "address"
+  end
+
   it "only fetches activities once" do
     mock_client.should_receive(:get_and_map).once.with("1/comments","Comment", {}).and_return([])
     model.comments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mogli
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie