sublime_dsl 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c6a39ce468da1206014f15be5c290a183a34f3
-  data.tar.gz: dc07f39837167615520084fbaf98f11d03b3fb89
+  metadata.gz: 2b8d27365694163f7591eaddbbb3b5ee49e23d0d
+  data.tar.gz: 148e250394b70938505cc5d70724c6b90e83db6e
 SHA512:
-  metadata.gz: b739dd4ebe8ed084ba450e24f7ced6b759af4bf6407445f5eaab825a8dfed6f6831d57325e411e2278587b161507ef5ac58cb388e2e44899f8210bb83be5a393
-  data.tar.gz: 59c5477cd3a1be0fb91976e22a4684f18725ebcaf54cc45c96bbded11746f0fba08ce0561664334a1a02bd04869c288b2867e4bac980da4c5fba16769e3b998a
+  metadata.gz: cf534670e87d8b79925587e5fd0cb2f77672842db7d52eaca06833dbd521f7b580b34178c17c3ea5d054ade0fb35c6a5f31dbb4704ef94fbbbf7b8e7824af556
+  data.tar.gz: e2ca60fc9ddd9edef988c29b4cc4df32bb75a54cd3b516fcf51066ffdb84a905261047855a7ce1a4d362266d76b411986fa27e37fc241ca2b91d79f10c9007f2

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.1.3
+
+* Ruby 2.4: Fixnum now deprecated, use Integer
+* update gem dependency versions
+* protect against Regexp.new freezing its argument (Ruby 2.4.1)
+
 ## 0.1.2
 
 * grammars: fix a bug when exporting 'to' regexp containing '§'

data/lib/sublime_dsl.rb

@@ -12,7 +12,7 @@ require_relative 'sublime_dsl/cli'
 
 module SublimeDSL
 
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   class Error < StandardError; end
   class OptionError < Error; end

data/lib/sublime_dsl/sublime_text/keyboard.rb

@@ -48,7 +48,10 @@ module SublimeText
         # map_char and map_key call this method while @sublime is not yet set
         unless @defining_sublime
           @defining_sublime = true
-          # FIXME: space => key_event nil, but generates a key_event when modified
+          # FIXME: space => key_event nil, but generates a key_event when modified,
+          # because it's a character
+          # => put it in SUBLIME_ALIAS_MAP, but remember it was named 'space' when
+          # generating its to_s ('ctrl+ ' will generate problems...)
           kb.map_char 'space' => ' ', key_event: nil
           @defining_sublime = false
         end

data/lib/sublime_dsl/textmate/plist.rb

@@ -93,13 +93,13 @@ module TextMate
 
       def dump_object(object, indent)
         case object
-        when String;      dump_string(object, indent)
-        when Fixnum;      dump_fixnum(object, indent)
-        when Hash;        dump_hash(object, indent)
-        when Array;       dump_array(object, indent)
-        when TrueClass;   "#{indent}<true/>\n"
-        when FalseClass;  "#{indent}<false/>\n"
-        else; raise Error, "unexpected type: #{object.class.name}"
+        when String then      dump_string(object, indent)
+        when Integer then     dump_integer(object, indent)
+        when Hash then        dump_hash(object, indent)
+        when Array then       dump_array(object, indent)
+        when TrueClass then   "#{indent}<true/>\n"
+        when FalseClass then  "#{indent}<false/>\n"
+        else raise Error, "unexpected type: #{object.class.name}"
         end
       end
 
@@ -107,7 +107,7 @@ module TextMate
         "#{indent}<string>" << h(str) << "</string>\n"
       end
 
-      def dump_fixnum(num, indent)
+      def dump_integer(num, indent)
         "#{indent}<integer>#{num}</integer>\n"
       end
 

data/lib/sublime_dsl/textmate/preference.rb

@@ -267,8 +267,15 @@ module TextMate
       end
 
       def convert_object(object)
-        k = object.class.name.split('::').last.snake_case
-        send "convert_#{k}", object
+        case object
+        when Array then convert_array object
+        when Hash then convert_hash object
+        when Tools::RegexpWannabe then object.to_s
+        # TODO: booleans as 1/0 or true/false?
+        when TrueClass then 1
+        when FalseClass then 0
+        else object  # String, Integer, NilClass
+        end
       end
 
       def convert_array(list)
@@ -281,18 +288,6 @@ module TextMate
         out
       end
 
-      def convert_regexp_wannabe(re)
-        re.to_s
-      end
-
-      def convert_string(v) v end
-      def convert_fixnum(v) v end
-      def convert_nil_class(v) v end
-
-      # TODO: booleans as 1/0 or true/false?
-      def convert_true_class(v) 1 end
-      def convert_false_class(v) 0 end
-
     end
 
   end

data/lib/sublime_dsl/tools/regexp_wannabe.rb

@@ -99,7 +99,7 @@ module Tools
     end
 
     def try_conversion
-      @warnings = capture_warnings { @regexp = Regexp.new(source) }
+      @warnings = capture_warnings { @regexp = Regexp.new(source.dup) }
       @backref = nil unless source =~ /§[1-9]/
     rescue RegexpError => ex
       msg = ex.message
@@ -122,7 +122,7 @@ module Tools
       end
 
       begin
-        @warnings = capture_warnings { @regexp = Regexp.new(source) }
+        @warnings = capture_warnings { @regexp = Regexp.new(source.dup) }
       rescue RegexpError => ex
         @error = ex.message
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sublime_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Thierry Lambert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2017-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 description: |
   Sublime DSL allows generating Sublime Text configuration files
   from a Ruby DSL, giving the power of Ruby to develop and maintain
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A DSL to specify Sublime Text packages.