iprofiler 0.1.0 → 0.1.1

data/lib/iprofiler/client.rb

@@ -9,34 +9,46 @@ module Iprofiler
   class Client
     include Api::QueryMethods
 
-    attr_accessor :api_key, :api_secret, :api_host
+    CONNECTION_PARAMETERS = [:api_key, :api_secret, :api_host]
+    attr_reader :api_key, :api_secret, :api_host, :missing_credentials
+
+    CONNECTION_PARAMETERS.each do |attr|
+      define_method "#{attr}=" do | val |
+        instance_variable_set("@#{attr}", val).tap do |v|
+          validate_credential_presence
+        end
+      end
+    end
 
     def initialize(api_key=Iprofiler.api_key, api_secret=Iprofiler.api_secret, api_host=Iprofiler.api_host)
       @api_key = api_key
       @api_secret = api_secret
       @api_host = api_host
+      validate_credential_presence
     end
 
     def valid_credentials?
-      company_lookup({}).code == 200
+      credentials_present? && (company_lookup({}).code == 200)
     end
 
   protected
 
+    def credentials_present?
+      missing_credentials.size == 0
+    end
+
+    def credentials_missing?
+      !credentials_present?
+    end
+
+    def validate_credential_presence
+      @missing_credentials = CONNECTION_PARAMETERS.select{ |attr| send(attr).nil?}
+    end
+
     def get(api_path, options)
-      response = Net::HTTP.get_response(request_uri(api_path, options))
-      Mash.from_json(response.body).tap do |reply|
-        code = response.code.to_i
-        reply.code = code
-        if code == 200
-          reply.status = reply.status.to_sym
-        else
-          reply.status = :error
-        end
-        # email requests are served by Leadiq server
-        email = options['email'] || options[:email]
-        reply.email = email unless email.nil?
-      end
+      return credentials_missing_error if credentials_missing?
+      http_reply = Net::HTTP.get_response(request_uri(api_path, options))
+      construct_reply(http_reply, options)
     end
 
   private
@@ -64,6 +76,30 @@ module Iprofiler
       )
     end
 
+    def credentials_missing_error
+      return Mash.new.tap do |reply|
+        reply.status = :error
+        reply.code = 400
+
+        missing = CONNECTION_PARAMETERS.none?{ |attr| send(attr).nil?}
+        reply.error = "Invalid or missing API connection parameter(s)[#{missing_credentials.join(",")}]"
+      end
+    end
+
+    def construct_reply(response, options)
+      Mash.from_json(response.body).tap do |reply|
+        code = response.code.to_i
+        reply.code = code
+        if code == 200
+          reply.status = reply.status.to_sym
+        else
+          reply.status = :error
+        end
+        # email requests are served by Leadiq server
+        email = options['email'] || options[:email]
+        reply.email = email unless email.nil?
+      end
+    end
   end
 
 end

data/lib/iprofiler/version.rb

@@ -3,7 +3,7 @@ module Iprofiler
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/spec/cases/api_spec.rb

@@ -55,6 +55,7 @@ describe Iprofiler::Api do
         client.api_host.should eq(new_api_host)
       end
 
+
     end
   end
 
@@ -68,6 +69,12 @@ describe Iprofiler::Api do
       client.api_key = "DUMMY KEY"
       client.valid_credentials?.should eq(false)
     end
+
+    it "empty authentication parameters should not be allowed" do
+      client.api_key = nil
+      reply = client.company_lookup({})
+      reply.status.should eq(:error)
+    end
   end
 
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iprofiler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: