lib/rapidash/http_client.rb in rapidash-0.0.4 vs lib/rapidash/http_client.rb in rapidash-0.0.5

@@ -1,33 +1,54 @@
 require 'faraday'
 
 module Rapidash
   module HTTPClient
 
-    attr_accessor :site, :extension
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    attr_accessor :extension, :site
     attr_writer :connection
 
-    def site=(value)
+    def initialize
+    end
+
+    def site=(site)
+      @site = site
       @connection = nil
-      @site = value
     end
 
     def connection
-      @connection ||= Faraday.new(site)
+      @connection ||= Faraday.new(site || self.class.site_url)
     end
 
     def request(verb, url, options = {})
-      url = "#{url}.#{extension}" if extension
+      if extension
+        url = "#{url}.#{(extension)}"
+      elsif self.class.respond_to?(:url_extension) && self.class.url_extension
+        url = "#{url}.#{(self.class.url_extension)}"
+      end
       url = connection.build_url(url, options[:params]).to_s
       response = connection.run_request(verb, url, options[:body], options[:header])
 
       # "foo"[0] does not work in 1.8.7, "foo"[0,1] is required
       case response.status.to_s[0,1]
       #Handle redirects
       when "3"
         request(verb, response.headers["location"], options)
       when "2"
         return Response.new(response)
+      end
+    end
+
+
+
+    module ClassMethods
+      attr_accessor :site_url
+
+      def site(site)
+        @site_url = site
       end
     end
   end
 end