better_struct 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 6dc03c111c603fad4d9d16ba6683b5a357dbbb55
-  data.tar.gz: 48ebb2ba1af8a444ab8c15d463f31d8119c6efd6
+SHA1:
+  metadata.gz: 769d8c773ce3b173db61b643690f593dfb5fecf3
+  data.tar.gz: 7647a81cd6a1b7b25a7f23dad153e3a5ebb3dfa4
 SHA512:
-  metadata.gz: ad186e5220cd663d77719c255de8ce1575420ea564f2bb1c70e623984db6382c28bbf2322a8f8f9ee473e098eeffef7e333000b84ac5f2dfdf95f536166723a1
-  data.tar.gz: 86dd02f3f9e1b5b11d4f8f78dd17bd8eb1a992a8150d7e515a80ba21f306a3c99d09ae3519712ff300407d2bf262cdae6f6a464beeb6207237076bac6ecc84d8
+  metadata.gz: 1dd5b1022f097f919d9b65883301950f643bda6d145cc6eee14e32ef3c8c8c0686b90f888193415ea3b5f1110a755227c152dbf8adb8d227c3dd4fa53cde54ce
+  data.tar.gz: d4fd8c5ed520589ee4d4981dbfb5dddfa3573202f629c8b483bec691c9cfb241b760b75c27f453f483fb461c67d1e892857c15da3832a7d624b67778f269f60e

data/.gitignore

@@ -0,0 +1 @@
+Gemfile.lock

data/README.md

@@ -7,11 +7,11 @@
 It behaves like an OpenStruct on steroids with monad.
 
 ```ruby
-hash = { "FooBar1" => { foo_bar2: "Hello World!" } }
+hash = { "FooBar1" => { "FooBar2" => "Hello World!" } }
 
 # Instead of this:
-if hash["FooBar1"] && hash["FooBar1"][:foo_bar2] && hash["FooBar1"][:foo_bar2].respond_to?(:sub)
-  hash["FooBar1"][:foo_bar2].sub("Hello ", "") # => "World!"
+if hash["FooBar1"] && hash["FooBar1"]["FooBar2"] && hash["FooBar1"]["FooBar2"].respond_to?(:sub)
+  hash["FooBar1"]["FooBar2"].sub("Hello ", "") # => "World!"
 end
 
 # Simply use:
@@ -59,7 +59,7 @@ better_struct.all? { |i| i.is_a?(BetterStruct) } == BetterStruct.new(true) # =>
 #### Like an OpenStruct on steroids
 
 ```ruby
-some_hash = { "FooBar1" => { foo_bar2: "Hello World!" } }
+some_hash = { foo_bar1: { foo_bar2: "Hello World!" } }
 better_struct = BetterStruct.new(some_hash)
 
 better_struct.foo_bar1.foo_bar2 == BetterStruct.new("Hello World!") # => true
@@ -70,7 +70,7 @@ better_struct.foo_bar1.foo_bar2 == BetterStruct.new("Hello World!") # => true
 ```ruby
 better_struct = BetterStruct.new("foobar")
 
-better_struct.gsub("foo", "super-").value == "super-foo" # => true
+better_struct.gsub("foo", "super-").value == "super-bar" # => true
 
 ```
 

data/lib/better_struct/methodize.rb

@@ -16,7 +16,8 @@ class BetterStruct
 
 private
 
-  def __methodize(string)
+  def __methodize(value)
+    string = value.to_s
     return string if __methodized?(string)
 
     duplicated_string = string.dup

data/lib/better_struct/version.rb

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

data/lib/better_struct.rb

@@ -4,12 +4,13 @@ require_relative "./better_struct/methodize"
 
 class BetterStruct
   EQUAL_SIGN = "=".freeze
-  MAP_METHOD_NAMES = %i(map map!).to_set.freeze
+  MAP_METHOD_NAMES = %w(map map!).to_set.freeze
 
   attr_reader :value
 
   def initialize(value = nil)
     @value = value
+    __load_defined_methods
   end
 
   def ==(other)
@@ -25,31 +26,28 @@ class BetterStruct
   end
 
   def empty?
-    value.respond_to?(:empty?) ? !!value.empty? : !value
+    value.respond_to?(:empty?) ? value.empty? : !value
   end
 
 private
 
-  def __wrap(value)
-    value.is_a?(self.class) ? self : self.class.new(value)
-  end
+  def __load_defined_methods
+    @__defined_methods = {}
 
-  def __wrap_block_args
-    return unless block_given?
-
-    Proc.new do |*args|
-      wrapped_arguments = args.map! { |arg| __wrap(arg) }
-      yield(*wrapped_arguments)
+    if value && value.respond_to?(:each_pair)
+      value.each_pair { |key, v| @__defined_methods[__methodize(key)] = v }
     end
   end
 
   def method_missing(method_name, *args, &block)
+    method_name = method_name.to_s
+
     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
+    elsif __assignment?(method_name)
+      @__defined_methods[method_name[0...-1]] = args.first
     else
-      __wrap(__defined_methods[method_name.to_s])
+      __wrap(@__defined_methods[method_name])
     end
   end
 
@@ -57,33 +55,31 @@ private
     method_name[-1] == EQUAL_SIGN
   end
 
-  def __defined_methods
-    @__defined_methods ||= begin
-      result = {}
+  def __delegate_method(method_name, *args, &block)
+    result = value.public_send(method_name, *__unwrap_items(args), &__wrap_block_args(&block))
+    result = __unwrap_items(result) if MAP_METHOD_NAMES.include?(method_name)
 
-      if value && value.respond_to?(:each_pair)
-        value.each_pair { |key, v| result[__methodize(key.to_s)] = v }
-      end
+    __wrap(result)
+  end
 
-      result
-    end
+  def __wrap(value)
+    value.is_a?(self.class) ? self : self.class.new(value)
   end
 
-  def __delegate_method(method_name, *args, &block)
-    result = value.public_send(method_name, *__unwrap_items(args), &__wrap_block_args(&block))
+  def __wrap_block_args
+    return unless block_given?
 
-    if MAP_METHOD_NAMES.include?(method_name)
-      __wrap(__unwrap_items(result))
-    else
-      __wrap(result)
+    Proc.new do |*args|
+      wrapped_arguments = args.map! { |arg| __wrap(arg) }
+      yield(*wrapped_arguments)
     end
   end
 
   def __unwrap_items(items)
-    if items.is_a?(Array)
-      items.map! { |item| item.is_a?(self.class) ? item.value : item }
-    else
-      items
-    end
+    items.is_a?(Array) ? items.map! { |i| __unwrap(i) } : items
+  end
+
+  def __unwrap(value)
+    value.is_a?(self.class) ? value.value : value
   end
 end

data/test/better_struct_test.rb

@@ -75,7 +75,7 @@ module BetterStructTest
     def test_operators
       better_struct = BetterStruct.new([1, 2, 3])
 
-      assert better_struct.map { |i| i * i }.value == [1, 4, 9]
+      assert better_struct.map { |i| i * i * 2 }.value == [2, 8, 18]
     end
 
     def test_methods_underscoring

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: better_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Evgeny Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: stackprof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Use your data without pain
@@ -101,7 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,20 +122,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Use your data without pain
 test_files:
 - test/better_struct_test.rb
-has_rdoc: