egov_utils 0.1.19 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32bbbdd34a0a8981f2000387b993c342e209e88237a230a85ea2262a4d515aa3
-  data.tar.gz: 2da793eaa12459a2cde485f4f849aaf342ab0f2aa4a21a031b8859540fa3e734
+  metadata.gz: b4a1277bc53acada48031d6bca281ce875e4f937b8e86ad3e05588ad7c2e3201
+  data.tar.gz: 69e8697534f1b8398739b9578f337a294b4c07455c94e0c89505f9f511a804f6
 SHA512:
-  metadata.gz: 95f36315e2c902ea4ff7acd9936ffaa0a04a8b8e4935ddcff4fe3ffd54c9d84e9233faa257ecf5ab0cba108d24f912f56126771502f5c930b7a364d22f6d0535
-  data.tar.gz: f4f497a24f9024f01213dd3375fd65828a2a84e86bea6aa1c7436436eeb1feeeec9fe60eaca1a9a0d2395edd5ca4989a58bacab1e46aeb0bacfcf8b18ea3c31b
+  metadata.gz: d34e4b723a3c007cf2eb5c4bbd494af079f5e520c72d8fd80ddd09b5431d78b088fbcea6ee6c73a87cfee0179a4ff8d7d945a3da31eeed3a63da96c0f01377bf
+  data.tar.gz: 9aef7643e96b238fcee2a0d1ead31b43889c9f0e9ff261bcd69a26cf657e3ac3c6891a11b86df8fd252229e9ddec75ebe9fdf44a3a1271a65de38638bfc35e0b

data/app/controllers/egov_utils/users_controller.rb

@@ -21,7 +21,7 @@ module EgovUtils
       @user.mail ||= @user.login
       respond_to do |format|
         if @user.save
-          UserMailer.confirmation_email(@user).deliver_later unless current_user.logged?
+          UserMailer.confirmation_email(@user).deliver_later if EgovUtils::Settings.allow_register? && !current_user.logged?
           format.html{ redirect_to main_app.root_path, notice: t('activerecord.successful.messages.created', model: User.model_name.human) }
           format.json{ render json: @user, status: :created }
         else

data/app/models/ability.rb

@@ -12,6 +12,8 @@ class Ability
   include CanCan::Ability
 
   def initialize(user)
+    can :create, User if EgovUtils::Settings.allow_register?
+
     user.all_roles.each do |role|
       role.define_abilities(self, user)
     end

data/app/resources/egov_utils/love.rb

@@ -1,8 +1,11 @@
+require 'activeresource'
+
 module EgovUtils
-  class Love < ActiveResource::Base
+  class Love < ::ActiveResource::Base
 
     def self.config
-      YAML.load_file(Rails.root.join('config', 'config.yml'))
+      file = Rails.root.join('config', 'config.yml')
+      File.exists?(file) ? YAML.load_file(file) : {}
     end
 
     self.site = "#{config['love_url'] || Rails.configuration.try(:love_url)}/api/v1/"

data/app/resources/egov_utils/organization.rb

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

data/app/validators/fileuid_validator.rb

@@ -1,8 +1,19 @@
 class FileuidValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     return if options[:allow_nil] && value.presence.nil?
-    unless value =~ /\A\d+-\w{1,4}-\d+\/\d{4}\z/i
+    if value.is_a?(EgovUtils::Fileuid)
+      record.errors.add(attribute, (options[:message] || :fileuid_format)) if value.invalid?
+    elsif !match_regexp?(record, attribute, value)
       record.errors.add(attribute, (options[:message] || :fileuid_format))
     end
   end
+
+  def match_regexp?(record, attribute, value)
+    type = nil
+    if type
+      value =~ EgovUtils::Fileuid::TYPES[type].to_regex
+    else
+      EgovUtils::Fileuid::TYPES.values.any?{|type_def| value =~ type_def.to_regex }
+    end
+  end
 end

data/app/views/egov_utils/sessions/new.html.haml

@@ -2,4 +2,5 @@
   = f.text_field(:username)
   = f.password_field(:password)
   = f.submit t(:label_login)
-= link_to t('label_signup'), new_user_path, class: 'btn btn-secondary'
+- if EgovUtils::Settings.allow_register?
+  = link_to t('label_signup'), new_user_path, class: 'btn btn-secondary'

data/lib/bootstrap_form/fileuid.rb

@@ -6,6 +6,7 @@ module BootstrapForm
     def fileuid_field(method, options={})
       form_group_builder(method, options) do
         prepend_and_append_input(options) do
+          binding.pry
           @template.fileuid_field(@object_name, method, objectify_options(options))
         end
       end

data/lib/egov_utils.rb

@@ -4,6 +4,8 @@ require 'bootstrap'
 require 'bootstrap_form'
 require 'momentjs-rails'
 
+require 'egov_utils/fileuid'
+
 require "egov_utils/engine"
 
 module EgovUtils

data/lib/egov_utils/engine.rb

@@ -23,6 +23,10 @@ module EgovUtils
       end
     end
 
+    initializer 'egov_utils.initialize_settings' do
+      require 'egov_utils/settings'
+    end
+
     initializer 'egov_utils.set_locales' do
       config.middleware.use I18n::JS::Middleware
     end

data/lib/egov_utils/fileuid.rb

@@ -0,0 +1,159 @@
+module EgovUtils
+  class Fileuid
+
+    Snippet = Struct.new(:name, :type, :length, :mandatory) do
+
+      def mandatory?
+        mandatory.nil? ? true : mandatory
+      end
+
+      def static?
+        type == :static
+      end
+
+      def type_to_regex_part
+        case type
+        when String
+          type
+        when :integer
+          "\\d"
+        when :word
+          "\\w"
+        when :static
+          name
+        else
+          raise "Unsuported fileuid snippet type #{type}"
+        end
+      end
+
+      def length_to_regex_part
+        case length
+        when 1, nil
+          ''
+        when :any
+          mandatory? ? "+" : "*"
+        when Array
+          "{#{length[0]},#{length[1]}}"
+        when Numeric
+          "{#{length}}"
+        else
+          length
+        end
+      end
+
+      def to_regex_s
+        type_to_regex_part + length_to_regex_part
+      end
+    end
+
+    class Type
+      attr_reader :snippets
+
+      def initialize(*attrs)
+        @snippets = attrs
+      end
+
+      def snippet_names
+        snippets.select{|s| !s.static? }.collect{|s| s.name}
+      end
+
+      def validate!
+        raise "Snippet names for file uid type has to be uniq!" unless snippet_names.length == snippet_names.uniq.length
+      end
+
+      def to_regex_s
+        snippets.collect{|s| (s.type == :static ? s.to_regex_s : "(#{s.to_regex_s})") }.join()
+      end
+
+      def to_regex
+        /\A#{to_regex_s}\z/
+      end
+
+      def file_uid_to_s(fileuid)
+        snippets.collect{|snippet| snippet.static? ? snippet.name : fileuid.public_send(snippet.name) }.join
+      end
+
+    end
+
+    DASH_SNIPPET        = Snippet.new('-', :static)
+    SLASH_SNIPPET       = Snippet.new('/', :static)
+    BC_SNIPPET          = Snippet.new('bc', :integer, :any)
+    YEAR_SNIPPET        = Snippet.new('year', :integer, 4)
+    REGISTER_SNIPPET    = Snippet.new('agenda', '[-a-zA-Z]', [1,10])
+    COURT_AGEND_SNIPPET = Snippet.new('agenda', :word, [1,4])
+    COURT_SENAT_SNIPPET = Snippet.new('senat', :integer, :any)
+
+    TYPES = {
+      'court' => Type.new(BC_SNIPPET, DASH_SNIPPET, COURT_AGEND_SNIPPET, DASH_SNIPPET, COURT_SENAT_SNIPPET, SLASH_SNIPPET, YEAR_SNIPPET),
+      'msp'   => Type.new(BC_SNIPPET, SLASH_SNIPPET, YEAR_SNIPPET, DASH_SNIPPET, REGISTER_SNIPPET)
+    }
+
+    # Used for `serialize` method in ActiveRecord
+    class << self
+      def dump(fileuid)
+        unless obj.is_a?(self)
+          raise ::ActiveRecord::SerializationTypeMismatch,
+            "Attribute was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
+        end
+        fileuid.invalid? ? nil : to_s
+      end
+
+      def load(source)
+        Fileuid.new(source)
+      end
+    end
+
+    attr_accessor :bc, :agenda, :senat, :year, :document_number
+
+
+    def type
+      @type ||= @options['type']
+    end
+
+    def type_definition
+      TYPES[type]
+    end
+
+    def invalid?
+      @invalid
+    end
+
+    def initialize(str_val, **options)
+      @options = options.stringify_keys
+      parse_str!(str_val) if str_val.is_a?(String)
+    end
+
+    def parse_str!(str_val, type=self.type)
+      type ||= determine_type(str_val)
+      @type = type
+      @invalid = true unless type
+      return if invalid?
+      match_data = str_val.match(type_definition.to_regex)
+      if match_data
+        type_definition.snippet_names.each_with_index{|s_name, idx| self.send(s_name+'=', match_data[idx+1]) }
+      else
+        @invalid = true
+      end
+    end
+
+    def determine_type(str_val)
+      TYPES.each do |k, type|
+        return k if str_val =~ type.to_regex
+      end
+      @invalid = true
+    end
+
+    def as_json(**options)
+      invalid? ? nil : to_s
+    end
+
+    def to_s
+      if invalid?
+        ''
+      else
+        type_definition.file_uid_to_s(self)
+      end
+    end
+
+  end
+end

data/lib/egov_utils/settings.rb

@@ -0,0 +1,22 @@
+require 'settingslogic'
+
+module EgovUtils
+
+  def self.config_file
+    ENV.fetch('EGOVUTILS_CONFIG') { Rails.root.join('config', 'config.yml') }
+  end
+
+  class Settings < ::Settingslogic
+    source (File.exists?(EgovUtils.config_file) ? EgovUtils.config_file : {})
+
+    # namespace Rails.env
+
+    def allow_register?
+      allow_register
+    end
+
+  end
+
+  Settings['allow_register'] ||= false
+
+end

data/lib/egov_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.23
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: settingslogic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  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: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -254,28 +282,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: egon_gate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -391,9 +419,11 @@ files:
 - lib/egov_utils.rb
 - lib/egov_utils/auth_source.rb
 - lib/egov_utils/engine.rb
+- lib/egov_utils/fileuid.rb
 - lib/egov_utils/has_audit_trail.rb
 - lib/egov_utils/helpers/form_helper.rb
 - lib/egov_utils/helpers/tags/fileuid_field.rb
+- lib/egov_utils/settings.rb
 - lib/egov_utils/test_utils/controller_helpers.rb
 - lib/egov_utils/user_utils/application_controller_patch.rb
 - lib/egov_utils/user_utils/role.rb