ree_lib 1.0.43 → 1.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1322fe618658e425a1614927faf1ed43252e3b49bc9c953d3ba10de162693217
-  data.tar.gz: 8843b92fb6f84cbd83b1966108ea2a541ae798067b6b1a379c1cb7a1baeebbfa
+  metadata.gz: 1833caceb1fab8b06725a1a975b37176fe614d2977bec18a0bbcde694bc8c386
+  data.tar.gz: d7a55eebaeabce9227d6d5c991bbd55ce2b70e3a2c1857bef588205320d8a911
 SHA512:
-  metadata.gz: 41693ec34aff5834b7aba142dd2fb9a9a10146ce178091a8404d7c143bc6a1bce54b106fdbacac896ccc19df3ef5ef87d41a5a88cf2ad27646362839151a04cc
-  data.tar.gz: eb691d0b59814c5fab063627c6bea39ab8dcfec2f48643e17249a6175d2738c5867ba342776b7967626008757244848ad4abd95dd290f57de119a772b3167d81
+  metadata.gz: ca8d804780cdaed54a20b120bc8054568af74ca303fc2cd4e237944f1d8db6a9f26dd89fcbe31f912f5a3f966d315839267cc76208fe8a76dfbe7834faf3ab3a
+  data.tar.gz: 5840f846e9bf90ba3882454d21f9bf2df376319512a30766ba28ac41e72f70d70429dd0c4c69edc5bdf0bf4b45825c451861f46bb5b0cbbced98b58c7d625393

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.43)
+    ree_lib (1.0.45)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,8 +36,6 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.6.0)
-    nokogiri (1.14.2-x86_64-darwin)
-      racc (~> 1.4)
     nokogiri (1.14.2-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.23)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/dataset_extensions.rb

@@ -200,14 +200,18 @@ module ReeDao
           primary_key.map do |key|
             entity.send(key)
           end.join("_")
-        else
+        elsif entity.instance_variable_defined?(:"@#{primary_key}")
           entity.send(primary_key)
         end
       end
 
       def set_entity_cache(entity, raw)
         if !entity.is_a?(Integer) && !entity.is_a?(Symbol)
-          __ree_dao_cache.set(table_name, extract_primary_key(entity), raw)
+          p_key = extract_primary_key(entity)
+
+          if p_key
+            __ree_dao_cache.set(table_name, p_key, raw)
+          end
         end
       end
 

data/lib/ree_lib/packages/ree_text/package/ree_text/scrubbers/permit_scrubber.rb

@@ -3,6 +3,10 @@
 require 'set'
 
 class ReeText::PermitScrubber < Loofah::Scrubber
+  include Ree::LinkDSL
+
+  link :unescape_html
+
   attr_reader :tags, :attributes, :prune
 
   contract Kwargs[
@@ -11,7 +15,6 @@ class ReeText::PermitScrubber < Loofah::Scrubber
     attributes: Set,
   ] => Any
   def initialize(prune: false, tags: nil, attributes: nil)
-    @unescape_html = ReeText::UnescapeHtml.new
     @prune = prune
     @direction = @prune ? :top_down : :bottom_up
     @tags = tags
@@ -26,7 +29,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
 
       return CONTINUE
     end
-    
+
     return CONTINUE if node.text?
 
     unless (node.element? || node.comment?) && allowed_node?(node)
@@ -37,7 +40,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
   end
 
   protected
-  
+
   def allowed_node?(node)
     @tags.include?(node.name)
   end
@@ -74,8 +77,7 @@ class ReeText::PermitScrubber < Loofah::Scrubber
 
     if Loofah::HTML5::SafeList::ATTR_VAL_IS_URI.include?(attr_name)
       # this block lifted nearly verbatim from HTML5 sanitization
-      val_unescaped = @unescape_html
-        .call(attr_node.value)
+      val_unescaped = unescape_html(attr_node.value)
         .gsub(Loofah::HTML5::Scrub::CONTROL_CHARACTERS,'')
         .downcase
 

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.43"
+  VERSION = "1.0.45"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.43
+  version: 1.0.45
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree