served 0.3.3 → 0.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ee89d157c9cb6fb48f717dbd2071aa63d01ac6
-  data.tar.gz: 8630581e316aac202763c06f445c7c128eccb710
+  metadata.gz: d22e0da5fe463903fa6699329ba5f2f4fad64905
+  data.tar.gz: 5572ef473d464638fb46541e5367969fe784d766
 SHA512:
-  metadata.gz: 81590aac6711a2f45341a6a0090f0c584ef05c7b8e819b3880e959a3691d1f605a743121ac6368eb9415ef8b7b444da2ea30b0f1471d079657dd1faa1c7d2a83
-  data.tar.gz: d4ed40fd714f69b01a06ab712e083e1ce8d35a7f9a7f3b1a01852f368e4c1387726a5e9b7cf1974d3632e6f16a2a2d7733ba117af89b20fe00a122530c42fe7a
+  metadata.gz: e6540cbd7e3f2b875d9c22c8b5d412ccc892b2022d6ec8a84b21b434201e5d079dd4f69301e64f6ef96a56b96893d72e792810a1be279ab1bd8d64690c9021b7
+  data.tar.gz: be4a8d52c93ea6f42d1d5268972c307348963f411ef145dba65921f771dd2722a0d59b6f6332df0c0eab30d63b5779439a3c2df241d2b968218ca2c86e386026

data/.gitignore

@@ -11,3 +11,5 @@
 .idea/**.rvmrc
 .rvmrc
 .idea/
+.*.swp
+*.gem

data/.rubocop.yml

@@ -0,0 +1,53 @@
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/ConditionalAssignment:
+  Enabled: false
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/MultipleComparison:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineOperationIndentation:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 130
+
+Metrics/MethodLength:
+  Max: 20
+
+Metrics/AbcSize:
+  Max: 35
+
+Metrics/PerceivedComplexity:
+  Max: 15
+
+Metrics/CyclomaticComplexity:
+  Max: 15
+
+Metrics/BlockLength:
+  Enabled: false
+
+Lint/UnifiedInteger:
+  Enabled: false
+
+Performance/RegexpMatch:
+  Enabled: false

data/Rakefile

@@ -1,6 +1,17 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.options = ['--display-cop-names']
+end
+
+desc 'Run rubocop and rspec'
+task :ci do
+  Rake::Task["spec"].invoke
+  Rake::Task["rubocop"].invoke
+end
+
+task default: :ci

data/lib/served/attribute/base.rb

@@ -4,7 +4,6 @@ module Served
       include Resource::Attributable
       include Resource::Serializable
       include Resource::Validatable
-
     end
   end
-end
+end

data/lib/served/attribute.rb

@@ -1 +1 @@
-require_relative 'attribute/base'
+require_relative 'attribute/base'

data/lib/served/backends/base.rb

@@ -10,7 +10,6 @@ module Served
       def serialize_response(response)
         response
       end
-
     end
   end
-end
+end

data/lib/served/backends/http.rb

@@ -1,49 +1,54 @@
 require 'http'
 module Served
   module Backends
-    #HTTP Backend uses {https://github.com/httprb/http HTTP} client library.
+    # HTTP Backend uses {https://github.com/httprb/http HTTP} client library.
     class HTTP < Base
-
-      def get(endpoint, id, params={})
+      def get(endpoint, id, params = {})
         response = ::HTTP
-            .timeout(global: timeout)
-            .headers(headers)
-            .get(template.expand(id: id, query: params, resource: endpoint).to_s)
+          .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={})
+      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)
+          .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={})
+      def post(endpoint, body, params = {})
         response = ::HTTP
-            .timeout(global: timeout)
-            .headers(headers)
-            .post(template.expand(query: params, resource: endpoint).to_s, body: body)
+          .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={})
+      def delete(endpoint, id, params = {})
         response = ::HTTP
-            .timeout(global: timeout)
-            .headers(headers)
-            .delete(template.expand(query: params, resource: endpoint, id: id).to_s)
+          .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
+end

data/lib/served/backends/httparty.rb

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

data/lib/served/backends/patron.rb

@@ -1,45 +1,50 @@
 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.
+    # 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={})
+      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))
+                               .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={})
+      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))
+                               .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={})
+      def post(endpoint, body, params = {})
         serialize_response(::Patron::Session.new(headers: headers, timeout: timeout)
-                               .post(template.expand(query: params, resource: endpoint).to_s, body))
+                               .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))
+      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
-                       })
+        OpenStruct.new(body: response.body,
+                       code: response.status)
       end
-
     end
   end
-end
+end

data/lib/served/backends.rb

@@ -1,7 +1,6 @@
 require_relative 'backends/base'
 module Served
   module Backends
-
     # @private
     def self.[](backend)
       @backends ||= {
@@ -11,11 +10,10 @@ module Served
       }
       if @backends[backend]
         require_relative "backends/#{backend}"
-        return self.const_get(@backends[backend].classify.to_sym)
+        return const_get(@backends[backend].classify.to_sym)
       end
       require_relative 'backends/httparty'
-      self.const_get(@backends[:httparty].classify.to_sym)
+      const_get(@backends[:httparty].classify.to_sym)
     end
-
   end
-end
+end

data/lib/served/config.rb

@@ -1,4 +1,5 @@
 require_relative 'serializers/json'
+
 module Served
   include ActiveSupport::Configurable
   config_accessor :timeout
@@ -11,5 +12,4 @@ module Served
     config.hosts      = {}
     config.serializer = Served::Serializers::Json
   end
-
-end
+end

data/lib/served/error.rb

@@ -1,5 +1,4 @@
 module Served
-
   # TODO: remove in 1.0, this preserves backwards compatibility with 0.2
   module Resource
     class Base
@@ -10,4 +9,4 @@ module Served
 
   class Error < Served::Resource::Base::ServiceError
   end
-end
+end

data/lib/served/http_client.rb

@@ -1,10 +1,10 @@
 require 'addressable/template'
 require_relative 'error'
+
 module Served
   # Provides an interface between the HTTP client and the Resource.
   class HTTPClient
-
-    DEFAULT_TEMPLATE = '{/resource*}{/id}.json{?query*}'
+    DEFAULT_TEMPLATE = '{/resource*}{/id}.json{?query*}'.freeze
 
     attr_reader :template, :resource
 
@@ -12,12 +12,10 @@ module Served
     delegate :headers, :timeout, :host,  to: :@resource
 
     class ConnectionFailed < Served::Error
-
-        def initialize(resource)
-          super "Resource '#{resource.name}' could not be reached on '#{resource.host}'"
-        end
-
+      def initialize(resource)
+        super "Resource '#{resource.name}' could not be reached on '#{resource.host}'"
       end
+    end
 
     def initialize(resource)
       @resource = resource
@@ -25,6 +23,5 @@ module Served
       @template = Addressable::Template.new(h)
       @backend  = Served::Backends[Served.config.backend].new(self)
     end
-
   end
 end

data/lib/served/resource/attributable.rb

@@ -9,7 +9,6 @@ module Served
       end
 
       module ClassMethods
-
         # declare an attribute for the resource
         #
         # @example
@@ -18,7 +17,7 @@ module Served
         #   end
         #
         # @param name [Symbol] the name of the attribute
-        def attribute(name, options={})
+        def attribute(name, options = {})
           return if attributes.include?(name)
           attributes[name] = options
           attr_accessor name
@@ -39,20 +38,17 @@ module Served
         end
 
         module Prepend
-
           def inherited(subclass)
-            self.attributes.each do |name, options|
+            attributes.each do |name, options|
               subclass.attribute name, options
             end
             super
           end
-
         end
-
       end
 
-      def initialize(hash={})
-        reload_with_attributes(normalize_keys(hash) )
+      def initialize(hash = {})
+        reload_with_attributes(normalize_keys(hash))
         self
       end
 
@@ -102,7 +98,6 @@ module Served
           params
         end
       end
-
     end
   end
 end

data/lib/served/resource/base.rb

@@ -9,17 +9,20 @@ require_relative 'http_errors'
 
 module Served
   module Resource
-    # Service Resources should inherit directly from this class. Provides interfaces necessary for communicating with
-    # services based on the namespace. Classes should be namespaced under Services::ServiceName where ServiceName is the
-    # name of the service the resource lives on. The resource determines the host of the service based on this
-    # this namespace and what is in the configuration.
+    # Service Resources should inherit directly from this class. Provides
+    # interfaces necessary for communicating with services based on the namespace.
+    # Classes should be namespaced under Services::ServiceName where ServiceName is
+    # the name of the service the resource lives on. The resource determines the
+    # host of the service based on this this namespace and what is in the
+    # configuration.
     #
-    # Service Resources supports some ActiveModel validations so that a developer can include client side validations
-    # if desired. Validation options can be passed to the #attribute class method using the same options as
-    # ActiveModel#validate
+    # Service Resources supports some ActiveModel validations so that a developer can
+    # include client side validations if desired. Validation options can be passed
+    # to the #attribute class method using the same options as ActiveModel#validate.
     #
-    # 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.
+    # 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 Configurable
       include Requestable
@@ -28,7 +31,6 @@ module Served
       include Serializable
 
       attribute :id
-
     end
   end
 end

data/lib/served/resource/configurable.rb

@@ -8,9 +8,7 @@ module Served
       end
 
       module ClassMethods
-
         module Prepend
-
           private
 
           def inherited(subclass)
@@ -18,25 +16,24 @@ module Served
             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
+              subclass.send(:instance_variable_set, v, instance) if v.to_s =~ /@_c_/
             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)
+        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}")
+            instance_variable_set(:"@_c_#{name}", block) if block_given? && !instance_variable_get(:"@#{name}")
 
-            define_singleton_method(name) do |value=nil|
+            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
+              return instance_eval(&value) if value.is_a? Proc
               value
             end
 
@@ -45,7 +42,6 @@ module Served
             end
           end
         end
-
       end
     end
   end

data/lib/served/resource/http_errors.rb

@@ -5,6 +5,7 @@ module Served
       attr_reader :server_backtrace
       attr_reader :errors
       attr_reader :response
+      attr_reader :code
 
       # Defined in individual error classes
       def self.code
@@ -29,114 +30,83 @@ module Served
       def status
         self.class.status
       end
-
-      def code
-        @code
-      end
-
     end
 
     # 301 MovedPermanently
     class MovedPermanently < HttpError
-
       def self.code
         301
       end
-
     end
 
     # 400 BadRequest
     class BadRequest < HttpError
-
       def self.code
         400
       end
-
     end
 
     # 401 Unauthorized
     class Unauthorized < HttpError
-
       def self.code
         401
       end
-
     end
 
     # 403 Forbidden
     class Forbidden < HttpError
-
       def self.code
         403
       end
-
     end
 
     # 404 NotFound
     class NotFound < HttpError
-
       def self.code
         404
       end
-
     end
 
     # 405 MethodNotAllowed
     class MethodNotAllowed < HttpError
-
       def self.code
         405
       end
-
     end
 
     # 406 NotAcceptable
     class NotAcceptable < HttpError
-
       def self.code
         406
       end
-
     end
 
     # 408 RequestTimeout
     class RequestTimeout < HttpError
-
       def self.code
         408
       end
-
     end
 
     # 422 UnprocessableEntity
     class UnprocessableEntity < HttpError
-
       def self.code
         422
       end
-
     end
 
     # 500 InternalServerError
     class InternalServerError < HttpError
-
       def self.code
         500
       end
-
     end
 
     # 503 BadGateway
     class BadGateway < HttpError
-
       def self.code
         503
       end
-
     end
-
   end
 end
-
-
-

data/lib/served/resource/invalid_attribute_serializer.rb

@@ -1,11 +1,9 @@
 module Served
   module Resource
     class InvalidAttributeSerializer < Served::Error
-
       def initialize(s)
         super "'#{s}' attribute serializer does not exist"
       end
-
     end
   end
-end
+end

data/lib/served/resource/requestable.rb

@@ -5,14 +5,12 @@ module Served
 
       # raised when a handler is defined if the method doesn't exist or if a proc isn't supplied
       class HandlerRequired < StandardError
-
         def initialize
           super 'a handler is required, it must be a proc or a valid method'
         end
-
       end
 
-      HEADERS = { 'Content-type' => 'application/json', 'Accept' => 'application/json' }
+      HEADERS = { 'Content-type' => 'application/json', 'Accept' => 'application/json' }.freeze
 
       included do
         include Configurable
@@ -30,7 +28,7 @@ module Served
         end
 
         class_configurable :_headers do
-          HEADERS
+          HEADERS.dup
         end
 
         class_configurable :handlers, default: {}
@@ -60,12 +58,9 @@ module Served
         # 500 level errors
         handle(500) { Resource::InternalServerError }
         handle(503) { Resource::BadGateway }
-
-
       end
 
       module ClassMethods
-
         def handle_response(response)
           if raise_on_exceptions
             handler = handlers[response.code]
@@ -91,12 +86,12 @@ module Served
         #   the specific response code has been called. The method or proc should return a hash of attributes, if an
         #   error class is returned it will be raised
         # @yieldreturn [Hash] a hash of attributes, if an error class is returned it will be raised
-        def handle(code_or_range, symbol_or_proc=nil, &block)
+        def handle(code_or_range, symbol_or_proc = nil, &block)
           raise HandlerRequired unless symbol_or_proc || block_given?
           if code_or_range.is_a?(Range) || code_or_range.is_a?(Array)
-            code_or_range.each { |c|
+            code_or_range.each do |c|
               handlers[c] = symbol_or_proc || block
-            }
+            end
           else
             handlers[code_or_range] = symbol_or_proc || block
           end
@@ -106,13 +101,14 @@ module Served
         #
         # @param headers [Hash] the headers to send with each requesat
         # @return headers [Hash] the default headers for the class
-        def headers(h={})
+        def headers(h = {})
           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`
+        # Looks up a resource on the service by id. For example,
+        # `SomeResource.find(5)` would call `/some_resources/5`
         #
         # @param id [Integer] the id of the resource
         # @return [Resource::Base] the resource object.
@@ -135,8 +131,8 @@ module Served
         end
       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
+      # 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
@@ -169,15 +165,15 @@ module Served
         self.class.get(id, params)
       end
 
-      def put(params={})
+      def put(params = {})
         handle_response(client.put(resource_name, id, dump, params))
       end
 
-      def post(params={})
+      def post(params = {})
         handle_response(client.post(resource_name, dump, params))
       end
 
-      def delete(params={})
+      def delete(params = {})
         response = client.delete(resource_name, id, params)
         return true if response.code == 204
 

data/lib/served/resource/response_invalid.rb

@@ -1,13 +1,15 @@
 module Served
   module Resource
     class ResponseInvalid < Served::Error
+      def initialize(resource, original_error = false)
+        if original_error
+          return super "The resource '#{resource.name}' failed to serialize the " \
+            "response with message: #{original_error.message}'"
+        end
 
-      def initialize(resource, orignal_error=false)
-        return super "The resource '#{resource.name}' failed to serialize the response with message: " +
-                 "'#{orignal_error.message}'" if orignal_error
-        super "The resource '#{resource.name}' returned a response, but the result of serialization was `nil`"
+        super "The resource '#{resource.name}' returned a response, but the result " \
+              "of serialization was `nil`"
       end
-
     end
   end
-end
+end

data/lib/served/resource/serializable.rb

@@ -8,7 +8,7 @@ module Served
 
       # pseudo boolean class for serialization
       unless Object.const_defined?(:Boolean)
-        class ::Boolean;
+        class ::Boolean
         end
       end
 
@@ -21,7 +21,6 @@ module Served
       end
 
       module ClassMethods
-
         def load(string)
           begin
             result = serializer.load(self, string)
@@ -56,17 +55,24 @@ module Served
               true
             end
           end
-          return ->(v) { type.new(v) } if type.ancestors.include?(Served::Resource::Base) ||
-                                          type.ancestors.include?(Served::Attribute::Base)
-          raise InvalidAttributeSerializer, type
+
+          if type.ancestors.include?(Served::Resource::Base) ||
+              type.ancestors.include?(Served::Attribute::Base)
+            return ->(v) { type.new(v) }
+          end
+
+          raise InvalidAttributeSerializer.new(type)
         end
 
         def serialize_attribute(attr, value)
           return false unless attributes[attr.to_sym]
           serializer = attribute_serializer_for(attributes[attr.to_sym][:serialize])
           if value.is_a? Array
-            # TODO: Remove the Array class check below in 1.0, only here for backwards compatibility
-            return value if attributes[attr.to_sym][:serialize].nil? || attributes[attr.to_sym][:serialize] == Array
+            # TODO: Remove the Array class check below in 1.0, only here
+            # for backwards compatibility
+            return value if attributes[attr.to_sym][:serialize].nil? ||
+              attributes[attr.to_sym][:serialize] == Array
+
             value.collect do |v|
               if v.is_a? attributes[attr.to_sym][:serialize]
                 v
@@ -78,10 +84,9 @@ module Served
             serializer.call(value)
           end
         end
-
       end
 
-      def to_json(*args)
+      def to_json(*_args)
         dump
       end
 

data/lib/served/resource/validatable.rb

@@ -6,15 +6,18 @@ module Served
 
       # Supported Validation Types
       SUPPORTED_VALIDATIONS = [
-          :presence,
-          :numericality,
-          :format,
-          :inclusion,
-      ]
+        :presence,
+        :numericality,
+        :format,
+        :inclusion
+      ].freeze
 
-       # Saves a resource and raises an error if the save fails.
+      # Saves a resource and raises an error if the save fails.
       def save!
-        raise ::Served::Resource::ResourceInvalid.new(self) unless run_validations! && save(false)
+        unless run_validations! && save(false)
+          raise ::Served::Resource::ResourceInvalid.new(self)
+        end
+
         true
       end
 
@@ -31,9 +34,8 @@ module Served
       end
 
       module Prepend
-
-        def save(with_validations=true)
-          return false if (with_validations && self.class.validate_on_save && !valid?)
+        def save(with_validations = true)
+          return false if with_validations && self.class.validate_on_save && !valid?
           super()
         end
 
@@ -47,18 +49,14 @@ module Served
           end
           errors.empty?
         end
-
       end
 
       module ClassMethods
-
         module Prepend
-
-          def attribute(name, options={})
+          def attribute(name, options = {})
             super
             set_validations_for_attribute(name, options)
           end
-
         end
 
         private
@@ -69,9 +67,7 @@ module Served
             validates name, validation => options[validation] if options[validation]
           end
         end
-
       end
-
     end
   end
 end

data/lib/served/serializers/json.rb

@@ -1,32 +1,32 @@
 require 'json'
 module Served
   module Serializers
-
-    # The default serializer assumes that the default Rails API response is used for both data and errors.
+    # The default serializer assumes that the default Rails API response
+    # is used for both data and errors.
     module Json
-
       def self.load(resource, data)
         parsed = JSON.parse(data)
         # assume we need to return the entire response if it isn't
-        # namespaced by keys. TODO: remove after 1.0, this is strictly for backwards compatibility
+        # namespaced by keys. TODO: remove after 1.0, this is strictly
+        # for backwards compatibility
         resource_name = resource.resource_name
         if resource_name.is_a? Array
-          warn '[DEPRECATION] passing an array for resource name will no longer be supported in Served 1.0, ' +
-              'please ensure a single string is returned instead'
-          resource_name = resource_name.last  # backwards compatibility
+          warn '[DEPRECATION] passing an array for resource name will no longer ' \
+               'be supported in Served 1.0, please ensure a single string is ' \
+               'returned instead'
+          resource_name = resource_name.last # backwards compatibility
         end
         parsed[resource_name.singularize] || parsed
       end
 
       def self.dump(resource, attributes)
-        a = Hash[attributes.collect { |k,v| v.blank? ? nil : [k,v] }.compact]
-        {resource.resource_name.singularize => a}.to_json
+        a = Hash[attributes.collect { |k, v| v.blank? ? nil : [k, v] }.compact]
+        { resource.resource_name.singularize => a }.to_json
       end
 
       def self.exception(data)
         JSON.parse(data)
       end
-
     end
   end
 end

data/lib/served/serializers/json_api.rb

@@ -20,7 +20,8 @@ module Served
 
       def self.parse_errors(result, resource)
         result.each do |error|
-          if error.source_parameter && resource.attributes.keys.include?(error.source_parameter.to_sym)
+          if error.source_parameter &&
+              resource.attributes.keys.include?(error.source_parameter.to_sym)
             resource.errors.add(error.source_parameter.to_sym, error_message(error))
           else
             resource.errors.add(:base, error_message(error))
@@ -73,7 +74,9 @@ module Served
           rel_data = rel['data']
 
           relationship_attributes = if rel_data.is_a?(Array)
-                                      rel_data.inject([]) { |ary, r| ary << restructure_relationship(r, included) }
+                                      rel_data.inject([]) do |ary, r|
+                                        ary << restructure_relationship(r, included)
+                                      end
                                     else
                                       restructure_relationship(rel_data, included)
                                     end
@@ -88,7 +91,10 @@ module Served
       end
 
       def self.restructure_relationship(resource, included)
-        relationship = included.find {|r| resource['id'] == r['id'] && resource['type'] == r['type']}
+        relationship = included.find do |r|
+          resource['id'] == r['id'] && resource['type'] == r['type']
+        end
+
         relationship['attributes'].merge('id' => resource['id']) if relationship
       end
     end

data/lib/served/serializers/serialization_error.rb

@@ -1,11 +1,9 @@
 module Served
   module Serializers
     class SerializationError < Served::Error
-
       def initialize(original_exception)
         super("Failed to serialize object with error: '#{original_exception.message}'")
       end
-
     end
   end
-end
+end

data/lib/served/version.rb

@@ -1,3 +1,3 @@
 module Served
-  VERSION = '0.3.3'
+  VERSION = '0.4.0.rc1'.freeze
 end

data/served.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'served/version'
@@ -9,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Jarod Reid']
   spec.email         = ['jarod@solidalchemy.com']
 
-  spec.summary       = %q{Served provides an easy to use model layer for communicating with disributed Rails based Services.}
-  spec.description   = %q{Served provides an easy to use model layer for communicating with disributed Rails based Services.}
+  spec.summary       = 'Served provides an easy to use model layer for communicating with disributed Rails based Services.'
+  spec.description   = 'Served provides an easy to use model layer for communicating with disributed Rails based Services.'
   spec.homepage      = 'http://github.com/fugufish/served'
   spec.license       = 'MIT'
 
@@ -21,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'addressable',   '>= 2.4.0'
-  spec.add_dependency 'activemodel', '>= 3.2'
+  spec.add_dependency 'activemodel',   '>= 3.2'
 
   spec.add_development_dependency 'httparty', '~> 0.14.0'
   spec.add_development_dependency 'bundler',  '~> 1.10'
@@ -29,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec',    '~> 3.4.0'
   spec.add_development_dependency 'http',     '~> 1.0.4'
   spec.add_development_dependency 'patron',   '~> 0.5.0'
-
+  spec.add_development_dependency 'rubocop',  '~> 0.49'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: served
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0.rc1
 platform: ruby
 authors:
 - Jarod Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-26 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.49'
 description: Served provides an easy to use model layer for communicating with disributed
   Rails based Services.
 email:
@@ -146,6 +160,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -205,12 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Served provides an easy to use model layer for communicating with disributed