rest-graph 1.9.1 → 2.0.0

data/.travis.yml

@@ -0,0 +1,13 @@
+script: 'git submodule update --init; bundle exec rake test:travis'
+
+env:
+  - 'RESTGRAPH=rest-graph'
+  - 'RESTGRAPH=rails2'
+  - 'RESTGRAPH=rails3'
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx-2.0
+  - jruby

data/{CHANGES → CHANGES.md}

@@ -1,10 +1,37 @@
-= rest-graph changes history
+# CHANGES
 
-== rest-graph 1.9.1 -- 2011-06-07
+## rest-graph 2.0.0 -- 2011-10-08
+
+We have moved the development from rest-graph to [rest-core][].
+By now on, we would only fix bugs in rest-graph rather than adding
+features, and we would only backport important changes from rest-core
+once in a period. If you want the latest goodies, please see [rest-core][]
+Otherwise, you can stay with rest-graph with bugs fixes.
+
+[rest-core]: https://github.com/cardinalblue/rest-core
+
+* [RestGraph] Added `RestGraph#parse_fbsr!` which can parse Facebook's new
+  cookie. Also, `RestGraph#parse_cookies!` would look for that too.
+* [RestGraph] Added `expires_in` attribute which would be passed to cache.
+  The default value is 600 seconds. No effect if there's no cache, or if
+  the cache didn't support `:expires_in` option.
+* [RestGraph] Now `RestGraph#initialize` accepts string keys.
+* [RestGraph] We don't support em-http-request >= 1 at the moment.
+* [RestGraph] Fixed that parsing an invalid signed_request would raise an
+  error. From now on it would simply ignore it and wipe out the data.
+
+* [RailsUtil] Now by default, RestGraph would cache all GET requests in
+  `Rails.cache` for 600 seconds. You can change this by running:
+
+      rest_graph_setup(:cache => nil, :expires_in => 3600)
+
+  To disable cache or lengthen/shorten the lifetime of the cache result.
+
+## rest-graph 1.9.1 -- 2011-06-07
 
 * [RestGraph] Fixed parse_fbs! where fbs contains some json. (thanks Bruce)
 
-== rest-graph 1.9.0 -- 2011-05-26
+## rest-graph 1.9.0 -- 2011-05-26
 
 * [RestGraph] Removed deprecated rest-graph/auto_load.rb, and
               rest-graph/autoload.rb. Please simply require 'rest-graph'
@@ -35,7 +62,7 @@
               cause problems, thus we have provided this option to use POST
               instead.
 
-== rest-graph 1.8.0 -- 2011-03-08
+## rest-graph 1.8.0 -- 2011-03-08
 
 *  [RestGraph] Now require 'rest-graph/autoload' is deprecated, simply use
                require 'rest-graph' would require anything you "might" or
@@ -79,7 +106,7 @@
 
 * [FacebookUtil] Added some very Facebook specific utilities.
 
-== rest-graph 1.7.0 -- 2010-12-30
+## rest-graph 1.7.0 -- 2010-12-30
 
 * [RestGraph] Renamed rest-graph/auto_load to rest-graph/autoload; auto_load
               would be still working for a while.
@@ -101,7 +128,7 @@
 * [RailsUtil] Extract rest_graph_filter_uri, which would filter session,
               code, singed_request, etc. on the redirecting URI.
 
-== rest-graph 1.6.0 -- 2010-11-19
+## rest-graph 1.6.0 -- 2010-11-19
 
 * [RestGraph] Added em-http as an alternate for HTTP client. So rest-client
               is no longer a must-have dependency. Pass :async => true to
@@ -179,7 +206,7 @@
              RestGraph::TestUtil.history. This would get cleaned up in
              RestGraph::TestUtil.teardown as well.
 
-== rest-graph 1.5.0 -- 2010-10-11
+## rest-graph 1.5.0 -- 2010-10-11
 
 * [RestGraph] Make sure RestGraph::Error#message is string, that way,
               irb could print out error message correctly. Introduced
@@ -246,7 +273,7 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
 
 * [RailsUtil] URI.encode before URI.parse for broken URL Facebook passed.
 
-== rest-graph 1.4.6 -- 2010-09-01
+## rest-graph 1.4.6 -- 2010-09-01
 
 * [RestGraph] Now it will try to pick yajl-ruby or json gem from memory first,
               if it's not there, then try to load one and try to pick one
@@ -277,7 +304,7 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
               Now it's:
                 `rest_graph_authorize(message)`
 
-== rest-graph 1.4.5 -- 2010-08-07
+## rest-graph 1.4.5 -- 2010-08-07
 
 * [RestGraph] Treat oauth_token as access_token as well. This came from
               Facebook's new signed_request. Why didn't they choose
@@ -290,12 +317,12 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
               fbs with user code, instead of using sessions/cookies.
               That way, you can save fbs into memcache or somewhere.
 
-== rest-graph 1.4.4 -- 2010-08-06
+## rest-graph 1.4.4 -- 2010-08-06
 
 * [RailsUtil] Fixed a bug that empty query appends a question mark,
               that confuses Facebook, so that redirect_uri didn't match.
 
-== rest-graph 1.4.3 -- 2010-08-06
+## rest-graph 1.4.3 -- 2010-08-06
 
 * [RestGraph] Fixed a bug in RestGraph#fbs, which didn't join '&'.
               Thanks, Andrew.
@@ -308,7 +335,7 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
 * [RailsUtil] Favor Request#fullpath over Request#request_uri,
               which came from newer Rack and thus for Rails 3.
 
-== rest-graph 1.4.2 -- 2010-08-05
+## rest-graph 1.4.2 -- 2010-08-05
 
 * [RestGraph] Added RestGraph#fbs to generate fbs with correct sig,
               to be used for future parse_fbs! See the bug in RailsUtil.
@@ -321,7 +348,7 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
 
 * Thanks a lot, Andrew.
 
-== rest-graph 1.4.1 -- 2010-08-04
+## rest-graph 1.4.1 -- 2010-08-04
 
 * [RestGraph] Call error_handler when response contains error_code as well,
   which came from FQL response. Thanks Florent.
@@ -341,7 +368,7 @@ should be formatted by "#{app_id}|#{secret}" instead of the usual one.
 * [RailsUtil] Favor signed_request over session in rest_graph_setup
 * [RailsUtil] Now it's possible to setup all options in rest-graph.yaml.
 
-== rest-graph 1.4.0 -- 2010-07-15
+## rest-graph 1.4.0 -- 2010-07-15
 
 Changes only for RailsUtil, the core (rest-graph.rb) is pretty stable for now.
 
@@ -356,7 +383,8 @@ Changes only for RailsUtil, the core (rest-graph.rb) is pretty stable for now.
 * Now :auto_authorize_scope default to nothing.
 * Now there's :write_session option to save fbs in session, default to false.
 
-== rest-graph 1.3.0 -- 2010-06-11
+## rest-graph 1.3.0 -- 2010-06-11
+
 * Now rest-graph is rescuing all exceptions from rest-client.
 * Added RestGraph#exchange_sessions to exchange old sessions to access tokens.
 
@@ -378,7 +406,8 @@ for RailsUtil:
   http://github.com/cardinalblue/rest-graph/tree/rest-graph-1.3.0/example
 * url_for and link_to would auto pass :host option if it's inside canvas.
 
-== rest-graph 1.2.1 -- 2010-06-02
+## rest-graph 1.2.1 -- 2010-06-02
+
 * Deprecated RailsController, use RailsUtil instead.
 * Fixed a bug that passing access_token in query string
   in RestGraph#authorize_url
@@ -386,7 +415,8 @@ for RailsUtil:
   Thanks betelgeuse, closes #1
   http://github.com/cardinalblue/rest-graph/issues/issue/1
 
-== rest-graph 1.2.0 -- 2010-05-27
+## rest-graph 1.2.0 -- 2010-05-27
+
 * Add RestGraph#parse_json!
 * Add RailsController to help you integrate into Rails.
 * Simplify arguments checking and require dependency.
@@ -419,12 +449,14 @@ for RailsUtil:
 * Add RestGraph#fql_multi to do FQL multiquery. Thanks Ethan Czahor
   Usage: rg.fql_multi(:query1 => 'SELECT ...', :query2 => 'SELECT ...')
 
-== rest-graph 1.1.1 -- 2010-05-21
+## rest-graph 1.1.1 -- 2010-05-21
+
 * Add oauth realted utilites -- authorize_url and authorize!
 * Fixed a bug that in Ruby 1.8.7-, nil =~ /regexp/ equals to false.
   It is nil as expected in Ruby 1.9.1+
 
-== rest-graph 1.1.0 -- 2010-05-13
+## rest-graph 1.1.0 -- 2010-05-13
+
 * Main repository was moved to http://github.com/cardinalblue/rest-graph
   Sorry for the inconvenience. I'll keep pushing to both repositories until
   I am too lazy to do that.
@@ -439,20 +471,24 @@ for RailsUtil:
 * Config could be loaded manually as well. require 'rest-graph/load_config'
   and RestGraph::LoadConfig.load_config!('path/to/rest-graph.yaml', 'env')
 
-== rest-graph 1.0.0 -- 2010-05-06
+## rest-graph 1.0.0 -- 2010-05-06
+
 * now access_token is saved in data attributes.
 * cookies related methods got renamed, and saved all data in RestGraph
 * parse failed would return nil, while data is always a hash
 
-== rest-graph 0.9.0 -- 2010-05-04
+## rest-graph 0.9.0 -- 2010-05-04
+
 * renamed :server option to :graph_server
 * added :fql_server option and fql support.
 * cookies related parsing utility is now instance methods.
   you'll need to pass app_id and secret when initializing
 * if sig in cookies is bad, then it won't extract the access_token
 
-== rest-graph 0.8.1 -- 2010-05-03
+## rest-graph 0.8.1 -- 2010-05-03
+
 * added access_token parsing utility
 
-== rest-graph 0.8.0 -- 2010-05-03
+## rest-graph 0.8.0 -- 2010-05-03
+
 * release early, release often

data/Gemfile

@@ -1,24 +1,29 @@
 
 source 'http://rubygems.org'
 
-group :test do
-  # pick one http client
-  gem 'rest-client', '>=1.6'
-  gem 'em-http-request'
+gemspec
 
-  # optional
-  gem 'rack'
+gem 'rake'
+gem 'bacon'
+gem 'rr'
+gem 'webmock'
 
-  # optional, pick one json backend
-  gem 'yajl-ruby'
-  gem 'json'
-  gem 'json_pure'
+gem 'json'
+gem 'json_pure'
+
+gem 'rack'
+gem 'ruby-hmac'
+
+gem 'rest-client'
+gem 'em-http-request', '<1'
 
-  # falls back from openssl
-  gem 'ruby-hmac'
+platforms(:ruby) do
+  gem 'yajl-ruby'
+end
 
-  # for testing
-  gem 'rr'
-  gem 'webmock'
-  gem 'bacon'
+platforms(:jruby) do
+  gem 'jruby-openssl'
 end
+
+gem 'rails', '2.3.14' if ENV['RESTGRAPH'] == 'rails2'
+gem 'rails', '3.0.9'  if ENV['RESTGRAPH'] == 'rails3'

data/README.md

@@ -1,4 +1,5 @@
-# rest-graph
+# rest-graph [![Build Status](http://travis-ci.org/godfat/rest-graph.png)](http://travis-ci.org/godfat/rest-graph)
+
 by Cardinal Blue <http://cardinalblue.com>
 
 Tutorial on setting up a sample Facebook application with Rails 3
@@ -11,7 +12,7 @@ an experienced Ruby programmer, you might also want to look at
 
 ## LINKS:
 
-* [github](http://github.com/cardinalblue/rest-graph)
+* [github](https://ithub.com/cardinalblue/rest-graph)
 * [rubygems](http://rubygems.org/gems/rest-graph)
 * [rdoc](http://rdoc.info/projects/cardinalblue/rest-graph)
 * [mailing list](http://groups.google.com/group/rest-graph/topics)
@@ -20,6 +21,14 @@ an experienced Ruby programmer, you might also want to look at
 
 A lightweight Facebook Graph API client
 
+We have moved the development from rest-graph to [rest-core][].
+By now on, we would only fix bugs in rest-graph rather than adding
+features, and we would only backport important changes from rest-core
+once in a period. If you want the latest goodies, please see [rest-core][]
+Otherwise, you can stay with rest-graph with bugs fixes.
+
+[rest-core]: https://github.com/cardinalblue/rest-core
+
 ## FEATURES:
 
 * Simple Graph API call
@@ -53,7 +62,8 @@ A lightweight Facebook Graph API client
 
 Or if you want development version, put this in Gemfile:
 
-    gem 'rest-graph', :git => 'git://github.com/cardinalblue/rest-graph.git'
+    gem 'rest-graph', :git => 'git://github.com/cardinalblue/rest-graph.git',
+                      :submodules => true
 
 Or as a Rails2 plugin:
 
@@ -354,18 +364,18 @@ Takes a session key from the old REST API
 
 ## LICENSE:
 
-  Apache License 2.0
+Apache License 2.0
 
-  Copyright (c) 2010, Cardinal Blue
+Copyright (c) 2010-2011, Cardinal Blue
 
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-     <http://www.apache.org/licenses/LICENSE-2.0>
+   <http://www.apache.org/licenses/LICENSE-2.0>
 
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/Rakefile

@@ -9,34 +9,40 @@ desc 'Generate gemspec'
 task 'gem:spec' do
   Gemgem.spec = Gemgem.create do |s|
     require 'rest-graph/version'
-    s.name        = 'rest-graph'
-    s.version     = RestGraph::VERSION
-    # s.executables = [s.name]
+    s.name     = 'rest-graph'
+    s.version  = RestGraph::VERSION
+    s.homepage = 'https://github.com/cardinalblue/rest-graph'
 
     %w[].each{ |g| s.add_runtime_dependency(g) }
-    %w[rest-client em-http-request rack yajl-ruby json json_pure ruby-hmac
-       webmock bacon rr].each{ |g| s.add_development_dependency(g) }
+    %w[].each{ |g| s.add_development_dependency(g) }
 
-    s.authors     = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
-    s.email       = ['dev (XD) cardinalblue.com']
+    s.authors  = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
+    s.email    = ['dev (XD) cardinalblue.com']
   end
 
   Gemgem.write
 end
 
+module Gemgem
+  module_function
+  def test_rails *rails
+    rails.each{ |framework|
+      opts = Rake.application.options
+      args = (opts.singleton_methods - [:rakelib, 'rakelib']).map{ |arg|
+               if arg.to_s !~ /=$/ && opts.send(arg)
+                 "--#{arg}"
+               else
+                 ''
+               end
+             }.join(' ')
+      Rake.sh "cd example/#{framework}; #{Gem.ruby} -S rake test #{args}"
+    }
+  end
+end
+
 desc 'Run example tests'
-task 'test:example' => ['gem:install'] do
-  %w[rails3 rails2].each{ |framework|
-    opts = Rake.application.options
-    args = (opts.singleton_methods - [:rakelib, 'rakelib']).map{ |arg|
-             if arg.to_s !~ /=$/ && opts.send(arg)
-               "--#{arg}"
-             else
-               ''
-             end
-           }.join(' ')
-    sh "cd example/#{framework}; #{Gem.ruby} -S rake test #{args}"
-  }
+task 'test:example' do
+  Gemgem.test_rails('rails3', 'rails2')
 end
 
 desc 'Run all tests'
@@ -45,6 +51,14 @@ task 'test:all' => ['test', 'test:example']
 desc 'Run different json test'
 task 'test:json' do
   %w[yajl json].each{ |json|
-    sh "#{Gem.ruby} -S rake -r #{json} test"
+    Rake.sh "#{Gem.ruby} -S rake -r #{json} test"
   }
 end
+
+task 'test:travis' do
+  case ENV['RESTGRAPH']
+  when 'rails3'; Gemgem.test_rails('rails3')
+  when 'rails2'; Gemgem.test_rails('rails2')
+  else         ; Rake::Task['test'].invoke
+  end
+end

data/{TODO → TODO.md}

@@ -1,10 +1,12 @@
-= rest-graph todo list
+# TODO
+
+## RailsUtil
 
-== RailsUtil
 * provide a :validate_access_token or so option
 * test for rails util for writing cookie
 
-== RestGraph
+## RestGraph
+
 * error_handler can't be turned off
 * more docs?
 * more examples?

data/example/rails2/Gemfile

@@ -1,11 +1,11 @@
 
 source 'http://rubygems.org'
 
-gem 'rails', '2.3.11'
+gem 'rails', '2.3.14'
 
 gem 'rest-client' # for rest-graph
 gem 'yajl-ruby'   # for rest-graph
-gem 'rest-graph'
+gem 'rest-graph', :path => '../../'
 
 group 'test' do
   gem 'rr'

data/example/rails2/Rakefile

@@ -3,6 +3,7 @@
 
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 
+require 'rake/dsl_definition'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'