five_mobile_push 0.4.3 → 0.4.5

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm:
+  - 1.9.2
+script: bundle exec rspec spec

data/Gemfile

@@ -1,2 +1,7 @@
 source "http://rubygems.org"
 gemspec
+
+group :test do
+  gem "guard"
+  gem "guard-rspec"
+end

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/five_mobile_push.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "multi_json",              ["~> 1.0.0"]
-  s.add_dependency "faraday",                 ["~> 0.5.7"]
+  s.add_runtime_dependency "multi_json",      ["~> 1.0.0"]
+  s.add_runtime_dependency "faraday",         ["~> 0.7.3"]
+
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec",       ["~> 2.5.0"]
   s.add_development_dependency "yajl-ruby"
   s.add_development_dependency "webmock"

data/lib/faraday/errors.rb

@@ -4,28 +4,23 @@ require 'faraday'
 # is currently incomplete.
 module Faraday
   class Response::Errors < Response::Middleware
-
-    begin
-      def self.register_on_complete(env)
-        env[:response].on_complete do |finished_env|
-          case finished_env[:status]
+    def call(env)
+      @app.call(env).on_complete do
+        case env[:status]
           when 400
-            raise FiveMobilePush::GeneralError, finished_env[:body]
+            raise FiveMobilePush::GeneralError, response_values(env)
           when 401
-            raise FiveMobilePush::UnauthorizedError, finished_env[:body]
+            raise FiveMobilePush::UnauthorizedError, response_values(env)
           when 500
-            raise FiveMobilePush::ServerError, 'push.fivemobile.com is currently down'
-          end
+            env[:body] = 'push.fivemobile.com is currently down'
+            raise FiveMobilePush::ServerError, response_values(env)
         end
       end
-    rescue LoadError, NameError => e
-      self.load_error = e
     end
 
-    def initialize(app)
-      super
-      @parser = nil
+    # Copied from Faraday
+    def response_values(env)
+      { :status => env[:status], :headers => env[:response_headers], :body => env[:body] }
     end
-
   end
 end

data/lib/five_mobile_push/client.rb

@@ -1,9 +1,10 @@
+require 'uri'
 require 'faraday/errors'
 
 module FiveMobilePush
   class Client
 
-    DEFAULT_ENDPOINT = 'https://push.fivemobile.com/rest/'
+    DEFAULT_ENDPOINT = 'https://push.fivemobile.com/rest'
 
     attr_accessor :application_uid, :api_token, :adapter
 
@@ -41,6 +42,11 @@ module FiveMobilePush
       FiveMobilePush::Tag.new(self, device_uid)
     end
 
+    # @return [URI] a URI object for the {DEFAULT_ENDPOINT}
+    def self.default_endpoint
+      URI.parse(DEFAULT_ENDPOINT)
+    end
+
     private
 
       def perform_request(method, path, options={})

data/lib/five_mobile_push/version.rb

@@ -1,3 +1,3 @@
 module FiveMobilePush
-  VERSION = "0.4.3"
+  VERSION = "0.4.5"
 end

data/spec/five_mobile_push/client_spec.rb

@@ -9,8 +9,7 @@ describe FiveMobilePush::Client do
 
   it "connects using the fivemobile endpoint" do
     connection = subject.send(:connection).build_url(nil).to_s
-    endpoint = URI.parse(described_class::DEFAULT_ENDPOINT)
-    connection.should == endpoint.to_s
+    connection.should == described_class.default_endpoint.to_s
   end    
   
   describe "#device" do
@@ -39,7 +38,7 @@ describe FiveMobilePush::Client do
   
   context "response code is 400" do
     
-    let(:path) { "https://push.fivemobile.com/rest/some_endpoint?api_token=#{api_token}&application_id=#{application_uid}" }
+    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
     
     it "raises a GeneralError" do
       stub_request(:any, path).to_return(:body => "something broken", :status => 400)
@@ -50,7 +49,7 @@ describe FiveMobilePush::Client do
   
   context "response code is 401" do
     
-    let(:path) { "https://push.fivemobile.com/rest/some_endpoint?api_token=#{api_token}&application_id=#{application_uid}" }
+    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
     
     it "raises a GeneralError" do
       stub_request(:any, path).to_return(:body => "something broken", :status => 401)
@@ -61,7 +60,7 @@ describe FiveMobilePush::Client do
   
   context "response code is 500" do
     
-    let(:path) { "https://push.fivemobile.com/rest/some_endpoint?api_token=#{api_token}&application_id=#{application_uid}" }
+    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
     
     it "raises a GeneralError" do
       stub_request(:any, path).to_return(:body => "something broken", :status => 500)
@@ -70,4 +69,12 @@ describe FiveMobilePush::Client do
     
   end
 
+  describe '.default_endpoint' do
+    it { described_class.default_endpoint.should be_a(URI) }
+
+    it 'acts as a URI object' do
+      uri = described_class.default_endpoint + 'foo'
+      uri.to_s.should =~ /foo\z/
+    end
+  end
 end

data/spec/five_mobile_push/device_spec.rb

@@ -98,7 +98,7 @@ describe FiveMobilePush::Device do
   end
 
   def device_endpoint(name)
-    "https://push.fivemobile.com/rest/device/#{name}"
+    (FiveMobilePush::Client.default_endpoint + "device/#{name}").to_s
   end
 
 end

data/spec/five_mobile_push/notifier_spec.rb

@@ -52,6 +52,6 @@ describe FiveMobilePush::Notifier do
   end
 
   def notifier_endpoint(name)
-    "https://push.fivemobile.com/rest/notify/#{name}"
+    (FiveMobilePush::Client.default_endpoint + "notify/#{name}").to_s
   end
 end

data/spec/five_mobile_push/tags_spec.rb

@@ -49,11 +49,8 @@ describe FiveMobilePush::Tag do
 
   end
 
-  describe "#get" do
-  end
-
   def tag_endpoint(name)
-     "https://push.fivemobile.com/rest/device/tags/#{name}"
+    (FiveMobilePush::Client.default_endpoint + "tags/#{name}").to_s
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: five_mobile_push
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors: 
 - Kevin Faustino
@@ -11,8 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
-default_executable: 
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -33,64 +32,75 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.7
+        version: 0.7.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: fabrication
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.5
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.6.5
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: API wrapper for Five Mobile Push notification service
 email: 
 - kevin.faustino@gmail.com
@@ -104,8 +114,10 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - .yardopts
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - Rakefile
 - five_mobile_push.gemspec
@@ -132,7 +144,6 @@ files:
 - spec/five_mobile_push_spec.rb
 - spec/fixtures/register.json
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: ""
 licenses: []
 
@@ -156,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: five_mobile_push
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: API wrapper for Five Mobile Push notification service