skeleton-ui 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129ebeb0d1f8014b655ec386cc47546974bceb1b3d7117e51b94ce08235045ff
-  data.tar.gz: a3ec2f542d04712de55bd079dfa96770817c96aac239951ea2fe58a55bfe9cc7
+  metadata.gz: 070fce0dd13ee0154db462655d7f86b119ed77e75c0f0810de14ca407802643d
+  data.tar.gz: 937d99a22bed5cca8fcda3346f06cdd93dfcf0b81c10f32666a9f54f32ae960d
 SHA512:
-  metadata.gz: af6e514ead6d99c5636eaf54bce53d8288279d6f7b0a68674ae613b226b87077631a9bcca36dbfda676a0516782cf338a56b10ccad03364f55d97a2187af6084
-  data.tar.gz: d7aa3d27c079ea9e084e16e10ebe8f7abb10c9adc4619649c8bdb32f02e0e55d87aab665bf0aa9c0de98a36023f5a18f4798e06bf58cf94c18d8c86e97d18eb8
+  metadata.gz: 48a760cd677ff3c90110d490a9984f67f10c2bca83c2b8860384c4c9a33c300ad7c500ac8e45bae6e569eaaf814bca06f4c960c88f7e0fa43fa1ebc157233459
+  data.tar.gz: 0dcf69c1ee743eea168c6223537304823ea2f9502d6e30f6e9c20be851edbd9c042ab15a081c1c1bdbce8f00f67de54f08b75d1e53cc2ed33ad4ec7c26d100bf

data/lib/skeleton.rb

@@ -39,7 +39,9 @@ module Skeleton
 
 		def fill_html
 			language = Language.new
-			%w[ruby java python javascript].each do |lang|
+			languages = %w[ruby java python javascript]
+			languages += %w[swift] if ios?
+			languages.each do |lang|
         attach_image
 				type = language.type(lang)
         folder = Base::PAGE_OBJECTS_FOLDER

data/lib/skeleton/base.rb

@@ -5,7 +5,6 @@ class Base
 
   def precondition
     clear
-    FileUtils.rm_rf("#{ROOT_DIR}/server/screenshot.png")
     FileUtils.mkdir_p(PAGE_OBJECTS_FOLDER)
     FileUtils.mkdir_p(ATTACHMENTS_FOLDER)
   rescue
@@ -21,6 +20,7 @@ class Base
   def clear
     FileUtils.rm_rf(PAGE_OBJECTS_FOLDER)
     FileUtils.rm_rf(ATTACHMENTS_FOLDER)
+    FileUtils.rm_rf("#{ROOT_DIR}/server/screenshot.png")
   end
 
   protected

data/lib/skeleton/ios.rb

@@ -49,27 +49,30 @@ class IOS < Base
   def create_locator(line)
     locator_by_id = locator_by_id(line)
     locator_by_label = locator_by_label(line)
+    type = element_type(line)
     if !locator_by_id.empty?
-      create_locator_by_id(locator_by_id)
+      create_locator_by_id(locator_by_id, type)
     elsif !locator_by_label.empty?
-      type = element_type(line)
       create_locator_by_label(locator_by_label, type)
     end
   end
 
-  def create_locator_by_id(locator)
+  def create_locator_by_id(locator, type)
     method_name = locator.strip
+    locator_hash = { locator => type }
     code_generation(method_name: method_name,
                     locator_type: ACC_ID,
-                    locator_value: locator)
+                    locator_value: locator_hash,
+                    accessibility_id: true)
   end
 
   def create_locator_by_label(text, type)
     method_name = "#{type}#{increment_locator_id}"
     locator = "#{LABEL} LIKE '#{text}'"
+    locator_hash = { locator => type }
     code_generation(method_name: method_name,
                     locator_type: NSPREDICATE,
-                    locator_value: locator)
+                    locator_value: locator_hash)
   end
 
   def create_page_objects
@@ -110,23 +113,35 @@ class IOS < Base
     end
   end
 
-  def code_generation(method_name:, locator_type:, locator_value:)
-    java = @language.java(camel_method_name: camel_style(method_name),
+  def code_generation(method_name:,
+                      locator_type:,
+                      locator_value:,
+                      accessibility_id: false)
+    method_name = "_#{method_name}" if method_name[0] =~ /\d+/
+    snake_style = snake_style(method_name)
+    camel_style = camel_style(method_name)
+    java = @language.java(camel_method_name: camel_style,
                           locator_type: locator_type,
-                          locator_value: locator_value)
-    ruby = @language.ruby(snake_method_name: snake_style(method_name),
+                          locator_value: locator_value.keys.first)
+    ruby = @language.ruby(snake_method_name: snake_style,
                           locator_type: locator_type,
-                          locator_value: locator_value)
-    python = @language.python(snake_method_name: snake_style(method_name),
+                          locator_value: locator_value.keys.first)
+    python = @language.python(snake_method_name: snake_style,
                               locator_type: locator_type,
-                              locator_value: locator_value)
-    js = @language.js(camel_method_name: camel_style(method_name),
+                              locator_value: locator_value.keys.first)
+    js = @language.js(camel_method_name: camel_style,
                       locator_type: locator_type,
-                      locator_value: locator_value)
+                      locator_value: locator_value.keys.first)
+    xcui_element_type = XCUIElement.types[locator_value.values.first.to_sym]
+    swift = @language.swift(camel_method_name: camel_style,
+                            element_type: xcui_element_type,
+                            locator_value: locator_value.keys.first,
+                            accessibility_id: accessibility_id)
     save(code: java, format: Language::JAVA)
     save(code: ruby, format: Language::RUBY)
     save(code: python, format: Language::PYTHON)
     save(code: js, format: Language::JAVASCRIPT)
+    save(code: swift, format: Language::SWIFT)
   end
 
   def page_source

data/lib/skeleton/languages.rb

@@ -3,6 +3,7 @@ class Language
   RUBY = 'rb'.freeze
   PYTHON = 'py'.freeze
   JAVASCRIPT = 'js'.freeze
+  SWIFT = 'swift'.freeze
 
   def java(camel_method_name:, locator_type:, locator_value:)
     <<~JAVA
@@ -20,18 +21,34 @@ class Language
 
   def python(snake_method_name:, locator_type:, locator_value:)
     <<~PYTHON
-      #{snake_method_name} = driver.#{locator_type[:python]}("#{locator_value})"
+      #{snake_method_name} = self.driver.#{locator_type[:python]}("#{locator_value})"
 
     PYTHON
   end
 
   def js(camel_method_name:, locator_type:, locator_value:)
     <<~JS
-      #{camel_method_name} = driver.elements("#{locator_type[:javascript]}", "#{locator_value}");
+      let #{camel_method_name} = await driver.elements("#{locator_type[:javascript]}", "#{locator_value}");
 
     JS
   end
 
+  def swift(camel_method_name:, element_type:, locator_value:, accessibility_id:)
+    if accessibility_id
+    <<~SWIFT
+      let #{camel_method_name} = app.#{element_type}["#{locator_value}"]
+
+    SWIFT
+    else
+      <<~SWIFT
+      let #{camel_method_name} = app.#{element_type}.matching(
+        NSPredicate(format: #{locator_value})
+      ).element
+
+      SWIFT
+    end
+  end
+
   def type(format)
     case format
     when 'ruby', 'rb'
@@ -42,8 +59,98 @@ class Language
       JAVASCRIPT
     when 'python', 'py'
       PYTHON
+    when 'swift'
+      SWIFT
     else
       "I haven't this language format"
     end
   end
+end
+
+class XCUIElement
+  def self.types
+    return {
+        Other: "otherElements",
+        Group: "groups",
+        Window: "windows",
+        Sheet: "sheets",
+        Drawer: "drawers",
+        Alert: "alerts",
+        Dialog: "dialogs",
+        Button: "buttons",
+        RadioButton: "radioButtons",
+        RadioGroup: "radioGroups",
+        CheckBox: "checkBoxes",
+        DisclosureTriangle: "disclosureTriangles",
+        PopUpButton: "popUpButtons",
+        ComboBox: "comboBoxes",
+        MenuButton: "menuButtons",
+        ToolbarButton: "toolbarButtons",
+        Popover: "popovers",
+        Keyboard: "keyboards",
+        Key: "keys",
+        NavigationBar: "navigationBars",
+        TabBar: "tabBars",
+        TabGroup: "tabGroups",
+        Toolbar: "toolbars",
+        StatusBar: "statusBars",
+        Table: "tables",
+        TableRow: "tableRows",
+        TableColumn: "tableColumns",
+        Outline: "outlines",
+        OutlineRow: "outlineRows",
+        Browser: "browsers",
+        CollectionView: "collectionViews",
+        Slider: "sliders",
+        PageIndicator: "pageIndicators",
+        ProgressIndicator: "progressIndicators",
+        ActivityIndicator: "activityIndicators",
+        SegmentedControl: "segmentedControls",
+        Picker: "pickers",
+        PickerWheel: "pickerWheels",
+        Switch: "switches",
+        Toggle: "toggles",
+        Link: "links",
+        Image: "images",
+        Icon: "icons",
+        SearchField: "searchFields",
+        ScrollView: "scrollViews",
+        ScrollBar: "scrollBars",
+        StaticText: "staticTexts",
+        TextField: "textFields",
+        SecureTextField: "secureTextFields",
+        DatePicker: "datePickers",
+        TextView: "textViews",
+        Menu: "menus",
+        MenuItem: "menuItems",
+        MenuBar: "menuBars",
+        MenuBarItem: "menuBarItems",
+        Map: "maps",
+        WebView: "webViews",
+        IncrementArrow: "incrementArrows",
+        DecrementArrow: "decrementArrows",
+        Timeline: "timelines",
+        RatingIndicator: "ratingIndicators",
+        ValueIndicator: "valueIndicators",
+        SplitGroup: "splitGroups",
+        Splitter: "splitters",
+        RelevanceIndicator: "relevanceIndicators",
+        ColorWell: "colorWells",
+        HelpTag: "helpTags",
+        Matte: "mattes",
+        DockItem: "dockItems",
+        Ruler: "rulers",
+        RulerMarker: "rulerMarkers",
+        Grid: "grids",
+        LevelIndicator: "levelIndicators",
+        Cell: "cells",
+        LayoutArea: "layoutAreas",
+        LayoutItem: "layoutItems",
+        Handle: "handles",
+        Stepper: "steppers",
+        Tab: "tabs",
+        TouchBar: "touchBars",
+        StatusItem: "statusItems"
+    }
+  end
 end

data/lib/skeleton/version.rb

@@ -1,4 +1,4 @@
 module Skeleton
-  VERSION ||= '0.1.11'.freeze
+  VERSION ||= '0.1.12'.freeze
   GEM_NAME ||= 'skeleton-ui'.freeze
 end

data/server/server.rb

@@ -6,8 +6,12 @@ set :port, server_port
 
 File.open("#{Base::ROOT_DIR}/server/port", 'w+') { |f| f.write(server_port) }
 
+not_found do
+  redirect 'skeleton'
+end
+
 get '/' do
-  redirect "skeleton"
+  redirect 'skeleton'
 end
 
 get '/:file' do
@@ -20,4 +24,4 @@ post '/:file' do
   domain = params[:file].split('.').last
   file = domain == params[:file] ? "#{domain}.html" : params[:file]
   send_file "#{Base::ROOT_DIR}/server/#{file}"
-end
+end

data/server/skeleton.html

@@ -19,6 +19,7 @@
 					<li><a href="java">Java</a></li>
 					<li><a href="python">Python</a></li>
 					<li><a href="javascript">Javascript</a></li>
+					<li><a href="swift">Swift</a> (iOS required)</li>
 				</div>
 			</div>
 			<footer class="my-5 pt-5 text-muted text-center text-small">

data/server/template.html.erb

@@ -13,15 +13,15 @@
       <div class="py-5 text-center">
         <h2>Skeleton</h2>
       </div>
-      <div class="row" style="min-height: 670px;">
+      <div class="row" style="min-height: 666px;">
         <div class="col-md-4 mb-4">
-          <div class="aside" style="max-height: 670px;">
-            <div class="aside__img" style="background-image: url(screenshot.png); outline: 1px solid gray;"></div>
+          <div class="aside">
+            <div class="aside__img" style="width:100%; height:100%; background-image: url(screenshot.png); outline: 1px solid gray;"></div>
           </div>
         </div>
         <div class="col-md-8">
           <h4 class="mb-3">Screen Objects:</h4>
-          <div class="content" id="content" style="max-height: 670px; overflow-y: auto;">
+          <div class="content" id="content" style="max-height: 666px; overflow-y: auto;">
             <pre><code><%= @screen_objects %></code></pre>
           </div>
         </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeleton-ui
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - a.alterpesotskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler