five_mobile_push 0.4.5 → 0.4.6

data/Gemfile

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

data/lib/five_mobile_push/client.rb

@@ -1,25 +1,16 @@
 require 'uri'
-require 'faraday/errors'
+require 'faraday'
 
 module FiveMobilePush
   class Client
 
     DEFAULT_ENDPOINT = 'https://push.fivemobile.com/rest'
 
-    attr_accessor :application_uid, :api_token, :adapter
+    attr_accessor :application_uid, :api_token
 
     def initialize(options={})
       self.application_uid = options[:application_uid] || FiveMobilePush.application_uid
       self.api_token = options[:api_token]             || FiveMobilePush.api_token
-      self.adapter = options[:adapter]                 || FiveMobilePush.adapter
-    end
-
-
-    def connection
-      @connection ||= Faraday.new(:url => DEFAULT_ENDPOINT, :user_agent => 'FiveMobilePush Ruby gem') do |builder|
-        builder.adapter self.adapter
-        builder.use Faraday::Response::Errors
-      end
     end
 
     def get(path, options={})
@@ -42,25 +33,19 @@ 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={})
         options.merge!({:api_token => self.api_token, :application_id =>  self.application_uid })
-        connection.send(method) do |request|
-          case method
-          when :get, :delete
-            request.url(path, options)
-          when :post, :put
-            request.path = path
-            request.body = options
-          end
+
+        uri = [DEFAULT_ENDPOINT, path].join('/')
+
+        case method
+        when :get
+          Faraday.get(uri, options)
+        when :post
+          Faraday.post(uri, options)
         end
       end
-
   end
 end

data/lib/five_mobile_push/version.rb

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

data/spec/five_mobile_push/client_spec.rb

@@ -7,21 +7,16 @@ describe FiveMobilePush::Client do
 
   subject { FiveMobilePush::Client.new :api_token => api_token, :application_uid => application_uid }
 
-  it "connects using the fivemobile endpoint" do
-    connection = subject.send(:connection).build_url(nil).to_s
-    connection.should == described_class.default_endpoint.to_s
-  end    
-  
   describe "#device" do
-    
+
     it "initializes a Device" do
       subject.device('abc').should be_kind_of(FiveMobilePush::Device)
     end
-    
-  end  
-  
+
+  end
+
   describe "#notifier" do
-    
+
     it "initializes a Notifier" do
       subject.notifier.should be_kind_of(FiveMobilePush::Notifier)
     end
@@ -35,46 +30,37 @@ describe FiveMobilePush::Client do
     end
 
   end
-  
+
   context "response code is 400" do
-    
-    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
-    
+
+    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)
       expect { subject.get(path) }.to raise_error(FiveMobilePush::GeneralError)
     end
-    
+
   end
-  
+
   context "response code is 401" do
-    
-    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
-    
+
+    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)
       expect { subject.get(path) }.to raise_error(FiveMobilePush::UnauthorizedError)
     end
-    
+
   end
-  
+
   context "response code is 500" do
-    
-    let(:path) { (described_class.default_endpoint + "some_endpoint?api_token=#{api_token}&application_id=#{application_uid}").to_s }
-    
+
+    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)
       expect { subject.get(path) }.to raise_error(FiveMobilePush::ServerError)
     end
-    
-  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

@@ -16,7 +16,7 @@ describe FiveMobilePush::Device do
       {
         :manufacturer => 'Apple',
         :model        => 'iPhone 4',
-        :platform     => 'iOS',
+        :platform     => 'iPhone OS',
         :platform_ver => 'iOS 4.3'
       }
     }
@@ -98,7 +98,7 @@ describe FiveMobilePush::Device do
   end
 
   def device_endpoint(name)
-    (FiveMobilePush::Client.default_endpoint + "device/#{name}").to_s
+    (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)
-    (FiveMobilePush::Client.default_endpoint + "notify/#{name}").to_s
+    (FiveMobilePush::Client::DEFAULT_ENDPOINT + "notify/#{name}").to_s
   end
 end

data/spec/five_mobile_push/tags_spec.rb

@@ -50,7 +50,7 @@ describe FiveMobilePush::Tag do
   end
 
   def tag_endpoint(name)
-    (FiveMobilePush::Client.default_endpoint + "tags/#{name}").to_s
+    (FiveMobilePush::Client::DEFAULT_ENDPOINT + "tags/#{name}").to_s
   end
 
 end

data/spec/integration/client_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+FiveMobilePush.configure do |config|
+  config.api_token        = ''
+  config.application_uid  = ''
+end
+
+describe FiveMobilePush::Client do
+  let(:device) { double('Device', id: 12345, uid: 'abcdef') }
+
+  let(:device_info) {
+    {
+      'manufacturer' => 'Apple',
+      'model'        => 'iPhone 4',
+      'platform'     => 'iPhone OS',
+      'platform_ver' => '4.3.2'
+    }
+  }
+
+  let(:reg_data) { 'cafebabe' }
+
+  subject { described_class.new }
+  
+  it "register device" do
+    expect {
+      subject.device(device.uid).register(device_info, reg_data)
+    }.to_not raise_error
+  end
+end

data/spec/spec_helper.rb

@@ -1,10 +1,12 @@
 require 'five_mobile_push'
 require 'rspec'
-require 'webmock/rspec'
+# require 'webmock/rspec'
 require 'yajl'
 require 'uri'
 require 'fabrication'
 
+require 'ruby-debug'
+
 RSpec.configure do |config|
   config.mock_with :rspec
 end

metadata

@@ -2,7 +2,7 @@
 name: five_mobile_push
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Kevin Faustino
@@ -143,6 +143,7 @@ files:
 - spec/five_mobile_push/tags_spec.rb
 - spec/five_mobile_push_spec.rb
 - spec/fixtures/register.json
+- spec/integration/client_spec.rb
 - spec/spec_helper.rb
 homepage: ""
 licenses: []
@@ -184,4 +185,5 @@ test_files:
 - spec/five_mobile_push/tags_spec.rb
 - spec/five_mobile_push_spec.rb
 - spec/fixtures/register.json
+- spec/integration/client_spec.rb
 - spec/spec_helper.rb