typesafe_enum 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a03ce1356a736037c69f793aaffb12ffe001b4e8
-  data.tar.gz: 3d748bba73a6df9a5f2bf929c379ef2a2ca904b4
+  metadata.gz: 1f9b1132621b9e769433ef61e8fd2512a66197c4
+  data.tar.gz: f5394bf7f1a1e88c56c727352f8d2dd113934855
 SHA512:
-  metadata.gz: f8437ae0afc6f20a003ca259fedf412378ffdea8c9090b17cc9271326cb78a0c43dd8dda22a3df31c32d468b94ea8e7edbb3b586ca8c582c967ac7c447da1a03
-  data.tar.gz: c55260cab261cc0273cfc61ca0eaaf686f57ecda9d18d8ea6c13e237e12ae97bd4909fc1ce54bd1545d2f4fb50c7e9c5d38cd04572e4d39172db3a71790dfc80
+  metadata.gz: ffd661decf927ce85719a8cac164e7105f674e4289d68d546102f500aeb8d3a70907a25fafee22960c07967104ec77b8ee4ac8310450ba2febeafdb75c31dfa0
+  data.tar.gz: 6f4770854fe78d823c0031f16338c081a4fbac9def1e519e4f7c579566c57ffbac0a13f4d597890b42fe97df614a52a3f6ff83b48fca5b505c96004bcf9833c0

data/.gitignore

@@ -1,3 +1,7 @@
+# IDEA
+
+.idea
+
 # Ruby defaults
 
 /.bundle/

data/.rubocop.yml

@@ -12,13 +12,13 @@ Style/Documentation:
   Enabled: false
 
 # Allow one line around class body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
 # Allow one line around module body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
 # Allow one line around block body (Style/EmptyLines will still disallow two or more)
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.4.1

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.1.8 (22 December 2017)
+
+- Update to Ruby 2.4.1
+- Update to rspec 3.7
+- Update to RuboCop 0.52
+- Update to Yard 0.9.12
+
 ## 0.1.7 (28 April 2016)
 
 - The default `to_s` for `TypesafeEnum::Base` now includes the enum's class, key, value,

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ------------------------------------------------------------
 # RSpec
 
@@ -8,7 +10,7 @@ namespace :spec do
 
   desc 'Run all unit tests'
   RSpec::Core::RakeTask.new(:unit) do |task|
-    task.rspec_opts = %w(--color --format documentation --order default)
+    task.rspec_opts = %w[--color --format documentation --order default]
     task.pattern = 'unit/**/*_spec.rb'
   end
 
@@ -38,7 +40,7 @@ RuboCop::RakeTask.new
 
 desc 'List TODOs (from spec/todo.rb)'
 RSpec::Core::RakeTask.new(:todo) do |task|
-  task.rspec_opts = %w(--color --format documentation --order default)
+  task.rspec_opts = %w[--color --format documentation --order default]
   task.pattern = 'todo.rb'
 end
 
@@ -46,4 +48,4 @@ end
 # Defaults
 
 desc 'Run unit tests, check test coverage, run acceptance tests, check code style'
-task default: [:coverage, :rubocop]
+task default: %i[coverage rubocop]

data/lib/typesafe_enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TypesafeEnum
   Dir.glob(File.expand_path('../typesafe_enum/*.rb', __FILE__)).sort.each(&method(:require))
 end

data/lib/typesafe_enum/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A Ruby implementation of Joshua Bloch's
 # [typesafe enum pattern](http://www.oracle.com/technetwork/java/page1-139488.html#replaceenums)
 module TypesafeEnum
@@ -68,7 +70,7 @@ module TypesafeEnum
       # @param ord [Integer] the ordinal to look up
       # @return [self, nil] the corresponding enum instance, or nil
       def find_by_ord(ord)
-        return nil if ord < 0 || ord > size
+        return nil if ord > size || ord.negative?
         as_array[ord]
       end
 
@@ -94,11 +96,11 @@ module TypesafeEnum
         key = instance.key
         value = instance.value
         if (found = find_by_key(key))
-          fail NameError, "#{name}::#{key} already exists" unless value == found.value
-          warn("ignoring redeclaration of #{name}::#{key} with value #{value} (source: #{caller[4]})")
+          raise NameError, "#{name}::#{key} already exists" unless value == found.value
+          warn("ignoring redeclaration of #{name}::#{key} with value #{value} (source: #{caller(5..5).first})")
           nil
         else
-          fail NameError, "A #{name} instance with value '#{value}' already exists" if find_by_value(value)
+          raise NameError, "A #{name} instance with value '#{value}' already exists" if find_by_value(value)
           [key, value]
         end
       end
@@ -143,7 +145,7 @@ module TypesafeEnum
         result = 17
         result = 31 * result + self.class.hash
         result = 31 * result + ord
-        result.is_a?(Fixnum) ? result : result.hash
+        result.is_a?(Integer) ? result : result.hash
       end
     end
 
@@ -154,7 +156,7 @@ module TypesafeEnum
     private
 
     def initialize(key, value = nil, &block)
-      fail TypeError, "#{key} is not a symbol" unless key.is_a?(Symbol)
+      raise TypeError, "#{key} is not a symbol" unless key.is_a?(Symbol)
       @key = key
       @value = value || key.to_s.downcase
       @ord = self.class.size

data/lib/typesafe_enum/module_info.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module TypesafeEnum
   # The name of this gem
   NAME = 'typesafe_enum'
 
   # The version of this gem
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 
   # The copyright notice for this gem
-  COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'
+  COPYRIGHT = 'Copyright (c) 2017 The Regents of the University of California'
 end

data/spec/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: ../.rubocop.yml
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Enabled: false
 
@@ -8,3 +11,6 @@ Metrics/ModuleLength:
 
 Style/ClassAndModuleChildren:
   Enabled: false
+
+Security/MarshalLoad:
+  Enabled: false

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # ------------------------------------------------------------
 # SimpleCov setup
 

data/spec/unit/typesafe_enum/base_spec.rb

@@ -1,4 +1,6 @@
-# coding: utf-8
+
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 class Suit < TypesafeEnum::Base
@@ -152,7 +154,7 @@ module TypesafeEnum
     describe '::map' do
       it 'maps enum values' do
         all_keys = Suit.map(&:key)
-        expect(all_keys).to eq([:CLUBS, :DIAMONDS, :HEARTS, :SPADES])
+        expect(all_keys).to eq(%i[CLUBS DIAMONDS HEARTS SPADES])
       end
     end
 
@@ -253,7 +255,7 @@ module TypesafeEnum
 
       it 'always returns a Fixnum' do
         Suit.each do |s1|
-          expect(s1.hash).to be_a(Fixnum)
+          expect(s1.hash).to be_a(Integer)
         end
       end
     end
@@ -270,7 +272,7 @@ module TypesafeEnum
 
     describe '#value' do
       it 'returns the string value of the enum instance' do
-        expected = %w(clubs diamonds hearts spades)
+        expected = %w[clubs diamonds hearts spades]
         Suit.each_with_index do |s, index|
           expect(s.value).to eq(expected[index])
         end
@@ -279,7 +281,7 @@ module TypesafeEnum
 
     describe '#key' do
       it 'returns the symbol key of the enum instance' do
-        expected = [:CLUBS, :DIAMONDS, :HEARTS, :SPADES]
+        expected = %i[CLUBS DIAMONDS HEARTS SPADES]
         Suit.each_with_index do |s, index|
           expect(s.key).to eq(expected[index])
         end
@@ -301,7 +303,7 @@ module TypesafeEnum
             ec.each do |ev|
               result = ev.to_s
               [ec.to_s, ev.key, ev.ord, ev.value].each do |info|
-                expect(result).to include("#{info}")
+                expect(result).to include(info.to_s)
               end
             end
           end
@@ -311,7 +313,7 @@ module TypesafeEnum
 
     describe '::find_by_key' do
       it 'maps symbol keys to enum instances' do
-        keys = [:CLUBS, :DIAMONDS, :HEARTS, :SPADES]
+        keys = %i[CLUBS DIAMONDS HEARTS SPADES]
         expected = Suit.to_a
         keys.each_with_index do |k, index|
           expect(Suit.find_by_key(k)).to be(expected[index])
@@ -325,7 +327,7 @@ module TypesafeEnum
 
     describe '::find_by_value' do
       it 'maps values to enum instances' do
-        values = %w(clubs diamonds hearts spades)
+        values = %w[clubs diamonds hearts spades]
         expected = Suit.to_a
         values.each_with_index do |n, index|
           expect(Suit.find_by_value(n)).to be(expected[index])
@@ -351,7 +353,7 @@ module TypesafeEnum
 
     describe '::find_by_value_str' do
       it 'maps string values to enum instances' do
-        values = %w(clubs diamonds hearts spades)
+        values = %w[clubs diamonds hearts spades]
         expected = Suit.to_a
         values.each_with_index do |n, index|
           expect(Suit.find_by_value_str(n)).to be(expected[index])
@@ -407,11 +409,11 @@ module TypesafeEnum
         when Suit::SPADES
           '♠'
         else
-          fail "unknown suit: #{self}"
+          raise "unknown suit: #{self}"
         end
       end
 
-      expect(Suit.map { |s| pip(s) }).to eq(%w(♣ ♦ ♥ ♠))
+      expect(Suit.map { |s| pip(s) }).to eq(%w[♣ ♦ ♥ ♠])
     end
 
     it 'supports "inner class" methods' do

data/typesafe_enum.gemspec

@@ -1,4 +1,6 @@
-# coding: utf-8
+
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -26,9 +28,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.4'
-  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.52'
   spec.add_development_dependency 'simplecov', '~> 0.9.2'
   spec.add_development_dependency 'simplecov-console', '~> 0.2.0'
-  spec.add_development_dependency 'rubocop', '~> 0.32.1'
-  spec.add_development_dependency 'yard', '~> 0.8'
+  spec.add_development_dependency 'yard', '~> 0.9', '>= 0.9.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typesafe_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,70 +44,76 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.52'
 - !ruby/object:Gem::Dependency
-  name: simplecov-console
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov-console
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.12
   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.9.12
 description: A gem that implements the typesafe enum pattern in Ruby
 email:
 - david.moles@ucop.edu
@@ -132,7 +138,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/typesafe_enum/base_spec.rb
 - typesafe_enum.gemspec
-homepage: http://github.com/dmolesUC3/typesafe_enum
+homepage: http://github.com/typesafe_enum
 licenses:
 - MIT
 metadata: {}
@@ -152,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Typesafe enum pattern for Ruby
@@ -160,4 +166,3 @@ test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
 - spec/unit/typesafe_enum/base_spec.rb
-has_rdoc: