opto 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ac3340f2ab72942ad62dd4589d773e7713ebb24
-  data.tar.gz: 5882bb7b1bb860e10413ca659887c1e166f39bad
+  metadata.gz: 9dedbddd78ab84c43366135f15133aaa367044e7
+  data.tar.gz: 48e32fd24ef67476c171115dca96de827f2c90ce
 SHA512:
-  metadata.gz: 10ea21720b0b1d07c4d7deaa43424f296ac9b3dff137db003c2e40b87ba37604dbb864592268a1ffc30dfb0d8e46a1823a61954dfbf63e96f49df8a72d4fe4b6
-  data.tar.gz: 05c279f893883d1ac3b7dfabc8d9034719b22069369a24c6e7ed99f82e5f6ea192ce661cdb4278c68c4d4d68464446dd92160018f5a54626e6b91375f75a6d9a
+  metadata.gz: 7ea855a635ab51af7342cccf8b1f7aee5ae26def1564bf878c15e5316c116221d7097d6e0ed4276aa7d7591839f4c2e76acdec1924c0e7b0c63bc787a996f6f7
+  data.tar.gz: 3de6ee644c94c10a4570d370fb4a64609faa6bb940debc785a5bb1394a163243e475c944ea9df704707974f84aff2991b9a6384eb3533d56c4122cafd7e85714

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0-p648
   - 2.1.8
   - 2.2.3
-  - 2.3.1
   - 2.3.3
   - 2.4.0
   - jruby-9.1.5.0
@@ -18,4 +16,4 @@ deploy:
   gem: opto
   on:
     tags: true
-    rvm: 2.3.1
+    rvm: 2.4.0

data/lib/opto.rb

@@ -2,11 +2,6 @@ require "opto/version"
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 require "opto/option"
 require "opto/group"
 
@@ -15,6 +10,9 @@ require 'yaml'
 # An option parser/validator/resolver
 #
 module Opto
+  using Opto::Extension::SnakeCase
+  using Opto::Extension::HashStringOrSymbolKey
+
   # Initialize a new Opto::Option (when input is hash) or an Opto::Group (when input is an array of hashes)
   def self.new(opts)
     case opts

data/lib/opto/extensions/symbolize_keys.rb

@@ -0,0 +1,15 @@
+module Opto
+  module Extension
+    # Refines String to have .snakecase method that turns
+    # StringLikeThis into a string_like_this
+    module SymbolizeKeys
+      refine Hash do
+        def symbolize_keys
+          each_with_object(dup.clear) do |(key, value), hash|
+            hash[(key.to_sym rescue key)] = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opto/group.rb

@@ -2,11 +2,6 @@ require 'opto/option'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   # A group of Opto::Option instances. Members of Groups can see their relatives
   # and their values. Such as `option.value_of('another_option')`
@@ -14,7 +9,7 @@ module Opto
   # Most Array instance methods are delegated, such as .map, .each, .find etc.
   class Group
 
-    using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+    using Opto::Extension::HashStringOrSymbolKey
 
     attr_reader :options, :defaults
 

data/lib/opto/option.rb

@@ -4,21 +4,14 @@ require_relative 'setter'
 require_relative 'extensions/snake_case'
 require_relative 'extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   # What is an option? It's like a variable that has a value, which can be validated or
   # manipulated on creation. The value can be resolved from a number of origins, such as
   # an environment variable or random string generator.
   class Option
 
-    unless RUBY_VERSION < '2.1'
-      using Opto::Extension::SnakeCase
-      using Opto::Extension::HashStringOrSymbolKey
-    end
+    using Opto::Extension::SnakeCase
+    using Opto::Extension::HashStringOrSymbolKey
 
     attr_accessor :type
     attr_accessor :name

data/lib/opto/resolver.rb

@@ -1,11 +1,6 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   # Base for resolvers.
   #
@@ -15,7 +10,7 @@ module Opto
   # RandomString, which can generate random strings of defined length.
   class Resolver
 
-    using Opto::Extension::SnakeCase unless RUBY_VERSION < '2.1'
+    using Opto::Extension::SnakeCase
 
     attr_accessor :hint
     attr_accessor :option

data/lib/opto/resolvers/condition.rb

@@ -1,11 +1,6 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Resolvers
     # Allows setting the value conditionally based on other variables
@@ -34,7 +29,7 @@ module Opto
     # If you don't define an else, a null will be returned when no conditions match.
     class Condition < Opto::Resolver
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       class HashCond
         attr_reader :condition

data/lib/opto/resolvers/evaluate.rb

@@ -1,17 +1,12 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Resolvers
     # Geneerate a new random number. Requires :min and :max in hint to define range.
     class Evaluate < Opto::Resolver
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       def resolve
         raise TypeError, "String required" unless hint.kind_of?(String)

data/lib/opto/resolvers/interpolate.rb

@@ -1,11 +1,6 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Resolvers
     # Interpolates values from other options into a template string.
@@ -15,7 +10,7 @@ module Opto
     #   interpolate: mysql://admin:$mysql_admin_pass@mysql:1234/$mysql_db_name
     class Interpolate < Opto::Resolver
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       def resolve
         raise TypeError, "String expected" unless hint.kind_of?(String)

data/lib/opto/resolvers/random_number.rb

@@ -1,17 +1,12 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Resolvers
     # Geneerate a new random number. Requires :min and :max in hint to define range.
     class RandomNumber < Opto::Resolver
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       def resolve
         raise ArgumentError, "Range not set" if hint.nil?

data/lib/opto/resolvers/random_string.rb

@@ -1,31 +1,26 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Resolvers
     # Generates a random string.
     #
-    # Requires at least  :length. 
-    # Also accepts :charset which can be one of: 
-    # - numbers (0-9), 
-    # - letters (a-z + A-Z), 
-    # - downcase (a-z), 
+    # Requires at least  :length.
+    # Also accepts :charset which can be one of:
+    # - numbers (0-9),
+    # - letters (a-z + A-Z),
+    # - downcase (a-z),
     # - upcase (A-Z),
-    # - alphanumeric (0-9 + a-z + A-Z), 
-    # - hex (0-9 + a-f), 
-    # - hex_upcase (0-9 + A-F), 
+    # - alphanumeric (0-9 + a-z + A-Z),
+    # - hex (0-9 + a-f),
+    # - hex_upcase (0-9 + A-F),
     # - base64 (base64 charset (length has to be divisible by four when using base64)),
     #-  ascii_printable (all printable ascii chars)
     # - or a set of characters, for example:
     #   { length: 8, charset: '01' }  Will generate something like:  01001100
     class RandomString < Opto::Resolver
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       def charset(name)
         case name.to_s
@@ -56,7 +51,7 @@ module Opto
       end
 
       def resolve
-        if hint.kind_of?(Hash) 
+        if hint.kind_of?(Hash)
           if hint[:length].nil?
             raise ArgumentError, "Invalid settings for random string. Required: length, optional: charset. Charsets : numbers, letters, alphanumeric, hex, base64, ascii_printable and X-Y range."
           end

data/lib/opto/setter.rb

@@ -1,11 +1,6 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   # Base for Setters.
   #
@@ -15,7 +10,7 @@ module Opto
   # RandomString, which can generate random strings of defined length.
   class Setter
 
-    using Opto::Extension::SnakeCase unless RUBY_VERSION < '2.1'
+    using Opto::Extension::SnakeCase
 
     attr_accessor :hint
     attr_accessor :option

data/lib/opto/setters/environment_variable.rb

@@ -1,11 +1,6 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Setters
     # Set a value to environment.
@@ -15,7 +10,7 @@ module Opto
     # Everything will be converted to strings unless hint is a hash with :options. (also include :name in that case)
     class Env < Opto::Setter
 
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       attr_accessor :env_name, :dont_stringify
 

data/lib/opto/type.rb

@@ -1,25 +1,20 @@
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
-
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
+require 'opto/extensions/symbolize_keys'
 
 module Opto
   # Defines a type handler. Used as a base from which to inherit in the type handlers.
   class Type
+    using Opto::Extension::HashStringOrSymbolKey
+    using Opto::Extension::SnakeCase
+    using Opto::Extension::SymbolizeKeys
+
     GLOBAL_OPTIONS = {
       required: true
     }
 
     attr_accessor :options
 
-    unless RUBY_VERSION < '2.1'
-      using Opto::Extension::SnakeCase
-      using Opto::Extension::HashStringOrSymbolKey
-    end
-
     class << self
       def inherited(where)
         types[where.type] = where
@@ -55,9 +50,7 @@ module Opto
       #   end
       def validator(name, &block)
         raise TypeError, "Block required" unless block_given?
-        define_method("validate_#{name}", &block)
-        validators << "validate_#{name}".to_sym
-        # RUBY_VERSION >= 2.1 would allow validators << define_method("validate_#{name}", block)
+        validators << define_method("validate_#{name}", &block)
       end
 
       def sanitizers
@@ -75,8 +68,7 @@ module Opto
       #   end
       def sanitizer(name, &block)
         raise TypeError, "Block required" unless block_given?
-        define_method("sanitize_#{name}", &block)
-        sanitizers << "sanitize_#{name}".to_sym
+        sanitizers << define_method("sanitize_#{name}", &block)
       end
     end
 
@@ -93,7 +85,7 @@ module Opto
     end
 
     def initialize(options = {})
-      @options = Type::GLOBAL_OPTIONS.merge(self.class.const_defined?(:OPTIONS) ? self.class.const_get(:OPTIONS) : {}).merge(options)
+      @options = Type::GLOBAL_OPTIONS.merge(self.class.const_defined?(:OPTIONS) ? self.class.const_get(:OPTIONS) : {}).merge(options.symbolize_keys)
     end
 
     def type
@@ -128,7 +120,7 @@ module Opto
     def validate(value)
       errors.clear
       if value.nil?
-        errors[:presence] = "Required value missing" if required? 
+        errors[:presence] = "Required value missing" if required?
       else
         (Type.validators + self.class.validators).each do |validator|
           begin

data/lib/opto/types/array.rb

@@ -1,8 +1,4 @@
 require_relative '../type'
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
 
 module Opto
   module Types
@@ -17,7 +13,7 @@ module Opto
     #   - compact: when true, removes nils and blanks
     #   - count: when true, the output is the count of items in the array
     class Array < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
 
       OPTIONS = {

data/lib/opto/types/boolean.rb

@@ -2,11 +2,6 @@ require_relative '../type'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Types
     # A boolean value.
@@ -19,7 +14,7 @@ module Opto
     #   :true says "true" by default when outputting a string
     #   :false says "false" by default when outputting a string
     class Boolean < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       OPTIONS = {
         truthy: ['true', 'yes', '1', 'on', 'enabled', 'enable'],

data/lib/opto/types/enum.rb

@@ -2,11 +2,6 @@ require_relative '../type'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Types
     # A list of possible values
@@ -39,7 +34,7 @@ module Opto
     #         description: A friendly furry creature with a tail, says 'woof'
     #   )
     class Enum < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       OPTIONS = {
         options: [],

data/lib/opto/types/integer.rb

@@ -2,11 +2,6 @@ require_relative '../type'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Types
     # A number.
@@ -16,7 +11,7 @@ module Opto
     #   :max - maximum allowed value
     #   :nil_is_zero : set to true if you want to turn a null value into 0
     class Integer < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       OPTIONS = {
         min: 0,

data/lib/opto/types/string.rb

@@ -3,11 +3,6 @@ require 'base64'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Types
     # A string
@@ -25,7 +20,7 @@ module Opto
     #   - capitalize: set to true to upcase the first letter
     #   - hexdigest: valid options: md5, sha1, sha256, sha384, sha512 and nil/false. generate an md5/sha1/etc hexdigest from the value.
     class String < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       TRANSFORMATIONS = [ :upcase, :downcase, :strip, :chomp, :capitalize ]
 

data/lib/opto/types/uri.rb

@@ -3,11 +3,6 @@ require 'uri'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
 
-if RUBY_VERSION < '2.1'
-  using Opto::Extension::SnakeCase
-  using Opto::Extension::HashStringOrSymbolKey
-end
-
 module Opto
   module Types
     # An uri/url.
@@ -15,7 +10,7 @@ module Opto
     # Options:
     #   schemes: an array of allowed schemes, such as ['http', 'https', 'file']
     class Uri < Opto::Type
-      using Opto::Extension::HashStringOrSymbolKey unless RUBY_VERSION < '2.1'
+      using Opto::Extension::HashStringOrSymbolKey
 
       OPTIONS = {
         schemes: [ 'http', 'https' ]

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.7.0"
+  VERSION = "1.8.0"
 end

data/opto.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = ">= 2.1.0"
+
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - lib/opto.rb
 - lib/opto/extensions/hash_string_or_symbol_key.rb
 - lib/opto/extensions/snake_case.rb
+- lib/opto/extensions/symbolize_keys.rb
 - lib/opto/group.rb
 - lib/opto/option.rb
 - lib/opto/resolver.rb
@@ -104,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="