shufu 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 071d6191267e3bb684b700c188e3cdcc7924c7a93e329cf79c49eb0c203a0ff4
-  data.tar.gz: de82af9aac1ff9b9114f668f71b200706c1e6ba1e1d1e289d4ab562c830a9e6b
+  metadata.gz: 5292874c3c0b7e7b686e584768b18a91498e6e7bf0c1b1d2dfcce2cc3708a852
+  data.tar.gz: 56e7e3d7addc3d78e4742610112a3640de0153fab82f78be248afc2f38b0e7c7
 SHA512:
-  metadata.gz: 32f4aed2b7910b2a3f0a405d248165c48cd94abeed5c2fdf01cfd711f51aa9d8aaa09628e8f9cc9b3049695f6343e6f11c814b8afafcc2681da361cf9b4cfa5e
-  data.tar.gz: dc924999be4ee8db979697cc0c1e12580703a6af0ac6933fbd225327d5c4f25a4584db4e176b3cfa8163b641d069c44ff388b0959b8d3ce30e389d98e6e3547b
+  metadata.gz: b42b5b8ff788553bf653e5e5c4749be45ff57601bab548020caec226995cffee08a377ef1ddd68db5a47e159895f57ba7265783ad82961b3b94eea30356d1bad
+  data.tar.gz: 2a67a0eaa32072d833045a129d4a7026d1d4de6e967d42186f3d0422fd27396d1707d8721cd735c3cd1943388a6246100cef2a34aa1d117b47b05ece40046139

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shufu (0.1.4)
+    shufu (0.1.5)
       dry-initializer
 
 GEM

data/README.md

@@ -23,12 +23,14 @@ Or install it yourself as:
 ```ruby
 require "shufu"
 
-schema = [
-    { name: "git", type: "command" },
-    { name: "commit", type: "command" },
-    { name: "amend", type: "flag" },
-    { name: "author", type: "equal" }
-]
+schema = {
+  git: {
+    commit: {
+      amend: :flag,
+      author: :equal
+    }
+  }
+}
 
 command = Shufu::Command.new(schema)
 

data/lib/shufu/command.rb

@@ -1,10 +1,10 @@
 module Shufu
   class Command
     #
-    # @param [Array<Hash>] schema
+    # @param [Hash] schema
     #
     def initialize(schema)
-      @schema = schema.map { |s| Argument.new(**s) }
+      @schema = schema
     end
 
     #
@@ -12,24 +12,23 @@ module Shufu
     # @return [String]
     #
     def to_s(values)
-      arguments(values).join(" ")
+      arguments(@schema, values, []).join(" ")
     end
 
     #
-    # @reutrn [Array<String>]
+    # @param [Hash] schema
+    # @param [Hash] values
     #
-    def arguments(values)
-      [commands] + values.map { |k, v|
-        a = @schema.find { |a| a.name == k.to_s } || Argument.new(name: k)
-        a.to_s(v)
-      }
-    end
+    def arguments(schema, values, args)
+      schema.each do |k, v|
+        if v.is_a?(Hash)
+          args = arguments(v, values, args).prepend(k)
+        else
+          args << Argument.new(name: k, type: v).to_s(values[k]) if values[k]
+        end
+      end
 
-    #
-    # @return [Array<String>]
-    #
-    def commands
-      @schema.select { |a| a.type == :command }.map(&:name)
+      args
     end
   end
 end

data/lib/shufu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shufu
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shufu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - cc-kawakami