tune_spec 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8c4605566bacbca3e6a3071b4c65eb375ed6b92
-  data.tar.gz: ee71b13da66c5a9dae81e5859be1dbe5744e8ce8
+  metadata.gz: 8b83bf10235e9377d6a6a3cf9c6a30a67b49b124
+  data.tar.gz: df48ef4b2cb6d703d80735e8300638fdd50b9622
 SHA512:
-  metadata.gz: df310c927436e3effd24ae86bbdf5d17c6718ebbbe7e545ea4c9ec55c57131f462597daeb6b24c5c2a6ca4f10ff415f9710d5c77e191f9e9030ffbbad4ac090f
-  data.tar.gz: ba559f6895adf7571bb0a8f945e67e8180ea9a5ce8471e79d15934ea2f03dee97087b52b19ca4899e43f088e7f39af3f189411047dab13e5398f9093205577c9
+  metadata.gz: c1236ea27bc5238c533c86cd0e6d3164b786798cf7f37bfefcc1fc097af35e108cbe604977414346d679b6450f141fb22305e5362e5522d5aeb038a7d204f0f8
+  data.tar.gz: 4f7f0a5f9ce4ff5b7771d8b0ab734274e2a9502a69730895852c087d5df452cd1e76d03303e7da33b16235a984d27553a2d5011506067a9884f08a1b4130903d

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 .yardoc/
 doc/

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 2.4.1
+before_script:
+  - bundle exec yard config load_plugins true
+script:
+  - bundle exec rubocop
+  - bundle exec yard doctest

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tune_spec (0.4.0)
+    tune_spec (0.5.3)
 
 GEM
   remote: https://rubygems.org/
@@ -33,11 +33,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.15)
+  bundler (~> 1.16, >= 1.16.2)
   rubocop (~> 0.50.0)
   tune_spec!
   yard (~> 0.9.12)
   yard-doctest (~> 0.1.10)
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.16.2

data/doctest_helper.rb

@@ -9,7 +9,7 @@ TEST_ENV = 'STG'
 TuneSpec.configure do |conf|
   conf.directory = 'test'
   conf.steps_page_arg = :page_object
-  conf.groups_opts = { env: TEST_ENV }
+  conf.groups_opts = { env: TEST_ENV, aut: 'WEB' }
   conf.steps_opts = { env: TEST_ENV }
   conf.page_opts = { env: TEST_ENV }
 end
@@ -29,13 +29,18 @@ def file_content(name, type)
     klass.class_eval do
       case "#{type}"
       when 'groups'
-        define_method('initialize') do |env|; end
+        define_method('initialize') do |test, env:, aut:|; end
         define_method('complete') do; end
       when 'steps'
-        define_method('initialize') do |env, page_object|; end
-        define_method('verify_result') do; end
+        define_method('initialize') do |env:, page_object:|
+          @env = env
+          @page_object = page_object
+        end
+        define_method('verify_result') do
+          @page_object.click_element
+        end
       when 'page'
-        define_method('initialize') do |env|; end
+        define_method('initialize') do |env:|; end
         define_method('click_element') do; end
       end
     end

data/lib/tune_spec/instances.rb

@@ -11,49 +11,53 @@ module TuneSpec
     # Creates an instance of Group or calls an existing
     #
     # @param name [Symbol, String] the prefix of the Groups object class
-    # @param args [Any] additional optional arguments
+    # @param opts [Hash] optional arguments
+    # @param args [Any] extra arguments
     # @param block [Block] that yields to self
     # @return [GroupObject]
     # @example
-    #   groups(:login).complete
-    def groups(name, *args, &block)
-      instance_handler(name, Groups, *args, block)
+    #   groups(:login, {}, 'Main').complete
+    def groups(name, opts = {}, *args, &block)
+      instance_handler(name, Groups, opts, *args, block)
     end
 
     # Creates an instance of Step or calls an existing
     #
     # @param name [Symbol, String] the prefix of the Step object class
-    # @param args [Any] additional optional arguments
+    # @param opts [Hash] optional arguments
+    # @param args [Any] extra arguments
     # @param block [Block] that yields to self
     # @return [StepObject]
     # @example
     #   steps(:calculator, page: :home).verify_result
-    def steps(name, *args, page: nil, &block)
-      args.insert(0, pages(page)) if page
-      instance_handler(name, Steps, *args, block)
+    def steps(name, opts = {}, *args, &block)
+      opts[:page] && opts[:page] = pages(opts.fetch(:page))
+      instance_handler(name, Steps, opts, *args, block)
     end
 
     # Creates an instance of Page or calls an existing
     #
     # @param name [Symbol, String] the prefix of the Page object class
-    # @param args [Any] additional optional arguments
+    # @param opts [Hash] optional arguments
+    # @param args [Any] extra arguments
     # @param block [Block] that yields to self
     # @return [PageObject]
     # @example
     #   pages(:home).click_element
-    def pages(name, *args, &block)
-      instance_handler(name, Page, *args, block)
+    def pages(name, opts = {}, *args, &block)
+      instance_handler(name, Page, opts, *args, block)
     end
 
     private
 
     # @private
-    def instance_handler(name, klass, *args, block)
+    def instance_handler(name, klass, opts, *args, block)
       method_name = klass.instance_method_name(name)
       instance_klass = klass.call_object(method_name)
       create_instance_method(method_name, klass, instance_klass)
-      formatted_args = klass.format_args(args, instance_klass)
-      call_instance_method(method_name, *formatted_args, block)
+      formatted_opts = klass.format_opts(opts, instance_klass)
+      args << formatted_opts unless formatted_opts.empty?
+      call_instance_method(method_name, *args, block)
     end
 
     # @private
@@ -61,14 +65,14 @@ module TuneSpec
       return if respond_to?(method_name)
       define_singleton_method(method_name) do |*args|
         instance_var = instance_variable_get("@#{method_name}")
-        return instance_var if klass.rules_passed?(instance_var, args)
-        new_instance = create_instance(klass, instance_klass, args)
+        return instance_var if klass.rules_passed?(instance_var, args.first)
+        new_instance = create_instance(klass, instance_klass, *args)
         instance_variable_set("@#{method_name}", new_instance)
       end
     end
 
     # @private
-    def create_instance(klass, instance_klass, args)
+    def create_instance(klass, instance_klass, *args)
       return instance_klass.new(*args) if klass.object_type == :common
       wait_opts = TuneSpec.calabash_wait_opts
       page(instance_klass, *args).await(wait_opts)

data/lib/tune_spec/instances/groups.rb

@@ -8,7 +8,7 @@ module TuneSpec
     class Groups < Tuner
       class << self
         # Groups specific rules
-        def rules_passed?(instance, _args)
+        def rules_passed?(instance, _opts)
           instance
         end
 

data/lib/tune_spec/instances/page.rb

@@ -8,7 +8,7 @@ module TuneSpec
     class Page < Tuner
       class << self
         # Page specific rules
-        def rules_passed?(instance, _args)
+        def rules_passed?(instance, _opts)
           instance
         end
 

data/lib/tune_spec/instances/steps.rb

@@ -8,8 +8,9 @@ module TuneSpec
     class Steps < Tuner
       class << self
         # Steps specific rules
-        def rules_passed?(instance, args)
-          same_page?(instance, args[1]) if args
+        def rules_passed?(instance, opts = {})
+          return false if opts.nil?
+          same_page?(instance, opts[page_arg]) unless opts.empty?
         end
 
         private
@@ -19,7 +20,8 @@ module TuneSpec
           return false unless instance
           return true unless instance.respond_to?(page_arg)
           return true unless general_steps?(instance)
-          page.instance_of?(instance.page_object.class)
+          return true if page.nil?
+          page.instance_of?(instance.__send__(page_arg).class)
         end
 
         def general_steps?(instance)
@@ -33,6 +35,11 @@ module TuneSpec
         def page_arg
           TuneSpec.steps_page_arg
         end
+
+        def pre_format_opts(opts)
+          return opts unless opts.key?(:page)
+          opts.tap { |hash| hash[page_arg] = hash.delete(:page) }
+        end
       end
     end
   end

data/lib/tune_spec/instances/tuner.rb

@@ -10,15 +10,15 @@ module TuneSpec
         end
 
         # A hook to define rules by subclasses
-        def rules_passed?(_instance, _args)
+        def rules_passed?(_instance, _opts = {})
           raise "Implement a #rules_passed? method for #{self}"
         end
 
-        def format_args(args, object_klass)
-          default_args = fetch_default_args
-          args.tap do |arr|
-            default_args.each do |key, value|
-              arr.insert(0, value) if argument_required?(key, object_klass)
+        def format_opts(opts, instance_klass)
+          default_opts = fetch_default_opts
+          pre_format_opts(opts).tap do |hash|
+            default_opts.each do |key, value|
+              hash[key] = value if argument_required?(key, instance_klass)
             end
           end
         end
@@ -39,7 +39,7 @@ module TuneSpec
           @type ||= itself.to_s.split('::').last.downcase
         end
 
-        def fetch_default_args
+        def fetch_default_opts
           TuneSpec.__send__("#{type}_opts".downcase)
         end
 
@@ -48,18 +48,22 @@ module TuneSpec
         end
 
         def ensure_required(name)
-          path = load_files.detect { |f| f.include?("/#{name}.rb") }
+          path = project_files.detect { |f| f.include?("/#{name}.rb") }
           path ? require("./#{path}") : raise("Unable to find #{name}.rb")
         end
 
-        def load_files
-          @files ||= Dir.glob("#{file_directory}/**/*")
+        def project_files
+          @project_files ||= Dir.glob("#{file_directory}/**/*")
         end
 
         # A hook to implement folder name by subclass
         def file_directory
           raise "Implement a #folder_name method for #{self}"
         end
+
+        def pre_format_opts(opts)
+          opts
+        end
       end
     end
   end

data/lib/tune_spec/parser.rb

@@ -40,6 +40,7 @@ module TuneSpec
         end
       end
     end
+    # rubocop:enable MethodLength
 
     private
 

data/lib/tune_spec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TuneSpec
-  VERSION = '0.4.1'
+  VERSION = '0.5.3'
 end

data/tune_spec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
+  spec.add_development_dependency 'bundler', '~> 1.16', '>= 1.16.2'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
   spec.add_development_dependency 'yard', '~> 0.9.12'
   spec.add_development_dependency 'yard-doctest', '~> 0.1.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tune_spec
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Igor Starostenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +83,7 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -119,5 +126,5 @@ rubyforge_project:
 rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: tune_spec_0.4.1
+summary: tune_spec_0.5.3
 test_files: []