trenni-sanitize 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af6bc3fd66dd571a303a216442d9f8abf2e51e28693da8798107bcb540f32f85
-  data.tar.gz: af2f9d45d17c77128d6ed553e6512a0e3345195c867419286ccd527435ee235f
+  metadata.gz: be872bc0f1f2f9b2fca5c5a8738090aea3faf1f2880b9201447edad78419f0ab
+  data.tar.gz: 822005447509aaabe1c4ee6fbc9b97fe17c7b4eb7f7f9faa7e0697e394e955be
 SHA512:
-  metadata.gz: 24187244b0995b0a83f5fcf93d7c215514517456894b0523a3d60c51f46729993c4d1fdce35fa1ab1982fb68cc8838bfb6f532df0c73a016cd8f14c4cd0e33ae
-  data.tar.gz: cc6468c2fdaf2a2b5d396378a442a017cf3e64c75cb3fa56e26ffb21dc91e54d70adbde423c38e77ddd2b27322c591bd775c9ab0197412c42836a022766a03ff
+  metadata.gz: 70651108fffab5e259895627a312b9eadfa66233c8f6f7e0ec8de4f56cdfe0bf7cbec26d6ca88d4db3ad1e0be24c664282a1f3d932e73b7336b0054a305a790d
+  data.tar.gz: 31c18d416cc9735cdf39e4b348b854db3a81a06041e66fcbcd87970165ba8b08e2a7b491f0f617aa5e58d051a66337a5dca4040c17f53f55f706dfe032355916

data/.travis.yml

@@ -4,7 +4,6 @@ cache: bundler
 
 matrix:
   include:
-    - rvm: 2.3
     - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
@@ -12,6 +11,7 @@ matrix:
       os: osx
     - rvm: 2.6
       env: COVERAGE=BriefSummary,Coveralls
+    - rvm: 2.7
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"

data/lib/trenni/sanitize.rb

@@ -18,8 +18,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'sanitize/extensions'
-
 require_relative 'sanitize/text'
 require_relative 'sanitize/fragment'
-

data/lib/trenni/sanitize/filter.rb

@@ -66,6 +66,10 @@ module Trenni
 				def [] key
 					self.tag&.attributes[key]
 				end
+				
+				def limit_attributes(keys)
+					self.tag&.attributes&.select!{|key, value| keys.include?(key)}
+				end
 			end
 			
 			def initialize(output, entities)
@@ -116,11 +120,11 @@ module Trenni
 				
 				@current = Node.new(name, tag, current.skip)
 			end
-
+			
 			def attribute(key, value)
 				@current.tag.attributes[key] = value
 			end
-
+			
 			def open_tag_end(self_closing)
 				if self_closing
 					@current.tag.closed = true
@@ -135,7 +139,7 @@ module Trenni
 				# If the tag was self-closing, it's no longer current at this point, we are back in the context of the parent tag.
 				@current = self.top if self_closing
 			end
-
+			
 			def close_tag(name, offset = nil)
 				while node = @stack.pop
 					node.tag.write_closing_tag(@output) unless node.skip? TAG
@@ -153,19 +157,19 @@ module Trenni
 			def doctype(string)
 				@output << string unless current.skip? DOCTYPE
 			end
-
+			
 			def comment(string)
 				@output << string unless current.skip? COMMENT
 			end
-
+			
 			def instruction(string)
 				@output << string unless current.skip? INSTRUCTION
 			end
-
+			
 			def cdata(string)
 				@output << string unless current.skip? CDATA
 			end
-
+			
 			def text(string)
 				Markup.append(@output, string) unless current.skip? TEXT
 			end

data/lib/trenni/sanitize/fragment.rb

@@ -20,10 +20,12 @@
 
 require_relative 'filter'
 
+require 'set'
+
 module Trenni
 	module Sanitize
 		class Fragment < Filter
-			STANDARD_ATTRIBUTES = ['class', 'style'].freeze
+			STANDARD_ATTRIBUTES = Set.new(['class', 'style']).freeze
 			
 			ALLOWED_TAGS = {
 				'div' => STANDARD_ATTRIBUTES,
@@ -49,7 +51,7 @@ module Trenni
 			
 			def filter(node)
 				if attributes = ALLOWED_TAGS[node.name]
-					node.tag.attributes.slice!(*attributes)
+					node.limit_attributes(attributes)
 					
 					node.accept!
 				else

data/lib/trenni/sanitize/version.rb

@@ -20,6 +20,6 @@
 
 module Trenni
 	module Sanitize
-		VERSION = "0.4.0"
+		VERSION = "0.5.0"
 	end
 end

data/trenni-sanitize.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
 	
-	spec.required_ruby_version = '~> 2.1'
+	spec.required_ruby_version = '~> 2.4'
 	
 	spec.add_dependency "trenni", '~> 3.5'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trenni-sanitize
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -94,14 +94,12 @@ files:
 - README.md
 - Rakefile
 - lib/trenni/sanitize.rb
-- lib/trenni/sanitize/extensions.rb
 - lib/trenni/sanitize/filter.rb
 - lib/trenni/sanitize/fragment.rb
 - lib/trenni/sanitize/text.rb
 - lib/trenni/sanitize/version.rb
 - spec/spec_helper.rb
 - spec/trenni/sanitize/benchmark_spec.rb
-- spec/trenni/sanitize/extensions_spec.rb
 - spec/trenni/sanitize/fragment_spec.rb
 - spec/trenni/sanitize/sample.html
 - spec/trenni/sanitize/text_spec.rb
@@ -117,21 +115,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Sanitize markdown according to a set of rules.
 test_files:
 - spec/spec_helper.rb
 - spec/trenni/sanitize/benchmark_spec.rb
-- spec/trenni/sanitize/extensions_spec.rb
 - spec/trenni/sanitize/fragment_spec.rb
 - spec/trenni/sanitize/sample.html
 - spec/trenni/sanitize/text_spec.rb

data/lib/trenni/sanitize/extensions.rb

@@ -1,14 +0,0 @@
-
-class Hash
-	unless defined?(slice)
-		def slice(*keys)
-			self.select{|key, value| keys.include? key}
-		end
-	end
-	
-	unless defined?(slice!)
-		def slice!(*keys)
-			self.select!{|key, value| keys.include? key}
-		end
-	end
-end

data/spec/trenni/sanitize/extensions_spec.rb

@@ -1,26 +0,0 @@
-
-require 'trenni/sanitize/extensions'
-
-RSpec.describe Hash do
-	let(:hash) {{x: 10, y: 20, z: 30}}
-	
-	it "can slice the hash" do
-		result = hash.slice(:x)
-		
-		expect(hash.size).to be == 3
-		expect(result.size).to be == 1
-		
-		expect(result[:x]).to be == 10
-		expect(result[:y]).to be_nil
-		expect(result[:z]).to be_nil
-	end
-	
-	it "can slice! the hash in-place" do
-		hash.slice!(:x)
-		
-		expect(hash.size).to be == 1
-		expect(hash[:x]).to be == 10
-		expect(hash[:y]).to be_nil
-		expect(hash[:z]).to be_nil
-	end
-end