egov_utils 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2899be5e361f84f804ca797e2642f1c1a2dd2fafb77611b0ddc31de6196b576
-  data.tar.gz: 25af2ecd3c28f8e8891f499749c49d760fa8cdd227856cc7bccc494e7aa8fd50
+  metadata.gz: 38c99e9ec2cf5d25aa7b814edae5f6ea40bc0daf4415ab949b3a8cbacca86bb8
+  data.tar.gz: 0befe9b58a73e45efde674697f22c116e3a82e9219e68ea3ad8bf6bf6c70f29a
 SHA512:
-  metadata.gz: f0b3c160f69bec1b24c52b901bb6cbe72ab3bf6e8d8f9776d9c27c2df5133a4be6b7305e6254a199e82c471ed1f9bd5359decf8790b18fc848f9ebff81c5d688
-  data.tar.gz: 00f4ce960b807c0ad20a4300bf56cddcfeafde992ae599918e51729ae5033185714205d0f46ad093054b83ca9f7fafe4c1ca34709b738bbd63ff7e3869c294cd
+  metadata.gz: 73c3cef165f18c95dc3b518709ff825ff5f840b71444b471d414f2f0e0c031a17f68df0c4fa740e015109d7d7e509d7f92d3e2985f24375dc898e4fb1fbc51e9
+  data.tar.gz: c17455fe4ff7594600241b123e4100c881a0c6ba9bf9e6467c48d4b7912fbd3cc87f2891b48a1e89db0782d8a3da604a4726536acf20ed79f2e010656665c611

data/app/attributes/egov_utils/full_address.rb

@@ -1,13 +1,13 @@
 module EgovUtils
-  class FullAddress < AzaharaSchema::Attribute
+  class FullAddress < AzaharaSchema::DerivedAttribute
 
-    def arel_field
-      Arel::Nodes::NamedFunction.new 'CONCAT', [EgovUtils::Address.arel_table[:city], Arel::Nodes::SqlLiteral.new('\' \'') , EgovUtils::Address.arel_table[:street]]
+    def initialize(model, name, **options)
+      super(model, name, :concat, 'city', 'street', options)
     end
 
     def build_json_options!(options)
       options[:methods] ||= []
-      options[:methods] << 'full_address'
+      options[:methods] << name
       options
     end
 

data/app/schemas/egov_utils/address_schema.rb

@@ -22,7 +22,7 @@ module EgovUtils
 
     def initialize_available_attributes
       @available_attributes ||= []
-      @available_attributes << FullAddress.new(model, 'full_address', 'string')
+      @available_attributes << EgovUtils::FullAddress.new(model, 'full_address', schema: self)
       super
     end
 

data/app/views/egov_utils/redmine/issues/index.html.haml

@@ -1,5 +1,5 @@
 - @issues.group_by{|i| i.tracker}.each do |tracker, issues|
-  %h4= tracker.name + '('+t('label_done')+')'
+  %h4= tracker.name + ' ('+t('label_done')+')'
   %ul
     - issues.each do |issue|
       %li= issue.subject

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails