served 0.4.2 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +4 -0
  3. data/CHANGELOG.md +3 -0
  4. data/lib/served/resource/attributable.rb +0 -1
  5. data/lib/served/resource/configurable.rb +1 -1
  6. data/lib/served/resource/response_invalid.rb +2 -1
  7. data/lib/served/resource/serializable.rb +1 -1
  8. data/lib/served/resource/validatable.rb +1 -3
  9. data/lib/served/serializers/json.rb +1 -1
  10. data/lib/served/serializers/json_api.rb +1 -1
  11. data/lib/served/version.rb +1 -1
  12. data/served.gemspec +4 -6
  13. metadata +27 -27
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 74f8c94ee995ff5a6af1d15c55d9ee30146a9ea9
4
- data.tar.gz: 6746ed6f2289e2f8a95b1d6e25714d1279fbfa9d
3
+ metadata.gz: eeb6e4b5551eda089947f777ab4734743a32b173
4
+ data.tar.gz: 6dc5073de49966e14d0dd21506b49d2625a4c8b7
5
5
  SHA512:
6
- metadata.gz: 4991cf586106bd5adacb7a3624010b958dd8cee09442ea9e9f31957594a5c486c8d44a5fd252cf703c851f9452f1f038f1e7399f4a13a72f1ead6a35fa070f72
7
- data.tar.gz: fc6969c24288e840c4d0a5664f6d0f395b3ae5a5ae94f22979887be7cd1ec3852fc14860fda4a5ca90f57035b04fdebf9a91587a94dc02bc62e79a7aa96a4248
6
+ metadata.gz: 204997406c26270b6ef5eeb697ac375fa59d40ed1716656b7135633433a2b61028d136e454f3a733b542b2729c7936854149dca778b96944aefcc7084b99a3d6
7
+ data.tar.gz: b1b92d4afd0e620094741df18df04ae6f0debc09d2bda94fc723987b1a0eb5af1121913f72c6498b89563d543e8bbe8df4bc5470e942d8ae1c1de37690e1c46d
data/.rubocop.yml CHANGED
@@ -22,6 +22,10 @@ Style/StringLiterals:
22
22
  Style/SymbolArray:
23
23
  Enabled: false
24
24
 
25
+ Layout/EmptyLinesAroundArguments:
26
+ Exclude:
27
+ - 'spec/resource/serializable_spec.rb'
28
+
25
29
  Layout/MultilineMethodCallIndentation:
26
30
  EnforcedStyle: indented
27
31
 
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.4.3
4
+ * Fix rubocop failures.
5
+
3
6
  ## 0.4.2
4
7
  * Fix error handling so specific error messages appear correctly.
5
8
 
data/lib/served/resource/attributable.rb CHANGED
@@ -49,7 +49,6 @@ module Served
49
49
 
50
50
  def initialize(hash = {})
51
51
  reload_with_attributes(normalize_keys(hash))
52
- self
53
52
  end
54
53
 
55
54
  # @return [Array] the keys for all the defined attributes
data/lib/served/resource/configurable.rb CHANGED
@@ -32,7 +32,7 @@ module Served
32
32
 
33
33
  define_singleton_method(name) do |value = nil|
34
34
  instance_variable_set(:"@_c_#{name}", value) if value
35
- value = instance_variable_get(:"@_c_#{name}") unless value
35
+ value ||= instance_variable_get(:"@_c_#{name}")
36
36
  return instance_eval(&value) if value.is_a? Proc
37
37
  value
38
38
  end
data/lib/served/resource/response_invalid.rb CHANGED
@@ -3,8 +3,9 @@ module Served
3
3
  class ResponseInvalid < Served::Error
4
4
  def initialize(resource, original_error = false)
5
5
  if original_error
6
- return super "The resource '#{resource.name}' failed to serialize the " \
6
+ super "The resource '#{resource.name}' failed to serialize the " \
7
7
  "response with message: #{original_error.message}'"
8
+ return
8
9
  end
9
10
 
10
11
  super "The resource '#{resource.name}' returned a response, but the result " \
data/lib/served/resource/serializable.rb CHANGED
@@ -24,7 +24,7 @@ module Served
24
24
  def load(string)
25
25
  begin
26
26
  result = serializer.load(self, string)
27
- rescue => e
27
+ rescue StandardError => e
28
28
  raise ResponseInvalid.new(self, e)
29
29
  end
30
30
  raise ResponseInvalid.new(self) unless result
data/lib/served/resource/validatable.rb CHANGED
@@ -14,9 +14,7 @@ module Served
14
14
 
15
15
  # Saves a resource and raises an error if the save fails.
16
16
  def save!
17
- unless run_validations! && save(false)
18
- raise ::Served::Resource::ResourceInvalid.new(self)
19
- end
17
+ raise ::Served::Resource::ResourceInvalid.new(self) unless run_validations! && save(false)
20
18
 
21
19
  true
22
20
  end
data/lib/served/serializers/json.rb CHANGED
@@ -26,7 +26,7 @@ module Served
26
26
 
27
27
  def self.exception(data)
28
28
  JSON.parse(data)
29
- rescue
29
+ rescue StandardError
30
30
  {}
31
31
  end
32
32
  end
data/lib/served/serializers/json_api.rb CHANGED
@@ -68,7 +68,7 @@ module Served
68
68
  end
69
69
 
70
70
  def self.merge_relationships(restructured, data, included)
71
- data['relationships'].keys.each do |relationship|
71
+ data['relationships'].each_key do |relationship|
72
72
  rel = data['relationships'][relationship]
73
73
  next unless rel && rel['data']
74
74
  rel_data = rel['data']
data/lib/served/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Served
2
- VERSION = '0.4.2'.freeze
2
+ VERSION = '0.4.3'.freeze
3
3
  end
data/served.gemspec CHANGED
@@ -1,5 +1,3 @@
1
- # coding: utf-8
2
-
3
1
  lib = File.expand_path('../lib', __FILE__)
4
2
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
5
3
  require 'served/version'
@@ -20,15 +18,15 @@ Gem::Specification.new do |spec|
20
18
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
21
19
  spec.require_paths = ['lib']
22
20
 
21
+ spec.add_dependency 'activemodel', '>= 3.2'
23
22
  spec.add_dependency 'activesupport', '>= 3.2'
24
23
  spec.add_dependency 'addressable', '>= 2.4.0'
25
- spec.add_dependency 'activemodel', '>= 3.2'
26
24
 
27
- spec.add_development_dependency 'httparty', '~> 0.14.0'
28
25
  spec.add_development_dependency 'bundler', '~> 1.10'
29
- spec.add_development_dependency 'rake', '~> 10.0'
30
- spec.add_development_dependency 'rspec', '~> 3.4.0'
31
26
  spec.add_development_dependency 'http', '~> 1.0.4'
27
+ spec.add_development_dependency 'httparty', '~> 0.14.0'
32
28
  spec.add_development_dependency 'patron', '~> 0.5.0'
29
+ spec.add_development_dependency 'rake', '~> 10.0'
30
+ spec.add_development_dependency 'rspec', '~> 3.4.0'
33
31
  spec.add_development_dependency 'rubocop', '~> 0.49'
34
32
  end
metadata CHANGED
@@ -1,17 +1,17 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: served
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jarod Reid
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-12-05 00:00:00.000000000 Z
11
+ date: 2018-01-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: activesupport
14
+ name: activemodel
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
@@ -25,117 +25,117 @@ dependencies:
25
25
  - !ruby/object:Gem::Version
26
26
  version: '3.2'
27
27
  - !ruby/object:Gem::Dependency
28
- name: addressable
28
+ name: activesupport
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 2.4.0
33
+ version: '3.2'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 2.4.0
40
+ version: '3.2'
41
41
  - !ruby/object:Gem::Dependency
42
- name: activemodel
42
+ name: addressable
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '3.2'
47
+ version: 2.4.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '3.2'
54
+ version: 2.4.0
55
55
  - !ruby/object:Gem::Dependency
56
- name: httparty
56
+ name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 0.14.0
61
+ version: '1.10'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 0.14.0
68
+ version: '1.10'
69
69
  - !ruby/object:Gem::Dependency
70
- name: bundler
70
+ name: http
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '1.10'
75
+ version: 1.0.4
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '1.10'
82
+ version: 1.0.4
83
83
  - !ruby/object:Gem::Dependency
84
- name: rake
84
+ name: httparty
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '10.0'
89
+ version: 0.14.0
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '10.0'
96
+ version: 0.14.0
97
97
  - !ruby/object:Gem::Dependency
98
- name: rspec
98
+ name: patron
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 3.4.0
103
+ version: 0.5.0
104
104
  type: :development
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 3.4.0
110
+ version: 0.5.0
111
111
  - !ruby/object:Gem::Dependency
112
- name: http
112
+ name: rake
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.0.4
117
+ version: '10.0'
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.0.4
124
+ version: '10.0'
125
125
  - !ruby/object:Gem::Dependency
126
- name: patron
126
+ name: rspec
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 0.5.0
131
+ version: 3.4.0
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 0.5.0
138
+ version: 3.4.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rubocop
141
141
  requirement: !ruby/object:Gem::Requirement