riseup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8345958f998425fb0d2f39477f9ed24f2da288a2923cd79b8a6aa445c448aa5
-  data.tar.gz: cb133e4573c71c568387302bb203010bb6f4c8ea24f20f632809768b0a01252e
+  metadata.gz: 262f76dd7d5ed89f0f5c013c0a726ce31bbcd3914751b57df38b23ac0dd92b10
+  data.tar.gz: b9a606d88d6a3ed9e74b74b06af5a74b2b3cb7fb3598157f31b9597c4711cb15
 SHA512:
-  metadata.gz: 9002fdd7106633f9c54744989f8eb7328d8398af0a532c6b186403c2981d4bb7e5b01498ca463add713b86bc25e39c2d1fe170c206909cb0d218f2fa0670cb15
-  data.tar.gz: 33436b77aefd422db0ae5880bfb646ea929504018c755a4615609742485204fb41d2fe22d2ed3c338914e74c4815a1caa8d8c91d153312fa75d3a50979ed31ce
+  metadata.gz: 7db234e3c7ef5553792125ee8edcc43599b98c7c7379d2b3bde146821d387025906114159d7e7f5c209dda707a1bb591c47323299a39fe8dc217cec2478f7e6c
+  data.tar.gz: e01c704f20524a660414ee325d50480be0ecb2f2736221822f585c047ac26ad10e1a161247f02e04cba8f79ffb4e4bc3235bd88182c68d2535a07ea164d00f78

data/lib/riseup.rb

@@ -1,3 +1,3 @@
-require "riseup/token_data"
-require "riseup/spec"
-require "riseup/parser"
+require 'riseup/token_data'
+require 'riseup/spec'
+require 'riseup/parser'

data/lib/riseup/parser.rb

@@ -1,72 +1,74 @@
 require 'set'
 module Riseup
-class Parser
-#This is a super basic markup language, none of the characters here are unsafe for HTML
-	@@default_spec=Spec.new([
-		#Escapes
-		["\\*","*"],
-		["\\=","="],
-		["\\`","`"],
-		["\\\\","\\"],
-		#Bold
-		["**","<b>","</b>"],
-		#Italic
-		["*","<i>","</i>"],
-		#Header
-		["=","<h1>","</h2>"],
-		#Code
-		["`","<code>","</code>"],
-		#Newline
-		["\n","<br/>"]
-		])
+  class Parser
+    # This is a super basic markup language, none of the characters here are unsafe for HTML
+    @@default_spec = Spec.new([
+                                # Escapes
+                                ['\\*', '*'],
+                                ['\\=', '='],
+                                ['\\`', '`'],
+                                ['\\\\', '\\'],
+                                # Bold
+                                ['**', '<b>', '</b>'],
+                                # Italic
+                                ['*', '<i>', '</i>'],
+                                # Header
+                                ['=', '<h1>', '</h2>'],
+                                # Code
+                                ['`', '<code>', '</code>'],
+                                # Newline
+                                ["\n", '<br/>']
+                              ])
 
-	def initialize(unformated,spec=@@default_spec)
-		if (!unformated.is_a?(String))
-			raise ArgumentError.new("Unformated text (first argument) must be a String")
-		end
+    def initialize(unformated, spec = @@default_spec)
+      unless unformated.is_a?(String)
+        raise ArgumentError, 'Unformated text (first argument) must be a String'
+      end
 
-		if (!spec.is_a?(Spec))
-			raise ArgumentError.new("Markup specification (second argument) must be a Riseup::Spec")
-		end
-		@unformated=unformated
-		@spec=spec
-		tokens()
-	end
+      unless spec.is_a?(Spec)
+        raise ArgumentError, 'Markup specification (second argument) must be a Riseup::Spec'
+      end
+      @unformated = unformated
+      @spec = spec
+      tokens
+    end
 
-	def tokens()
-		@tokens = @unformated.split(@spec.regex).reject(&:empty?)
-	end
+    def tokens
+      @tokens = @unformated.split(@spec.regex).reject(&:empty?)
+    end
 
-	def parse()
-		if (@tokens.nil?)
-			tokens()
-		end
-		token_toggle=Set.new
-		new_html=Array.new
-		@tokens.each { |t|
-			if (@spec.include?(t))
-				if (token_toggle.include?(t))
-					token_toggle.delete(t)
-					if (!@spec[t].substitute?())
-						new_html.append(@spec[t].finish)
-					end
-				else
-					if (!@spec[t].substitute?())
-						token_toggle.add(t)
-						new_html.append(@spec[t].start)
-					else
-						new_html.append(@spec[t].substitute)
-					end
-				end
-			else
-				new_html.append(t)
-			end
-		}
-		new_html.join()
-	end
+    def parse
+      tokens if @tokens.nil?
 
-	def to_s()
-		@tokens.to_s()
-	end
-end
+      token_toggle = Set.new
+      new_html = []
+      @tokens.each do |t|
+        if @spec.include?(t)
+          if token_toggle.include?(t)
+            token_toggle.delete(t)
+            new_html.append(@spec[t].finish) unless @spec[t].substitute?
+          else
+            if !@spec[t].substitute?
+              token_toggle.add(t)
+              new_html.append(@spec[t].start)
+            else
+              new_html.append(@spec[t].substitute)
+            end
+          end
+        else
+          new_html.append(t)
+        end
+      end
+
+      # Fix unterminated tokens
+      token_toggle.reverse_each do |token|
+        new_html.append(@spec[token].finish) unless @spec[token].substitute?
+      end
+      new_html.join
+    end
+
+    def to_s
+      @tokens.to_s
+    end
+  end
 end

data/lib/riseup/spec.rb

@@ -1,43 +1,39 @@
 require 'set'
 
 module Riseup
-class Spec
-	def initialize(spec)
-		if (!spec.is_a?(Array))
-			raise ArgumentError.new("Specification must be an array")
-		end
-		spec.each_with_index { |i,j|
-			if (!i.is_a?(Array))
-				raise ArgumentError.new("Specification item #{j} must be an array")
-			end
-			if (i.size()<2)
-				raise ArgumentError.new("Specification item #{j} is too small, must contain at least 2 items")
-			end
-			if (i.size()>3)
-				raise ArgumentError.new("Specification item #{j} is too largw, must contain no more than 3 items")
-			end
-		}
-		@spec=spec
-		@spec_map = Hash[@spec.collect {|t| [t[0],TokenData.new(t[1],t[2])]}]
-		@tokens = @spec.map {|t| t[0]}
-		#(?x)
-		@regex=Regexp.new("("+(@tokens.map {|t| Regexp.escape(t)}).join("|")+"|[.])")	
-	end
+  class Spec
+    def initialize(spec)
+      unless spec.is_a?(Array)
+        raise ArgumentError, 'Specification must be an array'
+      end
+      spec.each_with_index do |i, j|
+        unless i.is_a?(Array)
+          raise ArgumentError, "Specification item #{j} must be an array"
+        end
+        if i.size < 2
+          raise ArgumentError, "Specification item #{j} is too small, must contain at least 2 items"
+        end
+        if i.size > 3
+          raise ArgumentError, "Specification item #{j} is too largw, must contain no more than 3 items"
+        end
+      end
+      @spec = spec
+      @spec_map = Hash[@spec.collect { |t| [t[0], TokenData.new(t[1], t[2])] }]
+      @tokens = @spec.map { |t| t[0] }
+      # (?x)
+      @regex = Regexp.new('(' + (@tokens.map { |t| Regexp.escape(t) }).join('|') + '|[.])')
+    end
 
-	def [](key)
-		@spec_map[key]
-	end
-	
-	def include?(x)
-		@spec_map.include?(x)
-	end
+    def [](key)
+      @spec_map[key]
+    end
 
-	def regex()
-		@regex
-	end
+    def include?(x)
+      @spec_map.include?(x)
+    end
 
-	def tokens()
-		@tokens
-	end
-end
+    attr_reader :regex
+
+    attr_reader :tokens
+  end
 end

data/lib/riseup/token_data.rb

@@ -1,37 +1,31 @@
 require 'set'
 class TokenData
-	def initialize(start,finish=nil)
-		if (finish.nil?)
-			@substitute = start
-			@isSub=true
-		else
-			@start=start
-			@finish=finish
-			@isSub=false
-		end
-	end
+  def initialize(start, finish = nil)
+    if finish.nil?
+      @substitute = start
+      @isSub = true
+    else
+      @start = start
+      @finish = finish
+      @isSub = false
+    end
+  end
 
-	def substitute()
-		@substitute
-	end
-	
-	def start()
-		@start
-	end
+  attr_reader :substitute
 
-	def finish()
-		@finish
-	end
+  attr_reader :start
 
-	def substitute?()
-		@isSub
-	end
-	
-	def all()
-		if (substitute?())
-			[@substitute]
-		else
-			[@start,@finish]
-		end
-	end
+  attr_reader :finish
+
+  def substitute?
+    @isSub
+  end
+
+  def all
+    if substitute?
+      [@substitute]
+    else
+      [@start, @finish]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riseup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Faissal Bensefia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: faissaloo@firemail.cc