ishin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5ed152cc96db8d638bde56aa627fc3fe4019038
-  data.tar.gz: 052b32431e70c55e0fe3497ca2e586ad86c031aa
+  metadata.gz: 2d63099f6c8f19f6a16138fd55d0d5bb556c229a
+  data.tar.gz: 3681c9613c481488fbf5697521865990a0116481
 SHA512:
-  metadata.gz: 087e9073b09d19c6001d386634165febbc9b9689343cdb00be535c3b2a0710b3862d3b8d79e7130efaa420e9c9fad4705c40f374ec50f09d406059428ef96f6c
-  data.tar.gz: aa5cb190539f3883c00b36204c8d4da0b19f66ed9c65dbb377aee7f50325dc20a5c2d022f7e838e09026a11a174f5f04cbf707084c3b1e37192328bcdd4c5318
+  metadata.gz: 9f4692e1e48867a3b07e973861f7708b93f4053978a12f656b0a257442d1af6bb1cab4b47c398b360caec5c7aefb243b3b7c08d5d26dd23ca60eda65e4663382
+  data.tar.gz: 4258b470c8ae5efcd9b04636ef8ef0c62687a4aa39394b3b5157f750ef4204c729b71126821acc8374acd36cbca172accc2e787d6456b4a4f351a586e3404c95

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/ishin-*.gem

data/README.md

@@ -147,3 +147,12 @@ Your object now exposes a method named `to_hash` taking the same options at the
 Once `bundle` is executed, simply run:
 
     rake spec
+
+## Changelog
+
+* 0.1.0
+  * Initial release.
+* 0.2.0
+  * Added `Ishin::Mixin`.
+* 0.2.1
+  * Now using `Struct.to_h` when converting a `Struct` instance.

data/lib/ishin.rb

@@ -3,7 +3,7 @@ require 'ishin/version'
 module Ishin
 
   module Mixin
-    def to_hash options = {}
+    def to_hash(options = {})
       Ishin::to_hash(self, options)
     end
   end
@@ -13,12 +13,9 @@ module Ishin
     result = {}
 
     case object
-    when Struct
-      struct_to_hash(result, object, options)
-    when Hash
-      hash_to_hash(result, object, options)
-    else
-      object_to_hash(result, object, options)
+      when Struct then struct_to_hash(result, object, options)
+      when Hash   then hash_to_hash(result, object, options)
+      else             object_to_hash(result, object, options)
     end
 
     result
@@ -31,28 +28,26 @@ module Ishin
     options
   end
 
-  def self.assign_value(result, key, value, options, new_options)
-    result[key] = should_recurse?(options, value) ? to_hash(value, new_options) : value
-  end
-
   def self.hash_to_hash(result, object, options)
-    return result.replace(object) unless options[:recursive]
+    return result.replace(object) if !should_recurse?(options) && options[:symbolize]
 
     new_options = decrement_recursion_depth(options.clone)
 
     object.each do |key, value|
       key = key.to_sym if options[:symbolize] && key.is_a?(String)
-      assign_value(result, key, value, options, new_options)
+
+      result[key] = is_native_type?(value) ? value : to_hash(value, new_options)
     end
   end
 
-  def self.struct_to_hash result, object, options
-    new_options = decrement_recursion_depth options.clone
+  def self.struct_to_hash(result, object, options)
+    result.replace(object.to_h)
+    return unless should_recurse?(options)
 
-    object.members.each do |member|
-      key = options[:symbolize] ? member : member.to_s
-      value = object[member]
-      assign_value(result, key, value, options, new_options)
+    new_options = decrement_recursion_depth(options.clone)
+
+    result.each do |key, value|
+      result[key] = to_hash(value, new_options) unless is_native_type?(value)
     end
   end
 
@@ -63,15 +58,20 @@ module Ishin
       value = object.instance_variable_get(var)
       key = var.to_s.delete('@')
       key = key.to_sym if options[:symbolize]
-      assign_value(result, key, value, options, new_options)
+
+      if should_recurse?(options) && !is_native_type?(value)
+        result[key] = to_hash(value, new_options)
+      else
+        result[key] = value
+      end
     end
   end
 
-  def self.should_recurse? options, value
-    options[:recursive] && options[:recursion_depth] > 0 && !is_native_type?(value)
+  def self.should_recurse?(options)
+    options[:recursive] && options[:recursion_depth] > 0
   end
 
-  def self.is_native_type? value
+  def self.is_native_type?(value)
     [ String, Numeric, TrueClass, FalseClass ].any? { |i| value.is_a?(i) }
   end
 

data/lib/ishin/version.rb

@@ -1,3 +1,3 @@
 module Ishin
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Eddy Luten
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake