nuggets 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5af6231048355058097a53aac9443148a84e7bbc
-  data.tar.gz: c6976ef57d142740afed95d49bfdd366992d5bbb
+SHA256:
+  metadata.gz: dad45b4d4a9ccf28b262ca7b38cb728d04fcbc03cd9ba1d761ac40bded7ce1db
+  data.tar.gz: a35c07426a38a092e2a6159f961574d9fd25a55d9b36e639807397b0c2baa877
 SHA512:
-  metadata.gz: ea703b2f4bd23a05391a67d6ce8694fa63ab59d02d8e7f7766de2516838a1a7bd8ce31c6a42e09ea78cfb4ddc4009956852e3845ec61f4eccbe6d6f793ef1259
-  data.tar.gz: 702b6c308c17b5fd8e54f7538bf6057f573cadf60326ace6a55b40cbe805e45b67e581a13a9618e5900f8ec461512d85ff287fa2e39a6ee83f532cf922844510
+  metadata.gz: a603785020efbd4ac9e8fb45c95207527f8e02857b76bf0cd201559169c1ea49a41a8e5ae7e5bfe1d48419eff6e72b95a8699c1ffcf49bb28b797881ebbc32f8
+  data.tar.gz: 3c16dbd738a21dc8ace62e6916e603fec2853b947c54753033e18d47f8379dcbafaa9f838e69dd48153136907815232a46a7281610bd5f239da47e826b730869

data/ChangeLog

@@ -2,6 +2,10 @@
 
 = Revision history for nuggets
 
+== 1.6.0 [2018-07-12]
+
+* Added <tt>JSON.*_{multi,canonical}</tt>.
+
 == 1.5.0 [2016-04-19]
 
 * Added String#format.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to nuggets version 1.5.0.
+This documentation refers to nuggets version 1.6.0.
 
 
 == DESCRIPTION
@@ -58,7 +58,7 @@ Travis CI::     https://travis-ci.org/blackwinter/nuggets
 
 == LICENSE AND COPYRIGHT
 
-Copyright (C) 2007-2016 Jens Wille
+Copyright (C) 2007-2018 Jens Wille
 
 nuggets is free software: you can redistribute it and/or modify it
 under the terms of the GNU Affero General Public License as published by

data/lib/nuggets/json/canonical.rb

@@ -0,0 +1,5 @@
+require 'json'
+
+require_relative 'canonical_mixin'
+
+JSON.extend(Nuggets::JSON::CanonicalMixin)

data/lib/nuggets/json/canonical_mixin.rb

@@ -0,0 +1,61 @@
+#--
+###############################################################################
+#                                                                             #
+# nuggets -- Extending Ruby                                                   #
+#                                                                             #
+# Copyright (C) 2007-2018 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# nuggets is free software; you can redistribute it and/or modify it under    #
+# the terms of the GNU Affero General Public License as published by the Free #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# nuggets is distributed in the hope that it will be useful, but WITHOUT ANY  #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with nuggets. If not, see <http://www.gnu.org/licenses/>.             #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  module JSON
+    module CanonicalMixin
+
+  def generate_canonical(obj, opts = {})
+    generate(_nuggets_json_canonical(obj), opts)
+  end
+
+  def pretty_generate_canonical(obj, opts = {})
+    pretty_generate(_nuggets_json_canonical(obj), opts)
+  end
+
+  def pretty_print_canonical(source, opts = {})
+    pretty_generate_canonical(parse_multi(source, opts), opts)
+  end
+
+  alias_method :pc, :pretty_print_canonical
+
+  private
+
+  def _nuggets_json_canonical(obj)
+    case obj
+      when ::Hash
+        obj.class.new.tap { |res|
+          obj.keys.sort.each { |k| res[k] = send(__method__, obj[k]) } }
+      when ::Array
+        obj.map { |v| send(__method__, v) }.sort_by(&:to_s)
+      else
+        obj
+    end
+  end
+
+    end
+  end
+end

data/lib/nuggets/json/multi.rb

@@ -0,0 +1,5 @@
+require 'json'
+
+require_relative 'multi_mixin'
+
+JSON.extend(Nuggets::JSON::MultiMixin)

data/lib/nuggets/json/multi_mixin.rb

@@ -0,0 +1,71 @@
+#--
+###############################################################################
+#                                                                             #
+# nuggets -- Extending Ruby                                                   #
+#                                                                             #
+# Copyright (C) 2007-2018 Jens Wille                                          #
+#                                                                             #
+# Authors:                                                                    #
+#     Jens Wille <jens.wille@gmail.com>                                       #
+#                                                                             #
+# nuggets is free software; you can redistribute it and/or modify it under    #
+# the terms of the GNU Affero General Public License as published by the Free #
+# Software Foundation; either version 3 of the License, or (at your option)   #
+# any later version.                                                          #
+#                                                                             #
+# nuggets is distributed in the hope that it will be useful, but WITHOUT ANY  #
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS   #
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for     #
+# more details.                                                               #
+#                                                                             #
+# You should have received a copy of the GNU Affero General Public License    #
+# along with nuggets. If not, see <http://www.gnu.org/licenses/>.             #
+#                                                                             #
+###############################################################################
+#++
+
+module Nuggets
+  module JSON
+    module MultiMixin
+
+  # Preserves multiple (non-unique) names in
+  # {"non-interoperable"}[https://tools.ietf.org/html/rfc7159#section-4] JSON objects.
+  def parse_multi(source, opts = {})
+    parse(source, opts.merge(object_class: MULTI_OBJECT))
+  end
+
+  def pretty_print_multi(source, opts = {})
+    pretty_generate(parse_multi(source, opts), opts)
+  end
+
+  alias_method :pp, :pretty_print_multi
+
+  private
+
+  class MULTI_OBJECT < ::Hash
+
+    def []=(k, v)
+      super(MULTI_KEY.new(k), v)
+    end
+
+    def each_multi(k)
+      block_given? ? each { |l, v| yield v if k == l } : enum_for(__method__, k)
+    end
+
+    def fetch_multi(k)
+      each_multi(k).to_a
+    end
+
+  end
+
+  class MULTI_KEY < ::String
+
+    def eql?(*)
+      false
+    end
+
+  end
+
+    end
+  end
+end

data/lib/nuggets/version.rb

@@ -3,7 +3,7 @@ module Nuggets
   module Version
 
     MAJOR = 1
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     class << self

data/spec/nuggets/array/format_spec.rb

@@ -3,6 +3,7 @@ require 'nuggets/array/format'
 describe Array, 'format' do
 
   def self.test_format(*f)
+    return if RUBY_ENGINE == 'jruby' && JRUBY_VERSION.include?('pre')
     f.pop.each { |x, y| example { (f.dup % x).should == y } }
   end
 

data/spec/nuggets/enumerable/minmax_spec.rb

@@ -7,7 +7,7 @@ describe Enumerable, 'minmax' do
 
     e.max.should == 'quux'
     e.max_by(:length).should == 'quuux'
-    e.max(:length).should == 5
+    e.max(:length).should == 5 if RUBY_VERSION < '2.4'
   }
 
   example {
@@ -15,7 +15,7 @@ describe Enumerable, 'minmax' do
 
     e.max.should == 222
     e.max_by(b).should == 45
-    e.max(b).should == 5
+    e.max(b).should == 5 if RUBY_VERSION < '2.4'
   }
 
 end

data/spec/nuggets/env/user_home_spec.rb

@@ -7,36 +7,16 @@ describe_extended ENV, Nuggets::Env::UserHomeMixin, true do
   end
 
   after do
-    ENV.clear
-    ENV.update(@old_env)
+    ENV.clear.update(@old_env)
   end
 
   example do
     ENV.user_home.should be_an_instance_of(String)
   end
 
-  example do
-    ENV.clear
-    ENV.user_home.should be_an_instance_of(String)
-  end
-
   example do
     ENV['HOME'] = 'foo'
     ENV.user_home.should == 'foo'
   end
 
-  unless RUBY_ENGINE == 'jruby'
-
-    example do
-      ENV.clear
-      ENV.user_home('bar').should == 'bar'
-    end
-
-    example do
-      ENV.clear
-      ENV.user_home(nil).should be_nil
-    end
-
-  end
-
 end

data/spec/nuggets/json/canonical_spec.rb

@@ -0,0 +1,74 @@
+require 'nuggets/json/canonical'
+require 'nuggets/json/multi'
+
+describe_extended JSON, Nuggets::JSON::CanonicalMixin, true do
+
+  let(:source) { '{"a":1,"b":[42,23],"a":{"b":2,"a":[3,5,4]}}' }
+
+  subject { JSON.parse(source) }
+
+  describe 'plain' do
+
+    example { expect(JSON.generate(subject)).to eq('{"a":{"b":2,"a":[3,5,4]},"b":[42,23]}') }
+
+    example { expect(JSON.pretty_generate(subject)).to eq(<<-EOT.chomp) }
+{
+  "a": {
+    "b": 2,
+    "a": [
+      3,
+      5,
+      4
+    ]
+  },
+  "b": [
+    42,
+    23
+  ]
+}
+    EOT
+
+  end
+
+  describe 'canonical' do
+
+    example { expect(JSON.generate_canonical(subject)).to eq('{"a":{"a":[3,4,5],"b":2},"b":[23,42]}') }
+
+    example { expect(JSON.pretty_generate_canonical(subject)).to eq(<<-EOT.chomp) }
+{
+  "a": {
+    "a": [
+      3,
+      4,
+      5
+    ],
+    "b": 2
+  },
+  "b": [
+    23,
+    42
+  ]
+}
+    EOT
+
+    example { expect(JSON.pretty_print_canonical(source)).to eq(<<-EOT.chomp) }
+{
+  "a": 1,
+  "a": {
+    "a": [
+      3,
+      4,
+      5
+    ],
+    "b": 2
+  },
+  "b": [
+    23,
+    42
+  ]
+}
+    EOT
+
+  end
+
+end

data/spec/nuggets/json/multi_spec.rb

@@ -0,0 +1,67 @@
+require 'nuggets/json/multi'
+
+describe_extended JSON, Nuggets::JSON::MultiMixin, true do
+
+  let(:source) { '{"a":1,"b":[42,23],"a":{"b":2}}' }
+
+  describe 'plain' do
+
+    subject { JSON.parse(source) }
+
+    example { expect(subject).to be_a(Hash) }
+    example { expect(subject.size).to eq(2) }
+    example { expect(subject.keys).to eq(%w[a b]) }
+
+    example { expect(subject['a']).to eq('b' => 2) }
+    example { expect(subject['b']).to eq([42, 23]) }
+
+    example { expect(JSON.pretty_generate(subject)).to eq(<<-EOT.chomp) }
+{
+  "a": {
+    "b": 2
+  },
+  "b": [
+    42,
+    23
+  ]
+}
+    EOT
+
+  end
+
+  describe 'multi' do
+
+    subject { JSON.parse_multi(source) }
+
+    let(:multi) { subject.fetch_multi('a') }
+
+    let(:pretty) { <<-EOT.chomp }
+{
+  "a": 1,
+  "b": [
+    42,
+    23
+  ],
+  "a": {
+    "b": 2
+  }
+}
+    EOT
+
+    example { expect(subject).to be_a(Hash) }
+    example { expect(subject.size).to eq(3) }
+    example { expect(subject.keys).to eq(%w[a b a]) }
+
+    example { expect(subject['a']).to eq(1) }
+    example { expect(subject['b']).to eq([42, 23]) }
+
+    example { expect(multi[0]).to eq(1) }
+    example { expect(multi[1]).to be_a(Hash) }
+    example { expect(multi[1]['b']).to eq(2) }
+
+    example { expect(JSON.pretty_generate(subject)).to eq(pretty) }
+    example { expect(JSON.pretty_print_multi(source)).to eq(pretty) }
+
+  end
+
+end

data/spec/nuggets/string/highlight_spec.rb

@@ -2,6 +2,8 @@ require 'nuggets/string/highlight'
 
 describe_extended String, Nuggets::String::HighlightMixin do
 
+unless RUBY_ENGINE == 'jruby' && JRUBY_VERSION.include?('pre')
+
   example do
     s = 'lingo go do the go go'; t = s.dup
     expect(s.highlight('lingo')).to eq('|lingo| go do the go go')
@@ -41,3 +43,5 @@ describe_extended String, Nuggets::String::HighlightMixin do
   end
 
 end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuggets
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -44,20 +44,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,10 @@ files:
 - lib/nuggets/io/modes.rb
 - lib/nuggets/io/redirect.rb
 - lib/nuggets/io/redirect_mixin.rb
+- lib/nuggets/json/canonical.rb
+- lib/nuggets/json/canonical_mixin.rb
+- lib/nuggets/json/multi.rb
+- lib/nuggets/json/multi_mixin.rb
 - lib/nuggets/lazy_attr.rb
 - lib/nuggets/log_parser.rb
 - lib/nuggets/log_parser/apache.rb
@@ -323,6 +327,8 @@ files:
 - spec/nuggets/integer/map_spec.rb
 - spec/nuggets/integer/roman_spec.rb
 - spec/nuggets/integer/to_binary_s_spec.rb
+- spec/nuggets/json/canonical_spec.rb
+- spec/nuggets/json/multi_spec.rb
 - spec/nuggets/module/lazy_attr_spec.rb
 - spec/nuggets/module/query_attr_spec.rb
 - spec/nuggets/numeric/duration_spec.rb
@@ -358,15 +364,13 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  nuggets-1.5.0 [2016-04-19]:
+  nuggets-1.6.0 [2018-07-12]:
 
-  * Added String#format.
-  * Added String#highlight.
-  * Dropped IO::NULL, available as File::NULL since Ruby 1.9.3.
+  * Added <tt>JSON.*_{multi,canonical}</tt>.
 
 rdoc_options:
 - "--title"
-- nuggets Application documentation (v1.5.0)
+- nuggets Application documentation (v1.6.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -387,7 +391,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Extending Ruby.