marked-conductor 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8baea5f97cf53a0a8ff79a8ccb0f6fc06ce84192f708291f2e07ebd85e3c393
-  data.tar.gz: 43c20bc158834e03ca7a8d2e5e52bde33ff27b7397183b2eece3adeb77162991
+  metadata.gz: c6a0da9f71e766f19edb6cb13fc27139af3934f3cdf013b0c51164cc3b20d73f
+  data.tar.gz: a0d4c8b2d37653632d8757f0704008fbc370a6edcc89c46e9f1eac8927cab9e7
 SHA512:
-  metadata.gz: 4672bd627a2d34dfc578ff80f9a3360d8a5319428c8b4746442a77adae4e7555f68c91797a0be91b4ddc2e384fb8dd84164682643d64342b580db4dd79921b76
-  data.tar.gz: 1ba57715e5ad4d0844f654a3792551d9d7bd333385a4018b0a0a00f1a90e67f3105798a89be2fb2be0f453ee5c88f170e5e6d183196213e4f258de7b8d59007e
+  metadata.gz: 5ccaa5df5811bf5433bea16f2ddc5b71c056592250b0757d83119e998a65426eaeb04e291f3b758bc0e74e64b1a6f58bcbcb59ed7a9eccdf5e58dfe26e474886
+  data.tar.gz: 340f3e73ff68f7026f169cc6c686de8dcd6651836c6b685e886e5a3c115f17b676ea889565929a6ec778ad017b914c0c796ac4e8b724fc8808288535bf5da54d

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+### 1.0.5
+
+2024-04-25 17:00
+
+#### FIXED
+
+- First-run config creating directory instead of file
+- Frozen string/encoding issue on string comparisons
+
 ### 1.0.3
 
 2024-04-25 14:32

data/lib/conductor/condition.rb

@@ -85,6 +85,8 @@ module Conductor
 
       return operator == :not_equal if val1.nil?
 
+      val2 = val2.force_encoding('utf-8')
+
       if val1.date?
         if val2.time?
           date1 = val1.to_date
@@ -112,22 +114,22 @@ module Conductor
              else
                Regexp.escape(val2)
              end
-
+      val1 = val1.dup.to_s.force_encoding('utf-8')
       case operator
       when :contains
-        val1.to_s =~ /#{val2}/i
+        val1 =~ /#{val2}/i
       when :not_starts_with
-        val1.to_s !~ /^#{val2}/i
+        val1 !~ /^#{val2}/i
       when :not_ends_with
-        val1.to_s !~ /#{val2}$/i
+        val1 !~ /#{val2}$/i
       when :starts_with
-        val1.to_s =~ /^#{val2}/i
+        val1 =~ /^#{val2}/i
       when :ends_with
-        val1.to_s =~ /#{val2}$/i
+        val1 =~ /#{val2}$/i
       when :equal
-        val1.to_s =~ /^#{val2}$/i
+        val1 =~ /^#{val2}$/i
       when :not_equal
-        val1.to_s !~ /^#{val2}$/i
+        val1 !~ /^#{val2}$/i
       else
         false
       end

data/lib/conductor/config.rb

@@ -18,7 +18,7 @@ module Conductor
 
   def create_config(config_file)
     config_dir = File.dirname(config_file)
-    scripts_dir = File.dirname(File.join(config_file, 'scripts'))
+    scripts_dir = File.dirname(File.join(config_dir, 'scripts'))
     FileUtils.mkdir_p(config_dir) unless File.directory?(config_dir)
     FileUtils.mkdir_p(scripts_dir) unless File.directory?(scripts_dir)
     File.open(config_file, 'w') { |f| f.puts sample_config }

data/lib/conductor/string.rb

@@ -14,19 +14,19 @@ class ::String
   end
 
   def date?
-    match(/^\d{4}-\d{2}-\d{2}/) ? true : false
+    dup.force_encoding('utf-8').match(/^\d{4}-\d{2}-\d{2}/) ? true : false
   end
 
   def time?
-    match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
+    dup.force_encoding('utf-8').match(/ \d{1,2}(:\d\d)? *([ap]m)?/i)
   end
 
   def to_date
-    Chronic.parse(self)
+    Chronic.parse(self.dup.force_encoding('utf-8'))
   end
 
   def strip_time
-    sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, '')
+    dup.force_encoding('utf-8').sub(/ \d{1,2}(:\d\d)? *([ap]m)?/i, '')
   end
 
   def to_day(time = :end)
@@ -39,7 +39,7 @@ class ::String
   end
 
   def bool?
-    match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
+    dup.force_encoding('utf-8').match(/^(?:y(?:es)?|no?|t(?:rue)?|f(?:alse)?)$/) ? true : false
   end
 
   def to_bool!

data/lib/conductor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conductor
-  VERSION = '1.0.3'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-conductor
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Brett Terpstra