appom 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3879fa2db3ae094cbc627ef932b190a4a9120b7e93105345c2acabff950c711e
-  data.tar.gz: fe2539b5aec732d111043ce739ef822c614eff9b3e5d1209ddb46e2053c91ad9
+  metadata.gz: 7dfe63bdf19bf6f40316e2936d3999a4b38c318fea12b9c6c4da67349ac0e5d5
+  data.tar.gz: 0fd90a46359d87728ef19c10369710a47957ce23773e7b850531e9751a5656c9
 SHA512:
-  metadata.gz: 4f5f0c93e6b96ff2185537a68b7fcae3e484204f439090dd71ef18e8a46952ea6798768f1c4d5e7b949b3995fb23313ed3d5af46502cf46bc142ad33d3a5e74c
-  data.tar.gz: 801e72d60b37ae6fa475093eb39b4f85a5324bb27d725b908516ba9f41b6be9804abb31943758972f1a8f4df4f1dd0a0af4fd98d666fc8a6723c3198218fedb7
+  metadata.gz: 257d602e52213df6d7cf4bc87c8b40aa97926047bfa0af025f226c68c215a8261cf6e8e6327de02c12ddec8acf14b8b5455e6daa4197156cb2c5c7c91c4236fc
+  data.tar.gz: d8ddb29f6881a3e9ab4204917642f36f2767359f77e614fe43785c36e24bd8cef8331500edc0c8c8f2f669cf97f1527485d918b4bbba102740f3c808032fe71c

data/lib/appom/element_container.rb

@@ -4,18 +4,30 @@ module Appom
       klass.extend ClassMethods
     end
 
-    module ClassMethods
-      attr_reader :mapped_items
+    # Raise if contain a block
+    def raise_if_block(obj, name, has_block, type)
+      return unless has_block
 
-      # Raise if contain a block
-      def raise_if_block(obj, name, has_block, type)
-        return unless has_block
+      puts "Type passed in: #{type}"
+      puts "#{obj.class}##{name} does not accept blocks"
 
-        puts "Type passed in: #{type}"
-        puts "#{obj.class}##{name} does not accept blocks"
+      raise Appom::UnsupportedBlockError
+    end
 
-        raise Appom::UnsupportedBlockError
-      end
+    ##
+    # Options re-combiner. This takes the original inputs and combines
+    # them such that there is only one hash passed as a final argument
+    # to Appium.
+    #
+    def merge_args(find_args, runtime_args)
+      find_args = find_args.dup.flatten
+      runtime_args = runtime_args.dup
+
+      [*find_args, *runtime_args]
+    end
+
+    module ClassMethods
+      attr_reader :mapped_items
 
       ##
       #
@@ -31,9 +43,9 @@ module Appom
       #
       def element(name, *find_args)
         build(name, *find_args) do |*runtime_args, &block|
-          raise_if_block(self, name, !block.nil?, :element)
           define_method(name) do
-            find(*find_args)
+            raise_if_block(self, name, !block.nil?, :element)
+            find(*merge_args(find_args, runtime_args))
           end
         end
       end
@@ -52,9 +64,9 @@ module Appom
       #
       def elements(name, *find_args)
         build(name, *find_args) do |*runtime_args, &block|
-          raise_if_block(self, name, !block.nil?, :elements)
           define_method(name) do
-            all(*find_args)
+            raise_if_block(self, name, !block.nil?, :elements)
+            all(*merge_args(find_args, runtime_args))
           end
         end
       end

data/lib/appom/version.rb

@@ -1,3 +1,3 @@
 module Appom
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appom
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Harry.Tran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appium_lib