better_struct 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 3cc67117521966619def878e57d6df34ec17410e
-  data.tar.gz: ba91831def735866a96254a596284fca5b9111b0
+  metadata.gz: 6dc03c111c603fad4d9d16ba6683b5a357dbbb55
+  data.tar.gz: 48ebb2ba1af8a444ab8c15d463f31d8119c6efd6
 SHA512:
-  metadata.gz: 444de9218c1a00233e010b8d4515edb45ba2c3080b9d495847a08b564f65debd17aba08a59b2cd33001fd956ca31cc562a44fb97ba6408e809e6dd7e1ba2ac6a
-  data.tar.gz: 692de0583b3d1631f3417f259186615c017c3885202ca6dd6e762bd62aa17665b02b3230ba02c738f1235ced80105022a4333c4af394e1847bd5eae2ca3fd2b7
+  metadata.gz: ad186e5220cd663d77719c255de8ce1575420ea564f2bb1c70e623984db6382c28bbf2322a8f8f9ee473e098eeffef7e333000b84ac5f2dfdf95f536166723a1
+  data.tar.gz: 86dd02f3f9e1b5b11d4f8f78dd17bd8eb1a992a8150d7e515a80ba21f306a3c99d09ae3519712ff300407d2bf262cdae6f6a464beeb6207237076bac6ecc84d8

data/lib/better_struct.rb

@@ -30,56 +30,56 @@ class BetterStruct
 
 private
 
-  def wrap(value)
+  def __wrap(value)
     value.is_a?(self.class) ? self : self.class.new(value)
   end
 
-  def wrap_block_args
+  def __wrap_block_args
     return unless block_given?
 
     Proc.new do |*args|
-      wrapped_arguments = args.map! { |arg| wrap(arg) }
+      wrapped_arguments = args.map! { |arg| __wrap(arg) }
       yield(*wrapped_arguments)
     end
   end
 
   def method_missing(method_name, *args, &block)
     if value.respond_to?(method_name)
-      delegate_method(method_name, *args, &block)
-    elsif assignment?(method_name) && defined_methods
-      @defined_methods[methodize(method_name[0...-1])] = args.first
+      __delegate_method(method_name, *args, &block)
+    elsif __assignment?(method_name) && __defined_methods
+      @__defined_methods[__methodize(method_name[0...-1])] = args.first
     else
-      wrap(defined_methods[method_name.to_s])
+      __wrap(__defined_methods[method_name.to_s])
     end
   end
 
-  def assignment?(method_name)
+  def __assignment?(method_name)
     method_name[-1] == EQUAL_SIGN
   end
 
-  def defined_methods
-    @defined_methods ||= begin
+  def __defined_methods
+    @__defined_methods ||= begin
       result = {}
 
       if value && value.respond_to?(:each_pair)
-        value.each_pair { |key, v| result[methodize(key.to_s)] = v }
+        value.each_pair { |key, v| result[__methodize(key.to_s)] = v }
       end
 
       result
     end
   end
 
-  def delegate_method(method_name, *args, &block)
-    result = value.public_send(method_name, *unwrap_items(args), &wrap_block_args(&block))
+  def __delegate_method(method_name, *args, &block)
+    result = value.public_send(method_name, *__unwrap_items(args), &__wrap_block_args(&block))
 
     if MAP_METHOD_NAMES.include?(method_name)
-      wrap(unwrap_items(result))
+      __wrap(__unwrap_items(result))
     else
-      wrap(result)
+      __wrap(result)
     end
   end
 
-  def unwrap_items(items)
+  def __unwrap_items(items)
     if items.is_a?(Array)
       items.map! { |item| item.is_a?(self.class) ? item.value : item }
     else

data/lib/better_struct/methodize.rb

@@ -5,11 +5,10 @@ class BetterStruct
   TRANSLITERATION_FROM = "ÀÁÂÃÄÅàáâãäåĀāĂ㥹ÇçĆćĈĉĊċČčÐðĎďĐđÈÉÊËèéêëĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħÌÍÎÏìíîïĨĩĪīĬĭĮįİıĴĵĶķĸĹĺĻļĽľĿŀŁłÑñŃńŅņŇňʼnŊŋÒÓÔÕÖØòóôõöøŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšſŢţŤťŦŧÙÚÛÜùúûüŨũŪūŬŭŮůŰűŲųŴŵÝýÿŶŷŸŹźŻżŽž".freeze
   TRANSLITERATION_TO   = "AAAAAAaaaaaaAaAaAaCcCcCcCcCcDdDdDdEEEEeeeeEeEeEeEeEeGgGgGgGgHhHhIIIIiiiiIiIiIiIiIiJjKkkLlLlLlLlLlNnNnNnNnnNnOOOOOOooooooOoOoOoRrRrRrSsSsSsSssTtTtTtUUUUuuuuUuUuUuUuUuUuWwYyyYyYZzZzZz".freeze
 
-  DIGIT_REGEXP = /[0-9]/.freeze
-  NOT_UNDERSCORED_REGEXP = /[^a-z0-9_]/.freeze
+  NON_UNDERSCORED_BEGIN_OR_END_REGEXP = /^[^a-z0-9_]+|[^a-z0-9_]+$/.freeze
+  BEFORE_FIRST_DIGIT_OR_NON_UNDERSCORED_REGEXP = /^(.)?(?=[0-9])|[^a-z0-9_]/.freeze
   NON_ENGLISH_REGEXP = /[#{ TRANSLITERATION_FROM }]/.freeze
   UNDERSCORE_DUPLICATES_REGEXP = /#{ UNDERSCORE_SIGN }{2,}/.freeze
-  UNDERSCORE_END_REGEXP = /#{ UNDERSCORE_SIGN }$/.freeze
   CAMELCASE_ABBREVIATION_REGEX = /([A-Z\d]+)([A-Z][a-z])/.freeze
   CAMELCASE_REGEX = /([a-z\d])([A-Z])/.freeze
 
@@ -17,38 +16,33 @@ class BetterStruct
 
 private
 
-  def methodize(string)
-    if string[0] =~ DIGIT_REGEXP
-      duplicated_string = string.dup
-      duplicated_string.prepend(UNDERSCORE_SIGN)
-    end
-
-    unless string =~ NOT_UNDERSCORED_REGEXP
-      return duplicated_string || string
-    end
+  def __methodize(string)
+    return string if __methodized?(string)
 
-    duplicated_string = string.dup if duplicated_string.nil?
+    duplicated_string = string.dup
 
-    transliterate!(duplicated_string)
-    underscore!(duplicated_string)
+    __transliterate!(duplicated_string)
+    __underscore!(duplicated_string)
 
     duplicated_string
   end
 
-  def transliterate!(string)
+  def __methodized?(string)
+    !string =~ BEFORE_FIRST_DIGIT_OR_NON_UNDERSCORED_REGEXP && !string =~ UNDERSCORE_DUPLICATES_REGEXP
+  end
+
+  def __transliterate!(string)
     if string =~ NON_ENGLISH_REGEXP
       string.tr!(TRANSLITERATION_FROM, TRANSLITERATION_TO)
     end
   end
 
-  def underscore!(string)
-    if string =~ NOT_UNDERSCORED_REGEXP
-      string.gsub!(CAMELCASE_ABBREVIATION_REGEX, UNDERSCORE_MASK)
-      string.gsub!(CAMELCASE_REGEX, UNDERSCORE_MASK)
-      string.downcase!
-      string.gsub!(NOT_UNDERSCORED_REGEXP, UNDERSCORE_SIGN)
-      string.gsub!(UNDERSCORE_DUPLICATES_REGEXP, UNDERSCORE_SIGN)
-      string.gsub!(UNDERSCORE_END_REGEXP, EMPTY_STRING)
-    end
+  def __underscore!(string)
+    string.gsub!(CAMELCASE_ABBREVIATION_REGEX, UNDERSCORE_MASK)
+    string.gsub!(CAMELCASE_REGEX, UNDERSCORE_MASK)
+    string.downcase!
+    string.gsub!(NON_UNDERSCORED_BEGIN_OR_END_REGEXP, EMPTY_STRING)
+    string.gsub!(BEFORE_FIRST_DIGIT_OR_NON_UNDERSCORED_REGEXP, UNDERSCORE_SIGN)
+    string.gsub!(UNDERSCORE_DUPLICATES_REGEXP, UNDERSCORE_SIGN)
   end
 end

data/lib/better_struct/version.rb

@@ -1,3 +1,3 @@
 class BetterStruct
-  VERSION = "0.2.3".freeze
+  VERSION = "0.2.4".freeze
 end

data/test/better_struct_test.rb

@@ -78,12 +78,24 @@ module BetterStructTest
       assert better_struct.map { |i| i * i }.value == [1, 4, 9]
     end
 
-    def test_underscoring_methods
+    def test_methods_underscoring
+      better_struct = BetterStruct.new({ "! CHAMPION !" => 1 })
+
+      assert better_struct.champion.value == 1
+    end
+
+    def test_methods_underscoring_started_with_digit
       better_struct = BetterStruct.new({ "1 Word (With-Space)" => 1 })
 
       assert better_struct._1_word_with_space.value == 1
     end
 
+    def test_methods_underscoring_with_underscores_around
+      better_struct = BetterStruct.new({ "_Abc__Def_" => 1 })
+
+      assert better_struct._abc_def_.value == 1
+    end
+
     def test_transliteration
       better_struct = BetterStruct.new({ "Título" => 1 })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Evgeny Li