isodoc 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a3a3be88ed08f8f5025c255a596b63685e4361411265eb024d0e9473f94fcca
-  data.tar.gz: 0e821ce48e0d212e638ee5fe70298ea7ea47780d057255d67e708cecd02f3319
+  metadata.gz: 60e7a916df30b4032fbe9f1b2dcc6cec2563759b21525f9a7aa932f1f0dd2a24
+  data.tar.gz: 4f4add705922211d501cafbd282df7402cb5228baae6300f62dd1868a42aac2f
 SHA512:
-  metadata.gz: ab31e514116f9dc989eae235a933062dfdd05418076b2d353e21d51d4a1767a4038e66946aa09d4a8e6616b8b0750bca340f92570b02d3320a63f14b8cc3c701
-  data.tar.gz: 7373511670a6a8314374ab368bce30e23fcc5c0088adb53ae43fe85b70b87198347a141fd91127a200dcad2baa01492af476507e561c25785cb232a680876068
+  metadata.gz: 7f4074992a9e19be5425fbf4dcc169ea31f57754261da482b33b5dde2ee14f210f0b4ca3419676268d3fccc9d0aa978e8fe06806d2b3754da6d13116e7332b1b
+  data.tar.gz: 2b6e8718338825d52344fbda655c4fee4d3593dc46a65879a7b178a111923aeefb78c96f201de2a9b8d982a50f0fe4e83453902312aa7d8150d968d0b0bea6ee

data/isodoc.gemspec

@@ -52,7 +52,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec", "~> 4.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.5.2"
+  spec.add_development_dependency "rubocop", "~> 1"
+spec.add_development_dependency "rubocop-performance"
 =begin
   if RUBY_VERSION.start_with?("3.1")
     spec.add_development_dependency "sassc-embedded", "1.54.0"

data/lib/isodoc/css.rb

@@ -75,6 +75,25 @@ module IsoDoc
     end
 
     def convert_scss(filename, stylesheet, stripwordcss)
+      load_scss_paths(filename)
+      Dir.mktmpdir do |dir|
+        variables_file_path = File.join(dir, "variables.scss")
+        File.write(variables_file_path, scss_fontheader(stripwordcss))
+        SassC.load_paths << dir
+        modified_stylesheet = %( @use "variables" as *;\n#{stylesheet})
+        compile_scss(modified_stylesheet)
+      end
+    end
+
+    def compile_scss(modified_stylesheet)
+      SassC::Engine
+        .new(modified_stylesheet, quiet_deps: true, syntax: :scss,
+                                  silence_deprecations: %w(mixed-decls),
+                                  importer: SasscImporter)
+        .render.gsub(/__WORD__/, "")
+    end
+
+    def load_scss_paths(filename)
       require "sassc-embedded"
       require "isodoc/sassc_importer"
       [File.join(Gem.loaded_specs["isodoc"].full_gem_path,
@@ -82,23 +101,6 @@ module IsoDoc
        File.dirname(filename)].each do |name|
         SassC.load_paths << name
       end
-
-      Dir.mktmpdir do |dir|
-        variables_file_path = File.join(dir, "variables.scss")
-        File.write(variables_file_path,
-                   scss_fontheader(stripwordcss))
-
-        SassC.load_paths << dir
-
-        # Modify the stylesheet to use the tempfile with @use
-        modified_stylesheet = <<~SCSS
-          @use "variables" as *;
-          #{stylesheet}
-        SCSS
-        SassC::Engine.new(modified_stylesheet,
-                          syntax: :scss, importer: SasscImporter)
-          .render
-      end
     end
 
     # stripwordcss if HTML stylesheet, !stripwordcss if DOC stylesheet
@@ -106,17 +108,28 @@ module IsoDoc
       filename.nil? and return nil
       filename = precompiled_style_or_original(filename)
       stylesheet = File.read(filename, encoding: "UTF-8")
-      stylesheet = populate_template(stylesheet, :word)
-      stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1") if stripwordcss
-      stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-") unless stripwordcss
+      stylesheet = preprocess_css(stylesheet, stripwordcss)
       File.extname(filename) == ".scss" and
         stylesheet = convert_scss(filename, stylesheet, stripwordcss)
+      write_css(filename, stylesheet)
+    end
+
+    def write_css(filename, stylesheet)
       Tempfile.open([File.basename(filename, ".*"), "css"],
                     mode: File::BINARY | File::SHARE_DELETE,
                     encoding: "utf-8") do |f|
-        f.write(stylesheet)
-        f
-      end
+                      f.write(stylesheet)
+                      f
+                    end
+    end
+
+    def preprocess_css(stylesheet, html)
+      stylesheet = populate_template(stylesheet, :word)
+      html and stylesheet.gsub!(/(\s|\{)mso-[^:]+:[^;]+;/m, "\\1")
+      !html and stylesheet.gsub!(/--/, "-DOUBLE_HYPHEN_ESCAPE-")
+      !html and stylesheet.gsub!(%r<([a-z])\.([0-9])(?=[^{}]*{)>m,
+                                 "\\1.__WORD__\\2")
+      stylesheet
     end
   end
 end

data/lib/isodoc/gem_tasks.rb

@@ -111,30 +111,30 @@ module IsoDoc
     end
 
     def compile_scss(filename)
+      load_scss_paths(filename)
+      Dir.mktmpdir do |dir|
+        File.write(File.join(dir, "variables.scss"), fonts_placeholder)
+        SassC.load_paths << dir
+        sheet_content = File.read(filename, encoding: "UTF-8")
+          .gsub(%r<([a-z])\.([0-9])(?=[^{}]*{)>m, "\\1.__WORD__\\2")
+        SassC::Engine.new(%<@use "variables" as *;\n#{sheet_content}>,
+                          syntax: :scss, importer: SasscImporter)
+          .render.gsub(/__WORD__/, "")
+      end
+    end
+
+    def load_scss_paths(filename)
       require "sassc-embedded"
       require "isodoc/sassc_importer"
-
       isodoc_path = if Gem.loaded_specs["isodoc"]
                       File.join(Gem.loaded_specs["isodoc"].full_gem_path,
                                 "lib", "isodoc")
-                    else
-                      File.join("lib", "isodoc")
+                    else File.join("lib", "isodoc")
                     end
       [isodoc_path,
        File.dirname(filename)].each do |name|
-        SassC.load_paths << name
-      end
-      Dir.mktmpdir do |dir|
-        variables_file_path = File.join(dir, "variables.scss")
-        File.write(variables_file_path, fonts_placeholder)
-        SassC.load_paths << dir
-
-      sheet_content = File.read(filename, encoding: "UTF-8")
-      SassC::Engine.new(%<@use "variables" as *;\n#{sheet_content}>,
-                        syntax: :scss,
-                        importer: SasscImporter)
-        .render
-    end
+         SassC.load_paths << name
+       end
     end
 
     def compile_scss_task(current_task)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.0".freeze
+  VERSION = "3.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Ribose Inc.
@@ -282,14 +282,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-embedded
   requirement: !ruby/object:Gem::Requirement
@@ -502,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.