inih 0.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2eb22c1756d5f3bc81e3f29cb73df77c292db0cf
-  data.tar.gz: 6cce3dc18f13b86a42b89d397a25989c173893b5
+SHA256:
+  metadata.gz: b0dc6ee69dd1c743a8b266c03e3f09242b22883b08524f0957aac889b5c108d8
+  data.tar.gz: 0db810c2b58a7d971d4b6bbbbed1b5e0cd7dd1f13fd393040553ac1a63ecd3a3
 SHA512:
-  metadata.gz: 17a976d8a68fe06056611e3c73e2e7c4def3d364e2afc35548b2327218558ab465495b85f6069859bd3f9cd1abc151b8e7f6d95b16490f8ac1308f98f9463314
-  data.tar.gz: eadf9ccc7dd215b18ded6e60424b098010edbfb53358f0618cbda9289dc62bcbd4402e3bcd84fbb4da1035effb2287731004fc49fd87259ba19f7691ee242a8d
+  metadata.gz: 10080d9a19918482e5abe6389c6f3b2bca99045ef2af42bfdd1ef13d0983cae47a6c68d885fda3b123fa02cb75d4cae918ea5396d502c0a9c878be1c9c29e55c
+  data.tar.gz: 189eb5996dd71b2027d99eaf47bfeb5f93ac4d3ace591232adf2529725b11e20cfb10749376f0421fbf5d214a2b8826395bc375c851b96367a86ae50f4470f8f

data/LICENSE

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+The MIT License (MIT) with restrictions
 
-Copyright (c) 2017 William Woodruff <william @ yossarian.net>
+Copyright (c) 2020 William Woodruff <william @ yossarian.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+The following terms additionally apply and override any above terms for
+applicable parties:
+
+You may not use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software in a military or law enforcement context,
+defined as follows:
+
+1. A military context is a professional context where the intended application
+of the Software is integration or use with or by military software, tools
+(software or hardware), or personnel. This includes contractors and
+subcontractors as well as research affiliates of any military	organization.
+
+2. A law enforcement context is a professional context where the intended
+application of the Software is integration or use with or by law enforcement
+software, tools (software or hardware), or personnel. This includes
+contractors and subcontractors as well as research affiliates of any law
+enforcement organization.
+
+Entities that sell or license to military or law enforcement organizations
+may use the Software under the original terms, but only in contexts that do
+not assist or supplement the sold or licensed product.
+
+Students and academics who are affiliated with research institutions may use
+the Software under the original terms, but only in contexts that do not assist
+or supplement collaboration or affiliation with any military or law
+enforcement organization.

data/README.md

@@ -1,13 +1,15 @@
 ruby-inih
 =========
 
+![license](https://raster.shields.io/badge/license-MIT%20with%20restrictions-green.png)
 [![Gem Version](https://badge.fury.io/rb/inih.svg)](https://badge.fury.io/rb/inih)
+[![Build Status](https://img.shields.io/github/workflow/status/woodruffw/ruby-inih/CI/master)](https://github.com/woodruffw/ruby-inih/actions?query=workflow%3ACI)
 
 A Ruby wrapper for [inih](https://github.com/benhoyt/inih), a simple INI parser.
 
 ### Installation
 
-```ruby
+```bash
 $ gem install inih
 ```
 
@@ -35,12 +37,12 @@ INIH.parse "[section]\nkey=value"
 #=> {"section"=>{"key"=>"value"}}
 ```
 
-Integers, floating-point numbers, and booleans are coerced into their respective Ruby types.
+Integers, floating-point numbers, and booleans are coerced into their respective Ruby types by
+default, **unless** `normalize: false` is passed to either method.
 
 ### TODO
 
-* Unit tests
-* Coerce scientific-notation?
+* Coerce scientific notation?
 
 ### License
 

data/ext/inih/inih.c

@@ -1,33 +1,29 @@
 #include "inih.h"
 
 VALUE mINIH = Qnil;
+VALUE cParseError = Qnil;
 
 static int mINIH_ini_handler(void *data, const char *sect, const char *name, const char *val);
 
 /*
-    @overload parse(string)
-        Parse an INI-formatted string into a Hash.
-        @param string [String] the INI-formatted string to parse
-        @return [Hash] the resulting hash
-        @raise [RuntimeError] if a parse error occurs
+    @overload parse_intern(string, normalize)
+    @api private
 */
-static VALUE mINIH_parse(VALUE self, VALUE string);
+static VALUE mINIH_parse_intern(VALUE self, VALUE string, VALUE normalize);
 
 /*
-    @overload load(filename)
-        Parse an INI-formatted file into a Hash.
-        @param filename [String] the INI-formatted file to parse
-        @return [Hash] the resulting hash
-        @raise [RuntimeError] if a parse or I/O error occurs
+    @overload load_intern(filename, normalize)
+    @api private
 */
-static VALUE mINIH_load(VALUE self, VALUE filename);
+static VALUE mINIH_load_intern(VALUE self, VALUE filename, VALUE normalize);
 
 void Init_inih()
 {
     mINIH = rb_define_module("INIH");
+    cParseError = rb_const_get(mINIH, rb_intern("ParseError"));
 
-    rb_define_singleton_method(mINIH, "parse", mINIH_parse, 1);
-    rb_define_singleton_method(mINIH, "load", mINIH_load, 1);
+    rb_define_singleton_method(mINIH, "parse_intern", mINIH_parse_intern, 2);
+    rb_define_singleton_method(mINIH, "load_intern", mINIH_load_intern, 2);
 }
 
 static int mINIH_ini_handler(void *data, const char *sect, const char *name, const char *val)
@@ -47,20 +43,25 @@ static int mINIH_ini_handler(void *data, const char *sect, const char *name, con
     return 1;
 }
 
-static VALUE mINIH_parse(VALUE self, VALUE string)
+static VALUE mINIH_parse_intern(VALUE self, VALUE string, VALUE normalize)
 {
     char *str = StringValueCStr(string);
     VALUE hash = rb_hash_new();
     int result;
 
     if ((result = ini_parse_string(str, mINIH_ini_handler, &hash)) != 0) {
-        rb_raise(rb_eRuntimeError, "parse error, line %d", result);
+        rb_raise(cParseError, "parse error, line %d", result);
     }
 
-    return rb_funcall(mINIH, rb_intern("normalize"), 1, hash);
+    if (normalize) {
+        return rb_funcall(mINIH, rb_intern("normalize_hash"), 1, hash);
+    }
+    else {
+        return hash;
+    }
 }
 
-static VALUE mINIH_load(VALUE self, VALUE filename)
+static VALUE mINIH_load_intern(VALUE self, VALUE filename, VALUE normalize)
 {
     char *file = StringValueCStr(filename);
     VALUE hash = rb_hash_new();
@@ -68,12 +69,17 @@ static VALUE mINIH_load(VALUE self, VALUE filename)
 
     if ((result = ini_parse(file, mINIH_ini_handler, &hash)) != 0) {
         if (result < 0) {
-            rb_raise(rb_eRuntimeError, "I/O error");
+            rb_raise(rb_eIOError, "I/O error");
         }
         else {
-            rb_raise(rb_eRuntimeError, "parse error, line %d", result);
+            rb_raise(cParseError, "parse error, line %d", result);
         }
     }
 
-    return rb_funcall(mINIH, rb_intern("normalize"), 1, hash);
+    if (normalize) {
+        return rb_funcall(mINIH, rb_intern("normalize_hash"), 1, hash);
+    }
+    else {
+        return hash;
+    }
 }

data/lib/inih.rb

@@ -1,15 +1,34 @@
 # frozen_string_literal: true
 
-require_relative "../ext/inih/inih"
+require_relative "inih/exceptions"
+require_relative "ext/inih"
 
 # The primary namespace for {INIH}.
 module INIH
-  # The current version of ruby-inih.
-  VERSION = "0.1.0"
+  module_function
+
+  # Parse an INI-formatted string into a Hash.
+  # @param string [String] the INI-formatted string to parse
+  # @param normalize [Boolean] whether or not to normalize the types of parsed values
+  # @return [Hash] the parsed hash
+  # @raise [INIH::ParseError] if a parse error occurs
+  def parse(string, normalize: true)
+    parse_intern string, normalize
+  end
+
+  # Parse an INI-formatted file into a Hash.
+  # @param filename [String] the INI-formatted file to parse
+  # @param normalize [Boolean] whether or not to normalize the types of parsed values
+  # @return [Hash] the resulting hash
+  # @raise [INIH::ParseError] if a parse error occurs
+  # @raise [IOError] if an I/O error occurs
+  def load(filename, normalize: true)
+    load_intern filename, normalize
+  end
 
   # Normalize a parsed INI file's values.
   # @api private
-  def self.normalize(hsh)
+  def normalize_hash(hsh)
     hsh.map do |k, sect|
       [k, normalize_sect(sect)]
     end.to_h
@@ -17,13 +36,14 @@ module INIH
 
   # Normalize the values in a section of a parsed INI file.
   # @api private
-  def self.normalize_sect(sect)
+  def normalize_sect(sect)
     sect.map do |k, v|
       nv = case v
+           when "" then nil
            when "true" then true
            when "false" then false
-           when /\A\d+\Z/ then Integer v
-           when /\A\d+\.\d+\Z/ then Float v
+           when /\A-?\d+\Z/ then Integer v
+           when /\A-?\d+\.\d+\Z/ then Float v
            else v
            end
 

data/lib/inih/exceptions.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module INIH
+  # A generic error in {INIH}.
+  class INIHError < RuntimeError
+  end
+
+  # Raised whenever parsing fails.
+  class ParseError < INIHError
+  end
+end

data/lib/inih/version.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module INIH
+  # The current version of ruby-inih.
+  VERSION = "2.0.1"
+end

data/vendor/bundle/gems/yard-0.9.19/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2007-2018 Loren Segal
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: inih
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
-dependencies: []
+date: 2020-06-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  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'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: A native library for parsing INI files.
 email: william@tuffbizz.com
 executables: []
@@ -27,6 +83,9 @@ files:
 - ext/inih/inih.c
 - ext/inih/inih.h
 - lib/inih.rb
+- lib/inih/exceptions.rb
+- lib/inih/version.rb
+- vendor/bundle/gems/yard-0.9.19/LICENSE
 homepage: https://github.com/woodruffw/ruby-inih
 licenses:
 - MIT
@@ -46,8 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: inih - a Ruby wrapper for a simple C INI parser