firebase 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e0fa541544ab3358d0fc06e917791916a5d9e1f
-  data.tar.gz: 12e96cf8448060ee5ae9d38a64c45f92fbe22842
+  metadata.gz: b144a7fbc2d7183897b257d55dc6d371c4d9c375
+  data.tar.gz: 551367963ea25efcb0dad36ad8e96deefc061305
 SHA512:
-  metadata.gz: 9620eed6c15a1214f24a12ecda7f6a351409c974dea0e2902b5b315731b8277e7c73d85c31e23cb938852ff562f4867d0a00fe0b85390851f74b1df1d7c59ef3
-  data.tar.gz: 4fa22a0d1a9a071ba7ec469feacf15860ad7dcc683c8d00755191b11cb170741ab4efb687b566ef04ab785d174723d56fa858bdfb27ca0c956041286b98e8031
+  metadata.gz: 93e12c2bbbec9255fda4a25388f0088b4d40768fb96489f276051dc05f9b18119f6761977f11c424221e6c625732db05113ec79391ce77c7c1c3cd2f2db89798
+  data.tar.gz: cd7eba8cf7d2729596585898b7796f51fd14b9b1080380ea2db2fbaf16b510ad26d0d48bdf3bd43f1e2e1bdc6a753167b8aa3ab279c93953ec7bd9298dca26f4

data/{CHANGELOG → CHANGELOG.md}

@@ -1,16 +1,23 @@
-- 0.2.2
+# Changelog
 
-Update dependencies
+## 0.2.3 (in development)
 
-- 0.2.1
+* Switch from problematic `typhoeus` client to `HTTPClient`
+* File permissions issue fix
+
+## 0.2.2
+
+* Update dependencies
+
+## 0.2.1
 
 * Fix auth parse exception
 
-- 0.2.0
+## 0.2.0
 
 * You can now pass query options to get/push/set, etc.
 * The old syntax no longer works. You now need to create instance variables of Firebase::Client.new(...)
 
-- 0.1.6
+## 0.1.6
 
 * You can now create instances of Firebase. The old syntax still works but will be removed in version 0,2. - @wannabefro

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'typhoeus', ">= 0.6.1"
+gem 'httpclient'
 gem 'json'
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -6,11 +6,8 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    ethon (0.7.0)
-      ffi (>= 1.3.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
     git (1.2.6)
     github_api (0.11.3)
       addressable (~> 2.3)
@@ -22,6 +19,7 @@ GEM
       oauth2
     hashie (2.1.1)
     highline (1.6.21)
+    httpclient (2.5.3.3)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -59,14 +57,12 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
     thread_safe (0.3.3)
-    typhoeus (0.6.8)
-      ethon (>= 0.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  httpclient
   jeweler
   json
   rspec
-  typhoeus (>= 0.6.1)

data/README.md

@@ -1,6 +1,6 @@
 # firebase
 
-Ruby wrapper for the Firebase backend API.
+Ruby wrapper for the [Firebase REST API](https://www.firebase.com/docs/rest/api/).
 
 Changes are sent to all subscribed clients automatically, so you can
 update your clients **in realtime from the backend**.

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/firebase.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "firebase"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oscar Del Ben"]
-  s.date = "2014-05-03"
+  s.date = "2015-01-23"
   s.description = "Firebase wrapper for Ruby"
   s.email = "info@oscardelben.com"
   s.extra_rdoc_files = [
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    "CHANGELOG",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "lib/firebase.rb",
     "lib/firebase/request.rb",
     "lib/firebase/response.rb",
-    "spec/firebase_request_spec.rb",
     "spec/firebase_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -44,18 +43,18 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.6.1"])
+      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<typhoeus>, [">= 0.6.1"])
+      s.add_dependency(%q<httpclient>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<typhoeus>, [">= 0.6.1"])
+    s.add_dependency(%q<httpclient>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/lib/firebase.rb

@@ -1,20 +1,17 @@
+require 'uri'
+require 'firebase/request'
+require 'firebase/response'
+
 module Firebase
   class Client
-
-    require 'firebase/request'
-    require 'firebase/response'
-
-    def self.format_uri(other)
-      if other
-        other.end_with?("/") ? other : other + '/'
-      end
-    end
-
     attr_reader :auth, :request
 
     def initialize(base_uri, auth=nil)
-      uri = Firebase::Client.format_uri(base_uri)
-      @request = Firebase::Request.new(uri)
+      if base_uri !~ URI::regexp(%w(https))
+        raise ArgumentError.new('base_uri must be a valid https uri')
+      end
+      base_uri += '/' unless base_uri.end_with?('/')
+      @request = Firebase::Request.new(base_uri)
       @auth = auth
     end
 

data/lib/firebase/request.rb

@@ -1,15 +1,11 @@
-require 'typhoeus'
+require 'httpclient'
 require 'json'
-require 'open-uri'
-require 'uri'
 
 module Firebase
   class Request
-
-    attr_reader :base_uri
-
     def initialize(base_uri)
-      @base_uri = base_uri
+      @client = HTTPClient.new(base_url: base_uri)
+      @client.default_header['Content-Type'] = 'application/json'
     end
 
     def get(path, query_options)
@@ -32,25 +28,11 @@ module Firebase
       process(:patch, path, value.to_json, query_options)
     end
 
-    def build_url(path)
-      path = "#{path}.json"
-      url = URI.join(base_uri, path)
-
-      url.to_s
-    end
-
     private
 
     def process(method, path, body=nil, query_options={})
-      @@hydra ||= Typhoeus::Hydra.new
-      request = Typhoeus::Request.new(build_url(path),
-                                      :body => body,
-                                      :method => method,
-                                      :params => query_options)
-      @@hydra.queue(request)
-      @@hydra.run
-
-      Firebase::Response.new(request.response)
+      response = @client.request(method, "#{path}.json", body: body, query: query_options, follow_redirect: true)
+      Firebase::Response.new(response)
     end
   end
 end

data/lib/firebase/response.rb

@@ -1,6 +1,5 @@
 module Firebase
   class Response
-
     attr_accessor :response
 
     def initialize(response)
@@ -9,8 +8,6 @@ module Firebase
 
     def body
       JSON.parse(response.body, :quirks_mode => true)
-    rescue JSON::ParserError => e
-      response.body == 'null' ? nil : raise
     end
 
     def raw_body
@@ -18,11 +15,11 @@ module Firebase
     end
 
     def success?
-      [200, 204].include? response.code
+      [200, 204].include? response.status
     end
 
     def code
-      response.code
+      response.status
     end
   end
 end

data/spec/firebase_spec.rb

@@ -1,11 +1,20 @@
 require 'spec_helper'
 
 describe "Firebase" do
-
   let (:data) do
     { 'name' => 'Oscar' }
   end
 
+  describe "invalid uri" do
+    it "should raise on http" do
+      expect{ Firebase::Client.new('http://test.firebaseio.com') }.to raise_error(ArgumentError)
+    end
+
+    it 'should raise on empty' do
+      expect{ Firebase::Client.new('') }.to raise_error(ArgumentError)
+    end
+  end
+
   before do
     @firebase = Firebase::Client.new('https://test.firebaseio.com')
     @req = @firebase.request

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: firebase
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Oscar Del Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -87,7 +87,6 @@ files:
 - lib/firebase.rb
 - lib/firebase/request.rb
 - lib/firebase/response.rb
-- spec/firebase_request_spec.rb
 - spec/firebase_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/oscardelben/firebase-ruby

data/spec/firebase_request_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe "Firebase Request" do
-
-  describe "url_builder" do
-    before do
-      @req = req = Firebase::Request.new 'https://test.firebaseio.com'
-    end
-
-    it "should build the correct url when passed no path" do
-      @req.build_url(nil).should == 'https://test.firebaseio.com/.json'
-    end
-
-    it "should build the correct url when passed a path" do
-      req = Firebase::Request.new 'https://test.firebaseio.com'
-
-      @req.build_url('users/eugene').should == 'https://test.firebaseio.com/users/eugene.json'
-    end
-  end
-end