nard-appi 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 165c29d46409d87030350c7625a4849227da3375
-  data.tar.gz: 48a07542b233dae0ba6cee6f950e18bdfc091c2f
+  metadata.gz: fd1d5e188752b5ac1db8b30fc8ef7ebf441b813e
+  data.tar.gz: 52f8962dfbf0498e4276bdd9eba15582ac98fb49
 SHA512:
-  metadata.gz: 2852994a67ddfc592ed22b83377232b75ff04ee51c95dade20ac5cb4b03f664b8e8ee309d97aee9892ea026b634e68b180fc1b4c63737b6031eaed52bcbe6550
-  data.tar.gz: 16751de92c26754306d43851c48fa57489b712479b1dd99cb1330f5a6a404fda2c56f349a4446608f9cff23c18eaab47c41c74eebb513855b94a4b6f397642b4
+  metadata.gz: bf4dd2403403efbedc3b7aff3f82e09a4ab452b5cb335d75fa2d3b5b39964085f9a267a814fa3cb6a4dd28637ec70a91964b8e65290679d43dee155d57c2d0fc
+  data.tar.gz: 0db077d150356a8f4215fbc8259923549c446ccd5a67a9225f3fce84e731f36088a5bcc68c0dbc05129502f78b985691fef8d46ff728c673f5877255440ee8af

data/lib/nard/appi/client/util/args_normalizer.rb

@@ -0,0 +1,58 @@
+require 'active_support'
+require 'active_support/core_ext'
+
+module Nard
+
+  module Appi
+
+    class Client
+
+      # Nard::Appi::Client の補助的な機能を格納する名前空間
+      module Util
+
+        # API へ送る情報を処理するクラス
+        class ArgsNormalizer
+
+          def self.execute( *args )
+            new( *args ).to_a
+          end
+
+          def initialize( *args )
+            @args = [ args ].flatten
+            @options = @args.extract_options!
+
+            process_instance_variables unless has_options?
+          end
+
+          def to_a
+            [ @args, @options ]
+          end
+
+          private
+
+          def has_options?
+            @options.present?
+          end
+
+          def process_instance_variables
+            _args = @args.dup
+            last_arg = @args.pop
+            if last_arg.present?
+              uri = URI.parse( last_arg.to_s )
+              @args = [ @args, uri.path ].flatten
+              @options = options_from_uri( uri )
+            else
+              @args = _args
+            end
+          end
+
+          def options_from_uri( uri )
+            uri.query.present? ? Hash[ URI::decode_www_form( uri.query ) ] : {}
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/nard/appi/client/util/base_normalizer.rb

@@ -1,4 +1,4 @@
-require_relative './module/args_normalizer'
+require_relative './args_normalizer'
 require_relative './module/path_normalizer'
 require_relative './module/options_normalizer'
 require_relative './module/boolean_normalizer'
@@ -15,7 +15,6 @@ module Nard
         # API へ送る情報を処理するクラス（基底クラス）
         class BaseNormalizer
 
-          include Module::ArgsNormalizer
           include Module::PathNormalizer
           include Module::OptionsNormalizer
           include Module::BooleanNormalizer
@@ -25,7 +24,7 @@ module Nard
           end
 
           def initialize( *args )
-            args, options = normalize_args( args )
+            args, options = ArgsNormalizer.execute( *args )
 
             @path = normalize_path( args )
 

data/lib/nard/appi/client/util/module/options_normalizer.rb

@@ -30,7 +30,7 @@ module Nard
               h = {}
 
               options.each do | k, v |
-                h[k] = normalize_value(v)
+                h[k] = normalize_value(v) if active_value?(v)
               end
 
               return h
@@ -44,6 +44,10 @@ module Nard
               raise NotImplementedError
             end
 
+            def active_value?( value )
+              true
+            end
+
           end
 
         end

data/lib/nard/appi/version.rb

@@ -1,5 +1,5 @@
 module Nard
   module Appi
-    VERSION = '0.1.3'.freeze
+    VERSION = '0.1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nard-appi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Shu Fujita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-04 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,8 +126,8 @@ files:
 - lib/nard/appi/api_ext/initializer.rb
 - lib/nard/appi/api_ext/version.rb
 - lib/nard/appi/client.rb
+- lib/nard/appi/client/util/args_normalizer.rb
 - lib/nard/appi/client/util/base_normalizer.rb
-- lib/nard/appi/client/util/module/args_normalizer.rb
 - lib/nard/appi/client/util/module/boolean_normalizer.rb
 - lib/nard/appi/client/util/module/options_normalizer.rb
 - lib/nard/appi/client/util/module/path_normalizer.rb

data/lib/nard/appi/client/util/module/args_normalizer.rb

@@ -1,31 +0,0 @@
-require 'active_support'
-require 'active_support/core_ext'
-
-module Nard
-
-  module Appi
-
-    class Client
-
-      # Nard::Appi::Client の補助的な機能を格納する名前空間
-      module Util
-
-        module Module
-
-          module ArgsNormalizer
-
-            private
-
-            def normalize_args( args )
-              args = [ args ].flatten
-              options = args.extract_options!
-              [ args, options.with_indifferent_access ]
-            end
-
-          end
-
-        end
-      end
-    end
-  end
-end