rest-more 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 5d7d25f35f71824a54722882781fec66d4a0f0d7
+  data.tar.gz: 162468ea7578ce061ed9b9ebcc71b510eb610313
+!binary "U0hBNTEy":
+  metadata.gz: 263040498b133b04aaa64cf6d808cc95ea93b2cc6902f702a4354d7f4f92cb2f8ab706ed3bdf6681380ae9ccc8e888f9a5129ef8808741ad0906a56e500071b0
+  data.tar.gz: daf111d5deafae6196d8c70a0d7d89d76f799bde3ee7991df828d39997a0b9e78e7b980c79f859e29cb381191734a42eb29eb227975afbfc3ea34355e5b6d349

data/.travis.yml

@@ -7,5 +7,6 @@ env:
 
 rvm:
   - 1.9.3
+  - 2.0.0
   - rbx-head
   - jruby-head

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## rest-more 2.0.3 -- 2013-04-01
+
+* Fixed compatibility with Ruby 2.0.
+* Adopt rest-core 2.0.3.
+
 ## rest-more 2.0.2 -- 2013-02-07
 
 * Updated Facebook OAuth URL from https://graph.facebook.com/oauth/authorize

data/Rakefile

@@ -19,7 +19,7 @@ task 'gem:spec' do
     s.version  = RestMore::VERSION
     s.homepage = 'https://github.com/cardinalblue/rest-more'
 
-    %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=2.0.0') }
+    %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=2.0.3') }
 
     s.authors  = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
     s.email    = ['dev (XD) cardinalblue.com']

data/example/rails3/Gemfile

@@ -1,7 +1,7 @@
 
 source 'http://rubygems.org'
 
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
 
 gem 'rest-client' # for rest-core
 gem 'rest-core', :path => '../../rest-core'

data/lib/rest-core/client/dropbox.rb

@@ -92,5 +92,7 @@ module RestCore::Dropbox::Client
   end
 end
 
-RestCore::Dropbox.send(:include, RestCore::ClientOauth1)
-RestCore::Dropbox.send(:include, RestCore::Dropbox::Client)
+class RestCore::Dropbox
+  include RestCore::ClientOauth1
+  include RestCore::Dropbox::Client
+end

data/lib/rest-core/client/facebook.rb

@@ -291,6 +291,9 @@ module RestCore::Facebook::Client
   end
 end
 
-RestCore::Facebook.send(:include, RestCore::Facebook::Client)
-require 'rest-core/client/facebook/rails_util' if
-  Object.const_defined?(:Rails)
+class RestCore::Facebook
+  include RestCore::Facebook::Client
+
+  autoload :RailsUtil, 'rest-core/client/facebook/rails_util' if
+    Object.const_defined?(:Rails)
+end

data/lib/rest-core/client/github.rb

@@ -28,6 +28,9 @@ module RestCore::Github::Client
   end
 end
 
-RestCore::Github.send(:include, RestCore::Github::Client)
-require 'rest-core/client/github/rails_util' if
-  Object.const_defined?(:Rails)
+class RestCore::Github
+  include RestCore::Github::Client
+
+  autoload :RailsUtil, 'rest-core/client/github/rails_util' if
+    Object.const_defined?(:Rails)
+end

data/lib/rest-core/client/linkedin.rb

@@ -36,7 +36,10 @@ module RestCore::Linkedin::Client
   end
 end
 
-RestCore::Linkedin.send(:include, RestCore::ClientOauth1)
-RestCore::Linkedin.send(:include, RestCore::Linkedin::Client)
-require 'rest-core/client/linkedin/rails_util' if
-  Object.const_defined?(:Rails)
+class RestCore::Linkedin
+  include RestCore::ClientOauth1
+  include RestCore::Linkedin::Client
+
+  autoload :RailsUtil, 'rest-core/client/linkedin/rails_util' if
+    Object.const_defined?(:Rails)
+end

data/lib/rest-core/client/twitter.rb

@@ -86,7 +86,10 @@ module RestCore::Twitter::Client
   end
 end
 
-RestCore::Twitter.send(:include, RestCore::ClientOauth1)
-RestCore::Twitter.send(:include, RestCore::Twitter::Client)
-require 'rest-core/client/twitter/rails_util' if
-  Object.const_defined?(:Rails)
+class RestCore::Twitter
+  include RestCore::ClientOauth1
+  include RestCore::Twitter::Client
+
+  autoload :RailsUtil, 'rest-core/client/twitter/rails_util' if
+    Object.const_defined?(:Rails)
+end

data/lib/rest-core/util/rails_util_util.rb

@@ -37,9 +37,7 @@ module RestCore::RailsUtilUtil
     end
 
     def rc_options_extract members, options, method
-      # Hash[] is for ruby 1.8.7
-      # map(&:to_sym) is for ruby 1.8.7
-      Hash[options.send(method){ |(k, v)| members.map(&:to_sym).member?(k) }]
+      options.send(method){ |(k, v)| members.member?(k) }
     end
   end
 

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/rest-more.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
   "Cardinal Blue",
   "Lin Jen-Shin (godfat)"]
-  s.date = "2013-02-07"
+  s.date = "2013-04-01"
   s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][]\n\n[rest-core]: https://github.com/cardinalblue/rest-core"
   s.email = ["dev (XD) cardinalblue.com"]
   s.executables = ["rib-rest-core"]
@@ -82,7 +82,7 @@ Gem::Specification.new do |s|
   "test/twitter/test_api.rb"]
   s.homepage = "https://github.com/cardinalblue/rest-more"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.0"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]"
   s.test_files = [
   "test/dropbox/test_api.rb",
@@ -101,14 +101,14 @@ Gem::Specification.new do |s|
   "test/twitter/test_api.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 2.0.0"])
+      s.add_runtime_dependency(%q<rest-core>, [">= 2.0.3"])
     else
-      s.add_dependency(%q<rest-core>, [">= 2.0.0"])
+      s.add_dependency(%q<rest-core>, [">= 2.0.3"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 2.0.0"])
+    s.add_dependency(%q<rest-core>, [">= 2.0.3"])
   end
 end

data/test/facebook/test_handler.rb

@@ -60,7 +60,8 @@ describe RC::Facebook do
 
       @bad_fql_query  = 'SELECT name FROM bad_table WHERE uid="12345"'
       bad_fql_request = "https://api.facebook.com/method/fql.query?" \
-                        "format=json&query=#{CGI.escape(@bad_fql_query)}"
+                        "format=json&query=#{
+                          RC::Middleware.escape(@bad_fql_query)}"
 
       stub_request(:get, bad_fql_request).to_return(:body => @fql_error)
     end

data/test/facebook/test_old.rb

@@ -9,7 +9,7 @@ describe RC::Facebook do
 
   should 'do fql query with/without access_token' do
     fql = 'SELECT name FROM likes where id="123"'
-    query = "format=json&query=#{CGI.escape(fql)}"
+    query = "format=json&query=#{RC::Middleware.escape(fql)}"
     stub_request(:get, "https://api.facebook.com/method/fql.query?#{query}").
       to_return(:body => '[]')
 
@@ -27,8 +27,10 @@ describe RC::Facebook do
     f0 = 'SELECT display_name FROM application WHERE app_id="233082465238"'
     f1 = 'SELECT display_name FROM application WHERE app_id="110225210740"'
     f0q, f1q = "\"#{f0.gsub('"', '\\"')}\"", "\"#{f1.gsub('"', '\\"')}\""
-    q = "format=json&queries=#{CGI.escape("{\"f0\":#{f0q},\"f1\":#{f1q}}")}"
-    p = "format=json&queries=#{CGI.escape("{\"f1\":#{f1q},\"f0\":#{f0q}}")}"
+    q = "format=json&queries=#{RC::Middleware.escape(
+          "{\"f0\":#{f0q},\"f1\":#{f1q}}")}"
+    p = "format=json&queries=#{RC::Middleware.escape(
+          "{\"f1\":#{f1q},\"f0\":#{f0q}}")}"
 
     stub_multi = lambda{
       stub_request(:get,

data/test/facebook/test_parse.rb

@@ -23,8 +23,8 @@ describe RC::Facebook do
     app_id       = '1829'
     secret       = app_id.reverse
     sig          = '398262caea8442bd8801e8fba7c55c8a'
-    fbs          = "access_token=#{CGI.escape(access_token)}&expires=0&" \
-                   "secret=abc&session_key=def-456&sig=#{sig}&uid=3"
+    fbs          = "access_token=#{RC::Middleware.escape(access_token)}&" \
+                   "expires=0&secret=abc&session_key=def-456&sig=#{sig}&uid=3"
 
     check = lambda{ |token, fbs1|
       http_cookie =

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - Cardinal Blue
@@ -10,24 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.3
 description: ! 'Various REST clients such as Facebook and Twitter built with [rest-core][]
 
 
@@ -108,27 +105,26 @@ files:
 - test/twitter/test_api.rb
 homepage: https://github.com/cardinalblue/rest-more
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Various REST clients such as Facebook and Twitter built with [rest-core][]
 test_files:
 - test/dropbox/test_api.rb