cucumber_steps 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c8254682300dbc569f5ec56fe437f9990203f1
-  data.tar.gz: 309a57de69540aff5c7ced5ac02b4e5276b3f2c0
+  metadata.gz: 10cb4c2203d3df16dd2a65008dc5693125cc9f4d
+  data.tar.gz: e413e8198aee140cf3a40a2ce0bd67698eb06d16
 SHA512:
-  metadata.gz: 3590d7b26eede5a6094d7eb4498734e7403c9820ab604f3ecc065bd956862755e9841f275a5e09607772ee4b0b7131d985ccc91e42030e63f967fda16504a02c
-  data.tar.gz: 599c4e9bcdd4e371e5a5546177ee792a30ae1a6bade6be9dfe1d02263e526270d49d880b71c50762bae308300cfea91e268ee98415325abca52524947cd73237
+  metadata.gz: 3c015ae1dd4c2154aed89cca87fee41800908f0186fc5d7f9b8250a6adfb870c6df0720b30528db1c1d79af8cb5ceaf34e23bd4d38826d222ce6eacb06925956
+  data.tar.gz: 5b006f1961491378dfb06bdbffbb9eda3b4596410db0d68bffd4a2260e1bc3206e547774ac10db9e3e60315b387d725a3df1f98d2a970f351382108a44c17662

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/cucumber_steps/browser/{instance/defaults.rb → defaults.rb}

@@ -1,4 +1,4 @@
-module CucumberSteps::Browser::Instance::Defaults
+module CucumberSteps::Browser::Defaults
 
   BROWSER_ARGUMENTS = {
       'phantomjs' => {
@@ -22,7 +22,7 @@ module CucumberSteps::Browser::Instance::Defaults
 
     options = args.find { |e| e.is_a?(Hash) }
 
-    pare_defined_options = ::CucumberSteps::Browser::Instance::Defaults::BROWSER_ARGUMENTS[browser_name.to_s] || {}
+    pare_defined_options = ::CucumberSteps::Browser::Defaults::BROWSER_ARGUMENTS[browser_name.to_s] || {}
     options.merge!(pare_defined_options) if pare_defined_options.is_a?(Hash)
 
     return args

data/lib/cucumber_steps/browser/{instance/scope_handler.rb → scope_handler.rb}

@@ -1,4 +1,4 @@
-module CucumberSteps::Browser::Instance::ScopeHandler
+module CucumberSteps::Browser::ScopeHandler
 
   def current_scope
     target_scope = self

data/lib/cucumber_steps/browser.rb

@@ -1,47 +1,17 @@
-require 'cucumber_steps/browser/browser_steps'
-require 'cucumber_steps/browser/click_steps'
-require 'cucumber_steps/browser/expect_steps'
-require 'cucumber_steps/browser/hover_steps'
-require 'cucumber_steps/browser/sketch_steps'
-require 'cucumber_steps/browser/typing_steps'
-require 'cucumber_steps/browser/visit_steps'
+require 'watir'
+class CucumberSteps::Browser < Watir::Browser
 
-module CucumberSteps::Browser
+  require 'cucumber_steps/browser/defaults'
+  extend CucumberSteps::Browser::Defaults
 
-  require 'cucumber_steps/browser/instance'
+  require 'cucumber_steps/browser/scope_handler'
+  include CucumberSteps::Browser::ScopeHandler
 
-  def browser
-    @browser || reopen_browser!
-  end
-
-  def reopen_browser!
-
-    if @browser.is_a?(::CucumberSteps::Browser::Instance)
-      @browser.close
-    end
-
-    browser = ::CucumberSteps::Browser::Instance.new(browser_name)
-    @browser = browser
+  protected
 
+  def initialize(browser_name, *args)
+    super(browser_name, *self.class.args_with_default_options(browser_name, *args))
+    Kernel.at_exit { self.close rescue nil } if CucumberSteps::ENVFetcher.close_browser_at_exit?
   end
 
-  def browser_name=(new_browser_name)
-    @browser_name = new_browser_name.to_s.strip
-  end
-
-  def browser_name
-    CucumberSteps::ENVFetcher.browser_name || @browser_name || 'phantomjs'
-  end
-
-  def parse_html_attributes(raw_attributes)
-    raw_attributes.scan(/(\w+)="([^"]+)"/).reduce({}) do |all_matcher, (attr_name, value)|
-      all_matcher[attr_name.downcase.to_sym]=value
-      all_matcher
-    end
-  end
-
-end
-
-World(CucumberSteps::Browser)
-
-
+end

data/lib/cucumber_steps/declarations/browser_steps.rb

@@ -0,0 +1,10 @@
+require 'cucumber_steps/declarations/browser_steps/configure_steps'
+require 'cucumber_steps/declarations/browser_steps/click_steps'
+require 'cucumber_steps/declarations/browser_steps/expect_steps'
+require 'cucumber_steps/declarations/browser_steps/hover_steps'
+require 'cucumber_steps/declarations/browser_steps/sketch_steps'
+require 'cucumber_steps/declarations/browser_steps/typing_steps'
+require 'cucumber_steps/declarations/browser_steps/visit_steps'
+
+require 'cucumber_steps/world_extensions/browser_methods'
+World(CucumberSteps::WorldExtensions::BrowserMethods)

data/lib/cucumber_steps/declarations.rb

@@ -0,0 +1,4 @@
+require 'cucumber_steps'
+
+require 'cucumber_steps/declarations/debug_steps' if CucumberSteps::ENVFetcher.development?
+require 'cucumber_steps/declarations/browser_steps'

data/lib/cucumber_steps/env_fetcher.rb

@@ -1,39 +1,41 @@
 module CucumberSteps::ENVFetcher
   extend self
 
-  CLI_ALIASES_FOR_TRUE = %W[yes true]
-  CLI_ALIASES_FOR_FALSE = %W[no false]
+  TRANSLATE_TABLE = {
+      'yes' => true,
+      'true' => true,
+      'no' => false,
+      'false' => false
+  }
 
   def development?
-    lookup_for_true_case('DEVELOPER_ENV')
+    lookup_for true, 'DEVELOPER_ENV'
   end
 
   def close_browser_at_exit?
-    lookup_for_true_case('CLOSE_BROWSER_AT_EXIT') or
-        not lookup_for_false_case('BROWSER_NOT_EXIT_AFTER_TEST', 'BROWSER_NOT_EXIT_AT_EXIT')
+    not lookup_for(false, 'CLOSE_BROWSER_AT_EXIT', 'BROWSER_CLOSE_AT_EXIT', 'CLOSE_BROWSER')
   end
 
   def browser_name
-    lookup_value_by('BROWSER','BROWSER_NAME')
+    lookup_value_by('BROWSER', 'BROWSER_NAME')
   end
 
   protected
 
-  def lookup_for_true_case(*env_keys)
-    filtered_env(env_keys).any? { |k, v| CLI_ALIASES_FOR_TRUE.include?(v.to_s.downcase) }
-  end
-
-  def lookup_for_false_case(*env_keys)
-    filtered_env(env_keys).any? { |k, v| CLI_ALIASES_FOR_FALSE.include?(v.to_s.downcase) }
+  def lookup_for(boolean, *env_keys)
+    formatted_env(env_keys).any? { |k, v| v == boolean }
   end
 
   def lookup_value_by(*env_keys)
     filtered_env(env_keys).values.first
   end
 
+  def formatted_env(filtered_env)
+    filtered_env.reduce({}) { |m, (k, v)| m.merge!({k => TRANSLATE_TABLE[v]}); m }
+  end
+
   def filtered_env(env_keys)
     lookup_env_keys = env_keys.map(&:to_s).map(&:upcase)
-
     ENV.select { |env_key, value| lookup_env_keys.include?(env_key) }
   end
 

data/lib/cucumber_steps/world_extensions/browser_methods.rb

@@ -0,0 +1,35 @@
+module CucumberSteps::WorldExtensions::BrowserMethods
+
+  require 'cucumber_steps/browser'
+
+  def browser
+    @browser || reopen_browser!
+  end
+
+  def reopen_browser!
+
+    if @browser.is_a?(::CucumberSteps::Browser)
+      @browser.close
+    end
+
+    browser = ::CucumberSteps::Browser.new(browser_name)
+    @browser = browser
+
+  end
+
+  def browser_name=(new_browser_name)
+    @browser_name = new_browser_name.to_s.strip
+  end
+
+  def browser_name
+    CucumberSteps::ENVFetcher.browser_name || @browser_name || 'phantomjs'
+  end
+
+  def parse_html_attributes(raw_attributes)
+    raw_attributes.scan(/(\w+)="([^"]+)"/).reduce({}) do |all_matcher, (attr_name, value)|
+      all_matcher[attr_name.downcase.to_sym]=value
+      all_matcher
+    end
+  end
+
+end

data/lib/cucumber_steps/world_extensions.rb

@@ -0,0 +1,3 @@
+module CucumberSteps::WorldExtensions
+  require 'cucumber_steps/world_extensions/browser_methods'
+end

data/lib/cucumber_steps.rb

@@ -1,12 +1,10 @@
 module CucumberSteps
 
-  require 'cucumber_steps/env_fetcher'
-
-  require 'cucumber_steps/debug' if CucumberSteps::ENVFetcher.development?
-
   require 'cucumber'
-  require 'cucumber/rb_support/rb_dsl'
+  # require 'cucumber/rb_support/rb_dsl'
 
   require 'cucumber_steps/browser'
+  require 'cucumber_steps/env_fetcher'
+  require 'cucumber_steps/world_extensions'
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber_steps
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,19 +111,22 @@ files:
 - cucumber_steps.gemspec
 - lib/cucumber_steps.rb
 - lib/cucumber_steps/browser.rb
-- lib/cucumber_steps/browser/browser_steps.rb
-- lib/cucumber_steps/browser/click_steps.rb
-- lib/cucumber_steps/browser/expect_steps.rb
-- lib/cucumber_steps/browser/hover_steps.rb
-- lib/cucumber_steps/browser/instance.rb
-- lib/cucumber_steps/browser/instance/defaults.rb
-- lib/cucumber_steps/browser/instance/scope_handler.rb
-- lib/cucumber_steps/browser/locating_scope_steps.rb
-- lib/cucumber_steps/browser/sketch_steps.rb
-- lib/cucumber_steps/browser/typing_steps.rb
-- lib/cucumber_steps/browser/visit_steps.rb
-- lib/cucumber_steps/debug.rb
+- lib/cucumber_steps/browser/defaults.rb
+- lib/cucumber_steps/browser/scope_handler.rb
+- lib/cucumber_steps/declarations.rb
+- lib/cucumber_steps/declarations/browser_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/click_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/configure_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/expect_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/hover_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/locating_scope_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/sketch_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/typing_steps.rb
+- lib/cucumber_steps/declarations/browser_steps/visit_steps.rb
+- lib/cucumber_steps/declarations/debug_steps.rb
 - lib/cucumber_steps/env_fetcher.rb
+- lib/cucumber_steps/world_extensions.rb
+- lib/cucumber_steps/world_extensions/browser_methods.rb
 homepage: ''
 licenses:
 - MIT

data/lib/cucumber_steps/browser/instance.rb

@@ -1,17 +0,0 @@
-require 'watir'
-class CucumberSteps::Browser::Instance < Watir::Browser
-
-  require 'cucumber_steps/browser/instance/defaults'
-  extend CucumberSteps::Browser::Instance::Defaults
-
-  require 'cucumber_steps/browser/instance/scope_handler'
-  include CucumberSteps::Browser::Instance::ScopeHandler
-
-  protected
-
-  def initialize(browser_name, *args)
-    super(browser_name, *self.class.args_with_default_options(browser_name, *args))
-    Kernel.at_exit { self.close rescue nil } if CucumberSteps::ENVFetcher.close_browser_at_exit?
-  end
-
-end