hookercookerman-amee 0.1.6 → 0.1.8

data/amee.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee}
-  s.version = '0.1.6'
+  s.version = '0.1.8'
   
   s.homepage = 'http://github.com/hookercookerman/amee/tree/master'
   s.description = %q{Its a gem to interact with the amee api}

data/features/config.feature

@@ -12,9 +12,9 @@ Feature: Amee can be configured
     And the amee config: "cache" should be: "true"
     
   Scenario: server should be changed if I set a config with new server
-    When I set the: "server" on the amee config with: "prod.amee.com"
+    When I set the: "logging" on the amee config with: "false"
 
-    Then the amee config: "server" should be: "prod.amee.com"
+    Then the amee config: "logging" should be: "false"
     And the amee config: "cache_store" should be: "Moneta::Memory"
     And the amee config: "cache" should be: "true"
   

data/lib/amee/service.rb

@@ -2,7 +2,6 @@ require 'net/http'
 module Amee
   class Service
     include HTTParty
-    base_uri Amee::Config[:server]
     format :json
     
     attr_accessor :auth_token
@@ -12,27 +11,29 @@ module Amee
     end
     
     def post(method, path, options = {})
-      perform_request(:post, method, path, options)
+      perform_request(:post, method, full_path(path), options)
     end
     
     def get(method, path, options = {})
-      perform_request(:get, method, path, options)
+      perform_request(:get, method,full_path(path), options)
     end
     
     def put(method, path, options = {})
-      perform_request(:put, method, path, options)
+      perform_request(:put, method, full_path(path), options)
     end
     
     def delete(method, path, options = {})
-      perform_request(:delete, method, path, options)
+      perform_request(:delete, method, full_path(path), options)
     end
     
     def self.auth_token(username, password, path)
       response = Net::HTTP.post_form(
-        URI.parse(self.base_uri + path),
+        URI.parse("http://#{Amee::Config[:server]}#{path}"),
         {'username'=> username, 'password'=>password}
       )
       response['authToken']
+    rescue Errno::ECONNREFUSED, SocketError
+      raise Amee::Session::ServerNotFound, "Amee Server could not be found"
     end
     
     private
@@ -43,6 +44,8 @@ module Amee
       response = self.class.send(type, path, options)
       check_response(response.code)
       Parser.parse(method, response)
+    rescue Errno::ECONNREFUSED, SocketError
+      raise Amee::Session::ServerNotFound, "Amee Server could not be found"
     end
     
     def attach_headers(options)
@@ -54,6 +57,13 @@ module Amee
       )
     end
     
+    # using the config instead of base_uri as onces its set its set
+    # Also https as well if needed
+    # same for the format but I dont care about XML
+    def full_path(path)
+      "http://#{Amee::Config[:server]}#{path}"
+    end
+    
     # checking the status code of the response; if we are not authenticated
     # then authenticate the session
     #

data/lib/amee/session.rb

@@ -6,6 +6,7 @@ module Amee
     class NotAuthenticated < StandardError; end
     class PermissionDenied < StandardError; end
     class NotFound < StandardError; end
+    class ServerNotFound < StandardError; end
     class UnknownError < StandardError; end
     attr_accessor :auth_token, :cache, :service
     

data/lib/amee.rb

@@ -36,5 +36,5 @@ require "amee/profile_api/profile_category"
 require "amee/profile_api/profile"
 
 module Amee
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hookercookerman-amee
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors: 
 - Richard Hooker