inih 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6e998b8cdce0816f6f77964b60658041f34e5d23
-  data.tar.gz: 911f377e3c7e39f772a0bb3700ea70b0f128a789
+SHA256:
+  metadata.gz: b34e36b18fe1afa2aa4680a413f1bcfb779d9b0523f9755cbef6814d28539173
+  data.tar.gz: 64c99571876f4468350f8a58c99e65b7babbdab21a0ffc074014ed741c20f667
 SHA512:
-  metadata.gz: 617ed17dae6e9da378a986b7fc5272c325bd64664b33aabb9c6cbf1ce0151d4332260556586a2d1abcf9a3e1054359f03cc31f527d41034b9c33047f3cb66694
-  data.tar.gz: 8fb920f32b2baaabe0b3a5d1f87a0736b5bf12f2f06293cf22f19977aba35ddf0169b9b047a6f893899d4498906e84b8b029e5bb58d4485772a1d61f3d21b7e3
+  metadata.gz: d693a05a060e2ae66f7a26eee6a36686339acaf22054b55e499cd81b1adba0982bc907237d85085f30fcdd27d703db23e4d36a53add7fe6be6b85d115aa30f0d
+  data.tar.gz: 1dcb6104668fd4ddaaecc773f36c2b8d703bc065fbcbb0d0ebea4799e027dd03de03f56bb6da5907cf4a20583c94d95e6767d66574485cb379a72b633257f610

data/README.md

@@ -7,7 +7,7 @@ A Ruby wrapper for [inih](https://github.com/benhoyt/inih), a simple INI parser.
 
 ### Installation
 
-```ruby
+```bash
 $ gem install inih
 ```
 
@@ -35,11 +35,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
 
-* 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,37 @@
 # frozen_string_literal: true
 
+require_relative "inih/exceptions"
 require_relative "ext/inih"
 
 # The primary namespace for {INIH}.
 module INIH
+  module_function
+
   # The current version of ruby-inih.
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
+
+  # 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,7 +39,7 @@ 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

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/vendor/bundle/gems/yard-0.9.14/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,43 @@
 --- !ruby/object:Gem::Specification
 name: inih
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
-dependencies: []
+date: 2018-06-03 00:00:00.000000000 Z
+dependencies:
+- !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: 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 +55,8 @@ files:
 - ext/inih/inih.c
 - ext/inih/inih.h
 - lib/inih.rb
+- lib/inih/exceptions.rb
+- vendor/bundle/gems/yard-0.9.14/LICENSE
 homepage: https://github.com/woodruffw/ruby-inih
 licenses:
 - MIT
@@ -47,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: inih - a Ruby wrapper for a simple C INI parser