rest-more 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d94a93481cb47814a0fe9e40aa939c0511b8972
-  data.tar.gz: 3e51315c98ffe426c74e37e6d3384d60e7a0563a
+  metadata.gz: 98ac71864d29ae971e6089b3e162f0a15a69d277
+  data.tar.gz: 4dcf5ff68b60bcc92cef303ff8ca94e68feb9697
 SHA512:
-  metadata.gz: 2c5c2ccbaff604f3272cb7db82620635a92772f6f7350059e3bff697044ca3bd4e6cca1e7a23600ebfbdb9070d19ba449aa0f5cca31148a55161f196774cae57
-  data.tar.gz: fd1fa8e8c101fca082a8a59584ea85bc740c8d09c276ce04a156299626c0d65cdebc69bf652d0c3246ce73a3d7c7fad1676ea1d5d753cf137d9c013b18250226
+  metadata.gz: fda0e5a602f1105e6ce465915789df10198d8f91a20ded059541a9297da0cbdcd3cdfa93766406914fb70cb726b44cb73d820507533332be968e1497089e176f
+  data.tar.gz: 6847bb6f40a0a68db98b97147d32dadbc32cc1058491f7631d33df051068eb0495fc91c9bacaaf97c8c16585c01926440b705c0c1f9679f75ed01dbd18318a78

data/.gitignore

@@ -1,2 +1,2 @@
 /pkg/
-Gemfile.lock
+/coverage/

data/.travis.yml

@@ -1,13 +1,15 @@
-before_install: 'git submodule update --init'
+
+language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - 2.2
+  - rbx-2
+  - jruby
+
+install: 'bundle install --retry=3'
 script: 'ruby -r bundler/setup -S rake test:travis'
 
 env:
   - 'RESTMORE=rest-more'
   - 'RESTMORE=rails3'
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - ruby
-  - rbx-2
-  - jruby

data/CHANGES.md

@@ -1,5 +1,10 @@
 # CHANGES
 
+## rest-more 3.3.2 -- 2015-01-05
+
+* Added RC::StackExchange#authorized?
+* Removed RC::Firebase from autoloading.
+
 ## rest-more 3.3.1 -- 2014-10-08
 
 * Made `RC::Facebook#authorize_url` accepts the second argument as the option.

data/Gemfile

@@ -18,6 +18,9 @@ gem 'multi_json'
 
 gem 'rack'
 
+gem 'simplecov', :require => false if ENV['COV']
+gem 'coveralls', :require => false if ENV['CI']
+
 platforms :ruby do
   gem 'yajl-ruby'
 end

data/README.md

@@ -1,4 +1,4 @@
-# rest-more [![Build Status](https://secure.travis-ci.org/godfat/rest-more.png?branch=master)](http://travis-ci.org/godfat/rest-more)
+# rest-more [![Build Status](https://secure.travis-ci.org/godfat/rest-more.png?branch=master)](http://travis-ci.org/godfat/rest-more) [![Coverage Status](https://coveralls.io/repos/godfat/rest-more/badge.png)](https://coveralls.io/r/godfat/rest-more)
 
 by Lin Jen-Shin ([godfat](http://godfat.org))
 
@@ -14,6 +14,9 @@ talk is in Mandarin.
 * [github](https://github.com/godfat/rest-more)
 * [rubygems](https://rubygems.org/gems/rest-more)
 * [rdoc](http://rdoc.info/projects/godfat/rest-more)
+* [mailing list](http://www.freelists.org/list/rest-core)
+  Send your questions to: <rest-core@freelists.org> and you could read
+  through [archives](http://www.freelists.org/archives/rest-core)
 
 ## DESCRIPTION:
 
@@ -323,7 +326,7 @@ Which is using `RestCore::Universal` for accessing arbitrary websites.
 
 Apache License 2.0
 
-Copyright (c) 2011-2014, Lin Jen-Shin (godfat)
+Copyright (c) 2011-2015, Lin Jen-Shin (godfat)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Rakefile

@@ -52,6 +52,10 @@ task 'test:json' do
   }
 end
 
+task 'test' do
+  SimpleCov.add_filter('rest-core/lib') if ENV['COV'] || ENV['CI']
+end
+
 task 'test:travis' do
   case ENV['RESTMORE']
   when 'rails3'; Gemgem.test_rails('rails3')

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

@@ -62,10 +62,10 @@ module RestCore::Github::Client
   def all path, query={}, opts={}
     q = {:per_page => MAX_PER_PAGE}.merge(query)
     r = get(path, q, opts.merge(RESPONSE_KEY => PROMISE)).then{ |response|
-      body = response[RESPONSE_BODY] + (page_range(response).map{ |page|
+      body = response[RESPONSE_BODY] + page_range(response).map{ |page|
         get(path, q.merge(:page => page),
             opts.merge(RESPONSE_KEY => RESPONSE_BODY))
-      }.inject([], &:+))
+      }.inject([], &:+)
       response.merge(RESPONSE_BODY => body)
     }.future_response
 

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

@@ -56,6 +56,10 @@ module RestCore::StackExchange::Client
     end
   end
 
+  def authorized?
+    !!access_token
+  end
+
   private
   def default_data ;                                      {}; end
   def default_query; {:key => key, :site => 'stackoverflow'}; end

data/lib/rest-more.rb

@@ -4,7 +4,6 @@ require 'rest-core'
 module RestCore
   autoload :Dropbox      , 'rest-core/client/dropbox'
   autoload :Facebook     , 'rest-core/client/facebook'
-  autoload :Firebase     , 'rest-core/client/firebase'
   autoload :Github       , 'rest-core/client/github'
   autoload :Instagram    , 'rest-core/client/instagram'
   autoload :Linkedin     , 'rest-core/client/linkedin'

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '3.3.1'
+  VERSION = '3.3.2'
 end

data/rest-more.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-more 3.3.1 ruby lib
+# stub: rest-more 3.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "3.3.1"
+  s.version = "3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-10-08"
+  s.date = "2015-01-05"
   s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][].\n\n[rest-core]: https://github.com/godfat/rest-core"
   s.email = ["godfat (XD) godfat.org"]
   s.executables = ["rib-rest-core"]
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   "test/twitter/test_twitter.rb"]
   s.homepage = "https://github.com/godfat/rest-more"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.4.2"
+  s.rubygems_version = "2.4.5"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]."
   s.test_files = [
   "test/dropbox/test_dropbox.rb",

data/task/gemgem.rb

@@ -38,6 +38,99 @@ module Gemgem
     self.spec = spec
   end
 
+  def gem_install
+    require 'rubygems/commands/install_command'
+    # read ~/.gemrc
+    Gem.use_paths(Gem.configuration[:gemhome], Gem.configuration[:gempath])
+    Gem::Command.extra_args = Gem.configuration[:gem]
+
+    # setup install options
+    cmd = Gem::Commands::InstallCommand.new
+    cmd.handle_options([])
+
+    # install
+    install = Gem::Installer.new(gem_path, cmd.options)
+    install.install
+    puts "\e[35mGem installed: \e[33m#{strip_path(install.gem_dir)}\e[0m"
+  end
+
+  def gem_spec
+    create
+    write
+  end
+
+  def gem_build
+    require 'fileutils'
+    require 'rubygems/package'
+    gem = nil
+    Dir.chdir(dir) do
+      gem = Gem::Package.build(Gem::Specification.load(spec_path))
+      FileUtils.mkdir_p(pkg_dir)
+      FileUtils.mv(gem, pkg_dir) # gem is relative path, but might be ok
+    end
+    puts "\e[35mGem built: \e[33m#{strip_path("#{pkg_dir}/#{gem}")}\e[0m"
+  end
+
+  def gem_release
+    sh_git('tag', gem_tag)
+    sh_git('push')
+    sh_git('push', '--tags')
+    sh_gem('push', gem_path)
+  end
+
+  def gem_check
+    ver = spec.version.to_s
+
+    if ENV['VERSION'].nil?
+      puts("\e[35mExpected "                                  \
+           "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
+      exit(1)
+
+    elsif ENV['VERSION'] != ver
+      puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
+           "\e[35mbut got\n         "                         \
+           "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
+      exit(2)
+    end
+  end
+
+  def test
+    return if test_files.empty?
+
+    if ENV['COV'] || ENV['CI']
+      require 'simplecov'
+      if ENV['CI']
+        require 'coveralls'
+        SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+      end
+      SimpleCov.start do
+        add_filter('test/')
+        add_filter('test.rb')
+      end
+    end
+
+    test_files.each{ |file| require "#{dir}/#{file[0..-4]}" }
+  end
+
+  def clean
+    return if ignored_files.empty?
+
+    require 'fileutils'
+    trash = File.expand_path("~/.Trash/#{spec.name}")
+    puts "Move the following files into: \e[35m#{strip_path(trash)}\e[33m"
+
+    ignored_files.each do |file|
+      from = "#{dir}/#{file}"
+      to   = "#{trash}/#{File.dirname(file)}"
+      puts strip_path(from)
+
+      FileUtils.mkdir_p(to)
+      FileUtils.mv(from, to)
+    end
+
+    print "\e[0m"
+  end
+
   def write
     File.open(spec_path, 'w'){ |f| f << split_lines(spec.to_ruby) }
   end
@@ -173,82 +266,38 @@ namespace :gem do
 
 desc 'Install gem'
 task :install => [:build] do
-  Gemgem.sh_gem('install', Gemgem.gem_path)
+  Gemgem.gem_install
 end
 
 desc 'Build gem'
 task :build => [:spec] do
-  require 'fileutils'
-  require 'rubygems/package'
-  gem = nil
-  Dir.chdir(Gemgem.dir) do
-    gem = Gem::Package.build(Gem::Specification.load(Gemgem.spec_path))
-    FileUtils.mkdir_p(Gemgem.pkg_dir)
-    FileUtils.mv(gem, Gemgem.pkg_dir) # gem is relative path, but might be ok
-  end
-  puts "\e[35mGem built: \e[33m" \
-       "#{Gemgem.strip_path("#{Gemgem.pkg_dir}/#{gem}")}\e[0m"
+  Gemgem.gem_build
 end
 
 desc 'Generate gemspec'
 task :spec do
-  Gemgem.create
-  Gemgem.write
+  Gemgem.gem_spec
 end
 
 desc 'Release gem'
 task :release => [:spec, :check, :build] do
-  Gemgem.module_eval do
-    sh_git('tag', Gemgem.gem_tag)
-    sh_git('push')
-    sh_git('push', '--tags')
-    sh_gem('push', Gemgem.gem_path)
-  end
+  Gemgem.gem_release
 end
 
 task :check do
-  ver = Gemgem.spec.version.to_s
-
-  if ENV['VERSION'].nil?
-    puts("\e[35mExpected "                                  \
-         "\e[33mVERSION\e[35m=\e[33m#{ver}\e[0m")
-    exit(1)
-
-  elsif ENV['VERSION'] != ver
-    puts("\e[35mExpected \e[33mVERSION\e[35m=\e[33m#{ver} " \
-         "\e[35mbut got\n         "                         \
-         "\e[33mVERSION\e[35m=\e[33m#{ENV['VERSION']}\e[0m")
-    exit(2)
-  end
+  Gemgem.gem_check
 end
 
 end # of gem namespace
 
 desc 'Run tests'
 task :test do
-  next if Gemgem.test_files.empty?
-  Gemgem.test_files.each{ |file| require "#{Gemgem.dir}/#{file[0..-4]}" }
+  Gemgem.test
 end
 
 desc 'Trash ignored files'
 task :clean => ['gem:spec'] do
-  next if Gemgem.ignored_files.empty?
-
-  require 'fileutils'
-  trash = File.expand_path("~/.Trash/#{Gemgem.spec.name}")
-  puts "Move the following files into:" \
-       " \e[35m#{Gemgem.strip_path(trash)}\e[33m"
-
-  Gemgem.ignored_files.each do |file|
-    from = "#{Gemgem.dir}/#{file}"
-    to   = "#{trash}/#{File.dirname(file)}"
-    puts Gemgem.strip_path(from)
-
-    FileUtils.mkdir_p(to)
-    FileUtils.mv(from, to)
-  end
-
-  print "\e[0m"
+  Gemgem.clean
 end
 
 task :default do

data/test/facebook/test_error.rb

@@ -59,6 +59,7 @@ describe RC::Facebook::Error do
     rg = RC::Facebook.new(:cache => {},
                           :error_handler => lambda{|env|env})
     rg.get('me'); rg.get('me')
+    rg.wait
     rg.cache.values.should.eq []
   end
 end

data/test/facebook/test_page.rb

@@ -67,7 +67,8 @@ describe RC::Facebook do
         f.for_pages(data, pages, {}, kind){ |r|
           r.should.eq expects.shift
         }
-        f.wait until expects.empty?
+        f.wait
+        expects.should.empty?
 
         # this data cannot be merged
         stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
@@ -75,7 +76,8 @@ describe RC::Facebook do
         f.for_pages(data, pages, {}, kind){ |r|
           r.should.eq expects.shift
         }
-        f.wait until expects.empty?
+        f.wait
+        expects.should.empty?
       }
 
       stub_request(:get, 'zzz').to_return(:body =>
@@ -87,7 +89,8 @@ describe RC::Facebook do
       f.for_pages(data, 3, {}, kind){ |r|
         r.should.eq expects.shift
       }
-      f.wait until expects.empty?
+      f.wait
+      expects.should.empty?
     }
   end
 end

data/test/facebook/test_parse.rb

@@ -77,7 +77,7 @@ describe RC::Facebook do
 
   describe 'signed_request' do
     def encode str
-      [str].pack('m').tr("\n=", '').tr('+/', '-_')
+      [str].pack('m0').tr('=', '').tr('+/', '-_')
     end
 
     def setup_sr secret, data, sig=nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Various REST clients such as Facebook and Twitter built with [rest-core][].