appush_client 0.5 → 0.6

data/appush_client.gemspec

@@ -2,16 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = 'appush_client'
-  s.version = '0.5'
+  s.version = '0.6'
 
   s.authors = ['Igor Guerrero']
-  s.date = '2010-01-09'
-  s.description = "Ruby client library for Appush PUSH service."
+  s.date = '2010-02-21'
+  s.description = 'Ruby client library for Appush PUSH service.'
   s.email = ['igor@appush.com']
-  s.homepage = 'http://appush.com'
+  s.homepage = 'http://github.com/APPush/Appush-Ruby-Client'
   s.files = ['appush_client.gemspec', 'CONTRIBUTORS', 'LICENSE', 'README.md', 'lib/appush_client.rb',
     'spec/appush_client_spec.rb']
-  s.summary = "Ruby client library for Appush PUSH service."
-
-  s.add_dependency 'rest-client', '>= 1.3.1'
+  s.summary = 'Ruby client library for Appush PUSH service.'
 end

data/lib/appush_client.rb

@@ -1,7 +1,4 @@
-#appush_client.rb
-
 require 'json'
-require 'rest_client'
 
 module AppushClient
   class AppushClient
@@ -12,93 +9,113 @@ module AppushClient
       @user = user
       @password = password
 
-      # cleaning params[:service_url], removing tailing "/"
-      params[:service_url] = clean_service_url(params[:service_url])
+      u = URI.parse(params[:service_url])
+      @http = Net::HTTP.new(u.host, u.port)
+      @http.use_ssl = true if u.scheme == 'https'
+      @path = u.path
+      @service_url = "#{u.scheme}://#@user:#@password@#{u.host}#{u.path}"
+    end
 
-      # http://xkcd.com/208/
-      @protocol = params[:service_url].match(/^https?:\/\//)[0] # match the protocol, http:// or https://
-      @url = params[:service_url].sub(/^https?:\/\//, '') # removes the protocol form the service
+    def post(path, body=nil, options={})
+      res = request(:post, path, body, options)
+      return res.body
+    end
 
-      @service_url = "#{@protocol}#{@user}:#{@password}@#{@url}"
+    def put(path, body=nil, options={})
+      res = request(:put, path, body, options)
+      return res.body
     end
 
-    def to_s
-      "Server = #{@service_url}"
+    def delete(path, options={})
+      res = request(:delete, path, nil, options)
+      return res.body
     end
 
-    private
+    def get(path, options={})
+      res = request(:get, path, nil, options)
+      return res.body
+    end
 
-    def clean_service_url(service_url)
-      while !service_url.match(/\/$/).nil?
-        service_url = service_url.sub(/\/$/, '')
+    def request(method, path, body, options)
+      options = {:content_type=>'application/json'}.merge(options)
+      req = case method
+      when :get
+        Net::HTTP::Get.new("#@path#{path}")
+      when :post
+        Net::HTTP::Post.new("#@path#{path}")
+      when :put
+        Net::HTTP::Put.new("#@path#{path}")
+      when :delete
+        Net::HTTP::Delete.new("#@path#{path}")
       end
+      req.basic_auth @user, @password
+      req.content_type = options[:content_type]
+      req.body = body
+      res = @http.request(req)
+      check_for_error(res)
+    end
+
+    def check_for_error(res)
+      case res.code
+      when /^(4|5)/
+        raise AppushClient.const_set(res.class.to_s.split('::').last, Class.new(StandardError))
+      else
+        return res
+      end
+    end
 
-      service_url
+    def to_s
+      "Server = #{@service_url}"
     end
   end
 
   class RootUser < AppushClient
     # POST
     def create_application(name, env="dev", dev_pem="", prod_pem="")
-      url = "#{@service_url}/application"
       data = {:name=>name, :env=>env, :dev_pem=>dev_pem, :prod_pem=>prod_pem}.to_json
-
-      RestClient.post url, data, :content_type=>:json, :accept=>:json
+      post "/application", data
     end
 
     # PUT
     # parameters are optional: :name, :env, :dev_pem, :prod_pem
     def modify_application(id, params={})
-      url = "#{@service_url}/application/#{id}"
       data = Hash.new
-
       data[:name] = params[:name] if params[:name]
       data[:env] = params[:env] if params[:env]
       data[:dev_pem] = params[:dev_pem] if params[:dev_pem]
       data[:prod_pem] = params[:prod_pem] if params[:prod_pem]
 
       data = data.to_json
-      RestClient.put url, data, :content_type=>:json, :accept=>:json
+      put "/application/#{id}", data
     end
 
     # GET
     def list_applications()
-      url = "#{@service_url}/application"
-
-      RestClient.get url, :content_type=>:json, :accept=>:json
+      get "/application"
     end
 
     # GET <id>
     def get_application(id)
-      url = "#{@service_url}/application/#{id}"
-
-      RestClient.get url, :content_type=>:json, :accept=>:json
+      get "/application/#{id}"
     end
 
     # GET application/<id>/icon
     def get_application_icon(id)
-      url = "#{@service_url}/application/#{id}/icon"
-
-      RestClient.get url, :content_type=>"image/png", :accept=>"image/png"
+      get "/application/#{id}/icon", :content_type=>"image/png"
     end
 
     # PUT application/<id>/icon
     def save_application_icon(app_id, icon)
-      url = "#{@service_url}/application/#{app_id}/icon"
-
-      RestClient.put url, icon, :content_type=>"image/png"
+      put "/application/#{app_id}/icon", icon, :content_type=>"image/png"
     end
 
     # DELETE <id>
     def delete_application(id)
-      url = "#{@service_url}/application/#{id}"
-
-      RestClient.delete url, :content_type=>:json, :accept=>:json
+      delete "/application/#{id}"
     end
 
     # POST <id> send notification
     def send_notification(app_id, params={})
-      url = "#{@service_url}/application/#{app_id}/notification"
       params = {:tags=>[], :devices=>[], :exclude=>[], :alert=>"", :sound=>"", :badge=>0, :kv=>[]}.merge params
 
       payload = {"aps"=>{"alert"=>params[:alert],
@@ -110,55 +127,43 @@ module AppushClient
               "exclude"=>params[:exclude]}.merge payload
       data = data.to_json
 
-      RestClient.post url, data, :content_type=>:json, :accept=>:json
+      post "/application/#{app_id}/notification", data
     end
 
     # GET get notification status
     def get_notification_status(app_id, notification_id)
-      url = "#{@service_url}/application/#{app_id}/notification/#{notification_id}"
-
-      RestClient.get url, :content_type=>:json, :accept=>:json
+      get "/application/#{app_id}/notification/#{notification_id}"
     end
 
     # GET all the devices with a tag
     def get_devices_by_tag(app_id, tag)
-      url = "#{@service_url}/application/#{app_id}/tag/#{tag}"
-
-      RestClient.get url, :content_type=>:json, :accept=>:json
+      get "/application/#{app_id}/tag/#{tag}"
     end
   end
 
   class Profile < AppushClient
     # GET device info
     def get_device(device_token)
-      url = "#{@service_url}/device/#{device_token}"
-
-      RestClient.get url, :content_type=>:json, :accept=>:json
+      get "/device/#{device_token}"
     end
 
     # PUT register a device with tags
     def register_device(device_token, tags=[])
-      url = "#{@service_url}/device/#{device_token}"
-
       data = {:tags=>tags}.to_json
 
-      RestClient.put url, data, :content_type=>:json, :accept=>:json
+      put "/device/#{device_token}", data
     end
 
     # DELETE unregister device
     def unregister_device(device_token)
-      url = "#{@service_url}/device/#{device_token}"
-
-      RestClient.delete url, :content_type=>:json, :accept=>:json
+      delete "/device/#{device_token}"
     end
   end
 
   class Application < AppushClient
     # POST
     def create_profile()
-      url = "#{@service_url}/profile"
-
-      RestClient.post url, "".to_json, :content_type=>:json, :accept=>:json
+      post "/profile", "{}"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appush_client
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  version: "0.6"
 platform: ruby
 authors: 
 - Igor Guerrero
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 -05:00
+date: 2010-02-21 00:00:00 -05:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.3.1
-    version: 
+dependencies: []
+
 description: Ruby client library for Appush PUSH service.
 email: 
 - igor@appush.com
@@ -39,7 +30,7 @@ files:
 - lib/appush_client.rb
 - spec/appush_client_spec.rb
 has_rdoc: true
-homepage: http://appush.com
+homepage: http://github.com/APPush/Appush-Ruby-Client
 licenses: []
 
 post_install_message: