egov_utils 0.1.23 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4a1277bc53acada48031d6bca281ce875e4f937b8e86ad3e05588ad7c2e3201
-  data.tar.gz: 69e8697534f1b8398739b9578f337a294b4c07455c94e0c89505f9f511a804f6
+  metadata.gz: 18a523079b611c16cb2d396f77d105946a0f82359afc2bdf264c8eca9ead5b54
+  data.tar.gz: 83d00e43acb7ac7d1a1996214ebf417601085642629575c13bc5ce8a650fd183
 SHA512:
-  metadata.gz: d34e4b723a3c007cf2eb5c4bbd494af079f5e520c72d8fd80ddd09b5431d78b088fbcea6ee6c73a87cfee0179a4ff8d7d945a3da31eeed3a63da96c0f01377bf
-  data.tar.gz: 9aef7643e96b238fcee2a0d1ead31b43889c9f0e9ff261bcd69a26cf657e3ac3c6891a11b86df8fd252229e9ddec75ebe9fdf44a3a1271a65de38638bfc35e0b
+  metadata.gz: de2382de5425cb8f9399b933057b3bace3e2ded8cbf66c4f4a65b29ebdaf8c1582afbd72e6bc3feccb8a69abc512af21f68d2c7b2ba010a624b1e8a7e00a8bef
+  data.tar.gz: 69e22c0e7132b03f8fa34ceb14619bdbdd6419f8b13e7fb7a878a8d2dc95a7c947022db81b377b0f53079869e228b8965bffdc4f33210075a47cd14625c03558

data/app/models/egov_utils/user.rb

@@ -116,12 +116,12 @@ module EgovUtils
 
     def ldap_groups
       if provider.present?
-        group_ids = Rails.cache.read("#{cache_key}/ldap_group_ids", expires_in: 30.minutes)
+        group_ids = persisted? && Rails.cache.read("#{cache_key}/ldap_group_ids", expires_in: 30.minutes)
         if group_ids
           groups = EgovUtils::Group.where(id: group_ids).to_a
         else
           groups = EgovUtils::Group.where(provider: provider).to_a.select{|g| auth_source.member?(ldap_dn, g.external_uid) }
-          Rails.cache.write("#{cache_key}/ldap_group_ids", groups.collect(&:id), expires_in: 30.minutes)
+          Rails.cache.write("#{cache_key}/ldap_group_ids", groups.collect(&:id), expires_in: 30.minutes) if persisted?
         end
         groups
       end

data/lib/bootstrap_form/fileuid.rb

@@ -6,7 +6,6 @@ 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/fileuid.rb

@@ -89,13 +89,21 @@ module EgovUtils
     }
 
     # Used for `serialize` method in ActiveRecord
-    class << self
-      def dump(fileuid)
-        unless obj.is_a?(self)
+    class Coder
+
+      def initialize(attr_name, type)
+        @attr_name = attr_name
+        @type = type
+      end
+
+      def dump(obj)
+        return if obj.nil?
+        obj = Fileuid.new(obj, type: @type) if obj.is_a?(String)
+        unless obj.is_a?(Fileuid)
           raise ::ActiveRecord::SerializationTypeMismatch,
             "Attribute was supposed to be a #{self}, but was a #{obj.class}. -- #{obj.inspect}"
         end
-        fileuid.invalid? ? nil : to_s
+        obj.invalid? ? nil : obj.to_s
       end
 
       def load(source)
@@ -103,8 +111,13 @@ module EgovUtils
       end
     end
 
-    attr_accessor :bc, :agenda, :senat, :year, :document_number
+    AVAILABLE_ATTRIBUTES = [:bc, :agenda, :senat, :year, :document_number]
 
+    attr_accessor *AVAILABLE_ATTRIBUTES
+
+    def ==(other)
+      other.is_a?(Fileuid) && AVAILABLE_ATTRIBUTES.all?{|a| self.public_send(a) == other.public_send(a) }
+    end
 
     def type
       @type ||= @options['type']
@@ -115,18 +128,18 @@ module EgovUtils
     end
 
     def invalid?
-      @invalid
+      !type || @invalid
     end
 
     def initialize(str_val, **options)
       @options = options.stringify_keys
+      @str_val = str_val
       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
@@ -140,7 +153,7 @@ module EgovUtils
       TYPES.each do |k, type|
         return k if str_val =~ type.to_regex
       end
-      @invalid = true
+      nil
     end
 
     def as_json(**options)

data/lib/egov_utils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.26
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails