RubyGems - facebooker - Versions diffs - 1.0.61 → 1.0.62 - Mend

facebooker 1.0.61 → 1.0.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/Rakefile +1 -1
data/facebooker.gemspec +5 -5
data/generators/xd_receiver/templates/xd_receiver_ssl.html +1 -1
data/lib/facebooker.rb +6 -1
data/lib/facebooker/models/page.rb +3 -1
data/lib/facebooker/models/user.rb +5 -1
data/lib/facebooker/rails/extensions/rack_setup.rb +7 -5
data/lib/facebooker/rails/helpers/fb_connect.rb +1 -1
data/lib/facebooker/version.rb +1 -1
data/test/facebooker/models/page_test.rb +6 -1
data/test/facebooker/models/user_test.rb +19 -0
data/test/facebooker/rails_integration_test.rb +2 -2
metadata +3 -3

data/Rakefile CHANGED

@@ -24,7 +24,7 @@ HOE = Hoe.spec('facebooker') do
   self.history_file  = 'CHANGELOG.rdoc'
   self.remote_rdoc_dir = '' # Release to root
   self.test_globs = ['test/**/*_test.rb']
-  extra_deps << ['json', '>= 1.0.0']
+  extra_deps << ['json_pure', '>= 1.0.0']
   self.extra_rdoc_files  = FileList['*.rdoc']
 end

data/facebooker.gemspec CHANGED

@@ -2,11 +2,11 @@
 Gem::Specification.new do |s|
   s.name = %q{facebooker}
-  s.version = "1.0.61"
+  s.version = "1.0.62"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Fowler", "Patrick Ewing", "Mike Mangino", "Shane Vitarana", "Corey Innis", "Mike Mangino"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-02-05}
   s.description = %q{Facebooker is a Ruby wrapper over the Facebook[http://facebook.com] {REST API}[http://wiki.developers.facebook.com/index.php/API].  Its goals are:
 * Idiomatic Ruby
@@ -29,14 +29,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.0.0"])
       s.add_development_dependency(%q<hoe>, [">= 2.4.0"])
     else
-      s.add_dependency(%q<json>, [">= 1.0.0"])
+      s.add_dependency(%q<json_pure>, [">= 1.0.0"])
       s.add_dependency(%q<hoe>, [">= 2.4.0"])
     end
   else
-    s.add_dependency(%q<json>, [">= 1.0.0"])
+    s.add_dependency(%q<json_pure>, [">= 1.0.0"])
     s.add_dependency(%q<hoe>, [">= 2.4.0"])
   end
 end

data/generators/xd_receiver/templates/xd_receiver_ssl.html CHANGED

@@ -5,6 +5,6 @@
     <title>Cross-Domain Receiver Page</title>
 </head>
 <body>
-    <script src="https://www.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
+    <script src="https://ssl.connect.facebook.com/js/api_lib/v0.4/XdCommReceiver.js" type="text/javascript"></script>
 </body>
 </html>

data/lib/facebooker.rb CHANGED

@@ -1,5 +1,10 @@
 unless defined?(ActiveSupport) and defined?(ActiveSupport::JSON)
-  require 'json'
+  begin
+    require 'json'
+  rescue LoadError
+    gem "json_pure"
+    require "json"
+  end
   module Facebooker
     def self.json_decode(str)
       JSON.parse(str)

data/lib/facebooker/models/page.rb CHANGED

@@ -28,7 +28,9 @@ module Facebooker
     include Model
     attr_accessor :page_id,:name,:pic_small,:pic_big,:pic_square,:pic,:pic_large,:type,:website,:has_added_app,:founded,:company_overview,:mission,:products,:location,:parking,:public_transit,:hours,:attire,:payment_options,:culinary_team,:general_manager,:price_range,:restaurant_services,:restaurant_specialties,:release_date,:genre,:starring,:screenplay_by,:directed_by,:produced_by,:studio,:awards,:plot_outline,:network,:season,:schedule,:written_by,:band_members,:hometown,:current_location,:record_label,:booking_agent,:artists_we_like,:influences,:band_interests,:bio,:affiliation,:birthday,:personal_info,:personal_interests,:members,:built,:features,:mpg,:general_info,:fan_count
     attr_reader :genre
+    alias_method :id, :page_id
     def genre=(value)
       @genre = value.kind_of?(Hash) ? Genre.from_hash(value) : value
     end

data/lib/facebooker/models/user.rb CHANGED

@@ -25,6 +25,8 @@ module Facebooker
     populating_attr_reader :status
+    attr_accessor :request_locale
     # Can pass in these two forms:
     # id, session, (optional) attribute_hash
     # attribute_hash
@@ -214,7 +216,9 @@ module Facebooker
     # Retrieve profile data for logged in user
     # Optional: list of fields to retrieve as symbols
     def populate(*fields)
-      session.post('facebook.users.getInfo', :fields => collect(fields), :uids => id) do |response|
+      arguments = {:fields => collect(fields), :uids => id}
+      arguments[:locale]=request_locale unless request_locale.nil?
+      session.post('facebook.users.getInfo', arguments) do |response|
         populate_from_hash!(response.first)
       end
     end

data/lib/facebooker/rails/extensions/rack_setup.rb CHANGED

@@ -7,8 +7,10 @@ ActionController::Dispatcher.middleware.insert_before(
   Rack::Facebook
 )
-ActionController::Dispatcher.middleware.insert_before(
-  ActionController::Base.session_store,
-  Rack::FacebookSession,
-  ActionController::Base.session_options[:key]
-)
+#use this if you aren't using the cookie store and want to use
+# the facebook session key for your session id
+# ActionController::Dispatcher.middleware.insert_before(
+#   ActionController::Base.session_store,
+#   Rack::FacebookSession,
+#   ActionController::Base.session_options[:key]
+# )

data/lib/facebooker/rails/helpers/fb_connect.rb CHANGED

@@ -8,7 +8,7 @@ module Facebooker
           lang = "/#{options[:lang].to_s.gsub('-', '_')}" if options[:lang]
           # dont use the javascript_include_tag helper since it adds a .js at the end
           if request.ssl?
-            "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
+            "<script src=\"https://ssl.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           else
             "<script src=\"http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php#{lang}\" type=\"text/javascript\"></script>"
           end

data/lib/facebooker/version.rb CHANGED

@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 61
+    TINY  = 62
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/facebooker/models/page_test.rb CHANGED

@@ -13,11 +13,16 @@ class Facebooker::PageTest < Test::Unit::TestCase
     assert_equal(12345,p.page_id)
   end
-  def test_should_be_ble_to_initialize_with_photo_id_as_string
+  def test_should_be_able_to_initialize_with_photo_id_as_string
     p = Facebooker::Page.new("12345")
     assert_equal("12345",p.page_id)
   end
+  def test_should_alias_photo_id_as_id
+    p = Facebooker::Page.new("12345")
+    assert_equal("12345", p.id)
+  end
   def test_should_be_able_to_initialize_with_hash
     p = Facebooker::Page.new(:page_id=>12345,:name=>"test page")
     assert_equal("test page",p.name)

data/test/facebooker/models/user_test.rb CHANGED

@@ -79,6 +79,25 @@ class Facebooker::UserTest < Test::Unit::TestCase
   def test_raises_when_no_session_bound
     assert_raises(Facebooker::Model::UnboundSessionException) { Facebooker::User.new(1, nil).populate }
   end
+  def test_passes_request_locale_when_set
+    session = mock()
+    session.expects(:post).with("facebook.users.getInfo",has_entry(:locale,"es_ES"))
+    Facebooker::Session.expects(:current).returns(session)
+    user=Facebooker::User.new(1)
+    user.request_locale="es_ES"
+    user.name
+  end
+  def test_doesnt_pass_request_locale_when_not_set
+    session = mock()
+    session.expects(:post).with("facebook.users.getInfo",Not(has_key(:locale)))
+    Facebooker::Session.expects(:current).returns(session)
+    user=Facebooker::User.new(1)
+    user.name
+  end
   def test_can_set_mobile_fbml
     @user.expects(:set_profile_fbml).with(nil,"test",nil,nil)

data/test/facebooker/rails_integration_test.rb CHANGED

@@ -1159,7 +1159,7 @@ class RailsHelperTest < Test::Unit::TestCase
     end
     silence_warnings do
-      assert_equal "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
+      assert_equal "<script src=\"https://ssl.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php\" type=\"text/javascript\"></script>",
         @h.fb_connect_javascript_tag
     end
   end
@@ -1174,7 +1174,7 @@ class RailsHelperTest < Test::Unit::TestCase
     end
     silence_warnings do
-      assert_equal "<script src=\"https://www.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
+      assert_equal "<script src=\"https://ssl.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php/en_US\" type=\"text/javascript\"></script>",
         @h.fb_connect_javascript_tag(:lang => "en_US")
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebooker
 version: !ruby/object:Gem::Version
-  version: 1.0.61
+  version: 1.0.62
 platform: ruby
 authors:
 - Chad Fowler
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-01-22 00:00:00 -05:00
+date: 2010-02-05 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   type: :runtime
   version_requirement:
   version_requirements: !ruby/object:Gem::Requirement