served 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6caeaa76f12084ca80555e8bf472e9f85ebcae70
-  data.tar.gz: 006b93ac7370979237e29fffe4b49a70938684fe
+  metadata.gz: 20a3772be5d8a3b6c27909c4cb61c4bdd33fdb2c
+  data.tar.gz: 3bc802236bc9a3f77bdab3577bb917313fc29332
 SHA512:
-  metadata.gz: 9bc45c23b36761e2c2a24bb7fc295f75a807969455c02347acb74d3664de0eb865716b16da51e401bbe73a50fc1ab60fa6c898ec5e816c800d02092425770697
-  data.tar.gz: 51e0f9ceda390a79ee3da2b1fe071ca376bf3538506d7ce6092e327e51b313200a354521b697c7b8034554c5de04db5a7b01aa33f430006a7e16dccdf52a4abc
+  metadata.gz: 4b9c306b2e26bd19e0fdfef7ce4abd9c14172c2490030710613c44041787e3ae07ff8dd47d51975163eefa405dd0249cd43861bb115d8df3a9ba1471517b5973
+  data.tar.gz: 3f45537c4946005cf8e056db0d9832e95821ba21ce8c47c2edea36582c878eeb2bf186e56b0aff7fcbd535bb6fec79dbfd8bac04a0688140193a3a24487c5aae

data/.ruby-version

@@ -0,0 +1 @@
+2.4.0

data/.travis.yml

@@ -2,7 +2,8 @@ language: ruby
 rvm:
   - 2.1
   - 2.2.2
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
 before_install: gem install bundler -v 1.10.5
 
 gemfile:
@@ -13,4 +14,4 @@ gemfile:
 matrix:
   exclude:
     - gemfile: gemfiles/5.0.gemfile
-      rvm: 2.1
+      rvm: 2.1

data/CHANGELOG.md

@@ -1,11 +1,26 @@
 # Changelog
 
+## 0.2.0
+
+* new HTTP client backend functionality, ability to support multiple
+  HTTP backends
+* `headers` updated to merge, can be called multiple times, allows modularization
+* backend support for `HTTParty`, `HTTP`, and `Patron`
+* `host_config` method removed from `Support::Resource::Base`
+* update travis to test against  Ruby 2.4.0, Ruby 2.1.9, Ruby 2.3.2
+* various refactoring
+* add `validation_on_save` option to allow skipping validation on save
+* better configuration inheritance in resources
+* if using HTTParty as a backend `Errno::ECONNREFUSED` will no longer be returned for connection errors, 
+`Served::HTTPClient::ConnectionFailed` will be raised instead
+
 ## 0.1.12
  * add validation support
  * add serialization support
  * allow definition of individual attributes
  * add resource level `headers` option
- * `host_config` will be deprecated in 0.2.0
+ * add resource level `reasource_name` option
+ * add resource level `host` option, `host_config` will be deprecated in 0.2.0
  * add `Served::Attribute::Base` class
  
 ## 0.1.11

data/README.md

@@ -1,5 +1,5 @@
 # Served
-[![Build Status](https://travis-ci.org/optoro/served.svg)](https://travis-ci.org/optoro/served)
+[![Build Status](https://travis-ci.org/optoro/served.svg?branch=master)](https://travis-ci.org/optoro/served)
 [![Gem Version](https://badge.fury.io/rb/served.svg)](https://badge.fury.io/rb/served)
 
 Served is a gem in the vein of [ActiveResource](https://github.com/rails/activeresource) designed to facilitate
@@ -11,6 +11,7 @@ Add the following to your Gemfile:
 
 ```gem 'served'```
 
+Served supports Ruby versions `>= 2.1` and versions of Rails `>= 3.2`, including Rails 5.
 # Configuration
 Served is configured by passing a block to ```Served::configure```.
 
@@ -21,6 +22,8 @@ Served.configure do |config|
    }
    
    config.timeout = 100
+   
+   config.backend = :patron
 end
 ```
 
@@ -43,6 +46,10 @@ maintained for backwards compatibility, however the extension will likely be rem
 ## Timeout
 Sets the request timeout in milliseconds.
 
+## Backend
+Configure the HTTP client backend. Supports either :http (default), which will use the HTTP client, or :patron, which 
+will use Patron. Patron is suggested for use if high concurrency between requests is required. Also requires the 
+machine to have libcurl.
 
 # Defining a Resource
 A service model can be created by declaring a class inheriting from ```Service::Resource::Base```.

data/lib/served/attribute/base.rb

@@ -1,9 +1,13 @@
 module Served
   module Attribute
     class Base
-      include Support::Attributable
-      include Support::Serializable
-      include Support::Validatable
+      include Resource::Attributable
+      include Resource::Serializable
+      include Resource::Validatable
+
+      def initialize(*args)
+        # placeholder
+      end
     end
   end
 end

data/lib/served/backends/base.rb

@@ -0,0 +1,16 @@
+module Served
+  module Backends
+    class Base
+      delegate :headers, :resource, :template, :timeout, to: :@client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def serialize_response(response)
+        response
+      end
+
+    end
+  end
+end

data/lib/served/backends/http.rb

@@ -0,0 +1,49 @@
+require 'http'
+module Served
+  module Backends
+    #HTTP Backend uses {https://github.com/httprb/http HTTP} client library.
+    class HTTP < Base
+
+      def get(endpoint, id, params={})
+        response = ::HTTP
+            .timeout(global: timeout)
+            .headers(headers)
+            .get(template.expand(id: id, query: params, resource: endpoint).to_s)
+        serialize_response(response)
+      rescue ::HTTP::ConnectionError
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def put(endpoint, id, body, params={})
+        response = ::HTTP
+            .timeout(global: timeout)
+            .headers(headers)
+            .put(template.expand(id: id, query: params, resource: endpoint).to_s, body: body)
+        serialize_response(response)
+      rescue ::HTTP::ConnectionError
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def post(endpoint, body, params={})
+        response = ::HTTP
+            .timeout(global: timeout)
+            .headers(headers)
+            .post(template.expand(query: params, resource: endpoint).to_s, body: body)
+        serialize_response(response)
+      rescue ::HTTP::ConnectionError
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def delete(endpoint, id, params={})
+        response = ::HTTP
+            .timeout(global: timeout)
+            .headers(headers)
+            .delete(template.expand(query: params, resource: endpoint, id: id).to_s)
+        serialize_response(response)
+      rescue ::HTTP::ConnectionError
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+    end
+  end
+end

data/lib/served/backends/httparty.rb

@@ -0,0 +1,47 @@
+require 'httparty'
+module Served
+  module Backends
+    # HTTParty Backend uses the {https://github.com/jnunemaker/httparty HTTParty} client
+    class HTTParty < Base
+
+      def get(endpoint, id, params={})
+        ::HTTParty.get(template.expand(id: id, query: params, resource: endpoint).to_s,
+                       headers: headers,
+                       timeout: timeout
+        )
+      rescue Errno::ECONNREFUSED
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def put(endpoint, id, body, params={})
+        ::HTTParty.put(template.expand(id: id, query: params, resource: endpoint).to_s,
+                       body: body,
+                       headers: headers,
+                       timeout: timeout
+        )
+      rescue Errno::ECONNREFUSED
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def post(endpoint, body, params={})
+        ::HTTParty.post(template.expand(query: params, resource: endpoint).to_s,
+                        body: body,
+                        headers: headers,
+                        timeout: timeout
+        )
+      rescue Errno::ECONNREFUSED
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def delete(endpoint, id, params={})
+        ::HTTParty.delete(template.expand(id: id, query: params, resource: endpoint).to_s,
+                          headers: headers,
+                          timeout: timeout
+        )
+      rescue Errno::ECONNREFUSED
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+    end
+  end
+end

data/lib/served/backends/patron.rb

@@ -0,0 +1,45 @@
+require 'patron'
+module Served
+  module Backends
+    # Patron Backend uses {Patron https://github.com/toland/patron} for its client. This backend does not lock the GIL
+    # and is thread safe. Use Patron if you need high concurrency.
+    class Patron < Base
+
+      def get(endpoint, id, params={})
+        serialize_response(::Patron::Session.new(headers: headers, timeout: timeout)
+                               .get(template.expand(id: id, query: params, resource: endpoint).to_s))
+      rescue ::Patron::ConnectionFailed
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def put(endpoint, id, body, params={})
+        serialize_response(::Patron::Session.new(headers: headers, timeout: timeout)
+                               .put(template.expand(id: id, query: params, resource: endpoint).to_s, body))
+      rescue ::Patron::ConnectionFailed
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def post(endpoint, body, params={})
+        serialize_response(::Patron::Session.new(headers: headers, timeout: timeout)
+                               .post(template.expand(query: params, resource: endpoint).to_s, body))
+      rescue ::Patron::ConnectionFailed
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def delete(endpoint, id, params={})
+        serialize_response(::Patron::Session.new(headers: headers, timeout: timeout)
+                               .delete(template.expand(id: id, query: params, resource: endpoint).to_s))
+      rescue ::Patron::ConnectionFailed
+        raise Served::HTTPClient::ConnectionFailed.new(resource)
+      end
+
+      def serialize_response(response)
+        OpenStruct.new({
+                           body: response.body,
+                           code: response.status
+                       })
+      end
+
+    end
+  end
+end

data/lib/served/backends.rb

@@ -0,0 +1,21 @@
+require_relative 'backends/base'
+module Served
+  module Backends
+
+    # @private
+    def self.[](backend)
+      @backends ||= {
+        http:     'HTTP',
+        patron:   'Patron',
+        httparty: 'HTTParty'
+      }
+      if @backends[backend]
+        require_relative "backends/#{backend}"
+        return self.const_get(@backends[backend].classify.to_sym)
+      end
+      require_relative 'backends/httparty'
+      self.const_get(@backends[:httparty].classify.to_sym)
+    end
+
+  end
+end

data/lib/served/config.rb

@@ -0,0 +1,12 @@
+module Served
+  include ActiveSupport::Configurable
+  config_accessor :timeout
+  config_accessor :backend
+
+  configure do |config|
+    config.timeout = 30
+    config.backend = :http
+    config.hosts   = {}
+  end
+
+end

data/lib/served/http_client.rb

@@ -1,38 +1,29 @@
 require 'addressable/template'
 module Served
-  # Provides an interface between HTTParty and the models. Most of the crap in here is self explanatory
+  # Provides an interface between the HTTP client and the Resource.
   class HTTPClient
-    HEADERS = { 'Content-type' => 'application/json', 'Accept' => 'application/json' }
+
     DEFAULT_TEMPLATE = '{/resource*}{/id}.json{?query*}'
 
-    def initialize(host, timeout, headers={})
-      host += DEFAULT_TEMPLATE unless host =~ /{.+}/
-      @template = Addressable::Template.new(host)
-      @timeout  = timeout
-      @headers = HEADERS.merge(headers || {})
-    end
+    attr_reader :template, :resource
 
-    def get(endpoint, id, params={})
-      HTTParty.get(@template.expand(id: id, query: params, resource: endpoint).to_s,
-                   headers: @headers,
-                   timeout: @timeout
-      )
-    end
+    delegate :get, :put, :delete, :post, to: :@backend
+    delegate :headers, :timeout, :host,  to: :@resource
 
-    def put(endpoint, id, body, params={})
-      HTTParty.put(@template.expand(id: id, query: params, resource: endpoint).to_s,
-        body:    body,
-        headers: @headers,
-        timeout: @timeout
-      )
-    end
+    class ConnectionFailed < StandardError
 
-    def post(endpoint, body, params={})
-      HTTParty.post(@template.expand(query: params, resource: endpoint).to_s,
-        body:    body,
-        headers: @headers,
-        timeout: @timeout
-      )
+        def initialize(resource)
+          super "Resource #{resource.name} could not be reached on #{resource.host}"
+        end
+
+      end
+
+    def initialize(resource)
+      @resource = resource
+      h = host + @resource.template
+      @template = Addressable::Template.new(h)
+      @backend  = Served::Backends[Served.config.backend].new(self)
     end
+
   end
 end

data/lib/served/{support → resource}/attributable.rb

@@ -1,8 +1,13 @@
 module Served
-  module Support
+  module Resource
     module Attributable
       extend ActiveSupport::Concern
 
+      included do
+        prepend Prepend
+        singleton_class.prepend ClassMethods::Prepend
+      end
+
       module ClassMethods
 
         # declare an attribute for the resource
@@ -33,10 +38,31 @@ module Served
           @attributes ||= {}
         end
 
+        module Prepend
+
+          def inherited(subclass)
+            self.attributes.each do |name, options|
+              subclass.attribute name, options
+            end
+            super
+          end
+
+        end
+
       end
 
-      def initialize(options={})
-        reload_with_attributes(options)
+      module Prepend
+
+        def initialize(options={})
+          reload_with_attributes(options.symbolize_keys)
+          super options
+        end
+
+      end
+
+      # @return [Array] the keys for all the defined attributes
+      def attributes
+        Hash[self.class.attributes.keys.collect { |name| [name, send(name)] }]
       end
 
       private
@@ -56,12 +82,10 @@ module Served
       end
 
       def set_attribute(name, value)
-        raise InvalidAttributeError, "`#{name}' is not a valid attribute" unless self.class.attributes.include?(name)
         instance_variable_set("@#{name}", value)
       end
 
     end
 
-
   end
-end
+end

data/lib/served/resource/base.rb

@@ -1,3 +1,8 @@
+require_relative 'attributable'
+require_relative 'serializable'
+require_relative 'validatable'
+require_relative 'configurable'
+
 module Served
   module Resource
     # Service Resources should inherit directly from this class. Provides interfaces necessary for communicating with
@@ -12,34 +17,64 @@ module Served
     # A resource may also serialize values as specific classes, including nested resources. If serialize is set to a
     # Served Resource, it will validate the nested resource as well as the top level.
     class Base
-      include Support::Attributable
-      include Support::Validatable
-      include Support::Serializable
+      include Configurable
+      include Attributable
+      include Validatable
+      include Serializable
+
+      attribute :id
+
+      # Default headers for every request
+      HEADERS = {'Content-type' => 'application/json', 'Accept' => 'application/json'}
 
-      # raised when an attribute is passed to a resource that is not declared
-      class InvalidAttributeError < StandardError;
-      end
 
       # raised when the connection receives a response from a service that does not constitute a 200
       class ServiceError < StandardError
         attr_reader :response
 
-        def initialize(response)
+        def initialize(resource, response)
           @response = response
-          super "An error occurred making the request: #{@response.code}"
+          begin
+            error = JSON.parse(response.body)
+          rescue JSON::ParserError
+            super "Service #{resource.class.name} experienced an error and sent back an invalid error response"
+            return
+          end
+          super "Service #{resource.class.name} responded with an error: #{error['error']} -> #{error['exception']}"
+          set_backtrace(error['traces']['Full Trace'].collect {|e| e['trace']})
         end
       end
 
-      class << self
+      class_configurable :resource_name do
+        name.split('::').last.tableize
+      end
+
+      class_configurable :host do
+        Served.config[:hosts][parent.name.underscore.split('/')[-1]] || Served.config[:hosts][:default]
+      end
 
+      class_configurable :timeout do
+        Served.config.timeout
+      end
+
+      class_configurable :_headers do
+        HEADERS
+      end
+
+      class_configurable :template do
+        '{/resource*}{/id}.json{?query*}'
+      end
+
+      class << self
 
         # Defines the default headers that should be used for the request.
         #
         # @param headers [Hash] the headers to send with each requesat
         # @return headers [Hash] the default headers for the class
         def headers(h={})
-          @headers = h unless h.empty?
-          @headers
+          headers ||= _headers
+          _headers(headers.merge!(h)) unless h.empty?
+          _headers
         end
 
         # Looks up a resource on the service by id. For example `SomeResource.find(5)` would call `/some_resources/5`
@@ -51,62 +86,21 @@ module Served
           instance.reload
         end
 
-        # Get or set the resource name for the given resource used for endpoint generation
-        #
-        # @param resource [String] the name of the resource
-        # @return [String] the name of the resource. `SomeResource.resource_name` will return `some_resources`
-        def resource_name(resource=nil)
-          @resource_name = resource if resource
-          @resource_name ||name.split('::').last.tableize
-        end
-
-        # @deprecated returns host information
-        def host_config
-          host
-        end
-
-        # Get or set the host for the resource
-        #
-        # @param host [String] the resource host
-        # @return [String] or [Hash] the configured host.
-        # @see Services::Configuration
-        def host(h=nil)
-          @host = h if h
-          @host ||= Served.config[:hosts][parent.name.underscore.split('/')[-1]]
-        end
-
-        # Get or set the timeout for the current resource
-        #
-        # @return [Integer] allowed timeout in seconds
-        def timeout(sec=nil)
-          @timeout = sec if sec
-          @timeout || Served.config.timeout
-        end
-
+        # @return [Served::HTTPClient] the HTTPClient using the configured backend
         def client
-          @connection ||= Served::HTTPClient.new(host_config, timeout, headers)
-        end
-
-        private
-
-        # Everything should allow an id attribute
-        def inherited(subclass)
-          return if subclass.attributes.include?(:id) # attribute method does this already, but rather not do a
-          # class_eval if not necessary
-          subclass.class_eval do
-            attribute :id
-          end
+          @client ||= Served::HTTPClient.new(self)
         end
 
       end
 
-      # @see Services::Resource::Base::resource_name
-      def resource_name
-        self.class.resource_name
+      def initialize(options={})
+        # placeholder
       end
 
       # Saves the record to the service. Will call POST if the record does not have an id, otherwise will call PUT
       # to update the record
+      #
+      # @return [Boolean] returns true or false depending on save success
       def save
         if id
           reload_with_attributes(put[resource_name.singularize])
@@ -116,13 +110,9 @@ module Served
         true
       end
 
-      alias_method :save!, :save # TODO: differentiate save! and safe much the same AR does.
-
-      def attributes
-        Hash[self.class.attributes.keys.collect { |name| [name, send(name)] }]
-      end
-
       # Reloads the resource using attributes from the service
+      #
+      # @return [self] self
       def reload
         reload_with_attributes(get)
         self
@@ -145,7 +135,7 @@ module Served
       end
 
       def handle_response(response)
-        raise ServiceError, response unless (200..299).include?(response.code)
+        raise ServiceError.new(self, response) unless (200..299).include?(response.code)
         JSON.parse(response.body)
       end
 
@@ -153,6 +143,10 @@ module Served
         self.class.client
       end
 
+      def presenter
+        {resource_name.singularize.to_sym => attributes}
+      end
+
     end
   end
 end

data/lib/served/resource/configurable.rb

@@ -0,0 +1,52 @@
+module Served
+  module Resource
+    module Configurable
+      extend ActiveSupport::Concern
+
+      included do
+        singleton_class.prepend ClassMethods::Prepend
+      end
+
+      module ClassMethods
+
+        module Prepend
+
+          private
+
+          def inherited(subclass)
+            super
+            instance_variables.each do |v|
+              instance = instance_variable_get(v)
+              instance = instance.clone unless instance.is_a? Fixnum
+              subclass.send(:instance_variable_set, v, instance) if /@_c_/ =~ v
+            end
+          end
+
+        end
+
+        private
+
+        # Declare a configurable attribute. This is used to declare the configuration methods used in
+        # Served::Resource::Base
+        def class_configurable(name, options={}, &block)
+          instance_eval do
+            instance_variable_set(:"@_c_#{name}", options[:default]) if options[:default]
+            instance_variable_set(:"@_c_#{name}", block ) if block_given? && !instance_variable_get(:"@#{name}")
+
+            define_singleton_method(name) do |value=nil|
+              instance_variable_set(:"@_c_#{name}", value) if value
+              value = instance_variable_get(:"@_c_#{name}") unless value
+              return instance_eval &value if value.is_a? Proc
+              value
+            end
+
+            define_method(name) do
+              self.class.send(name)
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/served/{support → resource}/serializable.rb

@@ -1,14 +1,29 @@
 module Served
-  module Support
+  module Resource
     module Serializable
       extend ActiveSupport::Concern
 
+      # pseudo boolean class for serialization
+      unless Object.const_defined?(:Boolean)
+        class ::Boolean;
+        end
+      end
+
       # Specialized class serializers
       SERIALIZERS = {
           Fixnum => {call: :to_i},
           String => {call: :to_s},
-          Symbol => {call: :to_sym},
-          Float => {call: :to_f}
+          Symbol => {call: :to_sym, converter: -> (value) {
+            if value.is_a? Array
+              value = value.map { |a| a.to_sym }
+              return value
+            end
+          }},
+          Float => {call: :to_f},
+          Boolean => {converter: -> (value) {
+            return false unless value == "true"
+            true
+          }}
       }
 
       included do
@@ -27,8 +42,12 @@ module Served
             if serializer.is_a? Proc
               value = serializer.call(value)
             elsif s = SERIALIZERS[serializer]
-              value = value.send(s[:call]) if s[:call] && value.respond_to?(s[:call])
-              value = s[:converter].call(value) if s[:converter]
+              called = false
+              if s[:call] && value.respond_to?(s[:call])
+                value = value.send(s[:call])
+                called = true
+              end
+              value = s[:converter].call(value) if s[:converter] && !called
             else
               value = serializer.new(value)
             end
@@ -36,7 +55,6 @@ module Served
           super
         end
 
-
       end
 
       module ClassMethods
@@ -50,7 +68,7 @@ module Served
       end
 
       # renders the model as json
-      def to_json
+      def to_json(*args)
         raise InvalidPresenter, 'Presenter must respond to #to_json' unless presenter.respond_to? :to_json
         presenter.to_json
       end
@@ -58,7 +76,7 @@ module Served
       # override this to return a presenter to be used for serialization, otherwise all attributes will be
       # serialized
       def presenter
-        {resource_name.singularize => attributes}
+        attributes
       end
 
     end

data/lib/served/{support → resource}/validatable.rb

@@ -1,5 +1,5 @@
 module Served
-  module Support
+  module Resource
     # Resource validation functionality
     module Validatable
       extend ActiveSupport::Concern
@@ -10,23 +10,40 @@ module Served
           :numericality,
           :format,
           :inclusion,
-          :confirmation
       ]
 
+      class ResourceInvalid < StandardError
+
+        def initialize(resource)
+          super "[#{resource.errors.full_messages.join(', ')}]"
+        end
+      end
+
+      # Saves a resource and raises an error if the save fails.
+      def save!
+        raise ResourceInvalid.new(self) unless run_validations! && save(false)
+        true
+      end
+
       included do
         include ActiveModel::Validations
+        include Configurable
+        include Attributable
         singleton_class.prepend ClassMethods::Prepend
         prepend Prepend
+
+        class_configurable :validate_on_save do
+          true
+        end
       end
 
       module Prepend
 
-        def save
-          return false unless valid?
-          super
+        def save(with_validations=true)
+          return false if (with_validations && self.class.validate_on_save && !valid?)
+          super()
         end
 
-
         protected
 
         def run_validations!
@@ -41,6 +58,7 @@ module Served
       end
 
       module ClassMethods
+
         module Prepend
 
           def attribute(name, options={})
@@ -63,4 +81,4 @@ module Served
 
     end
   end
-end
+end

data/lib/served/resource.rb

@@ -1 +1 @@
-require 'served/resource/base'
+require 'served/resource/base'

data/lib/served/version.rb

@@ -1,3 +1,3 @@
 module Served
-  VERSION = '0.1.12'
+  VERSION = '0.2.0'
 end

data/lib/served.rb

@@ -1,4 +1,3 @@
-require 'httparty'
 require 'active_support/configurable'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module'
@@ -6,14 +5,11 @@ require 'active_model'
 
 require 'served/engine'
 require 'served/version'
+require 'served/config'
+require 'served/backends'
 require 'served/http_client'
-require 'served/support'
 require 'served/resource'
 require 'served/attribute'
 
-module Served
-  include ActiveSupport::Configurable
-  configure do |config|
-    config.timeout = 30
-  end
-end
+
+

data/served.gemspec

@@ -19,12 +19,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'httparty'
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'addressable',   '>= 2.4.0'
   spec.add_dependency 'activemodel', '>= 3.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'httparty', '~> 0.14.0'
+  spec.add_development_dependency 'bundler',  '~> 1.10'
+  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'rspec',    '~> 3.4.0'
+  spec.add_development_dependency 'http',     '~> 1.0.4'
+  spec.add_development_dependency 'patron',   '~> 0.5.0'
+
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: served
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Jarod Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-06 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,44 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: patron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 description: Served provides an easy to use model layer for communicating with disributed
   Rails based Services.
 email:
@@ -118,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -133,14 +162,20 @@ files:
 - lib/served.rb
 - lib/served/attribute.rb
 - lib/served/attribute/base.rb
+- lib/served/backends.rb
+- lib/served/backends/base.rb
+- lib/served/backends/http.rb
+- lib/served/backends/httparty.rb
+- lib/served/backends/patron.rb
+- lib/served/config.rb
 - lib/served/engine.rb
 - lib/served/http_client.rb
 - lib/served/resource.rb
+- lib/served/resource/attributable.rb
 - lib/served/resource/base.rb
-- lib/served/support.rb
-- lib/served/support/attributable.rb
-- lib/served/support/serializable.rb
-- lib/served/support/validatable.rb
+- lib/served/resource/configurable.rb
+- lib/served/resource/serializable.rb
+- lib/served/resource/validatable.rb
 - lib/served/version.rb
 - served.gemspec
 homepage: http://github.com/fugufish/served
@@ -163,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Served provides an easy to use model layer for communicating with disributed

data/lib/served/support.rb

@@ -1,3 +0,0 @@
-require_relative 'support/attributable'
-require_relative 'support/serializable'
-require_relative 'support/validatable'