Merge pull request #613 from 3flex/test-on-puppet-4

travis: test on Puppet 4 for real

.travis.yml

@@ -21,7 +21,7 @@ matrix:
     - rvm: 2.1.0
       env: PUPPET_GEM_VERSION="~> 3.0"
     - rvm: 2.1.0
-      env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+      env: PUPPET_GEM_VERSION="~> 4.0"
   allow_failures:
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 2.7.0"

Gemfile

@@ -12,7 +12,7 @@ group :rake, :test do
 end
 
 group :rake do
-  gem 'rspec-puppet', '>=2',     :require => false
+  gem 'rspec-puppet', '>=2.1.0', :require => false
   gem 'rake',         '>=0.9.2.2'
   gem 'puppet-lint',  '>=1.0.1'
 end

manifests/resource/location.pp

@@ -298,12 +298,6 @@ define nginx::resource::location (
     default  => file,
   }
 
-  $vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
-  $config_file = "${::nginx::config::conf_dir}/sites-available/${vhost_sanitized}.conf"
-
-  $location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
-  $location_sanitized = regsubst($location_sanitized_tmp, '\\\\', '_', 'G')
-
   ## Check for various error conditions
   if ($vhost == undef) {
     fail('Cannot create a location reference without attaching to a virtual host')
@@ -320,6 +314,12 @@ define nginx::resource::location (
     warning('The $fastcgi_script parameter is deprecated; please use $fastcgi_param instead to define custom fastcgi_params!')
   }
 
+  $vhost_sanitized = regsubst($vhost, ' ', '_', 'G')
+  $config_file = "${::nginx::config::conf_dir}/sites-available/${vhost_sanitized}.conf"
+
+  $location_sanitized_tmp = regsubst($location, '\/', '_', 'G')
+  $location_sanitized = regsubst($location_sanitized_tmp, '\\\\', '_', 'G')
+
   # Use proxy or fastcgi template if $proxy is defined, otherwise use directory template.
   if ($proxy != undef) {
     $content_real = template('nginx/vhost/locations/proxy.erb')