djanowski-facebooker 1.0.2 → 1.0.4

data/lib/facebooker/models/user.rb

@@ -42,13 +42,18 @@ module Facebooker
     # Returns a user's events, params correspond to API call parameters (except UID):
     # http://wiki.developers.facebook.com/index.php/Events.get
     # E.g:
-    #  @user.events(:start_time => Time.now.to_i, :end_time => 1.month.from_now.to_i)
+    #  @user.events(:start_time => Time.now, :end_time => 1.month.from_now)
     #  # => Returns events betwen now and a month from now
     def events(params={})
-      @events ||= @session.post('facebook.events.get', {:uid => self.id}.merge(params)).map do |event|
+      @events ||= {}
+      [:start_time,:end_time].compact.each do |key|
+        params[key] = params[key].to_i
+      end
+#      puts @events[params.to_s].nil?
+      @events[params.to_s] ||= @session.post('facebook.events.get', {:uid => self.id}.merge(params)).map do |event|
         Event.from_hash(event)
       end
-    end
+    end    
     
     # 
     # Set the list of friends, given an array of User objects.  If the list has been retrieved previously, will not set

data/lib/facebooker/rails/publisher.rb

@@ -404,6 +404,11 @@ module Facebooker
         def protect_against_forgery?
           @paf ||= ActionController::Base.new.send(:protect_against_forgery?)
         end
+        
+        # url_for calls in publishers tend to want full paths
+        def url_for(options = {})
+          super(options.kind_of?(Hash) ? {:only_path => false}.update(options) : options)
+        end
       end
       ActionController::Routing::Routes.named_routes.install(self.master_helper_module)
       include self.master_helper_module

data/test/publisher_test.rb

@@ -391,7 +391,7 @@ class PublisherTest < Test::Unit::TestCase
     assert_equal({:src => '/images/image.png', :href => 'raw_string' },
         TestPublisher.new.image('image.png', 'raw_string'))
     assert_equal({:src => '/images/image.png', :href => 'http://apps.facebook.com/mike/pokes/do/1' },
-        TestPublisher.new.image('image.png', {:only_path=>false,:controller => :pokes, :action => :do, :id => 1}))    
+        TestPublisher.new.image('image.png', {:controller => :pokes, :action => :do, :id => 1}))
   end
   
   def test_action_link

data/test/user_test.rb

@@ -129,12 +129,18 @@ class UserTest < Test::Unit::TestCase
     events = @user.events
     assert_equal "29511517904", events.first.eid
   end
-  
-  def test_can_get_events
-    @user.expects(:events)
-    @user.events
+
+  def test_events_caching_honors_params
+    @user = Facebooker::User.new(9507801, @session)
+    @session.expects(:post).returns([{:eid=>1}])
+    assert_equal 1,@user.events.first.eid
+    @session.expects(:post).returns([{:eid=>2}])
+    assert_equal 2,@user.events(:start_time=>1.day.ago).first.eid
+    @session.expects(:post).never
+    assert_equal 1,@user.events.first.eid
   end
   
+  
   def test_to_s
     assert_equal("1234",@user.to_s)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: djanowski-facebooker
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
 - Chad Fowler