fb_graph 2.4.1 → 2.4.2

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    fb_graph (2.4.0)
+    fb_graph (2.4.1)
       httpclient (>= 2.2.0.2)
       rack-oauth2 (>= 0.14.0)
+      tzinfo
 
 GEM
   remote: http://rubygems.org/
@@ -24,8 +25,8 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    attr_required (0.0.3)
+    addressable (2.2.7)
+    attr_required (0.0.5)
     builder (3.0.0)
     configatron (2.9.0)
       yamler (>= 0.1.0)
@@ -39,15 +40,15 @@ GEM
     hike (1.2.1)
     httpclient (2.2.4)
     i18n (0.6.0)
-    journey (1.0.1)
+    journey (1.0.3)
     json (1.6.5)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-oauth2 (0.14.0)
+    rack-oauth2 (0.14.2)
       activesupport (>= 2.3)
-      attr_required (>= 0.0.3)
+      attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
       i18n
       json (>= 1.4.3)
@@ -68,8 +69,9 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    tzinfo (0.3.31)
+    webmock (1.8.0)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)
 

data/VERSION

@@ -1 +1 @@
-2.4.1
+2.4.2

data/fb_graph.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.add_runtime_dependency "httpclient", ">= 2.2.0.2"
   s.add_runtime_dependency "rack-oauth2", ">= 0.14.0"
+  s.add_runtime_dependency "tzinfo"
   s.add_development_dependency "rake", ">= 0.8"
   if RUBY_VERSION >= '1.9'
     s.add_development_dependency "cover_me", ">= 1.2.0"

data/lib/fb_graph/exception.rb

@@ -24,7 +24,12 @@ module FbGraph
 
       # Check the WWW-Authenticate header, since it seems to be more standardized than the response
       # body error information.
-      if www_authenticate = headers["WWW-Authenticate"]
+      # The complex lookup is needed to follow the HTTP spec - headers should be looked up
+      # without regard to case.
+      www_authenticate = headers.select do |name, value|
+        name.upcase == "WWW-Authenticate".upcase
+      end.to_a.flatten.second
+      if www_authenticate
         # Session expiration/invalidation is very common. Check for that first.
         if www_authenticate =~ /invalid_token/ && response[:error][:message] =~ /session has been invalidated/
           raise InvalidSession.new("#{response[:error][:type]} :: #{response[:error][:message]}")

data/lib/fb_graph/page/category_attributes.rb

@@ -94,7 +94,13 @@ module FbGraph
             date, index, mode = key.split('_')
             index = index.to_i - 1
             date, mode = date.to_sym, mode.to_sym
-            time = Time.parse(value)
+            if value.class == Fixnum
+              # The Unix "time" returned is a weird approximation of the string value.
+              # Example: "20:00" might be represented as 446400, which is 1970-01-05T20:00:00-08:00
+              time = Time.at(value).in_time_zone("Pacific Time (US & Canada)")
+            else
+              time = Time.parse(value)
+            end
             time = Time.utc(1970, 1, 1, time.hour, time.min)
             @hours[date] ||= []
             @hours[date][index] ||= {}
@@ -109,4 +115,4 @@ module FbGraph
 
     include CategoryAttributes
   end
-end
+end

data/spec/fb_graph/exception_spec.rb

@@ -91,6 +91,18 @@ describe FbGraph::Exception, ".handle_httpclient_error" do
       it "should raise an InvalidToken exception" do
         lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, headers)}.should raise_exception(FbGraph::InvalidToken)
       end
+
+      context "with a variant capitalization of the header" do
+        let(:headers) do
+          {
+            "Www-Authenticate" => 'OAuth "Facebook Platform" "invalid_token" "Invalid OAuth access token."'
+          }
+        end
+
+        it "should raise an InvalidToken exception" do
+          lambda {FbGraph::Exception.handle_httpclient_error(parsed_response, headers)}.should raise_exception(FbGraph::InvalidToken)
+        end
+      end
     end
 
     context "with an invalid request" do

data/spec/fb_graph/page/local_business_spec.rb

@@ -62,4 +62,27 @@ describe FbGraph::Page do
       )
     end
   end
-end
+
+  context 'for local_business category with hours as Fixnums' do
+    let :page do
+      mock_graph :get, 'local_business', 'pages/categories/local_business_fixnum' do
+        FbGraph::Page.new('local_business').fetch
+      end
+    end
+    subject { page }
+
+    its(:hours) { should be_instance_of Hash }
+    its(:hours) do
+      should == {
+        :mon => [{
+          :open  => Time.parse('1970-01-01 10:00:00 UTC'),
+          :close => Time.parse('1970-01-01 20:00:00 UTC')
+        }],
+        :tue=>[{
+          :open  => Time.parse('1970-01-01 10:00:00 UTC'),
+          :close => Time.parse('1970-01-01 20:00:00 UTC')
+        }]
+      }
+    end
+  end
+end

data/spec/mock_json/pages/categories/local_business_fixnum.json

@@ -0,0 +1,56 @@
+{
+    "id": "196723247025808",
+    "name": "Local Business Sample",
+    "picture": "http:\/\/profile.ak.fbcdn.net\/static-ak\/rsrc.php\/v1\/y0\/r\/XsEg9L6Ie5_.jpg",
+    "link": "http:\/\/www.facebook.com\/pages\/Local-Business-Sample\/196723247025808",
+    "category": "Bar",
+    "location": {
+        "street": "\u65b0\u7530\u8fba",
+        "city": "Kyoto",
+        "country": "Japan",
+        "zip": "513001"
+    },
+    "parking": {
+        "street": 1,
+        "lot": 0,
+        "valet": 1
+    },
+    "price_range": "$ (0-10)",
+    "public_transit": "30 min from Kyoto St.",
+    "hours": {
+        "mon_1_open": 64800,
+        "mon_1_close": 100800,
+        "tue_1_open": 64800,
+        "tue_1_close": 100800
+    },
+    "attire": "Casual",
+    "payment_options": {
+        "cash_only": 0,
+        "visa": 1,
+        "amex": 1,
+        "mastercard": 1,
+        "discover": 0
+    },
+    "culinary_team": "Team FbGraph!",
+    "general_manager": "Nov Matake",
+    "restaurant_services": {
+        "reserve": 1,
+        "walkins": 0,
+        "groups": 1,
+        "kids": 0,
+        "takeout": 0,
+        "delivery": 0,
+        "catering": 0,
+        "waiter": 0,
+        "outdoor": 0
+    },
+    "restaurant_specialties": {
+        "breakfast": 0,
+        "lunch": 0,
+        "dinner": 1,
+        "coffee": 0,
+        "drinks": 1
+    },
+    "phone": "1234567890",
+    "can_post": true
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_graph
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70212658806840 !ruby/object:Gem::Requirement
+  requirement: &70278768617680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70212658806840
+  version_requirements: *70278768617680
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
-  requirement: &70212658805880 !ruby/object:Gem::Requirement
+  requirement: &70278768615940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *70212658805880
+  version_requirements: *70278768615940
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70278768614800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70278768614800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70212658804580 !ruby/object:Gem::Requirement
+  requirement: &70278768612440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70212658804580
+  version_requirements: *70278768612440
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70212658799880 !ruby/object:Gem::Requirement
+  requirement: &70278768608100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70212658799880
+  version_requirements: *70278768608100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212658798420 !ruby/object:Gem::Requirement
+  requirement: &70278768605200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70212658798420
+  version_requirements: *70278768605200
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70212658795800 !ruby/object:Gem::Requirement
+  requirement: &70278768602580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70212658795800
+  version_requirements: *70278768602580
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70212658793320 !ruby/object:Gem::Requirement
+  requirement: &70278768601400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: 3.0.6
   type: :development
   prerelease: false
-  version_requirements: *70212658793320
+  version_requirements: *70278768601400
 description: A full-stack Facebook Graph API wrapper in Ruby.
 email: nov@matake.jp
 executables: []
@@ -472,6 +483,7 @@ files:
 - spec/mock_json/pages/blocked/show_blocked.json
 - spec/mock_json/pages/blocked/show_non_blocked.json
 - spec/mock_json/pages/categories/local_business.json
+- spec/mock_json/pages/categories/local_business_fixnum.json
 - spec/mock_json/pages/categories/movie.json
 - spec/mock_json/pages/categories/music.json
 - spec/mock_json/pages/categories/person.json
@@ -835,6 +847,7 @@ test_files:
 - spec/mock_json/pages/blocked/show_blocked.json
 - spec/mock_json/pages/blocked/show_non_blocked.json
 - spec/mock_json/pages/categories/local_business.json
+- spec/mock_json/pages/categories/local_business_fixnum.json
 - spec/mock_json/pages/categories/movie.json
 - spec/mock_json/pages/categories/music.json
 - spec/mock_json/pages/categories/person.json