served 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f8c94ee995ff5a6af1d15c55d9ee30146a9ea9
-  data.tar.gz: 6746ed6f2289e2f8a95b1d6e25714d1279fbfa9d
+  metadata.gz: eeb6e4b5551eda089947f777ab4734743a32b173
+  data.tar.gz: 6dc5073de49966e14d0dd21506b49d2625a4c8b7
 SHA512:
-  metadata.gz: 4991cf586106bd5adacb7a3624010b958dd8cee09442ea9e9f31957594a5c486c8d44a5fd252cf703c851f9452f1f038f1e7399f4a13a72f1ead6a35fa070f72
-  data.tar.gz: fc6969c24288e840c4d0a5664f6d0f395b3ae5a5ae94f22979887be7cd1ec3852fc14860fda4a5ca90f57035b04fdebf9a91587a94dc02bc62e79a7aa96a4248
+  metadata.gz: 204997406c26270b6ef5eeb697ac375fa59d40ed1716656b7135633433a2b61028d136e454f3a733b542b2729c7936854149dca778b96944aefcc7084b99a3d6
+  data.tar.gz: b1b92d4afd0e620094741df18df04ae6f0debc09d2bda94fc723987b1a0eb5af1121913f72c6498b89563d543e8bbe8df4bc5470e942d8ae1c1de37690e1c46d

data/.rubocop.yml

@@ -22,6 +22,10 @@ Style/StringLiterals:
 Style/SymbolArray:
   Enabled: false
 
+Layout/EmptyLinesAroundArguments:
+  Exclude:
+    - 'spec/resource/serializable_spec.rb'
+
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.4.3
+* Fix rubocop failures.
+
 ## 0.4.2
 * Fix error handling so specific error messages appear correctly.
 

data/lib/served/resource/attributable.rb

@@ -49,7 +49,6 @@ module Served
 
       def initialize(hash = {})
         reload_with_attributes(normalize_keys(hash))
-        self
       end
 
       # @return [Array] the keys for all the defined attributes

data/lib/served/resource/configurable.rb

@@ -32,7 +32,7 @@ module Served
 
             define_singleton_method(name) do |value = nil|
               instance_variable_set(:"@_c_#{name}", value) if value
-              value = instance_variable_get(:"@_c_#{name}") unless value
+              value ||= instance_variable_get(:"@_c_#{name}")
               return instance_eval(&value) if value.is_a? Proc
               value
             end

data/lib/served/resource/response_invalid.rb

@@ -3,8 +3,9 @@ module Served
     class ResponseInvalid < Served::Error
       def initialize(resource, original_error = false)
         if original_error
-          return super "The resource '#{resource.name}' failed to serialize the " \
+          super "The resource '#{resource.name}' failed to serialize the " \
             "response with message: #{original_error.message}'"
+          return
         end
 
         super "The resource '#{resource.name}' returned a response, but the result " \

data/lib/served/resource/serializable.rb

@@ -24,7 +24,7 @@ module Served
         def load(string)
           begin
             result = serializer.load(self, string)
-          rescue => e
+          rescue StandardError => e
             raise ResponseInvalid.new(self, e)
           end
           raise ResponseInvalid.new(self) unless result

data/lib/served/resource/validatable.rb

@@ -14,9 +14,7 @@ module Served
 
       # Saves a resource and raises an error if the save fails.
       def save!
-        unless run_validations! && save(false)
-          raise ::Served::Resource::ResourceInvalid.new(self)
-        end
+        raise ::Served::Resource::ResourceInvalid.new(self) unless run_validations! && save(false)
 
         true
       end

data/lib/served/serializers/json.rb

@@ -26,7 +26,7 @@ module Served
 
       def self.exception(data)
         JSON.parse(data)
-      rescue
+      rescue StandardError
         {}
       end
     end

data/lib/served/serializers/json_api.rb

@@ -68,7 +68,7 @@ module Served
       end
 
       def self.merge_relationships(restructured, data, included)
-        data['relationships'].keys.each do |relationship|
+        data['relationships'].each_key do |relationship|
           rel = data['relationships'][relationship]
           next unless rel && rel['data']
           rel_data = rel['data']

data/lib/served/version.rb

@@ -1,3 +1,3 @@
 module Served
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 end

data/served.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'served/version'
@@ -20,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'activemodel',   '>= 3.2'
   spec.add_dependency 'activesupport', '>= 3.2'
   spec.add_dependency 'addressable',   '>= 2.4.0'
-  spec.add_dependency 'activemodel',   '>= 3.2'
 
-  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 'httparty', '~> 0.14.0'
   spec.add_development_dependency 'patron',   '~> 0.5.0'
+  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'rspec',    '~> 3.4.0'
   spec.add_development_dependency 'rubocop',  '~> 0.49'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: served
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jarod Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,117 +25,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.0.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: http
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement