nginx-conf 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23dc53e45230ebde9f65c36c4a786b9aeee1cac
-  data.tar.gz: 084da322263674461034402d8c66ec4fca4483bb
+  metadata.gz: 9a91fd88edabcc9ae34ed5d2b0bb2088bd85a141
+  data.tar.gz: a9e4cd3b0879aa03974c5a37d31abf216f4880f4
 SHA512:
-  metadata.gz: 1ba74cf84d1764fe5cbe0e16ce089067de35f7162effef4c5d034ce287897e004708c44c205e846268337414bf3bfaa0ad42c7dc3233998df3a215fbd47fa083
-  data.tar.gz: 753d7762827745f418f6e1ab69b135cde7dbc8a82242306a5f5eb31dfd2c3e4b787207163a383e8bee4d190e84fe56ff9b87377f8760e4f3e32c2832e5cd04ac
+  metadata.gz: 06891eaccc49fa1017556bd7b2d160f052e50616ec8dad0a045e4a9340e3d3b8f266f49b0c4d8a24e3e6abeb20fc6ba0d76aab70d874bf551cca25cd224544d6
+  data.tar.gz: 9ef8ce8fa47860cf30b9e15add110e2609fd94874209beb96612fe4ab84f096d88059d74f0257b9bbac4fce6c77383a715a53b1697b8042ad53497bb13633b2b

data/lib/nginx-conf/nginx_conf.rb

@@ -1,4 +1,5 @@
 require 'block-is-hash'
+require 'map-rec'
 
 require_relative 'compiler'
 
@@ -6,50 +7,18 @@ require_relative 'compiler'
 
 def nginx_conf &block
   repeats = %i(server load_module fastcgi_param set if_)
-
-  hash = block_is_hash repeats, &block
-
-  replace_elems! hash
-  replace_elems! repeats
-
-  Compiler.new(repeats).compile hash
+  Compiler.new(replace_elems repeats)
+      .compile replace_elems(block_is_hash(repeats, &block))
 end
 
 
-def replace_elems! object
-  { if_: :if, return_: :return }.each do |origin, subst|
-    replace_elem! origin, subst, object
-  end
-end
-
-
-def replace_elem! origin, subst, object
-  replace = lambda { |o| replace_elem! origin, subst, o }
-
-  case object
-  when Hash
-    new_pairs = {}
-
-    object.each do |key, value|
-      case origin
-      when key
-        object.delete key
-        new_pairs[subst] = value
-      when value
-        object[key] = subst
-      else
-        replace.call value
-      end
-    end
-
-    object.merge! new_pairs
-  when Array
-    object.each_with_index do |value, key|
-      if value == origin
-        object[key] = subst
-      else
-        replace.call value
-      end
+def replace_elems object
+  map = { if_: :if, return_: :return }
+  map_rec object do |x|
+    if map.keys.include? x
+      map[x]
+    else
+      x
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginx-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Yota Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: block-is-hash
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: map-rec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: nginx.conf generator with pretty DSL
 email: raviqqe@gmail.com
 executables: []