hashstruct 1.3.1 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 015c8589bd7af72a393ec494cf5c044adc9b45170d09f8c7207027c0450aae34
-  data.tar.gz: 23ec8d2a0848ecfbb212cd68694ca2e151559c35e640e7c78bc930e948d813be
+  metadata.gz: ef62c5e766986486e0eae763c0f1bef12da2b6a52bbe7d272f67467a0aee3eba
+  data.tar.gz: 10e99235757740e723af33d73811c25d434535a57be1f632a750cfde6c0032e8
 SHA512:
-  metadata.gz: 8403282f22c80051296c10a65c17b4b9398288859d40c2ca10c41db2d26ccd9429a5c0ea0a90fe3c678f71c3f68f53c0ed9c5b2ea9e9d94a6f7258de394150c6
-  data.tar.gz: 645ca574efb7cd3e93eec60dc78e48a29070861db6f4f4a6406ecdfac0f53e9e97c7376b8b93bff0b023d63f9dbd4301e86748c20fbea4f89aa4c3b59d4ccfbf
+  metadata.gz: e9dea5dfff5fce6eaa30717d47015a44cc9d71435dd720932d3f28f617fd861352558db9197ade43d71a415ca8e9c39a150aee3d62503a5e63e42ad0f56696dd
+  data.tar.gz: 72edc59eb48835375aefe3cbfdbc9e6dcd779f67a78281ec141d53414dc9ed71f317cee03190f097a935c8f4fb64fadf892cb0b3b02f970ec748284c7f4a89d3

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
+Gemfile.lock
 *.gem

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Rakefile

@@ -1,2 +1,9 @@
-require 'rubygems/tasks'
-Gem::Tasks.new
+require 'bundler/gem_tasks'
+Bundler.require
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/*test.rb']
+end
+
+task :default => :test

data/hashstruct.gemspec

@@ -1,10 +1,6 @@
-#encoding: utf-8
-
-require_relative 'lib/hashstruct/version'
-
 Gem::Specification.new do |s|
   s.name          = 'hashstruct'
-  s.version       = HashStruct::VERSION
+  s.version       = '1.5'
   s.summary       = 'Overly helpful magic hash structure.'
   s.author        = 'John Labovitz'
   s.email         = 'johnl@johnlabovitz.com'
@@ -20,6 +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', '~> 12.3'
-  s.add_development_dependency 'rubygems-tasks', '~> 0.2'
+  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,22 +9,12 @@ class HashStruct < Hash
   end
 
   def [](key)
-    key = key.to_sym
-    if methods.include?(key)
-      method(key).call
-    elsif has_key?(key)
-      fetch(key)
-    else
-      nil
-    end
+    key = _make_key(key)
+    has_key?(key) ? fetch(key) : nil
   end
 
   def []=(key, value)
-    if methods.include?(:"#{key}=")
-      method(:"#{key}=").call(convert_object(value))
-    else
-      store(key.to_s.to_sym, convert_object(value))
-    end
+    store(_make_key(key), _convert_object(value))
   end
 
   def method_missing(method_id, *args)
@@ -32,17 +22,21 @@ class HashStruct < Hash
     if method_name =~ /=$/
       raise ArgumentError, "wrong number of arguments for method #{method_name.inspect} (#{args.length} for 1)", caller(1) if args.length != 1
       raise TypeError, "can't modify frozen #{self.class}", caller(1) if self.frozen?
-      self[method_name.chop.to_sym] = args.first
+      self[method_name.chop] = args.first
     else
       raise ArgumentError, "wrong number of arguments (#{args.length} for 0)", caller(1) if args.length != 0
       self[method_id]
     end
   end
 
-  def convert_object(obj)
+  def _make_key(obj)
+    obj.to_s.downcase.gsub(/[^\w]/, '_').to_sym
+  end
+
+  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
@@ -64,20 +58,22 @@ class HashStruct < Hash
       # 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
-           %r{^(Sun|Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s*\d*\s*\b(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\b}  # Sun, 06 Jun 2010 23:02:25 GMT
-        DateTime.parse(obj)
+           %r{^\d{4}/\d{1,2}/\d{1,2}}   # 2010/06/06
+        Date.parse(obj)
       # boolean true
       when 'true', 'yes', 'on'
         true
       # 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
@@ -87,4 +83,4 @@ class HashStruct < Hash
     end
   end
 
-end
+end

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,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: hashstruct
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: '1.5'
 platform: ruby
 authors:
 - John Labovitz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  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: '12.3'
+        version: '5.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '5.20'
 - !ruby/object:Gem::Dependency
-  name: rubygems-tasks
+  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: '0.2'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        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,
@@ -48,16 +76,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - README.md
 - Rakefile
 - hashstruct.gemspec
 - lib/hashstruct.rb
-- lib/hashstruct/version.rb
+- test/test.rb
 homepage: http://github.com/jslabovitz/hashstruct
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -72,9 +101,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Overly helpful magic hash structure.
-test_files: []
+test_files:
+- test/test.rb

data/lib/hashstruct/version.rb

@@ -1,5 +0,0 @@
-class HashStruct
-
-  VERSION = '1.3.1'
-
-end