anyway_config 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57f348945f2dbb59224655d3967880fd8c02adba6b54748b14436266c4c0c5d
-  data.tar.gz: 36101f8dcb28679c746846d861a220ec28d836eb62cbbdaa5cb3f1254b56446b
+  metadata.gz: e1fad9e1aac1823b53c56253352f21964432c8c93fc7515308ac729aaead836f
+  data.tar.gz: 172f7208a1df440f37e531801623e54a31b65524b321e22ea2f821418a0b6e73
 SHA512:
-  metadata.gz: d623918a56e50ab8c2f7eba539d2a4c1ea487a3192277525b559443d49328ee2cb70e9739bdd8524298ef3bff69fde6819b26262e245dafd7712a8a2c5a50d27
-  data.tar.gz: 60a2be222bc918750f6896bb4fcb1c2f1a2570ca32780a3f55e8d3610f8f3fdc78033971c9104968f5970c9b3943272f54fe911995dc43819f774a669010c80a
+  metadata.gz: a29addaa15fd5c9476476a4a3d3e9b4652116314f606c07b88dbc223cee8d626014a8d0ef18d8ca8c10ffbe355c760b462dfcb27d9299df399404d4c4187e149
+  data.tar.gz: c30bfbae04f2da1367f213be8fdb1312aed3c198472bb3a66695c85b59bcee1c0aca5b0c7ab099ca463c4d3c67b28c538950b5f9b9294887896bf707872303eb

data/README.md

@@ -164,7 +164,7 @@ Example usage:
 
 ```ruby
 class MyConfig < Anyway::Config
-  attr_config :host, :log_level, :concurrency, server_args: {}
+  attr_config :host, :log_level, :concurrency, :debug, server_args: {}
 
   # specify which options shouldn't be handled by option parser
   ignore_options :server_args
@@ -174,9 +174,17 @@ class MyConfig < Anyway::Config
     concurrency: "number of threads to use"
   )
 
+  # mark some options as flag
+  flag_options :debug
+
   # extend an option parser object (i.e. add banner or version/help handlers)
-  extend_options do |parser|
+  extend_options do |parser, config|
     parser.banner = "mycli [options]"
+
+    parser.on("--server-args VALUE") do |value|
+      config.server_args = JSON.parse(value)
+    end
+
     parser.on_tail "-h", "--help" do
       puts parser
     end

data/lib/anyway/config.rb

@@ -3,12 +3,14 @@
 require 'anyway/ext/deep_dup'
 require 'anyway/ext/deep_freeze'
 require 'anyway/ext/hash'
+require 'anyway/ext/string_serialize'
 require 'anyway/option_parser_builder'
 
 module Anyway # :nodoc:
   using Anyway::Ext::DeepDup
   using Anyway::Ext::DeepFreeze
   using Anyway::Ext::Hash
+  using Anyway::Ext::StringSerialize
 
   # Base config class
   # Provides `attr_config` method to describe
@@ -38,13 +40,21 @@ module Anyway # :nodoc:
       end
 
       def ignore_options(*args)
-        @ignore_options ||= []
-        @ignore_options |= args
+        args.each do |name|
+          option_parser_descriptors[name.to_s][:ignore] = true
+        end
       end
 
       def describe_options(**hargs)
-        @option_parser_descriptions ||= {}
-        @option_parser_descriptions.merge!(hargs.stringify_keys!)
+        hargs.each do |name, desc|
+          option_parser_descriptors[name.to_s][:desc] = desc
+        end
+      end
+
+      def flag_options(*args)
+        args.each do |name|
+          option_parser_descriptors[name.to_s][:flag] = true
+        end
       end
 
       def extend_options(&block)
@@ -52,12 +62,11 @@ module Anyway # :nodoc:
       end
 
       def option_parser_options
-        ignored_options = @ignore_options || []
-        descriptions = @option_parser_descriptions || {}
         config_attributes.each_with_object({}) do |key, result|
-          next if ignored_options.include?(key.to_sym)
+          descriptor = option_parser_descriptors[key.to_s]
+          next if descriptor[:ignore] == true
 
-          result[key] ||= descriptions[key.to_s]
+          result[key] = descriptor
         end
       end
 
@@ -79,6 +88,10 @@ module Anyway # :nodoc:
 
       private
 
+      def option_parser_descriptors
+        @option_parser_descriptors ||= Hash.new { |h, k| h[k] = {} }
+      end
+
       def underscore_name
         return unless name
 
@@ -152,9 +165,9 @@ module Anyway # :nodoc:
     def option_parser
       @option_parser ||= begin
         parser = OptionParserBuilder.call(self.class.option_parser_options) do |key, arg|
-          set_value(key, arg)
+          set_value(key, arg.is_a?(String) ? arg.serialize : arg)
         end
-        self.class.option_parser_extension&.call(parser) || parser
+        self.class.option_parser_extension&.call(parser, self) || parser
       end
     end
 

data/lib/anyway/env.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 require 'anyway/ext/deep_dup'
-require 'anyway/ext/string'
+require 'anyway/ext/string_serialize'
 
 module Anyway
   # Parses environment variables and provides
   # method-like access
   class Env
     using Anyway::Ext::DeepDup
-    using Anyway::Ext::String
+    using Anyway::Ext::StringSerialize
 
     def initialize
       @data = {}

data/lib/anyway/ext/{string.rb → string_serialize.rb}

@@ -3,13 +3,13 @@
 module Anyway
   module Ext
     # Extend String through refinements
-    module String
-      refine ::String do
-        # Regexp to detect array values
-        # Array value is a values that contains at least one comma
-        # and doesn't start/end with quote
-        ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
+    module StringSerialize
+      # Regexp to detect array values
+      # Array value is a values that contains at least one comma
+      # and doesn't start/end with quote
+      ARRAY_RXP = /\A[^'"].*\s*,\s*.*[^'"]\z/
 
+      refine ::String do
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/CyclomaticComplexity
         def serialize

data/lib/anyway/option_parser_builder.rb

@@ -1,19 +1,16 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'anyway/ext/string'
 
 module Anyway # :nodoc:
-  using Anyway::Ext::String
-
   # Initializes the OptionParser instance using the given configuration
   class OptionParserBuilder
     class << self
       def call(options)
         OptionParser.new do |opts|
-          options.each do |key, description|
-            opts.on(*option_parser_on_args(key, description)) do |arg|
-              yield [key, arg.serialize]
+          options.each do |key, descriptor|
+            opts.on(*option_parser_on_args(key, **descriptor)) do |arg|
+              yield [key, arg]
             end
           end
         end
@@ -21,9 +18,9 @@ module Anyway # :nodoc:
 
       private
 
-      def option_parser_on_args(key, description)
-        on_args = ["--#{key.to_s.tr('_', '-')} VALUE"]
-        on_args << description unless description.nil?
+      def option_parser_on_args(key, flag: false, desc: nil)
+        on_args = ["--#{key.to_s.tr('_', '-')}#{flag ? '' : ' VALUE'}"]
+        on_args << desc unless desc.nil?
         on_args
       end
     end

data/lib/anyway/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anyway # :nodoc:
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/config_spec.rb

@@ -241,11 +241,12 @@ describe Anyway::Config do
         Class.new(described_class) do
           config_name 'optparse'
           attr_config :host, :port, :log_level, :debug
+          flag_options :debug
         end
       end
 
       it "parses ARGC string" do
-        config_instance.parse_options!(%w[--host localhost --port 3333 --log-level debug --debug T])
+        config_instance.parse_options!(%w[--host localhost --port 3333 --log-level debug --debug])
         expect(config_instance.host).to eq("localhost")
         expect(config_instance.port).to eq(3333)
         expect(config_instance.log_level).to eq("debug")
@@ -300,9 +301,13 @@ describe Anyway::Config do
           config_name 'optparse'
           attr_config :host, :log_level, :concurrency, server_args: {}
 
-          extend_options do |parser|
+          extend_options do |parser, config|
             parser.banner = "mycli [options]"
 
+            parser.on("--server-args VALUE") do |value|
+              config.server_args = JSON.parse(value)
+            end
+
             parser.on_tail "-h", "--help" do
               puts parser
             end
@@ -313,6 +318,13 @@ describe Anyway::Config do
       it "allows to customize the parser" do
         expect(config_instance.option_parser.help).to include("mycli [options]")
       end
+
+      it "passes config to extension" do
+        config_instance.parse_options!(
+          ['--server-args', '{"host":"0.0.0.0"}']
+        )
+        expect(config_instance.server_args["host"]).to eq "0.0.0.0"
+      end
     end
   end
 end

data/spec/ext/{string_spec.rb → string_serialize_spec.rb}

@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-describe Anyway::Ext::String do
-  using Anyway::Ext::String
+describe Anyway::Ext::StringSerialize do
+  using Anyway::Ext::StringSerialize
 
   it "serializes a string", :aggregate_failures do
     expect("1,2, 3".serialize).to eq [1, 2, 3]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-29 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,7 +82,7 @@ files:
 - lib/anyway/ext/deep_dup.rb
 - lib/anyway/ext/deep_freeze.rb
 - lib/anyway/ext/hash.rb
-- lib/anyway/ext/string.rb
+- lib/anyway/ext/string_serialize.rb
 - lib/anyway/option_parser_builder.rb
 - lib/anyway/rails/config.rb
 - lib/anyway/version.rb
@@ -103,7 +103,7 @@ files:
 - spec/ext/deep_dup_spec.rb
 - spec/ext/deep_freeze_spec.rb
 - spec/ext/hash_spec.rb
-- spec/ext/string_spec.rb
+- spec/ext/string_serialize_spec.rb
 - spec/spec_helper.rb
 - spec/spec_norails_helper.rb
 - spec/support/cool_config.rb