riveter 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d6e22e7ef8c21ec6f308b9c255a1d8afe1b27806c99b7a80a89a941da7e1bc5
-  data.tar.gz: 8265f2ea310547dd69cc3fed955ece95404227dcd9f63eb79c55138913f04619
+  metadata.gz: e42d665fc17ac27cb6d8577a74537233a0175500af57a371c7f457093465c96e
+  data.tar.gz: 65944a322f2c186365d0765c6f7a4dbc97206726603a0b0182f65a44a7aaafad
 SHA512:
-  metadata.gz: 8d2504ef2ec31fc0d2fc30da0808c9016707025b0ec3e574564c0ce1b97f204ce8793c38336a71ec30c6ece9f4137aa57fa4f47a33046ea3444c4198439ec577
-  data.tar.gz: a5916646a15f3274d19b90ca13bdaff2baf54373f571810ab3ae2948b0c658f95833c89b49812d78042024c9865faa624ddf77029570f98b8e065290ad5ecabb
+  metadata.gz: 4d25d91b57c555a75d3d2dcc3e2add7ae448a1238461ddd4db9c4badd3b346d76685496806329804ec6c0064960cde324c689dbc55bc2630e7b8d95cb2834f9d
+  data.tar.gz: 37cee8302923c8478ff5c02f434c48136ac69ee426c1ad054d9fb3256d8ee87d04947b103f2cb36ac6c988c5ba9f98ae7beb1bc60a9316fa4f52a5a0ed78aadc

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.5.5

data/.travis.yml

@@ -2,11 +2,9 @@ language: ruby
 cache: bundler
 
 rvm:
-  - 2.1.10
-  - 2.2.10
   - 2.3.7
   - 2.4.4
-  - 2.5.1
+  - 2.5.5
 
 script: 'bundle exec rake spec'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    riveter (0.8.2)
+    riveter (0.8.3)
       activemodel (>= 4.0.0)
       railties (>= 4.0.0)
       validates_timeliness (>= 3.0.0)
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
+    actionmailer (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.10)
-      actionview (= 4.2.10)
-      activesupport (= 4.2.10)
+    actionpack (4.2.11.1)
+      actionview (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.10)
-      activesupport (= 4.2.10)
+    actionview (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.10)
-      activesupport (= 4.2.10)
+    activejob (4.2.11.1)
+      activesupport (= 4.2.11.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
+    activemodel (4.2.11.1)
+      activesupport (= 4.2.11.1)
       builder (~> 3.1)
-    activerecord (4.2.10)
-      activemodel (= 4.2.10)
-      activesupport (= 4.2.10)
+    activerecord (4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       arel (~> 6.0)
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
@@ -53,20 +53,20 @@ GEM
       columnize (= 0.9.0)
     coderay (1.1.2)
     columnize (0.9.0)
-    concurrent-ruby (1.1.3)
-    coveralls (0.8.22)
+    concurrent-ruby (1.1.5)
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.4)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     erubis (2.7.0)
-    globalid (0.4.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    haml (5.0.4)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
     haml-rails (1.0.0)
@@ -82,18 +82,18 @@ GEM
       ruby_parser (~> 3.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
+    json (2.2.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.8.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -104,16 +104,16 @@ GEM
     rack (1.6.11)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.10)
-      actionmailer (= 4.2.10)
-      actionpack (= 4.2.10)
-      actionview (= 4.2.10)
-      activejob (= 4.2.10)
-      activemodel (= 4.2.10)
-      activerecord (= 4.2.10)
-      activesupport (= 4.2.10)
+    rails (4.2.11.1)
+      actionmailer (= 4.2.11.1)
+      actionpack (= 4.2.11.1)
+      actionview (= 4.2.11.1)
+      activejob (= 4.2.11.1)
+      activemodel (= 4.2.11.1)
+      activerecord (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.10)
+      railties (= 4.2.11.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -121,11 +121,11 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.10)
-      actionpack (= 4.2.10)
-      activesupport (= 4.2.10)
+    railties (4.2.11.1)
+      actionpack (= 4.2.11.1)
+      activesupport (= 4.2.11.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -146,9 +146,9 @@ GEM
       rspec-mocks (~> 3.2.0)
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
-    ruby_parser (3.11.0)
+    ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    sexp_processor (4.11.0)
+    sexp_processor (4.12.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
     simplecov (0.16.1)
@@ -164,18 +164,18 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    temple (0.8.0)
-    term-ansicolor (1.7.0)
+    temple (0.8.1)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.4)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    timeliness (0.3.8)
-    tins (1.20.2)
+    tilt (2.0.9)
+    timeliness (0.4.3)
+    tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    validates_timeliness (4.0.2)
-      timeliness (~> 0.3.7)
+    validates_timeliness (4.1.1)
+      timeliness (>= 0.3.10, < 1)
 
 PLATFORMS
   ruby
@@ -194,4 +194,4 @@ DEPENDENCIES
   shoulda-matchers (~> 2.8.0)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/riveter/core_extensions.rb

@@ -119,9 +119,9 @@ module Riveter
       # When both +hsh+ and +other_hash+ contains an entry with the same key,
       # it merges and returns the values from both arrays.
       #
-      #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-      #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
-      #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+      #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}, "d" => {"d1" => 400}}
+      #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}, "d" => nil}
+      #    h1.rmerge!(h2)   #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}, "d" => nil}
       #
       # Simply using Hash#merge! would return
       #
@@ -146,15 +146,17 @@ module Riveter
       # includes the same key, the value is merged instead replaced with
       # +other_hash+ value.
       #
-      #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-      #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
-      #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}}
+      #    h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}, "d" => {"d1" => 400}}
+      #    h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}, "d" => nil}
+      #    h1.rmerge(h2)    #=> {"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}, "d" => nil}
       #
       # Simply using Hash#merge would return
       #
       #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
       #
       def rmerge(other_hash)
+        return nil if other_hash.nil?
+
         r = {}
         merge(other_hash)  do |key, oldval, newval|
           r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval

data/lib/riveter/enumerated.rb

@@ -4,7 +4,7 @@ module Riveter
 
     included do
 
-      const_names = self.constants(false).freeze
+      const_names = self.constants(false).sort.freeze
       const_values = const_names.collect {|name| self.const_get(name) }.freeze
 
       # create hashes for decoding names and values

data/lib/riveter/version.rb

@@ -1,3 +1,3 @@
 module Riveter
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/riveter/core_extensions_spec.rb

@@ -108,9 +108,9 @@ describe Riveter::CoreExtensions do
   describe Riveter::CoreExtensions::HashExtensions do
     describe "#rmerge" do
       it {
-        h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}}
-        h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}}
-        h1.rmerge(h2).should eq({"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}})
+        h1 = {"a" => 100, "b" => 200, "c" => {"c1" => 12, "c2" => 14}, "d" => {"d1" => 400}}
+        h2 = {"b" => 254, "c" => 300, "c" => {"c1" => 16, "c3" => 94}, "d" => nil}
+        h1.rmerge(h2).should eq({"a" => 100, "b" => 254, "c" => {"c1" => 16, "c2" => 14, "c3" => 94}, "d" => nil})
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riveter
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -406,8 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Provides several useful patterns, packaged in a gem, for use in Rails.