apache-config-generator 0.1.2 → 0.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2. Another minor release, lots of improvements since 0.1.
+
 v0.1.2. Some more small fixes.
 
 v0.1.1. Stupid bug in initial release.

data/apache-config-generator.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apache-config-generator}
-  s.version = "0.1.2"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Bintz"]

data/lib/apache/master.rb

@@ -113,5 +113,11 @@ module Apache
         opts.each { |o| server_alias o } if !opts.empty?
       end
     end
+
+    def document_root(*opts)
+      directory? opts.first
+      self << "DocumentRoot #{quoteize(opts.first)}"
+    end
+    alias :document_root! :document_root
   end
 end

data/lib/apache/mpm_prefork.rb

@@ -47,8 +47,8 @@ module Apache
               when String
                 @config << "#{which} #{opts * " "}"
               when Array
-                which.each do |w|
-                  @config << "#{w} #{opts.shift}"
+                which.each do |tag|
+                  @config << "#{tag} #{opts.shift}"
                 end
             end
           end

data/lib/apache/rewrites.rb

@@ -170,7 +170,7 @@ module Apache
   module RegularExpressionMatcher
     # Test this rewritable thing
     def test(from, opts = {})
-      from = from.gsub(@from, @to.gsub(/\$([0-9])/) { |m| '\\' + $1 })
+      from = from.gsub(@from, @to.gsub(/\$([0-9])/) { |match| '\\' + $1 })
       replace_placeholders(from, opts)
     end
 
@@ -179,14 +179,14 @@ module Apache
     end
 
     # Replace the placeholders in this rewritable thing
-    def replace_placeholders(s, opts)
+    def replace_placeholders(string, opts)
       opts.each do |opt, value|
         case value
           when String
-            s = s.gsub('%{' + opt.to_s.upcase + '}', value)
+            string = string.gsub('%{' + opt.to_s.upcase + '}', value)
         end
       end
-      s.gsub(%r{%\{[^\}]+\}}, '')
+      string.gsub(%r{%\{[^\}]+\}}, '')
     end
   end
 
@@ -387,12 +387,9 @@ module Apache
       end
 
       result = false
-      case to[0..0]
-        when '-'
-          case to
-            when '-f'
-              result = opts[:files].include? source if opts[:files]
-          end
+      case to
+        when '-f'
+          result = opts[:files].include?(source) if opts[:files]
         else
           result = source[Regexp.new(to)]
       end

data/lib/apache/ssl.rb

@@ -3,12 +3,13 @@ module Apache
     def enable_ssl_engine(options = {})
       self << ""
       self << "SSLEngine on"
-      options.each do |k, v|
-        case k
+      options.each do |key, value|
+        value = quoteize(value).first
+        case key
           when :certificate_file, :certificate_key_file
-            self << "SSL#{apachify(k)} #{quoteize(v).first}"
+            self << "SSL#{apachify(key)} #{value}"
           when :ca_certificate_file
-            self << "SSLCACertificateFile #{quoteize(v).first}"
+            self << "SSLCACertificateFile #{value}"
         end
       end
       self << ""

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - John Bintz