Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Now require json pure, but use json if available

  • Loading branch information...
commit c5b3ecbe41cf07dd7f66732e2c41666747623c88 1 parent 69640f9
@mmangino authored
View
2  Rakefile
@@ -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
View
7 lib/facebooker.rb
@@ -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)
View
10 lib/facebooker/rails/extensions/rack_setup.rb
@@ -7,8 +7,8 @@
Rack::Facebook
)
-ActionController::Dispatcher.middleware.insert_before(
- ActionController::Base.session_store,
- Rack::FacebookSession,
- ActionController::Base.session_options[:key]
-)
+# ActionController::Dispatcher.middleware.insert_before(
+# ActionController::Base.session_store,
+# Rack::FacebookSession,
+# ActionController::Base.session_options[:key]
+# )
View
2  lib/facebooker/version.rb
@@ -2,7 +2,7 @@ module Facebooker #:nodoc:
module VERSION #:nodoc:
MAJOR = 1
MINOR = 0
- TINY = 61
+ TINY = 62
STRING = [MAJOR, MINOR, TINY].join('.')
end
Please sign in to comment.
Something went wrong with that request. Please try again.