hashstruct 1.4 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2859100ae0f6c106591cc4319e4748ef00dabc6fbc54fa44f0cd1cd9c8a56d4e
-  data.tar.gz: 0e26a1dde2d422f4ece4f61fa1aceb03fd394afcf7a0c85fe2bba3f1bbb3b4c5
+  metadata.gz: ef62c5e766986486e0eae763c0f1bef12da2b6a52bbe7d272f67467a0aee3eba
+  data.tar.gz: 10e99235757740e723af33d73811c25d434535a57be1f632a750cfde6c0032e8
 SHA512:
-  metadata.gz: eabd38283c9d2f0750feb25b7a69bdf2264c1a76cd369ddbf22973561fb3239747a39312c1d159f20442634bf600f3ed24555e3537ed0d577515bee7969714ec
-  data.tar.gz: 35d432323b4379676faf24b8bd00e221b033cc258705b761639712b146155cc3be22eb2b1ec07a21015effb35e8761f39472b103e2338b63c7f0cea7d03c49d1
+  metadata.gz: e9dea5dfff5fce6eaa30717d47015a44cc9d71435dd720932d3f28f617fd861352558db9197ade43d71a415ca8e9c39a150aee3d62503a5e63e42ad0f56696dd
+  data.tar.gz: 72edc59eb48835375aefe3cbfdbc9e6dcd779f67a78281ec141d53414dc9ed71f317cee03190f097a935c8f4fb64fadf892cb0b3b02f970ec748284c7f4a89d3

data/hashstruct.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'hashstruct'
-  s.version       = '1.4'
+  s.version       = '1.5'
   s.summary       = 'Overly helpful magic hash structure.'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -16,5 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_path  = 'lib'
 
-  s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'bundler', '~> 2.5'
+  s.add_development_dependency 'minitest', '~> 5.20'
+  s.add_development_dependency 'minitest-power_assert', '~> 0.3'
+  s.add_development_dependency 'rake', '~> 13.1'
 end

data/lib/hashstruct.rb

@@ -9,12 +9,12 @@ class HashStruct < Hash
   end
 
   def [](key)
-    key = make_key(key)
+    key = _make_key(key)
     has_key?(key) ? fetch(key) : nil
   end
 
   def []=(key, value)
-    store(make_key(key), convert_object(value))
+    store(_make_key(key), _convert_object(value))
   end
 
   def method_missing(method_id, *args)
@@ -29,14 +29,14 @@ class HashStruct < Hash
     end
   end
 
-  def make_key(obj)
-    obj.to_s.downcase.to_sym
+  def _make_key(obj)
+    obj.to_s.downcase.gsub(/[^\w]/, '_').to_sym
   end
 
-  def convert_object(obj)
+  def _convert_object(obj)
     case obj
     when String
-      case obj
+      case obj.strip
       # URI
       when %r{^(ftp|http|https|mailto):}
         URI.parse(obj) rescue obj
@@ -56,9 +56,9 @@ class HashStruct < Hash
       when %r{^(\d+)/(\d+)$}
         Rational($1.to_i, $2.to_i)
       # date
-      when %r{^\d{4}-\d{2}-\d{2}$},      # 2010-06-06
-           %r{^\d{1,2}/\d{1,2}/\d{4}$},  # 06/06/2010
-           %r{^\d{4}/\d{1,2}/\d{1,2}$}   # 2010/06/06
+      when %r{^\d{4}-\d{2}-\d{2}},      # 2010-06-06
+           %r{^\d{1,2}/\d{1,2}/\d{4}},  # 06/06/2010
+           %r{^\d{4}/\d{1,2}/\d{1,2}}   # 2010/06/06
         Date.parse(obj)
       # boolean true
       when 'true', 'yes', 'on'
@@ -66,11 +66,14 @@ class HashStruct < Hash
       # boolean false
       when 'false', 'no', 'off'
         false
+      # nil or empty string
+      when nil, ''
+        nil
       else
         obj
       end
     when Array
-      obj.map { |o| convert_object(o) }
+      obj.map { |o| _convert_object(o) }
     when Hash
       HashStruct.new(obj)
     when HashStruct

data/test/test.rb

@@ -0,0 +1,23 @@
+require 'minitest/autorun'
+require 'minitest/power_assert'
+
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'hashstruct'
+
+class Test < Minitest::Test
+
+  def setup
+    @h = HashStruct.new(
+      date1: '2017-11-01',
+      'Date-Time' => '2023-12-23T13:20:00-05:00',
+    )
+  end
+
+  def test_date
+    d1 = @h.date1
+    assert { d1.kind_of?(Date) }
+    d2 = @h.date_time
+    assert { d2.kind_of?(Date) }
+  end
+
+end

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: hashstruct
 version: !ruby/object:Gem::Version
-  version: '1.4'
+  version: '1.5'
 platform: ruby
 authors:
 - John Labovitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.20'
+- !ruby/object:Gem::Dependency
+  name: minitest-power_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13.1'
 description: "\n    HashStruct provides an object based on Hash, but acts like Struct
   (or OpenStruct), providing helpful\n    accessors for each key from the get-go.
   It also magically parses string values when it can (eg, dates,\n    URIs, numbers,
@@ -39,6 +81,7 @@ files:
 - Rakefile
 - hashstruct.gemspec
 - lib/hashstruct.rb
+- test/test.rb
 homepage: http://github.com/jslabovitz/hashstruct
 licenses:
 - MIT
@@ -58,8 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Overly helpful magic hash structure.
-test_files: []
+test_files:
+- test/test.rb