lapis_lazuli 2.0.1 → 3.0.0

data/lib/lapis_lazuli/generators/cucumber/template/features/helpers/user_helper.rb

@@ -0,0 +1,74 @@
+# This helper loads user data from the config files.
+# After loading the data, it will overwrite certain strings, like __TIMESTAMP__ to randomize information
+module User
+  extend LapisLazuli
+
+  class << self
+    @@data = nil
+
+    def load_user_data(user)
+      data = config('users.default-user')
+      begin
+        specific_data = config("users.#{user}")
+      rescue Exception => err1
+        begin
+          specific_data = config("users.#{ENV['TEST_ENV']}.#{user}")
+        rescue Exception => err2
+          error "The given user `#{user}` was not found in any of the config files:\n- #{err1.message}\n- #{err2.message}"
+        end
+      end
+      new_data = data.merge specific_data
+      @@data = replace_hash_constants(new_data)
+    end
+
+    def get(field)
+      return @@data[field]
+    end
+
+    def set(field, value)
+      @@data[field] = User.replace_constants(value)
+    end
+
+    # Replace random or time values of a complete hash
+    def replace_hash_constants(hash)
+      if hash.respond_to? :each
+        new_hash = {}
+        hash.each do |key, value|
+          new_hash[key] = replace_constants(value)
+        end
+      else
+        new_hash = replace_constants(hash)
+      end
+      return new_hash
+    end
+
+    # replace certain constants in a string, for example '_TIMESTAMP_' becomes '154875631'
+    def replace_constants(value)
+      if value.to_s == value
+        epoch = Time.now.to_i
+        alpha = number_to_letter(epoch)
+        timestamp = Time.now.strftime("D%Y-%M-%d-T%H-%M-%S")
+
+        old_val = value.to_s
+        value = value.sub('_RAND_', epoch.to_s)
+        value = value.sub('_TIMESTAMP_', timestamp)
+        value = value.sub('_RAND-ALPHA_', alpha)
+        unless value == old_val
+          log.debug "#{old_val} > #{value}"
+        end
+      end
+      return value
+    end
+
+    def number_to_letter(numbers)
+      num_string = numbers.to_s
+      alpha26 = ("a".."j").to_a
+      letters = ''
+      num_string.scan(/./).each do |number|
+        letters += alpha26[number.to_i]
+      end
+      return letters
+    end
+
+  end
+end

data/lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/account_steps.rb

@@ -0,0 +1,60 @@
+# A step definition is a regex, to learn more about this go to http://rubular.com/
+# More info: https://github.com/cucumber/cucumber/wiki/Step-Definitions
+
+# The following step definition accepts both:
+# - the user logs in > will use the last stored user data
+# - "user-x" logs in > will load user data from config.yml
+When(/^"?(.*?)"? logs in$/) do |user|
+  user = nil if user == 'the user'
+  # Check out ./features/helpers/ for the function being called
+  Auth.log_in(user)
+end
+
+When(/^the user clicks on the logout button$/) do
+  Auth.log_out
+end
+
+Given(/^the user is logged out$/) do
+  Auth.ensure_log_out
+end
+
+Given(/^"(.*?)" is logged in$/) do |user|
+  Auth.ensure_log_in(user)
+end
+
+# One step definition that handles both the logged in as the logged out state
+Then(/^the page should display as logged (in|out) state$/) do |logged|
+  # Adjust variable for checking logged in or logged out state.
+  if logged == 'in' and !Auth.is_logged_in?
+    error 'Unable to find profile picture, the user wasnt logged in successfully'
+  elsif logged == 'out' and Auth.is_logged_in?
+    error 'The profile picture is present, indicating that the user did not log out successfully'
+  end
+end
+
+# A static way to write your step definition
+When 'the user clicks on the registration button' do
+  Register.open_registration
+end
+
+When 'the registration form should display' do
+  error 'The registration form did not display.' unless Register.is_registration_open?
+end
+
+Given /^"(.*?)" has the registration form opened$/ do |user|
+  User.load_user_data(user)
+  Register.ensure_open_registrarion
+end
+
+Given /^"(.*?)" has registered a new account$/ do |user|
+  Register.ensure_registered(user)
+end
+
+When 'the user completes registration' do
+  Register.register_user
+end
+
+Then 'the successful registration message should display' do
+  result, message = Register.registration_result
+  error message unless result
+end

data/lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/basic_steps.rb

@@ -0,0 +1,70 @@
+################################################################################
+# Copyright <%= config[:year] %> spriteCloud B.V. All rights reserved.
+# Generated by LapisLazuli, version <%= config[:lapis_lazuli][:version] %>
+# Author: "<%= config[:user] %>" <<%= config[:email] %>>
+
+# interactions_steps.rb is used to interact with elements on the page.
+# Quite advances piece of regex. Goto http://rubular.com/ for practise
+# Whatever is put between parenthesis is captured as a variable unless you start with `?:`
+# /(?: text)?/ means: ` text` is optional and do not capture it as a variable
+# /(.*?)/ means: Any amount of any character, but don't be "greedy"
+# "greedy" means, do not take characters that match the rest of the regex.
+Given(/^the user navigates to (?:the )?"(.*?)"(?: page)?$/) do |page|
+  Nav.to(page)
+end
+
+# An example of interacting with some elements
+Given(/^the user searches for "(.*?)"$/) do |query|
+  # Get the input element
+  searchbox = browser.find(:text_field => {:name => "s"})
+  # Make sure the input field is empty
+  searchbox.clear rescue log.debug "Could not clear searchbox"
+  # Fill in the query
+  searchbox.send_keys(query)
+  # Press enter to submit the search
+  searchbox.send_keys(:enter)
+end
+
+When(/^the user scrolls down$/) do
+  browser.driver.execute_script("window.scrollBy(0,400)")
+end
+
+Then(/^text "([^"]*)" should display somewhere on the page$/) do |string|
+  # Search for the text on the page
+  browser.wait(:xpath => "//*[contains(text(),\"#{string}\")]")
+end
+
+When(/^the user clicks on link "(.*?)"$/) do |url|
+  # Search for the element that includes the expected text
+ 
+  browser.wait(
+    :like => {
+      :element => :a,
+      :attribute => :href,
+      :include => url
+    }
+  ).click
+end
+
+When(/^the user clicks on the spritecloud logo$/) do
+  # Search for the logo
+  logo = browser.find(
+    a:  {class: ['logo']},
+    message: 'Unable to find the logo on this page.'
+  )
+  # And click the logo
+  logo.click
+end
+
+Then(/^the user should be on page "(.*?)"$/) do |page|
+  url = Nav.set_url page
+  Nav.wait_for_url url
+end
+
+Then /^the text "(.*?)" should display on the blog page$/ do |expected_text|
+  # Many things wrong here, can you fix it?
+  header = browser.find(:like => [:h2, :id, 'entry_title'])
+  unless heeder.text.include? expected_text
+    error "Unable to find text `#{expected_text}`"
+  end
+end

data/lib/lapis_lazuli/generators/cucumber/template/features/step_definitions/todo_steps.rb

@@ -0,0 +1,27 @@
+When(/^a todo item with text "(.*?)" is added$/) do |string|
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+Then(/^a todo item with text "(.*?)" should be present$/) do |string|
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+Given(/^"(.*?)" has (at least|exactly|at most) (\d+) todo items?$/) do |user, rule, number|
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+When(/^the user marks (\d+|all) todo items as completed$/) do |amount|
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+When("the clear completed button is pressed") do
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+Then("no todo items should display") do
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+Then("the progress bar should display at {int} percent") do |int|
+  pending # Write code here that turns the phrase above into concrete actions
+end

data/lib/lapis_lazuli/generators/cucumber/template/features/support/env.rb

@@ -5,13 +5,14 @@
 require 'lapis_lazuli'
 require 'lapis_lazuli/cucumber'
 
-LapisLazuli::WorldModule::Config.config_file = "config/config.yml"
+LapisLazuli::WorldModule::Config.add_config("config/config.yml")
+LapisLazuli::WorldModule::Config.add_config("config/users.yml")
 World(LapisLazuli)
 
 # Do something when LapisLazuli is started (This is before the browser is opened)
 LapisLazuli.Start do
   #If BROWSER is NIL, Lapis Lazuli will default to Firefox
-  if !ENV['BROWSER'] || ENV['BROWSER'] == 'firefox'
+  if ENV['BROWSER'] == 'firefox'
 
     # Get Selenium to create a profile object
     require 'selenium-webdriver'

data/lib/lapis_lazuli/generic/xpath.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 module LapisLazuli

data/lib/lapis_lazuli/options.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 module LapisLazuli
@@ -13,10 +13,11 @@ module LapisLazuli
     "error_strings" => [nil, "List of strings that indicate errors when detected on a web page."],
     "default_env" => [nil, "Indicates which environment specific configuration to load when no test environment is provided explicitly."],
     "test_env" => [nil, "Indicates which environment specific configuration to load in this test run."],
-    "browser" => ['firefox', "Indicates the browser in which to run tests. Possible values are 'firefox', 'chrome', 'safari', 'ie', 'ios'."],
+    "browser" => [nil, "Indicates the browser in which to run tests. Possible values are 'firefox', 'chrome', 'safari', 'ie', 'ios'."],
     "email_domain" => ["google.com", "The domain name used when generating email addresses. See the `placeholders` command for more information."],
     "screenshot_on_failure" => [true, "Toggle whether failed scenarios should result in a screenshot being taken automatically."],
     "screenshot_dir" => [".#{File::SEPARATOR}screenshots", "Location prefix for the screenshot path."],
+    "screenshots_height" => [nil, "When 'full' the window will be resized to max height before taking a screenshot"],
     "screenshot_scheme" => ["old", "Naming scheme for screenshots. Possible values are 'old' and 'new'. This option will be deprecated in the near future, and only the new scheme will be supported."],
     "breakpoint_on_error" => [false, "If the error() function is used to create errors, should the debugger be started?"],
     "step_pause_time" => [0, "(Deprecated) Number of seconds to wait after each cucumber step is executed."],

data/lib/lapis_lazuli/placeholders.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 #

data/lib/lapis_lazuli/proxy.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 

data/lib/lapis_lazuli/runtime.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 require 'singleton'

data/lib/lapis_lazuli/scenario.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 require "securerandom"

data/lib/lapis_lazuli/storage.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 module LapisLazuli

data/lib/lapis_lazuli/version.rb

@@ -2,9 +2,9 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 module LapisLazuli
-  VERSION = "2.0.1"
+  VERSION = "3.0.0"
 end

data/lib/lapis_lazuli/versions.rb

@@ -2,7 +2,7 @@
 # LapisLazuli
 # https://github.com/spriteCloud/lapis-lazuli
 #
-# Copyright (c) 2013-2017 spriteCloud B.V. and other LapisLazuli contributors.
+# Copyright (c) 2013-2019 spriteCloud B.V. and other LapisLazuli contributors.
 # All rights reserved.
 #
 require 'lapis_lazuli/api'

data/lib/lapis_lazuli/world/config.rb

@@ -9,193 +9,204 @@
 require "lapis_lazuli/options"
 require "lapis_lazuli/storage"
 require "lapis_lazuli/runtime"
+require 'deep_merge'
 
 module LapisLazuli
-module WorldModule
-  ##
-  # Module with configuration loading related functions
-  #
-  # Manages the following:
-  #   @config          - internal configuration representation
-  #   config_file      - Needs to be set before config can be accessed.
-  #   @env             - loaded/detected config/test environment
-  module Config
+  module WorldModule
     ##
-    # Explicitly store the configuration file name.
-    module ClassMethods
-      def config_file=(name)
-        @config_file = name
-      end
+    # Module with configuration loading related functions
+    #
+    # Manages the following:
+    #   @config          - internal configuration representation
+    #   config_files     - Needs to be set before config can be accessed.
+    #   @env             - loaded/detected config/test environment
+    module Config
+      ##
+      # Explicitly store the configuration file name.
+      module ClassMethods
+
+        # <b>DEPRECATED:</b> Please use <tt>add_config</tt> instead.
+        def config_file=(name)
+          warn "[DEPRECATION] `config_file = name` is deprecated.  Please use `add_config(file)` instead."
+          add_config(name)
+        end
 
-      def config_file
-        return @config_file || "config/config.yml"
-      end
-    end
-    extend ClassMethods
+        # <b>DEPRECATED:</b> Please use <tt>config_files</tt> instead.
+        def config_file
+          warn "[DEPRECATION] `config_file` is deprecated.  Please use `config_files` instead."
+          return config_files
+        end
 
+        def add_config(file)
+          @config_files = [] if @config_files.nil?
+          @config_files.push(file)
+        end
 
-    ##
-    # The configuration is not a singleton, precisely, but it does not need to
-    # be created more than once. Note that explicitly calling load_config will
-    # still work to overwrite an existing configuration.
-    def init
-      # Guard against doing this more than once.
-      if not @config.nil?
-        return
-      end
-      
-      if Config.config_file.nil?
-        raise "No configuration file provided, set LapisLazuli::WorldModule::Config.config_file"
+        def config_files
+          return @config_files || ["config/config.yml"]
+        end
       end
+      extend ClassMethods
 
-      load_config(Config.config_file)
-      # In case there was no config file found an empty @config needs to be set to prevent infinite looping.
-      if @config.nil?
-        warn 'Unable to find a configuration file, defaulting to empty config.yml.'
-        @config = {}
-      end
-      
-      @metadata = Runtime.instance.set_if(self, :metadata) do
-        log.debug "Creating metadata storage"
-        Storage.new("metadata")
-      end
-    end
 
-    def metadata
-      if @metadata.nil?
-        raise "No metadata available"
-      end
-      return @metadata
-    end
+      ##
+      # The configuration is not a singleton, precisely, but it does not need to
+      # be created more than once. Note that explicitly calling load_config will
+      # still work to overwrite an existing configuration.
+      def init
+        # Guard against doing this more than once.
+        unless @config.nil?
+          return
+        end
+
+        if Config.config_files.nil?
+          raise "No configuration file provided, set LapisLazuli::WorldModule::Config.config_files"
+        end
 
+        load_config(Config.config_files)
+        # In case there was no config file found an empty @config needs to be set to prevent infinite looping.
+        if @config.nil?
+          warn 'Unable to find a configuration file, defaulting to empty config.yml.'
+          @config = {}
+        end
 
-    ##
-    # Loads a config based on a filename
-    #
-    # Supports: YML, JSON
-    #
-    # Example:
-    #   ENV['TEST_ENV'] = 'production'
-    #   load_config("config/config.yml")
-    #
-    # Will try to load the following files:
-    # - config/config-production.yml
-    # - config/config-debug.yml
-    # - config/config-test.yml
-    # - config/config-local.yml
-    # - config/config.yml
-    def load_config(config_name)
-      # Split the filename
-      ext = File.extname(config_name)
-      dir, filename = File.split(config_name)
-      basename = File.basename(filename, ext)
-
-      # What are the suffixes to check
-      suffixes = [
-        "debug",
-        "test",
-        "local"
-      ]
-
-      if ENV["TEST_ENV"]
-        @env = ENV["TEST_ENV"]
+        @metadata = Runtime.instance.set_if(self, :metadata) do
+          log.debug "Creating metadata storage"
+          Storage.new("metadata")
+        end
       end
 
-      # Do we have an environment
-      if not @env.nil?
-        # Add it to the suffixes
-        suffixes.unshift(@env)
+      def metadata
+        if @metadata.nil?
+          raise "No metadata available"
+        end
+        return @metadata
       end
 
-      # Turn suffixes into files to try
-      files = []
-      suffixes.each do |suffix|
-        files << "#{dir}#{File::SEPARATOR}#{basename}-#{suffix}#{ext}"
-      end
-      files << config_name
 
-      # Try all files in order
-      files.each do |file|
-        # Check if files exist
-        if File.file?(file)
-          begin
-            # Try to load a config file
-            return self.load_config_from_file(file)
-          rescue Exception => e
-            raise e
+      ##
+      # Loads a config based on a filename
+      #
+      # Supports: YML, JSON
+      #
+      # Example:
+      #   ENV['TEST_ENV'] = 'production'
+      #   load_config("config/config.yml")
+      #
+      # Will try to load the following files:
+      # - config/config-production.yml
+      # - config/config-debug.yml
+      # - config/config-test.yml
+      # - config/config-local.yml
+      # - config/config.yml
+      #
+      # Throws errors if:
+      # - Config file isn't readable
+      # - Environment doesn't exist in config
+      # - Default environment not set in config if no environment is set
+      def load_config(config_names)
+        # Go trough each config_name
+        config_names.each do |config_name|
+          files = []
+          # Split the filename
+          ext = File.extname(config_name)
+          dir, filename = File.split(config_name)
+          basename = File.basename(filename, ext)
+
+          # What are the suffixes to check
+          suffixes = %w(debug test local)
+
+          if ENV["TEST_ENV"]
+            @env = ENV["TEST_ENV"]
+          end
+
+          # Do we have an environment
+          unless @env.nil?
+            # Add it to the suffixes
+            suffixes.unshift(@env)
+          end
+
+          # Turn suffixes into files to try
+          suffixes.each do |suffix|
+            files << "#{dir}#{File::SEPARATOR}#{basename}-#{suffix}#{ext}"
+          end
+          files << config_name
+          # Try all files in order
+          files.each do |file|
+            # Check if files exist
+            if File.file?(file)
+              begin
+                # Try to load a config file
+                self.add_config_from_file(file)
+                break
+              rescue Exception => e
+                raise e
+              end
+            end
+          end
+        end
+        # If we have an environment, the config should contain it
+        if not @env.nil? and not self.has_config?(@env)
+          raise "Environment `#{@env}` doesn't exist in any of the config files"
+        end
+
+        # If we don't have one then load the default
+        if @env.nil? and self.has_config?("default_env")
+          tmp = self.config("default_env")
+          if self.has_config?(tmp)
+            @env = tmp
+            ENV['TEST_ENV'] = tmp
+          else
+            raise "Default environment not present in any of the config files"
           end
         end
       end
-    end
 
 
-    ##
-    # Loads a config file
-    #
-    # Supports: YML, JSON
-    #
-    # Throws errors if:
-    # - Config file isn't readable
-    # - Environment doesn't exist in config
-    # - Default environment not set in config if no environment is set
-    def load_config_from_file(filename)
-      # Set the global @config variable
-      @config = get_config_from_file(filename)
-
-      # If we have an environment this config should have it
-      if not @env.nil? and not self.has_config?(@env)
-        raise "Environment `#{@env}` doesn't exist in config file"
+      ##
+      # Loads a config file
+      #
+      # Supports: YML, JSON
+      #
+      # Adds the possibility to merge multiple config files.
+      def add_config_from_file(filename)
+        @config = {} if @config.nil?
+        # Add the data to the global config
+        @config.deep_merge! get_config_from_file(filename)
       end
 
-      # If we don't have one then load the default
-      if @env.nil? and self.has_config?("default_env")
-        tmp = self.config("default_env")
-        if self.has_config?(tmp)
-          @env = tmp
-        else
-          raise "Default environment not present in config file"
-        end
-      end
-    end
-
-    # Adds the possibility to merge multiple config files.
-    def add_config_from_file(filename)
-      # Add the data to the global config
-      @config.merge! get_config_from_file(filename)
-    end
-
-    # returns the data that's loaded from a config file.
-    # Supports YAML and JSON
-    def get_config_from_file(filename)
-      # Try to load the file from disk
-      begin
-        # Determine the extension
-        ext = File.extname(filename)
-        # Use the correct loader
-        if ext == ".yml"
-          data = YAML.load_file(filename)
-        elsif ext == ".json"
-          json = File.read(filename)
-          data = JSON.parse(json)
+      # returns the data that's loaded from a config file.
+      # Supports YAML and JSON
+      def get_config_from_file(filename)
+        # Try to load the file from disk
+        begin
+          # Determine the extension
+          ext = File.extname(filename)
+          # Use the correct loader
+          if ext == ".yml"
+            data = YAML.load_file(filename)
+          elsif ext == ".json"
+            json = File.read(filename)
+            data = JSON.parse(json)
+          end
+        rescue Exception => e
+          raise "Error loading file: #{filename} #{e}"
         end
-      rescue Exception => e
-        raise "Error loading file: #{filename} #{e}"
-      end
 
-      # Fix up empty files
-      if data.nil? or data == false
-        warn "Could not load configuration from '#{Config.config_file}'; it might be empty or malformed."
-        data = {}
+        # Fix up empty files
+        if data.nil? or data == false
+          warn "Could not load configuration from '#{Config.config_files}'; it might be empty or malformed."
+          data = {}
+        end
+        return data
       end
-      return data
-    end
 
-    ##
-    # Does the config have a variable?
-    # Uses config and catches any errors it raises
-    def has_config?(variable)
-      # Make sure the configured configuration is loaded, if possible
-      init
+      ##
+      # Does the config have a variable?
+      # Uses config and catches any errors it raises
+      def has_config?(variable)
+        # Make sure the configured configuration is loaded, if possible
+        init
 
         begin
           value = self.config(variable)
@@ -203,220 +214,223 @@ module WorldModule
         rescue RuntimeError => err
           return false
         end
-    end
-
-    ##
-    # Get the configuration from the config,
-    # uses a dot seperator for object traversing
-    #
-    # Example:
-    # ll.config("test.google.url") => "www.google.com"
-    #
-    # Raises error if traversing the object is impossible
-    def config(variable=false, default=(no_default_set=true;nil))
-      # Make sure the configured configuration is loaded, if possible
-      init
-
-      # No variable given? Return the entire object.
-      result = @config
-      if not variable
-        return result
       end
 
-      # Environment variables for known options override the option.
-      if CONFIG_OPTIONS.has_key? variable
-        var = variable.upcase
-        if ENV.has_key? var
-          return ENV[var]
+      ##
+      # Get the configuration from the config,
+      # uses a dot seperator for object traversing
+      #
+      # Example:
+      # ll.config("test.google.url") => "www.google.com"
+      #
+      # Raises error if traversing the object is impossible
+      def config(variable=false, default=(no_default_set=true; nil))
+        # Make sure the configured configuration is loaded, if possible
+        init
+
+        # No variable given? Return the entire object.
+        result = @config
+        if not variable
+          return result
         end
-      end
 
-      # Otherwise try to find it in the configuration object
-      variable.split(".").each do |part|
-        if no_default_set == true && result.nil?
-          raise "Unknown configuration variable '#{variable}' and no default given!"
+        # Environment variables for known options override the option.
+        if CONFIG_OPTIONS.has_key? variable
+          var = variable.upcase
+          if ENV.has_key? var
+            return ENV[var]
+          end
         end
-        break if result.nil?
-        begin
-          result = result[part]
-        rescue TypeError, NoMethodError => ex
-          warn "Could not read configuration variable #{variable}: #{ex}"
-          break
+
+        # Otherwise try to find it in the configuration object
+        variable.split(".").each do |part|
+          if no_default_set == true && result.nil?
+            raise "Unknown configuration variable '#{variable}' and no default given!"
+          end
+          break if result.nil?
+          begin
+            result = result[part]
+          rescue TypeError, NoMethodError => ex
+            warn "Could not read configuration variable #{variable}: #{ex}"
+            break
+          end
         end
-      end
 
-      if default.nil? and result.nil?
-        if CONFIG_OPTIONS.has_key? variable
-          return CONFIG_OPTIONS[variable][0]
-        elsif no_default_set == true
-          raise "Unknown configuration variable '#{variable}' and no default given!"
+        if default.nil? and result.nil?
+          if CONFIG_OPTIONS.has_key? variable
+            return CONFIG_OPTIONS[variable][0]
+          elsif no_default_set == true
+            raise "Unknown configuration variable '#{variable}' and no default given!"
+          end
+        else
+          return result || default
         end
-      else
-        return result || default
       end
-    end
 
-    ##
-    # Does the environment have a certain config variable
-    def has_env?(variable)
-      # Make sure the configured configuration is loaded, if possible
-      init
+      ##
+      # Does the environment have a certain config variable
+      def has_env?(variable)
+        # Make sure the configured configuration is loaded, if possible
+        init
 
-      if @env.nil?
-        return false
+        if @env.nil?
+          return false
+        end
+        return self.has_config?("#{@env}.#{variable}")
       end
-      return self.has_config?("#{@env}.#{variable}")
-    end
-
-    ##
-    # Returns current environment
-    def current_env
-      init
 
-      return @env
-    end
+      ##
+      # Returns current environment
+      def current_env
+        init
 
-    ##
-    # Get a environment variable from the config file
-    # Alias for ll.config(ll.env + "." + variable)
-    def env(variable=false, default=(no_default_set=true;nil))
-      # Make sure the configured configuration is loaded, if possible
-      init
-
-      if not variable
-        return self.config(@env)
+        return @env
       end
 
-      # Environment variables for known options override environment specific
-      # options, too
-      env_var = var_from_env(variable, default)
-      if env_var != default
-        return env_var
-      end
-
-      result = self.config("#{@env}.#{variable}",default)
+      ##
+      # Get a environment variable from the config file
+      # Alias for ll.config(ll.env + "." + variable)
+      def env(variable=false, default=(no_default_set=true; nil))
+        # Make sure the configured configuration is loaded, if possible
+        init
 
-      if no_default_set == true and result.nil?
-        raise "Unknown environment variable '#{@env}.#{variable}' and no default given"
-      end
+        if not variable
+          return self.config(@env)
+        end
 
-      return result
+        # Environment variables for known options override environment specific
+        # options, too
+        env_var = var_from_env(variable, default)
+        if env_var != default
+          return env_var
+        end
 
-    end
+        result = self.config("#{@env}.#{variable}", default)
 
-    ##
-    # Checks if a variabl exist in the env or config
-    def has_env_or_config?(variable)
-      # Make sure the configured configuration is loaded, if possible
-      init
+        if no_default_set == true and result.nil?
+          raise "Unknown environment variable '#{@env}.#{variable}' and no default given"
+        end
 
-      return self.has_env?(variable) || self.has_config?(variable)
-    end
+        return result
 
-    ##
-    # Get a variable from the config
-    # First checks the environment section, before it checks the global part
-    def env_or_config(variable, default=nil)
-      # Make sure the configured configuration is loaded, if possible
-      init
-
-      # Environment variables for known options override environment specific
-      # options, too
-      env_var = var_from_env(variable, default)
-      if env_var != default
-        return env_var
       end
 
-      if self.has_env?(variable)
-        return self.env(variable, default)
-      elsif self.has_config?(variable)
-        return self.config(variable, default)
-      else
-        return default
+      ##
+      # Checks if a variabl exist in the env or config
+      def has_env_or_config?(variable)
+        # Make sure the configured configuration is loaded, if possible
+        init
+
+        return self.has_env?(variable) || self.has_config?(variable)
       end
-    end
 
-    def var_from_env(var, default=nil)
-      # Simple solution for single depth variables like "browser"
-      if ENV.has_key? var
-        return ENV[var]
+      ##
+      # Get a variable from the config
+      # First checks the environment section, before it checks the global part
+      def env_or_config(variable, default=(no_default_set=true; nil))
+        # Make sure the configured configuration is loaded, if possible
+        init
+
+        # Environment variables for known options override environment specific
+        # options, too
+        env_var = var_from_env(variable, default)
+        if env_var != default
+          return env_var
+        end
+
+        if self.has_env?(variable)
+          return self.env(variable)
+        elsif self.has_config?(variable)
+          return self.config(variable)
+        else
+          if no_default_set == true
+            raise "Unknown environment or configuration variable '(#{@env}.)#{variable}' and no default given"
+          end
+          return default
+        end
       end
 
-      value = default
+      def var_from_env(var, default=nil)
+        # Simple solution for single depth variables like "browser"
+        if ENV.has_key? var
+          return ENV[var]
+        end
+
+        value = default
 
-      # Variables like:
-      #  var_from_env("remote.url","http://test.test")
-      if var.is_a? String and
+        # Variables like:
+        #  var_from_env("remote.url","http://test.test")
+        if var.is_a? String and
           not default.is_a? Hash
 
-        # Env variables cannot contain a . replace them by _
-        key_wanted = var.gsub(".","__")
+          # Env variables cannot contain a . replace them by _
+          key_wanted = var.gsub(".", "__")
 
-        # Do a case insensitive compare
-        ENV.keys.each do |key|
-          if key.casecmp(key_wanted) == 0
-            value = ENV[key]
-            break
+          # Do a case insensitive compare
+          ENV.keys.each do |key|
+            if key.casecmp(key_wanted) == 0
+              value = ENV[key]
+              break
+            end
           end
-        end
 
-      # Environment:
-      #   REMOTE__USER=test
-      #   REMOTE__PASS=test
-      #   REMOTE__PROXY__HTTP=http://test.com
-      #
-      # Call:
-      #   var_from_env("remote",{})
-      #
-      # Result:
-      #   {"USER" => "test",
-      #    "PASS" => "test",
-      #    "proxy" => {"HTTP" => "http://test.con"}}
-      elsif default.is_a? Hash
-        # Env variables cannot contain a . replace them by _
-        key_wanted = var.gsub(".","__")
-        # Use a regular expression starting with the wanted key
-        rgx = Regexp.new("^#{key_wanted}","i")
-
-        result = {}
-        # For each key check if it matched the regexp
-        ENV.keys.each do |key|
-          if (key =~ rgx) == 0
-            tmp = result
-            # Remove start and split into parts
-            parts = key.sub(rgx, "").split("__")
-            # Remove empty start if needed
-            if parts[0].to_s.empty?
-              parts.shift
-            end
+          # Environment:
+          #   REMOTE__USER=test
+          #   REMOTE__PASS=test
+          #   REMOTE__PROXY__HTTP=http://test.com
+          #
+          # Call:
+          #   var_from_env("remote",{})
+          #
+          # Result:
+          #   {"USER" => "test",
+          #    "PASS" => "test",
+          #    "proxy" => {"HTTP" => "http://test.con"}}
+        elsif default.is_a? Hash
+          # Env variables cannot contain a . replace them by _
+          key_wanted = var.gsub(".", "__")
+          # Use a regular expression starting with the wanted key
+          rgx = Regexp.new("^#{key_wanted}", "i")
+
+          result = {}
+          # For each key check if it matched the regexp
+          ENV.keys.each do |key|
+            if (key =~ rgx) == 0
+              tmp = result
+              # Remove start and split into parts
+              parts = key.sub(rgx, "").split("__")
+              # Remove empty start if needed
+              if parts[0].to_s.empty?
+                parts.shift
+              end
 
-            # For each part
-            parts.each_with_index do |part, index|
-              # Final part should store the value in the hash
-              if index == parts.length - 1
-                tmp[part] = ENV[key]
-              else
-                # Otherwise, downcase the partname
-                part.downcase!
-                # Set it to an object if needed
-                if !tmp.has_key? part
-                  tmp[part] = {}
+              # For each part
+              parts.each_with_index do |part, index|
+                # Final part should store the value in the hash
+                if index == parts.length - 1
+                  tmp[part] = ENV[key]
+                else
+                  # Otherwise, downcase the partname
+                  part.downcase!
+                  # Set it to an object if needed
+                  if !tmp.has_key? part
+                    tmp[part] = {}
+                  end
+                  # Assign tmp to the new hash
+                  tmp = tmp[part]
                 end
-                # Assign tmp to the new hash
-                tmp = tmp[part]
               end
             end
           end
-        end
 
-        # If we have set keys in the result return it
-        if result.keys.length > 0
-          return result
+          # If we have set keys in the result return it
+          if result.keys.length > 0
+            return result
+          end
         end
-      end
 
-      return value
-    end
-  end # module Config
-end # module WorldModule
+        return value
+      end
+    end # module Config
+  end # module WorldModule
 end # module LapisLazuli