better_struct 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: 97a1b4ed42f6ff0493a116d85f4126719ef77483
-  data.tar.gz: f074b953c21dbc3f369980fda77cba90a97d4f9c
+  metadata.gz: 63739e5a654591d3d685a383a163fca50902f3b2
+  data.tar.gz: 8ac3510abea38370cbe2d67a951deec7d1c002bd
 SHA512:
-  metadata.gz: 47f5073d2d96c0dafa123fd270fc134f7e5cb8c4db66ed6cd8b87ef54052f5f8213198f515f3b0816f390f60257e9d51790137c2e4d0d47f222826354dbf4ef2
-  data.tar.gz: e40dfdbb67e4f26060550cd009da3e9e079e102fbeabeeb2fadeb3ab5bb18e17ea364c65f84ca9a6bb80b5b9699530930ab7a0653f1cbdbe6b5c556461892fa6
+  metadata.gz: 45b9c991c3010cfd5ce2b25a853bbffd2f0bef51b6479770571141b8b293b01ceef9ab93102d6054e14a91aae4715b1172768afd37791d0a0d4130d457dc9b76
+  data.tar.gz: 03f58914d44f74f1d4a2eafb045066b338723f13e603fa32af51f9555aec93ecc1097d1c4aab056d3c7f1803a75807ebc1fef0d3651a10f2fb49661bbb9d0363

data/README.md

@@ -10,12 +10,12 @@ It behaves like an OpenStruct on steroids with monad.
 hash = { "FooBar1" => { foo_bar2: "Hello World!" } }
 
 # Instead of this:
-if hash["FooBar1"] && hash["FooBar1"][:foo_bar2]
-  puts hash["FooBar1"][:foo_bar2]
+if hash["FooBar1"] && hash["FooBar1"][:foo_bar2] && hash["FooBar1"][:foo_bar2].respond_to?(:sub)
+  hash["FooBar1"][:foo_bar2].sub("Hello ", "") # => "World!"
 end
 
 # Simply use:
-puts BetterStruct.new(hash).foo_bar1.foo_bar2.value
+BetterStruct.new(hash).foo_bar1.foo_bar2.sub("Hello ", "").value # => "World!"
 ```
 
 ## Installation
@@ -39,7 +39,7 @@ Or install it yourself as:
 #### Maybe monad
 
 ```ruby
-BetterStruct.new(nil) == BetterStruct.new(nil).some_method # => true
+BetterStruct.new(nil) == BetterStruct.new(nil).this_method.does_not_exist # => true
 ```
 
 #### Everything is wrapped
@@ -47,21 +47,16 @@ BetterStruct.new(nil) == BetterStruct.new(nil).some_method # => true
 ```ruby
 better_struct = BetterStruct.new("foobar")
 
-better_struct[0..2].is_a?(BetterStruct)        # => true
 better_struct[0..2] == BetterStruct.new("foo") # => true
 ```
 
 ```ruby
 better_struct = BetterStruct.new([1, 2, 3])
 
-result = better_struct.all? { |i| i.is_a?(BetterStruct) }
-
-result.is_a?(BetterStruct)       # => true
-result == BetterStruct.new(true) # => true
-
+better_struct.all? { |i| i.is_a?(BetterStruct) } == BetterStruct.new(true) # => true
 ```
 
-#### Like OpenStruct
+#### Like an OpenStruct on steroids
 
 ```ruby
 some_hash = { "FooBar1" => { foo_bar2: "Hello World!" } }
@@ -85,21 +80,21 @@ better_struct.gsub("foo", "super-").value == "super-foo" # => true
 
 ## Benchmarking
 
-It is as fast as an OpenStruct:
+**BetterStruct** is even faster than an OpenStruct:
 
 ```
 $ ruby scripts/benchmark.rb
 
 Calculating -------------------------------------
-          OpenStruct     6.562k i/100ms
-        BetterStruct     7.155k i/100ms
+          OpenStruct     7.334k i/100ms
+        BetterStruct     7.856k i/100ms
 -------------------------------------------------
-          OpenStruct     75.194k (± 7.4%) i/s -    374.034k
-        BetterStruct     76.987k (± 6.7%) i/s -    386.370k
+          OpenStruct     75.971k (± 7.1%) i/s -    381.368k
+        BetterStruct     84.520k (± 4.5%) i/s -    424.224k
 
 Comparison:
-        BetterStruct:    76986.7 i/s
-          OpenStruct:    75193.6 i/s - 1.02x slower
+        BetterStruct:    84519.8 i/s
+          OpenStruct:    75971.1 i/s - 1.11x slower
 ```
 
 ## Contributing

data/better_struct.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 3.2.0"
-
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.5"

data/lib/better_struct.rb

@@ -1,8 +1,8 @@
-require "better_struct/version"
-require "active_support/inflector"
+require "set"
+require_relative "./better_struct/version"
+require_relative "./better_struct/methodize"
 
 class BetterStruct
-  PARAMETERIZE_SEPARATOR = "_".freeze
   EQUAL_SIGN = "=".freeze
   MAP_METHOD_NAMES = %i(map map!).to_set.freeze
 
@@ -26,21 +26,11 @@ class BetterStruct
 
 private
 
-  def methodize(string)
-    result = ActiveSupport::Inflector.underscore(string)
-
-    if result =~ /[^\w]/
-      ActiveSupport::Inflector.parameterize(result, PARAMETERIZE_SEPARATOR)
-    else
-      result
-    end
-  end
-
   def wrap(value)
     value.is_a?(self.class) ? self : self.class.new(value)
   end
 
-  def wrap_block_args(*args, &block)
+  def wrap_block_args(&block)
     return if block.nil?
 
     Proc.new do |*args|
@@ -52,16 +42,15 @@ private
   def method_missing(method_name, *args, &block)
     if value.respond_to?(method_name)
       delegate_method(method_name, *args, &block)
-    elsif assignment?(method_name, *args, &block) && defined_methods
-      attribute = methodize(method_name[0...-1])
-      @defined_methods[attribute] = args.first
+    elsif assignment?(method_name) && defined_methods
+      @defined_methods[methodize(method_name[0...-1])] = args.first
     else
       wrap(defined_methods[method_name.to_s])
     end
   end
 
-  def assignment?(method_name, *args, &block)
-    method_name[-1] == EQUAL_SIGN && args.size == 1 && block.nil?
+  def assignment?(method_name)
+    method_name[-1] == EQUAL_SIGN
   end
 
   def defined_methods
@@ -77,12 +66,12 @@ private
   end
 
   def delegate_method(method_name, *args, &block)
-    result = wrap(value.public_send(method_name, *unwrap_items(args), &wrap_block_args(*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.value))
+      wrap(unwrap_items(result))
     else
-      result
+      wrap(result)
     end
   end
 

data/lib/better_struct/methodize.rb

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

data/lib/better_struct/version.rb

@@ -1,3 +1,3 @@
 class BetterStruct
-  VERSION = "0.2.0"
+  VERSION = "0.2.1".freeze
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: better_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +108,7 @@ files:
 - Rakefile
 - better_struct.gemspec
 - lib/better_struct.rb
+- lib/better_struct/methodize.rb
 - lib/better_struct/version.rb
 - test/better_struct_test.rb
 homepage: https://github.com/exAspArk/better_struct