rest-firebase 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3abd41266838b60199410b6ac1bc94cba83482
-  data.tar.gz: 2b94610d3db1ca7149613ce7f0c475ffc1595270
+  metadata.gz: abdca1643c16e51c16f42747eeba4eda9f1a9e91
+  data.tar.gz: e3f1d4518d893fd9882047410c8617fef616d257
 SHA512:
-  metadata.gz: 80d3b15e2c4a5540d421643df0c98837b89cc79d523aed558f7edfeb4723d7c449c98e5085943818a0aa84f1e825dc4bbb8d0793c159a603d2d87e07685c9d4e
-  data.tar.gz: fab331037d2b0a0e7470ecb4e3bfb10c7c1f97895ed0522740874516076e82a0564b1c34ac0f5d1cf5f2cc7a78614fb58f0a6ece49ff902af50b7eb32cc790a4
+  metadata.gz: 9c28d6ac640f9146f4dd581a111fda8ebdda2cbd7341f437c42b21107b626d953e9904a555cfd99c11a74179eb6a77aaf009b7c2ba74a84b1267b48609a00ac5
+  data.tar.gz: 6c3f2e686c4e1ce85247810ec63a10af5dbf099c8e0a373f05223caac41ae0dc9dbb7f3c7b39b798fbcea6594ab177ffea37c2967fed293468f1e0014fe9b683

data/.travis.yml

@@ -1,11 +1,14 @@
-
+sudo: false
 language: ruby
 rvm:
-  - 2.0
-  - 2.1
   - 2.2
-  - rbx-2
-  - jruby
+  - 2.3.0
+  - rbx
+  - jruby-9
 
+before_install:
+  - rvm get head
+  - rvm reload
+  - rvm use --install $TRAVIS_RUBY_VERSION --binary --latest
 install: 'bundle install --retry=3'
-script: 'ruby -r bundler/setup -S rake test'
+script: 'ruby -vr bundler/setup -S rake test'

data/CHANGES.md

@@ -1,5 +1,9 @@
 # CHANGES
 
+## rest-firebase 1.1.0 -- 2016-02-04
+
+* Adopted rest-core 4.0.0
+
 ## rest-firebase 1.0.3 -- 2015-11-16
 
 ### Bugs fixed

data/Rakefile

@@ -2,21 +2,23 @@
 begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
-  sh 'git submodule update --init'
+  sh 'git submodule update --init --recursive'
   exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-$LOAD_PATH.unshift(File.expand_path("#{dir}/rest-core/lib"))
+%w[lib rest-builder/lib rest-builder/promise_pool/lib].each do |path|
+  $LOAD_PATH.unshift(File.expand_path("#{dir}/rest-core/#{path}"))
+end
 
 Gemgem.init(dir) do |s|
   s.name     = 'rest-firebase'
-  s.version  = '1.0.3'
+  s.version  = '1.1.0'
   s.homepage = 'https://github.com/CodementorIO/rest-firebase'
 
   s.authors  = ['Codementor', 'Lin Jen-Shin (godfat)']
   s.email    = ['help@codementor.io']
 
-  %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=3.5.0') }
+  %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=4.0.0') }
 
   # exclude rest-core
   s.files.reject!{ |f| f.start_with?('rest-core/') }

data/lib/rest-firebase.rb

@@ -1,28 +1,30 @@
 
 require 'rest-core'
+require 'rest-core/util/json'
+require 'rest-core/util/hmac'
 
 # https://www.firebase.com/docs/security/custom-login.html
 # https://www.firebase.com/docs/rest-api.html
 # https://www.firebase.com/docs/rest/guide/retrieving-data.html#section-rest-queries
-RestFirebase = RC::Builder.client(:d, :secret, :auth, :auth_ttl, :iat) do
-  use RC::DefaultSite   , 'https://SampleChat.firebaseIO-demo.com/'
-  use RC::DefaultHeaders, {'Accept' => 'application/json',
-                           'Content-Type' => 'application/json'}
-  use RC::DefaultQuery  , nil
-  use RC::JsonRequest   , true
-
-  use RC::Retry         , 0, RC::Retry::DefaultRetryExceptions
-  use RC::Timeout       , 10
-  use RC::FollowRedirect, 5
-  use RC::ErrorHandler  , lambda{ |env| RestFirebase::Error.call(env) }
-  use RC::ErrorDetectorHttp
-  use RC::JsonResponse  , true
-  use RC::CommonLogger  , nil
-  use RC::Cache         , nil, 600
-end
+RestFirebase =
+  RestCore::Builder.client(:d, :secret, :auth, :auth_ttl, :iat) do
+    use RestCore::DefaultSite   , 'https://SampleChat.firebaseIO-demo.com/'
+    use RestCore::DefaultHeaders, {'Accept' => 'application/json',
+                             'Content-Type' => 'application/json'}
+    use RestCore::DefaultQuery  , nil
+    use RestCore::JsonRequest   , true
+
+    use RestCore::Retry         , 0, RestCore::Retry::DefaultRetryExceptions
+    use RestCore::Timeout       , 10
+    use RestCore::FollowRedirect, 5
+    use RestCore::ErrorHandler  , lambda{|env| RestFirebase::Error.call(env)}
+    use RestCore::ErrorDetectorHttp
+    use RestCore::JsonResponse  , true
+    use RestCore::CommonLogger  , nil
+    use RestCore::Cache         , nil, 600
+  end
 
 class RestFirebase::Error < RestCore::Error
-  include RestCore
   class ServerError         < RestFirebase::Error; end
   class ClientError         < RestCore::Error; end
 
@@ -44,8 +46,9 @@ class RestFirebase::Error < RestCore::Error
   end
 
   def self.call env
-    error, code, url = env[RESPONSE_BODY], env[RESPONSE_STATUS],
-                       env[REQUEST_URI]
+    error, code, url = env[RestCore::RESPONSE_BODY],
+                       env[RestCore::RESPONSE_STATUS],
+                       env[RestCore::REQUEST_URI]
     return new(error, code, url) unless error.kind_of?(Hash)
     case code
       when 400; BadRequest
@@ -63,12 +66,10 @@ class RestFirebase::Error < RestCore::Error
 end
 
 module RestFirebase::Client
-  include RestCore
-
   class EventSource < RestCore::EventSource
     def onmessage event=nil, data=nil, sock=nil
       if event
-        super(event, Json.decode(data), sock)
+        super(event, RestCore::Json.decode(data), sock)
       else
         super
       end
@@ -77,12 +78,13 @@ module RestFirebase::Client
 
   def request env, a=app
     check_auth
-    query = env[REQUEST_QUERY].inject({}) do |q, (k, v)|
-      q[k] = Json.encode(v)
+    query = env[RestCore::REQUEST_QUERY].inject({}) do |q, (k, v)|
+      q[k] = RestCore::Json.encode(v)
       q
     end
-    super(env.merge(REQUEST_PATH => "#{env[REQUEST_PATH]}.json",
-                    REQUEST_QUERY => query), a)
+    super(env.merge(RestCore::REQUEST_PATH =>
+                      "#{env[RestCore::REQUEST_PATH]}.json",
+                    RestCore::REQUEST_QUERY => query), a)
   end
 
   def generate_auth opts={}
@@ -93,9 +95,10 @@ module RestFirebase::Client
     header = {:typ => 'JWT', :alg => 'HS256'}
     claims = {:v => 0, :iat => iat, :d => d}.merge(opts)
     # http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-26
-    input = [header, claims].map{ |d| base64url(Json.encode(d)) }.join('.')
+    input = [header, claims].map{ |d| base64url(RestCore::Json.encode(d)) }.
+            join('.')
     # http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-20
-    "#{input}.#{base64url(Hmac.sha256(secret, input))}"
+    "#{input}.#{base64url(RestCore::Hmac.sha256(secret, input))}"
   end
 
   def query

data/rest-firebase.gemspec

@@ -1,50 +1,50 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-firebase 1.0.3 ruby lib
+# stub: rest-firebase 1.1.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "rest-firebase"
-  s.version = "1.0.3"
+  s.name = "rest-firebase".freeze
+  s.version = "1.1.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
   s.authors = [
-  "Codementor",
-  "Lin Jen-Shin (godfat)"]
-  s.date = "2015-11-16"
-  s.description = "Ruby Firebase REST API client built on top of [rest-core][].\n\n[rest-core]: https://github.com/godfat/rest-core"
-  s.email = ["help@codementor.io"]
+  "Codementor".freeze,
+  "Lin Jen-Shin (godfat)".freeze]
+  s.date = "2016-02-04"
+  s.description = "Ruby Firebase REST API client built on top of [rest-core][].\n\n[rest-core]: https://github.com/godfat/rest-core".freeze
+  s.email = ["help@codementor.io".freeze]
   s.files = [
-  ".gitignore",
-  ".gitmodules",
-  ".travis.yml",
-  "CHANGES.md",
-  "Gemfile",
-  "LICENSE",
-  "README.md",
-  "Rakefile",
-  "TODO.md",
-  "doc/intro.md",
-  "example/daemon.rb",
-  "lib/rest-firebase.rb",
-  "rest-firebase.gemspec",
-  "task/README.md",
-  "task/gemgem.rb",
-  "test/test_api.rb"]
-  s.homepage = "https://github.com/CodementorIO/rest-firebase"
-  s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.5.0"
-  s.summary = "Ruby Firebase REST API client built on top of [rest-core][]."
-  s.test_files = ["test/test_api.rb"]
+  ".gitignore".freeze,
+  ".gitmodules".freeze,
+  ".travis.yml".freeze,
+  "CHANGES.md".freeze,
+  "Gemfile".freeze,
+  "LICENSE".freeze,
+  "README.md".freeze,
+  "Rakefile".freeze,
+  "TODO.md".freeze,
+  "doc/intro.md".freeze,
+  "example/daemon.rb".freeze,
+  "lib/rest-firebase.rb".freeze,
+  "rest-firebase.gemspec".freeze,
+  "task/README.md".freeze,
+  "task/gemgem.rb".freeze,
+  "test/test_api.rb".freeze]
+  s.homepage = "https://github.com/CodementorIO/rest-firebase".freeze
+  s.licenses = ["Apache License 2.0".freeze]
+  s.rubygems_version = "2.5.2".freeze
+  s.summary = "Ruby Firebase REST API client built on top of [rest-core][].".freeze
+  s.test_files = ["test/test_api.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 3.5.0"])
+      s.add_runtime_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
     else
-      s.add_dependency(%q<rest-core>, [">= 3.5.0"])
+      s.add_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 3.5.0"])
+    s.add_dependency(%q<rest-core>.freeze, [">= 4.0.0"])
   end
 end

data/test/test_api.rb

@@ -1,9 +1,10 @@
 
 require 'rest-firebase'
-require 'rest-core/test'
+require 'rest-builder/test'
 
 Pork::API.describe RestFirebase do
   before do
+    stub_select_for_stringio
     stub(Time).now{ Time.at(86400) }
   end
 
@@ -74,6 +75,7 @@ SSE
   end
 
   would 'refresh token' do
+    firebase # initialize http-client first (it's using Time.now too)
     mock(Time).now{ Time.at(0) }
     auth, query = firebase.auth, firebase.query
     query[:auth].should.eq auth

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-firebase
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Codementor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.0
 description: |-
   Ruby Firebase REST API client built on top of [rest-core][].
 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby Firebase REST API client built on top of [rest-core][].