egov_utils 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f63fa0be85c1b24f142e25d3ba88b06aa28746c
-  data.tar.gz: f591df909e11cc230e68a12c51a2a8324db9dd9d
+  metadata.gz: 2b4f8d1e7b832f1e39353978e0227fe9fe46c337
+  data.tar.gz: f196d70f9d135cd16c39dbc26d95348f35892868
 SHA512:
-  metadata.gz: 54147634748dbca9e1c632fb0a7be76663a5b7295e14180d26d9eaa99926a4f953ee063132ad29da18b1e64c4c1edae46e25df6e193f181b728c571edbc05581
-  data.tar.gz: 36ef6a4509dd5173c9027c4585341a33701992bf1ba7df49fd4371de8baf8d6a401d0557e648bafc926d1e13de344bb45002dae4a3ad5d7c30c30f67efcf9ed1
+  metadata.gz: d49271e7e63b551bc7ea734aca1051f53dd4927b9924bd02714a01b9b3f5b4cbab5b97b15bde02db068c544ccc6c17a13577f8d681057a3ec02533728dcfeab1
+  data.tar.gz: dba5631a2185d2a7b26f9acbec86a57a1ecc74ba55a88ce734ecc71d1e91d83db1471d69f78957406d03782e6edb35e3913b2067cd898a9443b3a259c870dc41

data/app/models/egov_utils/address.rb

@@ -5,6 +5,8 @@ module EgovUtils
 
     validates :street, :city, length: 3..255
     validates :postcode, numericality: { only_integer: true }
+    validates :district, inclusion: { in: :district_names }
+    validates :region, inclusion: { in: :region_names }
 
     District = Struct.new(:id, :name, :region_id)
     Region = Struct.new(:id, :name)
@@ -34,8 +36,16 @@ module EgovUtils
       regions.detect{|r| r[:id] == district[:region_id] } if district
     end
 
+    def district_names
+      self.class.districts.collect{|r| r[:name]}
+    end
+    def region_names
+      self.class.regions.collect{|r| r[:name]}
+    end
+
+
     def district=(value)
-      self.region = self.class.region_for_district(value)[:name]
+      self.region = self.class.region_for_district(value).try(:[], :name)
       super
     end
 

data/app/views/egov_utils/addresses/_form.html.haml

@@ -9,7 +9,7 @@
   .col-12
     = form.text_field :city
     = form.text_field :postcode
-    = form.text_field :district
+    = form.select :district, EgovUtils::Address.districts.collect{|r| [r[:name],r[:name]]}
     = form.select :region, EgovUtils::Address.regions.collect{|r| [r[:name],r[:name]]}
     -# form.text_field :country
     %div.validation-button

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The eGoverment utilities is set of functionalities to support basic eGoverment