egov_utils 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 645db7eb940442f396800108992bba65e51e538f37f813ace77d2c6e2834fa62
-  data.tar.gz: e5e345da32a0ca06f627ee8be1fe623eb8f4c67491946a1e58067f6e75195c34
+  metadata.gz: 32bbbdd34a0a8981f2000387b993c342e209e88237a230a85ea2262a4d515aa3
+  data.tar.gz: 2da793eaa12459a2cde485f4f849aaf342ab0f2aa4a21a031b8859540fa3e734
 SHA512:
-  metadata.gz: 6cde297896021821c290807c06ca689e145e1da3d96d1af1c4d654e1263bb2ff94f874eda73a2c079ded8d0f1050eb8c36ca9d79966aee0c1f1ceb564ec20caa
-  data.tar.gz: 34ea0683107c72945a89726ea377145d75c1f966d41ec1b8600e2204b08fe9693a9d014f461db5483f7c90f720148e89459c98818e33f179b9d383bf049ea8c1
+  metadata.gz: 95f36315e2c902ea4ff7acd9936ffaa0a04a8b8e4935ddcff4fe3ffd54c9d84e9233faa257ecf5ab0cba108d24f912f56126771502f5c930b7a364d22f6d0535
+  data.tar.gz: f4f497a24f9024f01213dd3375fd65828a2a84e86bea6aa1c7436436eeb1feeeec9fe60eaca1a9a0d2395edd5ca4989a58bacab1e46aeb0bacfcf8b18ea3c31b

data/app/assets/javascripts/egov_utils/eGovUtilities.coffee.erb

@@ -23,6 +23,10 @@ window.eGovUtilities =
     eGovUtilities.initDatepickers($container)
     eGovUtilities.initSelect2($container)
 
+  clearBeforeCache: ($container)->
+    $container ||= $(document)
+    eGovUtilities.destroySelect2($container)
+
   initDatepickers: ($container)->
     $container ||= $(document)
     if !Modernizr.inputtypes.date
@@ -37,8 +41,11 @@ window.eGovUtilities =
 
   initSelect2: ($container)->
     $container ||= $(document)
-    $('[data-provide="select2"]', $container).each (i, el)->
-      $(el).select2()
+    $('[data-provide="select2"]', $container).select2()
+
+  destroySelect2: ($container)->
+    $container ||= $(document)
+    $('[data-provide="select2"]', $container).select2('destroy')
 
 
   initModal: (modalId, options)->
@@ -91,3 +98,7 @@ window.eGovUtilities =
 $(eGovUtilities.setup)
 $(document).on 'turbolinks:load', (evt)->
   eGovUtilities.initPage()
+
+$(document).on 'turbolinks:before-cache', (evt)->
+  eGovUtilities.clearBeforeCache()
+

data/app/models/egov_utils/group.rb

@@ -4,6 +4,10 @@ module EgovUtils
     validates :name, presence: true, uniqueness: true
     validates :ldap_uid, uniqueness: true, allow_nil: true
 
+    def self.organizations_by_domains(domains)
+      EgovUtils::Organization.where(domain: domains)
+    end
+
     def members
 
     end
@@ -23,7 +27,11 @@ module EgovUtils
     end
 
     def external_uid
-      super || auth_source.send(:get_group_dn, sid: ldap_uid)
+      super || ( ldap? && ldap_uid && auth_source.send(:get_group_dn, sid: ldap_uid) )
+    end
+
+    def ldap_dn
+      ldap? && external_uid
     end
 
   end

data/app/models/egov_utils/principal.rb

@@ -16,5 +16,36 @@ module EgovUtils
     def auth_source
       @auth_source ||= EgovUtils::AuthSource.new(provider) if provider.present?
     end
+
+    def ldap?
+      !!auth_source
+    end
+
+    def ldap_dn
+      raise NotImplementedError
+    end
+
+    def ldap_domain
+      ldap? && ldap_dn.scan(/dc=([^,]*)/i).flatten.join('.')
+    end
+
+    def organization_by_domain(ldap_domain=self.ldap_domain)
+      @organization_by_domain ||= EgovUtils::Organization.where(domain: ldap_domain).first if ldap_domain
+    end
+
+    def organization_key
+      organization_by_domain.try(:key)
+    end
+
+    def organization_id(organization_key=self.organization_key)
+      EgovUtils::Organization.find_by_key(organization_key).try(:id)
+    end
+
+    def organization_with_suborganizations_keys(organization_key=self.organization_key)
+      return [] unless organization_key
+      Rails.cache.fetch("organizations/#{organization_key}/org_with_suborgs_keys") do
+        [organization_key] + ( organization_key && EgovUtils::Organization.where(superior_id: organization_id(organization_key)).collect(&:key) || [] )
+      end
+    end
   end
 end

data/app/models/egov_utils/user.rb

@@ -111,7 +111,7 @@ module EgovUtils
     end
 
     def ldap_dn
-      @ldap_dn = auth_source.send(:get_user_dn, login)[:dn]
+      @ldap_dn ||= auth_source.send(:get_user_dn, login)[:dn]
     end
 
     def ldap_groups

data/app/resources/egov_utils/love.rb

@@ -0,0 +1,15 @@
+module EgovUtils
+  class Love < ActiveResource::Base
+
+    def self.config
+      YAML.load_file(Rails.root.join('config', 'config.yml'))
+    end
+
+    self.site = "#{config['love_url'] || Rails.configuration.try(:love_url)}/api/v1/"
+
+    def self.where(clauses = {})
+      raise ArgumentError, "expected a clauses Hash, got #{clauses.inspect}" unless clauses.is_a? Hash
+      find(:all, params: {f: clauses})
+    end
+  end
+end

data/app/resources/egov_utils/organization.rb

@@ -0,0 +1,15 @@
+module EgovUtils
+  class Organization < Love
+
+    def self.find_by_key(key)
+      where(key: key).first
+    end
+
+    def self.courts(organization_keys)
+      filters = {category_abbrev: ['OS','KS']}
+      filters.merge!(key: organization_keys) if organization_keys.present?
+      all(params: {f: filters, sort: {'0' => {path: 'category_abbrev'} }})
+    end
+
+  end
+end

data/config/locales/cs.yml

@@ -3,6 +3,12 @@ cs:
   time:
     formats:
       default: "%a %d. %B %Y %H:%M"
+      time: "%H:%M"
+
+  bootstrap:
+    file_input:
+      placeholder: 'Vyberte soubor...'
+      button_label: Procházet
 
   ministery_justice_name: Ministerstvo spravedlnosti ČR
   label_no_records: Žádné záznamy k zobrazení
@@ -21,6 +27,7 @@ cs:
   label_logout: Odhlásit
   label_signup: Registrovat
   label_validate_address: Zvalidovat
+  label_save: Uložit
 
   text_born_on_at: "Narozen %{date} v %{place}"
 
@@ -46,6 +53,7 @@ cs:
       password_confirmation: Potvrzení hesla
       firstname: Jméno
       lastname: Příjmení
+      fullname: Jméno a příjmení
     egov_utils/address:
       full_address: Adresa
       street: Ulice

data/lib/bootstrap_form/custom_file_field.rb

@@ -0,0 +1,14 @@
+module BootstrapForm
+  module CustomFileField
+
+    def custom_file_field(name, *args)
+      options = args.extract_options!.symbolize_keys!
+      args << options
+      form_group_builder(name, options.reverse_merge(control_class: nil)) do
+        html = file_field_without_bootstrap(name, options.merge(class: 'custom-file-input')) + " " + content_tag('span', '', class: ['custom-file-control', options[:class]].compact.join(' '))
+        label('', html, class: "custom-file form-control")
+      end
+    end
+
+  end
+end

data/lib/egov_utils/engine.rb

@@ -3,6 +3,7 @@ require 'cancancan'
 require 'audited'
 require 'azahara_schema'
 
+require 'font-awesome-sass'
 require 'modernizr-rails'
 
 module EgovUtils
@@ -73,6 +74,7 @@ module EgovUtils
       require 'bootstrap_form/datetimepicker'
       require 'bootstrap_form/fileuid'
       require 'bootstrap_form/select2'
+      require 'bootstrap_form/custom_file_field'
       BootstrapForm::Helpers::Bootstrap.__send__(:prepend, BootstrapForm::Helpers::Bootstrap4)
 
       BootstrapForm::DATE_FORMAT = 'DD/MM/YYYY'
@@ -81,6 +83,7 @@ module EgovUtils
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Datetimepicker)
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Fileuid)
       BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::Select2)
+      BootstrapForm::FormBuilder.__send__(:prepend, BootstrapForm::CustomFileField)
 
       ActionView::Helpers::Tags::DateField.redefine_method(:format_date) do |value|
         value.try(:strftime, ruby_format_string)

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

data/vendor/assets/stylesheets/egov_utils/_bootstrap_variables.scss.erb

@@ -0,0 +1,12 @@
+$custom-file-text: (
+  placeholder: (
+    <% I18n.available_locales.each do |locale| %>
+    '<%= locale %>': "<%= I18n.t('bootstrap.file_input.placeholder', locale: locale, default: 'Choose file...') %>",
+    <% end %>
+  ),
+  button-label: (
+    <% I18n.available_locales.each do |locale| %>
+    '<%= locale %>': "<%= I18n.t('bootstrap.file_input.button_label', locale: locale, default: 'Browse') %>",
+    <% end %>
+  )
+);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0.beta
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
@@ -327,6 +341,8 @@ files:
 - app/models/egov_utils/person.rb
 - app/models/egov_utils/principal.rb
 - app/models/egov_utils/user.rb
+- app/resources/egov_utils/love.rb
+- app/resources/egov_utils/organization.rb
 - app/schemas/egov_utils/address_schema.rb
 - app/schemas/egov_utils/person_schema.rb
 - app/schemas/egov_utils/user_schema.rb
@@ -367,6 +383,7 @@ files:
 - db/migrate/20171103141234_add_birth_place_and_residence_to_people.rb
 - db/migrate/20171109172909_add_external_uid_to_groups.rb
 - db/migrate/20171115142450_add_confirmation_code_to_users.rb
+- lib/bootstrap_form/custom_file_field.rb
 - lib/bootstrap_form/datetimepicker.rb
 - lib/bootstrap_form/fileuid.rb
 - lib/bootstrap_form/helpers/bootstrap4.rb
@@ -474,6 +491,7 @@ files:
 - vendor/assets/javascripts/select2/i18n/zh-TW.js
 - vendor/assets/javascripts/select2/select2.js
 - vendor/assets/javascripts/shieldui-all.min.js
+- vendor/assets/stylesheets/egov_utils/_bootstrap_variables.scss.erb
 - vendor/assets/stylesheets/select2/select2-bootstrap.css
 - vendor/assets/stylesheets/select2/select2.css
 - vendor/assets/stylesheets/shield-custom/all.scss
@@ -503,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The eGoverment utilities is set of functionalities to support basic eGoverment