omnistruct 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2bca86c8dfacd6cc38fa06c599593f19ab4ad67
-  data.tar.gz: 203817b49cdaf1f902cc88d98f451c0a545b856c
+  metadata.gz: 8671e686d090e2a235b8b1e198a7fc1d870e92b7
+  data.tar.gz: b382c62204754572c48efb03e0e17bc027583f81
 SHA512:
-  metadata.gz: d91807ccee8ac5a7e9abf1b30c042795cfc75a9bce15fe8fbfebce09588984267723ea539795a16b956de9f2522148c936903b677fd5f83439a7a53dd818e7bb
-  data.tar.gz: b8b4ff5b8c5c2086986451948d72bf6f3f18ddb79683d3b55b1fca4650dfcf894a2628d0627022a13e041e832e0ce9279626c52274f997bc6af7e2b96e5570e5
+  metadata.gz: 8763db20f4aefa27afa5ae7b50d01d12215a1fc11e5cd08b9a859a72d0cc40ef18a1ca9cfe4526a30af0ae999d689a14cb422fa2b24778a340d1a5bf149b0459
+  data.tar.gz: 015aa503072ea842f9e444456dcb826e787151ec088f22bcf235bc8112674bd52d9de42fcc592d64f79af35156d6e12b21de04a8b80a814fb9be712e1899b651

data/README.md

@@ -45,6 +45,7 @@ Add's the following common `Hash` methods to struct types;
 struct = <struct type>.to_struct( [type] )
 merged = <struct type>.merge( Hash.new | <struct type> )
 json   = <struct type>.to_json
+value  = <struct type>.delete(:key)
 
 # ClassyStruct
 locked = <classy struct>.lock

data/ext/classystruct.rb

@@ -1,12 +1,13 @@
-require File.join(File.dirname(__FILE__), 'hash')
+require File.join(File.dirname(__FILE__), 'common')
 require 'classy_struct'
-require 'json'
 
 # ClassyStruct patches
 ####
 class ClassyStruct
+  STRUCT_TYPE = :classy_struct
+  CLASS_NAME  = "ClassyHashStruct"
+
   class ClassyStructClass
-    alias :to_h :to_hash
 
     # Convert ClassyStruct to Struct or OpenStruct
     #
@@ -26,22 +27,21 @@ class ClassyStruct
     #   s = struct.to_struct(:open_struct)
     #   s.class
     #   #=> OpenStruct
-    def to_struct(type=:classy_struct)
-      return self if type.to_sym == :classy_struct
-      return self.to_h.to_struct(type)
+    include CommonStruct
+
+    def struct_type
+      STRUCT_TYPE
     end
 
     def merge other
-      self.to_h.merge!(other.to_h).to_struct(:classy_struct)
+      self.to_h.merge!(other.to_h).to_struct(STRUCT_TYPE)
     end
 
     # Convert ClassyStruct to Struct, thus locking it.
     def lock
-      self.to_h.to_struct(:struct)
+      self.to_h.to_struct(Struct::STRUCT_TYPE)
     end
 
-    def to_json
-      self.to_h.to_json
-    end
+    alias :to_h :to_hash
   end
 end

data/ext/common.rb

@@ -0,0 +1,30 @@
+require 'json'
+
+module CommonStruct
+  DEFAULT_STRUCT_TYPE = :classy_struct
+
+  def struct_type
+    DEFAULT_STRUCT_TYPE
+  end
+
+  def to_struct(type=nil)
+    type ||= struct_type
+    return self if type.to_sym == struct_type
+    return self.to_h.to_struct(type)
+  end
+
+  def delete key
+    key = key.to_sym
+    val = send(key) rescue nil
+
+    unless val.nil?
+      send("#{key}=".to_sym, nil)
+    end
+
+    return val
+  end
+
+  def to_json
+    to_h.to_json
+  end
+end

data/ext/hash.rb

@@ -1,14 +1,14 @@
-require 'json'
+require File.join(File.dirname(__FILE__), 'classystruct')
+require File.join(File.dirname(__FILE__), 'openstruct')
+require File.join(File.dirname(__FILE__), 'struct')
 
 # Supports converting Hashes in to different kinds of structs via a 'to_struct'
 # method.
 #
 # Note: ClassyStruct perferred over OpenStruct, it's faster.
 class Hash
-  CLASSY_STRUCT_NAME = "ClassyHashStruct"
-
   attr_accessor :struct_type
-  @@struct_type = :classy_struct
+  @@struct_type = ClassyStruct::STRUCT_TYPE
 
   # Convert Hash to Struct, OpenStruct or ClassyStruct
   #
@@ -33,19 +33,19 @@ class Hash
   def to_struct(type=nil)
     self.struct_type = type.nil? ? struct_type : type.to_sym
 
-    if struct_type == :classy_struct
+    if struct_type == ClassyStruct::STRUCT_TYPE
       begin
-        Object.send(:remove_const, CLASSY_STRUCT_NAME.to_sym)
+        Object.send(:remove_const, ClassyStruct::CLASS_NAME)
       rescue; end
 
-      return Object.const_set(CLASSY_STRUCT_NAME, ClassyStruct.new).new(self)
+      return Object.const_set(ClassyStruct::CLASS_NAME, ClassyStruct.new).new(self)
     end
 
     self.each do |k,v|
       self[k] = v.to_struct(struct_type) if v.is_a? Hash
     end
 
-    if struct_type == :open_struct
+    if struct_type == OpenStruct::STRUCT_TYPE
       # openstruct is said to be slower, so giving the option to disable
       return OpenStruct.new(self)
     end
@@ -100,6 +100,10 @@ class Hash
 
   protected
   def self.struct_types
-    [ :classy_struct, :open_struct, :struct ]
+    [
+      ClassyStruct::STRUCT_TYPE,
+      OpenStruct::STRUCT_TYPE,
+      Struct::STRUCT_TYPE
+    ]
   end
 end

data/ext/openstruct.rb

@@ -1,30 +1,8 @@
-require File.join(File.dirname(__FILE__), 'hash')
+require File.join(File.dirname(__FILE__), 'common')
 require 'ostruct'
-require 'json'
 
 class OpenStruct
-  # replaces object
-  def merge! other
-    self.marshal_load(merge(other).to_h)
-  end
-
-  # returns new object
-  def merge other
-    OpenStruct.new(self.marshal_dump.merge(other.to_h))
-  end
-
-  def to_json
-    self.marshal_dump.to_json
-  end
-
-  # Convert OpenStruct to Struct, thus locking it.
-  def lock
-    self.marshal_dump.to_struct(:struct)
-  end
-
-  def unlock
-    self # noop
-  end
+  STRUCT_TYPE = :open_struct
 
   # Convert OpenStruct to Struct or ClassyStruct
   #
@@ -44,8 +22,31 @@ class OpenStruct
   #   s = struct.to_struct(:classy_struct)
   #   s.class
   #   #=> ClassyHashStruct
-  def to_struct(type=:open_struct)
-    return self if type.to_sym == :open_struct
-    return self.marshal_dump.to_struct(type)
+  include CommonStruct
+
+  def struct_type
+    STRUCT_TYPE
   end
+
+  # replaces object
+  def merge! other
+    self.marshal_load(merge(other).to_h)
+  end
+
+  # returns new object
+  def merge other
+    OpenStruct.new(self.to_h.merge(other.to_h))
+  end
+
+  # Convert OpenStruct to Struct, thus locking it.
+  def lock
+    self.to_h.to_struct(Struct::STRUCT_TYPE)
+  end
+
+  def unlock
+    self # noop
+  end
+
+  alias :to_h :marshal_dump
+  alias :to_hash :to_h
 end

data/ext/struct.rb

@@ -1,28 +1,11 @@
 require File.join(File.dirname(__FILE__), 'hash')
-require 'json'
+require File.join(File.dirname(__FILE__), 'common')
 
 class Struct
-  # returns new object
-  def merge other
-    selfHash = self.to_h
-    otherHash = other.is_a?(Hash) ? other : other.to_h
-
-    selfHash.merge!(otherHash)
-    selfHash.to_struct(:struct)
-  end
-
-  def lock
-    self #noop
-  end
-
-  # Convert Struct to OpenStruct or ClassyStruct (default), thus unlocking it.
-  def unlock(type=:classy_struct)
-    return nil if type.to_sym == :struct
-    return self.to_h.to_struct(type)
-  end
+  STRUCT_TYPE = :struct
 
-  def to_json
-    self.to_h.to_json
+  def struct_type
+    STRUCT_TYPE
   end
 
   # Convert Struct # to OpenStruct or ClassyStruct
@@ -43,10 +26,24 @@ class Struct
   #   s = struct.to_struct(:classy_struct)
   #   s.class
   #   #=> ClassyHashStruct
-  def to_struct(type=:classy_struct)
-    return self if type.to_sym == :struct
-    return self.to_h.to_struct(type)
+  include CommonStruct
+
+  # returns new object
+  def merge other
+    selfHash = self.to_h
+    otherHash = other.is_a?(Hash) ? other : other.to_h
+
+    selfHash.merge!(otherHash)
+    selfHash.to_struct(STRUCT_TYPE)
   end
-end
 
+  def lock
+    self #noop
+  end
 
+  # Convert Struct to OpenStruct or ClassyStruct (default), thus unlocking it.
+  def unlock(type=ClassyStruct::STRUCT_TYPE)
+    return nil if type.to_sym == Struct::STRUCT_TYPE
+    return self.to_h.to_struct(type)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnistruct
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Mervine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classy_struct
@@ -60,6 +60,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - ext/classystruct.rb
+- ext/common.rb
 - ext/hash.rb
 - ext/openstruct.rb
 - ext/struct.rb