morse_contactable 1.0.5 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e46a5b3fb00774d062256adcd221fbe9f9165b25
4
- data.tar.gz: 29a43d4a2e11401104ac7e4eba7e32d70b4f81ff
3
+ metadata.gz: 278cd320c0d7fe484c1f8ec6cba516227b62e0be
4
+ data.tar.gz: 01202a4d58984463f998dc651fe61fd4aa29c1f8
5
5
  SHA512:
6
- metadata.gz: ae8d2d8b7654058f70ca08afc808854bb84f4de73ded39464fb9c81d641fd2bc47b131432a0f9e10316c8f67b7bdeaa5c310374bb8a82f7d66932d949c903bab
7
- data.tar.gz: 26423ddee7393313f3594623f88918845ee7627427b36d7955e2da87d23ec0d061f303c603e9f398738d27c69783d7715d6ce040c21c0d7ede2a2ca724ac0802
6
+ metadata.gz: 48ec9a5112fcdad5ef1faa33dc6c8084c3f4924f6ebcead5fe63ea1f2d720c24e394abe4390af87b64a18e4784e8319d30bbcd7c00ec922ba8405b9128093491
7
+ data.tar.gz: e8902ef47fa4c87c66d1fea0916771389e800e54d335bcab4f19a27d0ec0c5829d4c977be5a308f1fe0282fb0caef37e739c6355403537450513c4de8dac1d46
data/.DS_Store CHANGED
Binary file
data/lib/addressable.rb CHANGED
@@ -1,7 +1,8 @@
1
1
  module Addressable
2
2
  extend ActiveSupport::Concern
3
3
  include FieldsValidator
4
-
4
+ REQUIRED_DATABASE_FIELDS = [:address1, :address2, :address3, :town, :county, :country, :postcode]
5
+
5
6
  included do
6
7
  validate_required_attributes
7
8
  end
@@ -14,7 +15,7 @@ module Addressable
14
15
 
15
16
  def required_database_fields
16
17
  result=defined?(super) ? super : []
17
- result+=[:address1, :address2, :address3, :town, :county, :country, :postcode]
18
+ result+= REQUIRED_DATABASE_FIELDS
18
19
  end
19
20
 
20
21
  def required_addressable_attributes
@@ -24,6 +25,10 @@ module Addressable
24
25
 
25
26
  public
26
27
 
28
+ def address_pretty
29
+ stringify_array address_array
30
+ end
31
+
27
32
  def city
28
33
  town
29
34
  end
@@ -50,6 +55,13 @@ module Addressable
50
55
 
51
56
  private
52
57
 
58
+ def address_array
59
+ Array.new.tap { |a| REQUIRED_DATABASE_FIELDS.select { |key| a<<self.send(key) } }
60
+ end
61
+
62
+ def stringify_array(array)
63
+ array.compact.join(", ")
64
+ end
53
65
 
54
66
  end
55
67
 
@@ -1,3 +1,3 @@
1
1
  module MorseContactable
2
- VERSION = "1.0.5"
2
+ VERSION = "1.0.6"
3
3
  end
@@ -26,4 +26,8 @@ Gem::Specification.new do |spec|
26
26
  spec.add_development_dependency "shoulda-matchers", "~> 2.8"
27
27
  spec.add_development_dependency "rake", "~> 10.0"
28
28
  spec.add_development_dependency "rspec", "~> 3.2"
29
+ spec.add_development_dependency "byebug"
30
+ spec.add_development_dependency "pry-byebug"
31
+
32
+
29
33
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: morse_contactable
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.5
4
+ version: 1.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - fredmcgroarty
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-08-06 00:00:00.000000000 Z
11
+ date: 2015-08-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: morse_fields_validator
@@ -122,6 +122,34 @@ dependencies:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: '3.2'
125
+ - !ruby/object:Gem::Dependency
126
+ name: byebug
127
+ requirement: !ruby/object:Gem::Requirement
128
+ requirements:
129
+ - - ">="
130
+ - !ruby/object:Gem::Version
131
+ version: '0'
132
+ type: :development
133
+ prerelease: false
134
+ version_requirements: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - ">="
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
139
+ - !ruby/object:Gem::Dependency
140
+ name: pry-byebug
141
+ requirement: !ruby/object:Gem::Requirement
142
+ requirements:
143
+ - - ">="
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ type: :development
147
+ prerelease: false
148
+ version_requirements: !ruby/object:Gem::Requirement
149
+ requirements:
150
+ - - ">="
151
+ - !ruby/object:Gem::Version
152
+ version: '0'
125
153
  description:
126
154
  email:
127
155
  - mcfremac@icloud.com