siteguard_lite-custom_signature 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 620a9a897b60fad5a8d1a5c220e77b0fa839ec29ccc7b396b63f855462105829
-  data.tar.gz: 37dd3fcaeacf86b82e579a8c6dd6e92a0faab701f96f5d94a98260bff280bc7d
+  metadata.gz: 2afd93f858fa218143f84c0f9f17d1193240151c01143e957eb486441072b415
+  data.tar.gz: 29790f84d51e9781f1d50c1dda38b37475b7a0d568e5690b04ecd73f4b5261cd
 SHA512:
-  metadata.gz: 824194ec96956d8aed714a3d3017e4eae3766ab5d7c843c690d9e6a38bb6c3f4bc809a284dff4cece8897cf61336a15627105ed38a9d68fc4ee41a083b849c97
-  data.tar.gz: f62f14b812d333dc7cf91db36efecc4bc6301a55ae8844900c6e49a05d0a6bc6d1c7a29d21da8bcc5227b3d7956f62a08d43fabd2f15756bb15bbb96cff6946d
+  metadata.gz: 29d812d5abbc1935b228a3bc1035359302ff1a07314e52d2fc5dd750fac7a6fe6331426b32feccae819eead5383bd146ef803eef0eca8d56d2f107cbf0d8c332
+  data.tar.gz: b9d2fccf098915d39214cbed4293f58503d7b328c58b1a55ec01152cda27f682a1004854bd29214dad911c3f5012485712cf4e31d6bea9a754f1f6d7a0c88bf4

data/lib/siteguard_lite/custom_signature/bytesize_validator.rb

@@ -1,6 +1,6 @@
 class BytesizeValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    if value.bytesize > options[:maximum]
+    if value && value.bytesize > options[:maximum]
       record.errors.add(attribute, :too_long, count: options[:maximum])
     end
   end

data/lib/siteguard_lite/custom_signature/condition.rb

@@ -20,7 +20,7 @@ module SiteguardLite
 
         [
           rule.enable_str,
-          'NONE',
+          rule.action,
           '',
           rule.name,
           @key,
@@ -42,14 +42,13 @@ module SiteguardLite
       private
 
       def comparison_str(rule, last)
-        if last
-          [
-            @comparison_methods,
-            "#{rule.exclusion_action}(#{rule.signature})"
-          ].flatten.join(',')
-        else
-          @comparison_methods.join(',')
+        str = @comparison_methods.join(',')
+
+        if last && rule.exclusion_action && rule.signature
+          str << ",#{rule.exclusion_action}(#{rule.signature})"
         end
+
+        str
       end
     end
   end

data/lib/siteguard_lite/custom_signature/rule.rb

@@ -3,17 +3,19 @@ module SiteguardLite
     class Rule
       include ActiveModel::Validations
 
-      attr_reader :name, :comment, :enable, :conditions
+      attr_reader :name, :action, :comment, :enable, :conditions
       attr_accessor :exclusion_action, :signature
 
       validates :name, bytesize: { maximum: 29 }
       validates :signature, bytesize: { maximum: 999 }
+      validates :action, inclusion: %w(BLOCK NONE WHITE) # TODO support FILTER action
 
       def initialize(args)
         @name = args[:name]
         @comment = args[:comment]
         @exclusion_action = args[:exclusion_action]
         @signature = args[:signature]
+        @action = args[:action] || 'NONE'
 
         @enable = true
 
@@ -42,6 +44,7 @@ module SiteguardLite
       def to_hash
         {
           name: @name,
+          action: @action,
           comment: @comment,
           exclusion_action: @exclusion_action,
           signature: @signature,

data/lib/siteguard_lite/custom_signature/version.rb

@@ -1,5 +1,5 @@
 module SiteguardLite
   module CustomSignature
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/siteguard_lite/custom_signature/yaml_loader.rb

@@ -7,6 +7,7 @@ module SiteguardLite
         y['rules'].each do |r|
           rule = SiteguardLite::CustomSignature::Rule.new(
             name: r['name'],
+            action: r['action'],
             comment: r['comment'],
             exclusion_action: r['exclusion_action'],
             signature: r['signature']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: siteguard_lite-custom_signature
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Takatoshi Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel