csp-util 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 973e6b8fb98154dde0ede0195239e6974d647ddf9787853cf2ac588b9af4e726
-  data.tar.gz: 630209282c527e0f137bdff3196c1a5c8652853596ef941456f38d0ae845c09a
+  metadata.gz: 5685705b8d2a895ab24cd1924ffb2bf3e29b4e076c08341bd40fe59bd2882910
+  data.tar.gz: 351d968a887cce2d67a987441d5380a50f6d9ef0cfe4c4192df059bb44289b97
 SHA512:
-  metadata.gz: 33be4aa362dd9670036da991d8db6dd15c82d1110239294461049520c04ecff87a1328b674d79329ab86e1173d1481a7056420f6108218907db76fa72ffcdb5d
-  data.tar.gz: 81b1d97f0835daa75da66182f48e81646551e1959810d0f79c2ddc938fb5139b9a38d224588330f4308c8edf4343762c4df583ca5db4275801036a5a7bd55a0d
+  metadata.gz: ae550162fe492a7a8b72586e26d4dabfada9accddd944b1df3ef2c71b8d11a7cc77380283244f5622003cab35979c1109f6ef4155418beba209c0caefcbc98aa
+  data.tar.gz: 3bc808773778786e4d8836beb47c6a071e68bf0569477d7d5909dc79c5f7bade9aeb2baa6b57be63f66480ae986c800fc3693b4d9c52d3942b6213ed1f0e90ef

data/lib/csp_util.rb

@@ -2,5 +2,4 @@
 
 require_relative 'csp_util/errors'
 require_relative 'csp_util/directive'
-require_relative 'csp_util/join_directives'
-require_relative 'csp_util/parse_directives'
+require_relative 'csp_util/directives'

data/lib/csp_util/directive.rb

@@ -17,31 +17,56 @@ module CSPUtil
 
     attr_reader :name, :value
 
-    def initialize(token)
-      dir_name, dir_value = token.split(' ', 2)
-      validate_name!(dir_name)
-
-      @name  = dir_name
-      @value =
-        if dir_value
-          dir_value.split(' ').map(&:strip)
-        else
-          []
-        end
+    def initialize(name=nil, value=nil)
+      self.name = name if name
+      self.value = value if value
+      return self
     end
 
-    def same_name?(another_directive)
-      return false unless name
+    def parse!(token)
+      name, value = token.split(' ', 2)
+      self.name = name
+      self.value = value
+      return self
+    end
+
+    def name=(name)
+      validate_name!(name)
+      @name = name
+    end
+
+    def value=(value)
+      if value.is_a?(Array)
+        @value = value.map(&:strip)  
+      elsif value
+        @value = value.split(' ').map(&:strip)
+      else
+        @value = []
+      end
+    end
 
-      name.casecmp(another_directive.name).zero?
+    def add_value(value)
+      if value.is_a?(Array)
+        @value = (@value << value).flatten.uniq 
+      else
+        @value = (@value << value.strip).uniq
+      end
+    end
+
+    def delete_value(value)
+      @value.delete(value)
+    end
+
+    def same_name?(another_directive)
+      @name.casecmp(another_directive.name).zero?
     end
 
     def to_h
-      { name: name, value: value }
+      { name: @name, value: @value }
     end
 
     def to_s
-      [name, value.join(' ')].reject(&:empty?).join(' ')
+      [@name, @value.join(' ')].reject(&:empty?).join(' ')
     end
 
     private

data/lib/csp_util/directives.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module CSPUtil
+  class << self
+    def join_directives(directives)
+      directives.map(&:to_s).join('; ')
+    end
+
+    def add_to_directives(directives, directive)
+      # add value to existing directive
+      directives.each do |d|
+        if d.same_name?(directive)
+          d.add_value(directive.value)
+          return directives
+        end
+      end
+
+      # or add directive
+      return directives << directive
+    end
+
+    def delete_from_directives(directives, directive)
+      directives.each do |d|
+        if d.same_name?(directive)
+          d.value = d.value - directive.value 
+          break
+        end
+      end
+      
+      directives.reject! do |d|
+        d.value.size == 0
+      end
+
+      return directives
+    end
+
+    def parse_directives(serialized_policy)
+      tokens = serialized_policy.split(';')
+      tokens.each_with_object([]) do |token, directives|
+        token.strip!
+        next if token.empty?
+
+        directive = Directive.new
+        directive.parse!(token)
+        validate_uniqueness!(directive, directives)
+
+        directives << directive
+      end
+    end
+
+    private
+
+    def validate_uniqueness!(directive, directives)
+      return if directives.none? { |d| d.same_name?(directive) }
+
+      raise(DuplicateDirective, directive.name)
+    end
+  end
+end

data/lib/csp_util/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CSPUtil
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csp-util
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Templarbit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -83,9 +83,8 @@ files:
 - csp-util.gemspec
 - lib/csp_util.rb
 - lib/csp_util/directive.rb
+- lib/csp_util/directives.rb
 - lib/csp_util/errors.rb
-- lib/csp_util/join_directives.rb
-- lib/csp_util/parse_directives.rb
 - lib/csp_util/version.rb
 homepage: https://github.com/templarbit/ruby-csp-util
 licenses:
@@ -107,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Content-Security-Policy utils

data/lib/csp_util/join_directives.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module CSPUtil
-  class << self
-    def join_directives(directives)
-      directives.map(&:to_s).join('; ')
-    end
-  end
-end

data/lib/csp_util/parse_directives.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module CSPUtil
-  class << self
-    def parse_directives(serialized_policy)
-      tokens = serialized_policy.split(';')
-
-      tokens.each_with_object([]) do |token, directives|
-        token.strip!
-        next if token.empty?
-
-        directive = Directive.new(token)
-        validate_uniqueness!(directive, directives)
-
-        directives << directive
-      end
-    end
-
-    private
-
-    def validate_uniqueness!(directive, directives)
-      return if directives.none? { |d| d.same_name?(directive) }
-
-      raise(DuplicateDirective, directive.name)
-    end
-  end
-end