redress 0.2.2 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -4
  3. data/lib/redress/form.rb +12 -11
  4. data/lib/redress/identity.rb +1 -1
  5. data/lib/redress/utils/build_form_from_model.rb +4 -1
  6. metadata +58 -44
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0c939634da1dd6e77568b2d4fa2bcf533340b718
4
- data.tar.gz: 369e02b67e16a7f25af5776f93325cdeed7d4c5f
3
+ metadata.gz: 87698ee232331526b44dec9787facf64872dd12b
4
+ data.tar.gz: '0518e7096233fa1d87fd4bc17231522f63672d5e'
5
5
  SHA512:
6
- metadata.gz: b8d60487e7cb69fdda743027008fe4b5eb22356de0db1bb033deb710f5382901aa8de9ab3361762f1d64e82bb15e764257448531c6932e93507c15cc2e1e58fe
7
- data.tar.gz: d62e7d6b92ba0bcd4366c6a4f8e2752526341c6dfe1c398fc9ee59f9d38ba8918ef5db7e82c69ec92e21649dbbf80c474267ee9d45327874f811d5565b3270ba
6
+ metadata.gz: a3ebcb62403d2facc8d6927e373b525b88a9c1c2dcdade40870e23df8e3f749f0242b08cec85f930b178848b42226b23677827176b9f12cd0c865ced4f1a4997
7
+ data.tar.gz: c65d6073f60a863c188503c57413a271661a047854f252fe7625145e3d89ded8b7f7ac76ef32abdcc436cab23d45af1f01b7a71ac6692db20cb1431cce1bae74
data/README.md CHANGED
@@ -4,7 +4,6 @@
4
4
  [![Code Climate](https://codeclimate.com/github/galetahub/redress/badges/gpa.svg)](https://codeclimate.com/github/galetahub/redress)
5
5
  [![Build Status](https://semaphoreci.com/api/v1/igor-galeta/redress/branches/master/shields_badge.svg)](https://semaphoreci.com/igor-galeta/redress)
6
6
  [![Coverage Status](https://coveralls.io/repos/github/galetahub/redress/badge.svg?branch=master)](https://coveralls.io/github/galetahub/redress?branch=master)
7
- [![Dependency Status](https://gemnasium.com/badges/github.com/galetahub/redress.svg)](https://gemnasium.com/github.com/galetahub/redress)
8
7
 
9
8
  ## Motivation (Command pattern)
10
9
 
@@ -68,7 +67,7 @@ class SimpleForm < ApplicationForm
68
67
  attribute :name, String
69
68
  attribute :email, String
70
69
  attribute :name_with_email, String
71
- attribute :age, Redress::Types::Form::Int
70
+ attribute :age, Redress::Types::Coercible::Integer
72
71
  end
73
72
 
74
73
  validates :name, presence: true
@@ -85,7 +84,7 @@ Form with multiple comments:
85
84
  ```ruby
86
85
  class CommentForm < Redress::Form
87
86
  define_schema do
88
- attribute :id, Redress::Types::Form::Int
87
+ attribute :id, Redress::Types::Coercible::Integer
89
88
  attribute :content, Redress::Types::String
90
89
  end
91
90
 
@@ -97,7 +96,7 @@ class OrderForm < Redress::Form
97
96
 
98
97
  define_schema do
99
98
  attribute :title, Redress::Types::String
100
- attribute :comments, Redress::Types::Array.member(CommentForm)
99
+ attribute :comments, Redress::Types::Array.of(CommentForm)
101
100
  end
102
101
  end
103
102
  ```
data/lib/redress/form.rb CHANGED
@@ -18,11 +18,8 @@ module Redress
18
18
 
19
19
  attr_reader :context
20
20
 
21
- # https://github.com/dry-rb/dry-struct/blob/master/lib/dry/struct.rb
22
- # schema - missing keys will result in setting them using default values,
23
- # unexpected keys will be ignored.
24
- #
25
- constructor_type :schema
21
+ transform_keys(&:to_sym)
22
+ transform_types { |type| type.meta(omittable: true) }
26
23
 
27
24
  def self.model_name
28
25
  ActiveModel::Name.new(self, nil, mimicked_model_name.to_s.camelize)
@@ -61,7 +58,7 @@ module Redress
61
58
  next if instance_methods.include?(method_name)
62
59
 
63
60
  define_method(method_name) do |value|
64
- writer_attribute(name, value)
61
+ write_attribute(name, value)
65
62
  end
66
63
  end
67
64
  end
@@ -74,21 +71,25 @@ module Redress
74
71
  @context = Hashie::Mash.new(options)
75
72
  end
76
73
 
77
- def attributes
78
- @attributes ||= Redress::Utils::AttributesHash.new(to_hash)
74
+ def properties
75
+ @properties ||= Redress::Utils::AttributesHash.new(to_hash)
79
76
  end
80
- alias properties attributes
81
77
 
82
78
  def map_model(model)
83
79
  end
84
80
 
85
81
  protected
86
82
 
87
- def writer_attribute(name, value)
83
+ def write_attribute(name, value)
88
84
  return unless self.class.attribute?(name)
85
+ @attributes[name] = safe_coercion(name, value)
86
+ end
89
87
 
88
+ def safe_coercion(name, value)
90
89
  type = self.class.schema[name]
91
- instance_variable_set("@#{name}", type[value])
90
+ type[value]
91
+ rescue ArgumentError
92
+ nil
92
93
  end
93
94
  end
94
95
  end
data/lib/redress/identity.rb CHANGED
@@ -12,7 +12,7 @@ module Redress
12
12
  end
13
13
 
14
14
  def self.version
15
- "0.2.2"
15
+ "0.3.0"
16
16
  end
17
17
 
18
18
  def self.version_label
data/lib/redress/utils/build_form_from_model.rb CHANGED
@@ -21,7 +21,10 @@ module Redress
21
21
 
22
22
  def model_attributes
23
23
  matching_attributes.each_with_object({}) do |name, hash|
24
- hash[name] = @model.public_send(name)
24
+ value = @model.public_send(name)
25
+ next if value.nil?
26
+
27
+ hash[name] = value
25
28
  end
26
29
  end
27
30
 
metadata CHANGED
@@ -1,211 +1,225 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: redress
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.2
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Igor Galeta
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-10-30 00:00:00.000000000 Z
11
+ date: 2018-07-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: wisper
14
+ name: activemodel
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 1.6.1
19
+ version: 4.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 1.6.1
26
+ version: 4.2.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dry-struct
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.3.1
33
+ version: 0.5.0
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: 0.3.1
40
+ version: 0.5.0
41
+ - !ruby/object:Gem::Dependency
42
+ name: dry-types
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: 0.13.2
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 0.13.2
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: hashie
43
57
  requirement: !ruby/object:Gem::Requirement
44
58
  requirements:
45
59
  - - ">="
46
60
  - !ruby/object:Gem::Version
47
- version: 3.5.0
61
+ version: 3.5.7
48
62
  type: :runtime
49
63
  prerelease: false
50
64
  version_requirements: !ruby/object:Gem::Requirement
51
65
  requirements:
52
66
  - - ">="
53
67
  - !ruby/object:Gem::Version
54
- version: 3.5.0
68
+ version: 3.5.7
55
69
  - !ruby/object:Gem::Dependency
56
- name: activemodel
70
+ name: wisper
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
73
  - - ">="
60
74
  - !ruby/object:Gem::Version
61
- version: 4.2.0
75
+ version: 2.0.0
62
76
  type: :runtime
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
80
  - - ">="
67
81
  - !ruby/object:Gem::Version
68
- version: 4.2.0
82
+ version: 2.0.0
69
83
  - !ruby/object:Gem::Dependency
70
- name: rake
84
+ name: actionpack
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
87
  - - "~>"
74
88
  - !ruby/object:Gem::Version
75
- version: '12.0'
89
+ version: 5.1.4
76
90
  type: :development
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
94
  - - "~>"
81
95
  - !ruby/object:Gem::Version
82
- version: '12.0'
96
+ version: 5.1.4
83
97
  - !ruby/object:Gem::Dependency
84
- name: pry
98
+ name: coveralls
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
101
  - - "~>"
88
102
  - !ruby/object:Gem::Version
89
- version: '0.10'
103
+ version: 0.8.21
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
108
  - - "~>"
95
109
  - !ruby/object:Gem::Version
96
- version: '0.10'
110
+ version: 0.8.21
97
111
  - !ruby/object:Gem::Dependency
98
- name: pry-byebug
112
+ name: guard-rspec
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
115
  - - "~>"
102
116
  - !ruby/object:Gem::Version
103
- version: '3.4'
117
+ version: '4.7'
104
118
  type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
122
  - - "~>"
109
123
  - !ruby/object:Gem::Version
110
- version: '3.4'
124
+ version: '4.7'
111
125
  - !ruby/object:Gem::Dependency
112
- name: pry-state
126
+ name: pry
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
129
  - - "~>"
116
130
  - !ruby/object:Gem::Version
117
- version: '0.1'
131
+ version: '0.10'
118
132
  type: :development
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
136
  - - "~>"
123
137
  - !ruby/object:Gem::Version
124
- version: '0.1'
138
+ version: '0.10'
125
139
  - !ruby/object:Gem::Dependency
126
- name: rspec
140
+ name: pry-byebug
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - "~>"
130
144
  - !ruby/object:Gem::Version
131
- version: '3.6'
145
+ version: '3.4'
132
146
  type: :development
133
147
  prerelease: false
134
148
  version_requirements: !ruby/object:Gem::Requirement
135
149
  requirements:
136
150
  - - "~>"
137
151
  - !ruby/object:Gem::Version
138
- version: '3.6'
152
+ version: '3.4'
139
153
  - !ruby/object:Gem::Dependency
140
- name: guard-rspec
154
+ name: pry-state
141
155
  requirement: !ruby/object:Gem::Requirement
142
156
  requirements:
143
157
  - - "~>"
144
158
  - !ruby/object:Gem::Version
145
- version: '4.7'
159
+ version: '0.1'
146
160
  type: :development
147
161
  prerelease: false
148
162
  version_requirements: !ruby/object:Gem::Requirement
149
163
  requirements:
150
164
  - - "~>"
151
165
  - !ruby/object:Gem::Version
152
- version: '4.7'
166
+ version: '0.1'
153
167
  - !ruby/object:Gem::Dependency
154
- name: reek
168
+ name: rake
155
169
  requirement: !ruby/object:Gem::Requirement
156
170
  requirements:
157
171
  - - "~>"
158
172
  - !ruby/object:Gem::Version
159
- version: '4.7'
173
+ version: '12.0'
160
174
  type: :development
161
175
  prerelease: false
162
176
  version_requirements: !ruby/object:Gem::Requirement
163
177
  requirements:
164
178
  - - "~>"
165
179
  - !ruby/object:Gem::Version
166
- version: '4.7'
180
+ version: '12.0'
167
181
  - !ruby/object:Gem::Dependency
168
- name: rubocop
182
+ name: reek
169
183
  requirement: !ruby/object:Gem::Requirement
170
184
  requirements:
171
185
  - - "~>"
172
186
  - !ruby/object:Gem::Version
173
- version: '0.49'
187
+ version: '4.7'
174
188
  type: :development
175
189
  prerelease: false
176
190
  version_requirements: !ruby/object:Gem::Requirement
177
191
  requirements:
178
192
  - - "~>"
179
193
  - !ruby/object:Gem::Version
180
- version: '0.49'
194
+ version: '4.7'
181
195
  - !ruby/object:Gem::Dependency
182
- name: coveralls
196
+ name: rspec
183
197
  requirement: !ruby/object:Gem::Requirement
184
198
  requirements:
185
199
  - - "~>"
186
200
  - !ruby/object:Gem::Version
187
- version: 0.8.21
201
+ version: '3.6'
188
202
  type: :development
189
203
  prerelease: false
190
204
  version_requirements: !ruby/object:Gem::Requirement
191
205
  requirements:
192
206
  - - "~>"
193
207
  - !ruby/object:Gem::Version
194
- version: 0.8.21
208
+ version: '3.6'
195
209
  - !ruby/object:Gem::Dependency
196
- name: actionpack
210
+ name: rubocop
197
211
  requirement: !ruby/object:Gem::Requirement
198
212
  requirements:
199
213
  - - "~>"
200
214
  - !ruby/object:Gem::Version
201
- version: 5.1.4
215
+ version: '0.49'
202
216
  type: :development
203
217
  prerelease: false
204
218
  version_requirements: !ruby/object:Gem::Requirement
205
219
  requirements:
206
220
  - - "~>"
207
221
  - !ruby/object:Gem::Version
208
- version: 5.1.4
222
+ version: '0.49'
209
223
  description:
210
224
  email:
211
225
  - galeta.igor@gmail.com