targetmy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b953809db27580c9e7706bc5459b4c467c3e231c
-  data.tar.gz: 0dfafe463112003fe55668e4280f0a077af9978b
+  metadata.gz: 0967bc88564143ab5918246abfcb96660bcb853e
+  data.tar.gz: 9cd132406ad68c74b64c910f3b21cd432db79d00
 SHA512:
-  metadata.gz: ba154befc29e50c0c77498f0064804b732d0f5c5ec7a2ca999e5c85c32817eba90154f533474485e55f6607f5831dcaa29e17eb6912d8ae3dfdabc7ed63970fe
-  data.tar.gz: 386c4fef8114392ddebf6a3a72f50b17e605b5456dacba399087a440a89d4b2bca826686cea401cc01ac8232f9fb2ab5393e7c466da72013187fcda137be5585
+  metadata.gz: d5e9938d430cb9db861129cb324cf951a1e063c8ec7256194feebee9cc80a9fb45f9ac8406544f08d032684cfec12cd4e25394d418698cb3bd7812ac2effb804
+  data.tar.gz: fa0e56486b09883d27ea95e1f3eea17b22a49b5beded01228a03f1300faa9480cfb088e80cc5b8683e08d2683031ef24ec3be16d2b4a0c541a574fe3dda07726

data/lib/targetmy/robot.rb

@@ -41,71 +41,59 @@ module Targetmy
         @browser.goto CAMPAIGNS_URL
 
         @config.items.each do |config|
-          click_create_campaign_btn
-          setup_adv_item config
+          # click to create_campaign_btn
+          Watir::Wait.until { @browser.link(:css, ".campaign-toolbar .campaign-toolbar__create-button").present? }
+          @browser.link(:css, ".campaign-toolbar .campaign-toolbar__create-button").click
 
+          # select product type and set link to the advertised site
+          Watir::Wait.until { @browser.div(:css, ".product-types.js-product-types-wrap").present? }
+          @adv_type_index = ADV_TYPES_INDEXES[config.type.to_sym]
+          @browser.div(css: ".product-types__item", index: @adv_type_index).click
+          @browser.text_field(:css, ".base-setting-my__main-url__input.js-main-url-input").set(config.link)
+
+          # setup adv_products
           Watir::Wait.until { @browser.div(:css, ".js-pacs-wrapper").present? }
           @adv_prod_index = nil
           config.adv_products.each do |prod|
-            click_product_btn prod
+            # select adv product
+            if @adv_prod_index != ADV_PROD_INDEXES[prod.type.to_sym]
+              @adv_prod_index = ADV_PROD_INDEXES[prod.type.to_sym]
+              @browser.div(css: ".pac-item._gray-block", index: @adv_prod_index).click
+            end
 
+            # create ads
             Watir::Wait.until { @browser.div(:css, ".banner-form").present? }
             prod.ads.each do |ad|
-              create_ad ad
+              # set ad form fields
+              @browser.text_field(:css, ".banner-form__input.js-text-value").set(ad.title)
+              @browser.textarea(:css, ".banner-form__input.js-text-value.banner-form__input_text-area").set(ad.text)
+              @browser.file_field(:css, ".banner-form__img-file.banner-form__input.js-image-value").set(ad.image)
+              # handle crop image
+              Watir::Wait.until { @browser.button(:css, ".image-cropper__save").present? }
+              @browser.button(:css, ".image-cropper__save").click
+
+              # create ad click
+              Watir::Wait.until { @browser.button(:css, ".banner-form__save-button.js-banner-save").present? }
+              Watir::Wait.until { sleep 1 }
+              @browser.button(:css, ".banner-form__save-button.js-banner-save").click
             end
-            
-            # @browser.text_field(:css, ".js-campaign-name").set(prod.campaign_name)
-            # @browser.div(:css, ".create-page__main-button").click
-            set_campaign_name prod
-            click_finish_campaign_btn
+
+            # set another fields
+            @browser.text_field(:css, ".js-campaign-name").set(prod.campaign_name)
+            # click to the finish btn
+            @browser.div(:css, ".create-page__main-button").click
+
+            puts "finish"
           end
 
         end
 
-      ensure
+      rescue Exception => e
         @browser.close
+        raise e
       end
     end 
 
-    def set_campaign_name prod
-      @browser.text_field(:css, ".js-campaign-name").set(prod.campaign_name)
-    end
-
-    def click_finish_campaign_btn
-      @browser.div(:css, ".create-page__main-button").click
-    end
-
-    def create_ad ad
-      @browser.text_field(:css, ".banner-form__input.js-text-value").set(ad.title)
-      @browser.textarea(:css, ".banner-form__input.js-text-value.banner-form__input_text-area").set(ad.text)
-      @browser.file_field(:css, ".banner-form__img-file.banner-form__input.js-image-value").set(ad.image)
-      Watir::Wait.until { @browser.button(:css, ".image-cropper__save").present? }
-      @browser.button(:css, ".image-cropper__save").click
-
-      Watir::Wait.until { @browser.button(:css, ".banner-form__save-button.js-banner-save").present? }
-      Watir::Wait.until { sleep 1 }
-      @browser.button(:css, ".banner-form__save-button.js-banner-save").click
-    end
-
-    def click_product_btn prod
-      if @adv_prod_index != ADV_PROD_INDEXES[prod.type.to_sym]
-        @adv_prod_index = ADV_PROD_INDEXES[prod.type.to_sym]
-        @browser.div(css: ".pac-item._gray-block", index: @adv_prod_index).click
-      end
-    end
-
-    def setup_adv_item config
-      Watir::Wait.until { @browser.div(:css, ".product-types.js-product-types-wrap").present? }
-      @adv_type_index = ADV_TYPES_INDEXES[config.type.to_sym]
-      @browser.div(css: ".product-types__item", index: @adv_type_index).click
-      @browser.text_field(:css, ".base-setting-my__main-url__input.js-main-url-input").set(config.link)
-    end
-
-    def click_create_campaign_btn
-      Watir::Wait.until { @browser.link(:css, ".campaign-toolbar .campaign-toolbar__create-button").present? }
-      @browser.link(:css, ".campaign-toolbar .campaign-toolbar__create-button").click
-    end
-
     def login(email, password)
       puts "login"
 

data/lib/targetmy/version.rb

@@ -1,3 +1,3 @@
 module Targetmy
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: targetmy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - dimag