firebase 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f4d0e635f2b61323e742ed14dffca10ef4507ea
-  data.tar.gz: feb3f0741ff08578e52d78f5396012c0b0f4ab76
+  metadata.gz: e864ba62615c80fdea3df462d52ff16f0a05581b
+  data.tar.gz: f92180ed3c2af45cdec10d0c0342a05079727b58
 SHA512:
-  metadata.gz: b7330bf19b01c9631ca5c181248907a5f4fa8faafe1db2ce85f23eb5c63b5317b41f13a4eca104c58fd8c96534ff5014dc3b86dfa53e45aa0c7fbe86950f382e
-  data.tar.gz: e30401898c34f104c7c4a4b6257f96eb4a6e0e090c64b7488e0eb02f3df2241061d30d73607d7fa4dfdd7b9fc4faa57d28f5e661f301c0a83f84790cbaaa4056
+  metadata.gz: 63f404aa8ed4b8f69baebeb5dc3043fd3f7bec1916dd9c1bb51e4690225e7908dad5807a732da525b8b365d2c43467079ff9626e658eb645f911b2e566dcf769
+  data.tar.gz: 7bdbd22fffb2c1ebb2362db13f2b7e01d13303c56d365e806f8073c8422699024a03fc2da4c2f9c6d283f4242aaca4478eefecc6b9db82d18a1fb3d7aeed32c9

data/.travis.yml

@@ -0,0 +1,8 @@
+sudo: false
+language: ruby
+rvm:
+ - "1.8.7"
+ - "1.9.3"
+ - "2.1.5"
+ - "2.2.3"
+bundler_args: --without utility

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.5
+
+* [Refactor to remove Request proxy class, expose http client](https://github.com/oscardelben/firebase-ruby/commit/138b1e1461ff33da506b0d7992b42e3544be9cf1)
+
 ## 0.2.4
 
 * Add support for server timestamp. 

data/Gemfile

@@ -9,6 +9,11 @@ gem 'json'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec"
-  gem "jeweler"
+  gem 'rake'
+  gem 'rdoc'
+  gem 'rspec'
+end
+
+group :utility do
+  gem 'jeweler'
 end

data/Gemfile.lock

@@ -1,25 +1,25 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.8)
     builder (3.2.2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    faraday (0.9.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
-    github_api (0.11.3)
+    git (1.2.9.1)
+    github_api (0.13.0)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.1)
+      descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 1.2)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6.6)
       oauth2
-    hashie (2.1.1)
-    highline (1.6.21)
-    httpclient (2.5.3.3)
+    hashie (3.4.3)
+    highline (1.7.8)
+    httpclient (2.7.0.1)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -29,34 +29,37 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.3)
-    multi_json (1.9.3)
+    json (1.8.3)
+    jwt (1.5.2)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.6.4)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.1)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    thread_safe (0.3.3)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (4.2.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -65,4 +68,6 @@ DEPENDENCIES
   httpclient
   jeweler
   json
+  rake
+  rdoc
   rspec

data/README.md

@@ -1,4 +1,4 @@
-# firebase
+# firebase [![Build Status](https://travis-ci.org/oscardelben/firebase-ruby.svg?branch=master)](https://travis-ci.org/oscardelben/firebase-ruby)
 
 Ruby wrapper for the [Firebase REST API](https://www.firebase.com/docs/rest/api/).
 

data/Rakefile

@@ -11,19 +11,22 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "firebase"
-  gem.homepage = "http://github.com/oscardelben/firebase-ruby"
-  gem.license = "MIT"
-  gem.summary = %Q{Firebase wrapper for Ruby}
-  gem.description = %Q{Firebase wrapper for Ruby}
-  gem.email = "info@oscardelben.com"
-  gem.authors = ["Oscar Del Ben"]
-  # dependencies defined in Gemfile
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+    gem.name = "firebase"
+    gem.homepage = "http://github.com/oscardelben/firebase-ruby"
+    gem.license = "MIT"
+    gem.summary = %Q{Firebase wrapper for Ruby}
+    gem.description = %Q{Firebase wrapper for Ruby}
+    gem.email = "info@oscardelben.com"
+    gem.authors = ["Oscar Del Ben"]
+    # dependencies defined in Gemfile
+  end
+  Jeweler::RubygemsDotOrgTasks.new
+rescue LoadError
 end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/firebase.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: firebase 0.2.5 ruby lib
+# stub: firebase 0.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "firebase"
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Oscar Del Ben"]
-  s.date = "2015-11-18"
+  s.date = "2015-11-26"
   s.description = "Firebase wrapper for Ruby"
   s.email = "info@oscardelben.com"
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
@@ -47,19 +48,22 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/lib/firebase.rb

@@ -30,7 +30,7 @@ module Firebase
 
     # Returns the data at path
     def get(path, query={})
-      process :get, path, query
+      process :get, path, nil, query
     end
 
     # Writes the data, returns the key name of the data added
@@ -41,7 +41,7 @@ module Firebase
 
     # Deletes the data at path and returs true
     def delete(path, query={})
-      process :delete, path, query
+      process :delete, path, nil, query
     end
 
     # Write the data at path but does not delete ommited children. Returns the data
@@ -55,7 +55,7 @@ module Firebase
     def process(verb, path, data=nil, query={})
       Firebase::Response.new @request.request(verb, "#{path}.json", {
         :body             => (data && data.to_json),
-        :query            => (auth ? { :auth => auth }.merge(query) : query),
+        :query            => (@auth ? { :auth => @auth }.merge(query) : query),
         :follow_redirect  => true
       })
     end

data/spec/firebase_spec.rb

@@ -21,17 +21,57 @@ describe "Firebase" do
 
   describe "set" do
     it "writes and returns the data" do
-      @firebase.should_receive(:process).with(:put, 'users/info', data, {})
+      expect(@firebase).to receive(:process).with(:put, 'users/info', data, {})
       @firebase.set('users/info', data)
     end
   end
 
   describe "get" do
     it "returns the data" do
-      @firebase.should_receive(:process).with(:get, 'users/info', {})
+      expect(@firebase).to receive(:process).with(:get, 'users/info', nil, {})
       @firebase.get('users/info')
     end
 
+    it "correctly passes custom ordering params" do
+      params = {
+        :orderBy => '"$key"',
+        :startAt => '"A1"'
+      }
+      expect(@firebase).to receive(:process).with(:get, 'users/info', nil, params)
+      @firebase.get('users/info', params)
+    end
+
+    it "works when run against real Firebase dataset" do
+      firebase = Firebase::Client.new 'https://dinosaur-facts.firebaseio.com'
+      response = firebase.get 'dinosaurs', :orderBy => '"$key"', :startAt => '"a"', :endAt => '"m"'
+      expect(response.body).to eq({
+        "bruhathkayosaurus" => {
+          "appeared" => -70000000,
+            "height" => 25,
+            "length" => 44,
+             "order" => "saurischia",
+          "vanished" => -70000000,
+            "weight" => 135000
+        },
+        "lambeosaurus" => {
+          "appeared" => -76000000,
+            "height" => 2.1,
+            "length" => 12.5,
+             "order" => "ornithischia",
+          "vanished" => -75000000,
+            "weight" => 5000
+        },
+        "linhenykus" => {
+          "appeared" => -85000000,
+            "height" => 0.6,
+            "length" => 1,
+             "order" => "theropoda",
+          "vanished" => -75000000,
+            "weight" => 3
+        }
+      })
+    end
+
     it "return nil if response body contains 'null'" do
       mock_response = double(:body => 'null')
       response = Firebase::Response.new(mock_response)
@@ -41,39 +81,39 @@ describe "Firebase" do
     it "return true if response body contains 'true'" do
       mock_response = double(:body => 'true')
       response = Firebase::Response.new(mock_response)
-      response.body.should eq(true)
+      expect(response.body).to eq(true)
     end
 
     it "return false if response body contains 'false'" do
       mock_response = double(:body => 'false')
       response = Firebase::Response.new(mock_response)
-      response.body.should eq(false)
+      expect(response.body).to eq(false)
     end
 
     it "raises JSON::ParserError if response body contains invalid JSON" do
       mock_response = double(:body => '{"this is wrong"')
       response = Firebase::Response.new(mock_response)
-      expect { response.body }.to raise_error
+      expect { response.body }.to raise_error(JSON::ParserError)
     end
   end
 
   describe "push" do
     it "writes the data" do
-      @firebase.should_receive(:process).with(:post, 'users', data, {})
+      expect(@firebase).to receive(:process).with(:post, 'users', data, {})
       @firebase.push('users', data)
     end
   end
 
   describe "delete" do
     it "returns true" do
-      @firebase.should_receive(:process).with(:delete, 'users/info', {})
+      expect(@firebase).to receive(:process).with(:delete, 'users/info', nil, {})
       @firebase.delete('users/info')
     end
   end
 
   describe "update" do
     it "updates and returns the data" do
-      @firebase.should_receive(:process).with(:patch, 'users/info', data, {})
+      expect(@firebase).to receive(:process).with(:patch, 'users/info', data, {})
       @firebase.update('users/info', data)
     end
   end
@@ -81,9 +121,9 @@ describe "Firebase" do
   describe "http processing" do
     it "sends custom auth" do
       firebase = Firebase::Client.new('https://test.firebaseio.com', 'secret')
-      firebase.request.should_receive(:request).with(:get, "todos.json", {
-        :body => {:foo => 'bar'}.to_json,
-        :query => {:auth => "secret"},
+      expect(firebase.request).to receive(:request).with(:get, "todos.json", {
+        :body => nil,
+        :query => {:auth => "secret", :foo => 'bar'},
         :follow_redirect => true
       })
       firebase.get('todos', :foo => 'bar')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebase
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Oscar Del Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -77,6 +91,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock