better_struct 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 262cd7ded259c467148ba2682fc571feec48a498
-  data.tar.gz: 141737a24c6d7251e08c22ad26c28d222ba12d1f
+  metadata.gz: 3cc67117521966619def878e57d6df34ec17410e
+  data.tar.gz: ba91831def735866a96254a596284fca5b9111b0
 SHA512:
-  metadata.gz: a52d2c6cdda7576685cc97ba9108121d5b9f8b60f817b8a1f8195614d1adc603ecb0e2b7e13fe60d6fbfc5d73b5848591f1d33feb2054133f8356dac1aed626e
-  data.tar.gz: 0038c03c2694d9520e7d8f8749343fbb2179549076607eb3513ba6e66cf7de4896cdacef7ad82db4d7ba5285f906d34706ef6ff510eebdfb8968de561fc243a4
+  metadata.gz: 444de9218c1a00233e010b8d4515edb45ba2c3080b9d495847a08b564f65debd17aba08a59b2cd33001fd956ca31cc562a44fb97ba6408e809e6dd7e1ba2ac6a
+  data.tar.gz: 692de0583b3d1631f3417f259186615c017c3885202ca6dd6e762bd62aa17665b02b3230ba02c738f1235ced80105022a4333c4af394e1847bd5eae2ca3fd2b7

data/lib/better_struct.rb

@@ -34,12 +34,12 @@ private
     value.is_a?(self.class) ? self : self.class.new(value)
   end
 
-  def wrap_block_args(&block)
-    return if block.nil?
+  def wrap_block_args
+    return unless block_given?
 
     Proc.new do |*args|
       wrapped_arguments = args.map! { |arg| wrap(arg) }
-      block.call(*wrapped_arguments)
+      yield(*wrapped_arguments)
     end
   end
 
@@ -62,7 +62,7 @@ private
       result = {}
 
       if value && value.respond_to?(:each_pair)
-        value.each_pair { |key, value| result[methodize(key.to_s)] = value }
+        value.each_pair { |key, v| result[methodize(key.to_s)] = v }
       end
 
       result

data/lib/better_struct/methodize.rb

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

data/lib/better_struct/version.rb

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

data/test/better_struct_test.rb

@@ -79,9 +79,9 @@ module BetterStructTest
     end
 
     def test_underscoring_methods
-      better_struct = BetterStruct.new({ "Word (With-Space)" => 1 })
+      better_struct = BetterStruct.new({ "1 Word (With-Space)" => 1 })
 
-      assert better_struct.word_with_space.value == 1
+      assert better_struct._1_word_with_space.value == 1
     end
 
     def test_transliteration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler