nginx-conf 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55aa416b9f116f24110019bafe7739a4dee06a7
-  data.tar.gz: b1c479d06625d9e92e558a1dc8385ab9fe1e6bdb
+  metadata.gz: b1505db4c8b8f524b38814653afc991e01a20c53
+  data.tar.gz: 82b269755c998abbb18ad62dfe61443a68e8b0b2
 SHA512:
-  metadata.gz: 6d0028e76ca6668954900d4fc8a03e8dcdf5f147222860de00ef4ae07b66c864aa208e4d9954dadaa7d5e6fb193adf707be8c93f0d2ebc00b451a9bdcd8f6bae
-  data.tar.gz: 629ef8ca068dc67a14055e10f9be95a8bb85adef9cf9d9fc2168889b4300b29f5d7d229a712b66bcf6e743a45cd50d2601b830a7eec89b0088fabb8aca5b8656
+  metadata.gz: 73cfa2c556baec73f7a85087a94f1fae0b1d71736773690f5899fbe7da286bdc8c7ccaca93e5bb50399c139d7d593b7af9b4f2bfc72ca5a9edb0157e16b40dfb
+  data.tar.gz: 2f8dc76fac06a8c613fbbd6f28c263fc35777ddbd3833990c9ec4a28059a3ff3122985be3bdd5b27d30979a92bad38d00b8afeb2582a06e6805c059aa479e774

data/lib/nginx-conf/compiler.rb

@@ -34,19 +34,20 @@ class Compiler
   def compile_hash_without_brackets hash
     hash.map do |key, values|
       if @repeats.include? key
-        values.map do |config|
-          compile_hash_item key, [config]
-        end.join()
+        values.map do |values_per_item|
+          compile_hash_item key, values_per_item
+        end.join
       else
         compile_hash_item key, values
       end
-    end.join()
+    end.join
   end
 
   def compile_hash_item key, values
     values = [values] if not values.is_a? Array
 
-    indent(key.to_s + ' ' + compile_elem(values) \
+    values_str = compile_elem(values)
+    indent(key.to_s + (values_str != '' ? ' ' + values_str : '') \
            + (values[-1].is_a?(Hash) ? "" : ";")) + "\n"
   end
 

data/lib/nginx-conf/nginx_conf.rb

@@ -5,6 +5,43 @@ require_relative 'compiler'
 
 
 def nginx_conf &block
-  repeats = %i(server load_module fastcgi_param)
-  Compiler.new(repeats).compile block_is_hash(repeats, &block)
+  repeats = %i(server load_module fastcgi_param set if_)
+
+  hash = block_is_hash repeats, &block
+  replace_if = lambda { |o| replace_elem :if_, :if, o }
+  replace_if.call hash
+  replace_if.call repeats
+  Compiler.new(repeats).compile hash
+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
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nginx-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yota Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-25 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: block-is-hash