From 2f0c9ef183a982d0923cc79ed743574670a7bc87 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:17:16 -0400
Subject: v5 v6: qrcode, sha call, fix

---
 lib/sisu/v5/qrcode.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/sisu/v5/qrcode.rb')

diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index 1f3f7ca8..04d91a5e 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -180,7 +180,7 @@ WOK
         sys=SiSU_Env::SystemCall.new
         dgst=case @dg
         when :sha512
-          (sys.sha516("#{pth}/#{file}")) #check
+          (sys.sha512("#{pth}/#{file}")) #check
         when :md5
           (sys.md5("#{pth}/#{file}"))
         else
-- 
cgit v1.2.3


From 32fd8f3908bc8632e2d8ab4d872f6e4362fe031b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sun, 12 Oct 2014 10:52:35 -0400
Subject: v5: merge v6: remove defaults.rb & some relics related to sisu skins

---
 lib/sisu/v5/qrcode.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'lib/sisu/v5/qrcode.rb')

diff --git a/lib/sisu/v5/qrcode.rb b/lib/sisu/v5/qrcode.rb
index 04d91a5e..483f4deb 100644
--- a/lib/sisu/v5/qrcode.rb
+++ b/lib/sisu/v5/qrcode.rb
@@ -66,8 +66,8 @@ module SiSU_QRcode
   require_relative 'html'                               # html.rb
   require_relative 'dp'                                 # dp.rb
     include SiSU_Param
+  require_relative 'generic_parts'                      # generic_parts.rb
   require_relative 'i18n'                               # i18n.rb
-  include SiSU_Viz
   class Source
     def initialize(opt)
       @opt=opt
@@ -116,6 +116,7 @@ module SiSU_QRcode
     end
     private
     class OutputInfo <Source
+      include SiSU_Parts_Generic
       def initialize(md)
         @manifest={ txt: [], txt_title: [] }
         @md,@fns=md,md.fns
@@ -129,7 +130,6 @@ module SiSU_QRcode
         l=SiSU_Env::StandardiseLanguage.new(@md.opt.lng).language
         @language=l[:n]
         @translate=SiSU_Translate::Source.new(@md,@language)
-        @brace_url=SiSU_Viz::Defaults.new.url_decoration
         @f.make_path(@f.output_path.qrcode.dir)
       end
       def spaces
@@ -165,7 +165,7 @@ module SiSU_QRcode
         kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
         @manifest[:txt] <<<<WOK
 #{id} #{kb}
-  #{@brace_url.txt_open}#{url}/#{file}#{@brace_url.txt_close}
+  #{the_text.url_open}#{url}/#{file}#{the_text.url_close}
 WOK
       end
       def summarize_html_seg(id,file,pth='',rel='',url='',img='● ')
@@ -173,7 +173,7 @@ WOK
         kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
         @manifest[:txt] <<<<WOK
 #{id} #{kb}
-  #{@brace_url.txt_open}#{url}/#{file}#{@brace_url.txt_close}
+  #{the_text.url_open}#{url}/#{file}#{the_text.url_close}
 WOK
       end
       def summarize_sources(id,file,pth,rel,url)
@@ -199,7 +199,7 @@ WOK
         kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1]
         @manifest[:txt] <<<<WOK
 #{id} #{dgst[1]} #{kb}
-  #{@brace_url.txt_open}#{url}/#{file}#{@brace_url.txt_close}
+  #{the_text.url_open}#{url}/#{file}#{the_text.url_close}
 WOK
       end
       def published_manifests?
@@ -247,7 +247,7 @@ WOK
       def published_languages(id,file)
         flv=published_manifests?
         flv.each do |l|
-          @manifest[:txt] << "#{l[:l]}  #{@brace_url.txt_open}#{l[:mu]}#{@brace_url.txt_close}\n"
+          @manifest[:txt] << "#{l[:l]}  #{the_text.url_open}#{l[:mu]}#{the_text.url_close}\n"
         end
       end
       def metadata(id,info)
@@ -263,7 +263,7 @@ WOK
         elsif url =~/^\.\.\//   then url.gsub(/^\.(\.)?/,@env.url.root)
         else                         url
         end
-        @manifest[:txt] << %{#{url} #{lnk} #{@brace_url.txt_open}#{static}#{@brace_url.txt_close}\n}
+        @manifest[:txt] << %{#{url} #{lnk} #{the_text.url_open}#{static}#{the_text.url_close}\n}
       end
       def output_tests
         if FileTest.file?(@f.place_file.html_segtoc.dir)==true
@@ -731,11 +731,11 @@ WOK
           end
           @manifest[:txt] <<<<WOK
 #{@translate.manifest_description_metadata}
-  #{@brace_url.txt_open}#{@en_manifest}#{@brace_url.txt_close}
+  #{the_text.url_open}#{@en_manifest}#{the_text.url_close}
 WOK
           metadata_tests
           @manifest[:txt_title] <<<<WOK
-  #{@brace_url.txt_open}#{@en_manifest}#{@brace_url.txt_close}
+  #{the_text.url_open}#{@en_manifest}#{the_text.url_close}
 WOK
           source_tests
           @manifest[:txt] <<<<WOK
-- 
cgit v1.2.3