nginx-conf 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a99c739bce2eddd662d416c4ce9bd065e823c5cd
-  data.tar.gz: e84d843bff928badb3b8bd14ff7558fa3e685121
+  metadata.gz: 2113222f57826f4a385670b75ba8d1dfc9f6818b
+  data.tar.gz: c574ef777215010cd02131bbdbaf4aec78361006
 SHA512:
-  metadata.gz: 614222b2838a16aea7654068bfa4811f74a9a6cad46756e08510ac08187b913efc79522c7279b701bb2659f81430310772fa9bacf32fb511f33f1b1ac7157c6e
-  data.tar.gz: 41b44d6f134fbaeb47f8a6a28ae90081734879ec4bc02db3acad8b60f444cd048137ab94a00e2226e929141f7af124ed2593c80fdba80e606a341a9692a60bcc
+  metadata.gz: 08721857af181bb9cfc9b31ff2114ea725626ab8b82a4d70b08e54ef96df3a2dd13d5da2798299864ed5ae42bbe49e08782bb84eea0a651d58662d25dd97a069
+  data.tar.gz: 389e9ff5ce26f3d784e0b0964a0dd769b7e956ec000715be958eeb527e3a6238ef433020f0d3cb5c3464169d8ce2706fce4eb416f8db3934e1bd900c7ebfad67

data/lib/nginx-conf.rb

@@ -1 +1 @@
-require_relative 'nginx-conf/conf'
+require_relative 'nginx-conf/nginx_conf'

data/lib/nginx-conf/compiler.rb

@@ -1,6 +1,10 @@
 class Compiler
   @@spaces = ' ' * 4
 
+  def initialize repeats
+    @repeats = repeats
+  end
+
   def compile hash
     @indents = 0
     compile_hash_without_brackets hash
@@ -29,8 +33,7 @@ class Compiler
 
   def compile_hash_without_brackets hash
     hash.map do |key, values|
-      case key
-      when :server, :load_module
+      if @repeats.include? key
         values.map do |config|
           compile_hash_item key, [config]
         end.join()

data/lib/nginx-conf/conf.rb

@@ -1,25 +1,39 @@
 require_relative 'compiler'
 
 
-class NginxConf
-  def initialize hash
-    raise if [:http, :load_module].any? { |k| hash.has_key? k }
-    @hash = hash.merge({load_module: [], http: {server: []}})
-  end
 
-  def load_module path
-    @hash[:load_module].push(path)
+class Conf
+  def initialize repeats, &block
+    @repeats = repeats
+    @attrs = {}
+    instance_eval(&block)
   end
 
-  def server hash
-    @hash[:http][:server].push(hash)
+  def method_missing name, *args, &block
+    if not (args or block)
+      @attrs[name]
+    end
+
+    if block
+      args.push Conf.new(@repeats, &block).to_hash
+    end
+
+    value = args.length == 1 ? args[0] : args
+
+    if @repeats.include? name and @attrs.include? name
+      @attrs[name].push value
+    elsif @repeats.include? name
+      @attrs[name] = [value]
+    else
+      @attrs[name] = value
+    end
   end
 
-  def to_s
-    Compiler.new.compile(@hash)
+  def to_hash
+    @attrs
   end
 
-  def [] key
-    @hash[key]
+  def to_s
+    Compiler.new(@repeats).compile(@attrs)
   end
 end

data/lib/nginx-conf/nginx_conf.rb

@@ -0,0 +1,7 @@
+require_relative 'conf'
+
+
+
+def nginx_conf &block
+  Conf.new(%i(server load_module), &block).to_s
+end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nginx-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yota Toyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies: []
-description: nginx.conf generator which tries to exploit expressiveness of built-in
-  types
+description: nginx.conf generator with pretty DSL
 email: raviqqe@gmail.com
 executables: []
 extensions: []
@@ -20,6 +19,7 @@ files:
 - lib/nginx-conf.rb
 - lib/nginx-conf/compiler.rb
 - lib/nginx-conf/conf.rb
+- lib/nginx-conf/nginx_conf.rb
 homepage: https://github.com/raviqqe/nginx-conf.rb
 licenses:
 - Unlicense
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: nginx.conf generator