swamp 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847a3ad24ced1c7638928fb5ede6945aa0e45b5c
-  data.tar.gz: b1bfa972a7c19a3022e75e18c006ed37f69f6f57
+  metadata.gz: 42ce404e057ecfc79a3afa928786b99b135d10c9
+  data.tar.gz: 641d6ab513f187aea8d33f761eeef486560d40f8
 SHA512:
-  metadata.gz: 8a048407fe8e70e48cbb7d546b7192f602f7b3a45b410c971357c26b099b24ed425ef9064d7df292a844cde56a2f045432b914aa9d65b163cf3533c6ab2f7099
-  data.tar.gz: 2544657716ca5091ae0ffbee4cad07357eac354d4d01dfe1ada3f273d7b6acad60289faeafb7975fe0ebf3f8ff3de63b9ceeab9018f32233d8caa4a253369a7d
+  metadata.gz: 1b061517a108252d8bd07a33842d3f01d2b3b59b745b1f695b04b996bbfa6221ad0f936a70ec9a1d93404c55f0e05d14e4d39991303160d0e47520b8bcfc8c39
+  data.tar.gz: 6fc06e74ff084b014b7a08173399eca8fa3504a0fd9ada5d37688604e024c7c35b7ab3917f03ea183e7e0c656331f1156dfee33069f8f36b699e06a542589f77

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+node_modules/
 Gemfile.lock
 coverage
 InstalledFiles
@@ -18,4 +19,4 @@ tmp
 # YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/

data/features/specifications/changing_scope_to_source.feature

@@ -11,6 +11,6 @@ Feature: User chooses the source scope
     Then swamp should output the following code snippet
       """
       def sign_up
-        source.click_button("Sign Up")
+        source.click_button("u_0_2")
       end
       """

data/features/specifications/user_scans_buttons_in_a_page.feature

@@ -7,14 +7,14 @@ Feature: user scans buttons in a page
   Background: swamp is running
     Given that swamp is already running
 
-  Scenario: A button that has text
+  Scenario: A button that has text and id
     Given I enter the url for this page: "button.html"
     When swamp scans that page
     Then swamp should highlight this element: "button"
     And it should output the following code snippet
       """
       def sign_up
-        page.click_button("Sign Up")
+        page.click_button("u_0_2")
       end
       """
 

data/features/specifications/using_prism_scope.feature

@@ -12,7 +12,7 @@ Feature: User chooses the prism scope
     When swamp scan this page: "button.html"
     Then it should output the following code snippet
     """
-    element :sign_up, 'button', text: 'Sign Up'
+    element :sign_up, '#u_0_2'
     """
 
   Scenario: Scanning a button that doesn't has text but has id

data/features/step_definitions/swamp_steps.rb

@@ -42,7 +42,7 @@ Given /^that swamp already have scanned a page$/ do
   path = File.join(File.dirname(__FILE__), '../support/page_examples/', "button.html")
   @url = "file://#{path}"
   swamp.scan(@url)
-  expect(fake_output.messages).to include("def sign_up\n  page.click_button(\"Sign Up\")\nend")
+  expect(fake_output.messages).to include("def sign_up\n  page.click_button(\"u_0_2\")\nend")
 end
 
 When /^I attempt to hit enter at the terminal$/ do
@@ -52,15 +52,15 @@ end
 Then /^swamp should scan the current page$/ do
   expect(fake_output.messages.size).to be <= 5
   expect(fake_output.messages[3]).to eq "Scanning, please wait..."
-  expect(fake_output.messages[4]).to eq "def sign_up\n  page.click_button(\"Sign Up\")\nend"
+  expect(fake_output.messages[4]).to eq "def sign_up\n  page.click_button(\"u_0_2\")\nend"
 end
 
 Then /^swamp should highlight this (element|link): "(.+)"$/ do |mode, selector|
   page = Capybara.current_session
   expect(page).to have_css "#{selector}[style]"
   if mode == "element"
-    expect(page.find(selector)[:style]).to include("border-width: 3px")
-    expect(page.find(selector)[:style]).to include("border-color: rgb(255, 0, 0)")
+    expect(page.find(selector)[:style]).to include("box-shadow: 0px 0px 15px rgb(81, 250, 200)")
+    expect(page.find(selector)[:style]).to include("border: 1px solid rgb(81, 250, 200)")
   else
     expect(page.find(selector)[:style]).to include("background-color: rgb(255, 0, 0)")
   end

data/lib/swamp/base.rb

@@ -16,7 +16,7 @@ module Swamp
       Capybara.run_server = false
       Capybara.default_selector = :css
       Capybara.default_driver = :selenium
-      Capybara.default_wait_time = 60
+      Capybara.default_max_wait_time = 60
 
       Capybara.configure do |config|
         config.match = :smart

data/lib/swamp/collections/buttons.rb

@@ -4,10 +4,10 @@ module Swamp
       elements = []
       page.all('button').map do |element|
         if element.visible?
-          if has_valid_text?(element)
-            shine %\//button[text()='#{element.text}']\, :xpath
-            button = Swamp::Button.new(element.text, element.text)
-            button.prism_selector = %\'button', text: '#{element.text}'\
+          if has_valid_text?(element) and has_id?(element)
+            shine %/##{element['id']}/
+            button = Swamp::Button.new(element.text, element['id'])
+            button.prism_selector = "'##{element['id']}'"
             elements << button
           elsif has_id?(element) and has_valid_id?(element)
             shine %/##{element['id']}/
@@ -15,10 +15,14 @@ module Swamp
             button.prism_selector = "'##{element['id']}'"
             elements << button
           elsif has_value?(element) and has_valid_value?(element)
-            shine %/button[value='#{element['value']}']/
+            shine %/button[value="#{element['value']}"]/
             button = Swamp::Button.new(element['value'], element['value'])
             button.prism_selector = %\"[value='#{element['value']}']"\
             elements << button
+          elsif has_valid_text?(element)
+            button = Swamp::Button.new(element.text, element.text)
+            button.prism_selector = %\'button', text: '#{element.text}'\
+            elements << button
           end
         end
       end

data/lib/swamp/collections/elements.rb

@@ -1,10 +1,6 @@
 module Swamp
   class Elements < Base
 
-    BORDER_SIZE = "3px"
-    BORDER_COLOR = "#ff0000"
-    BACKGROUND_COLOR = "#ff0000"
-
     def has_id?(element)
       element['id'] != nil and element['id'] != "" ? true : false
     end
@@ -41,39 +37,21 @@ module Swamp
       @formatter ||= Swamp::Formatter.new
     end
 
-    def shine(selector, mode = :css)
-      set_border_size(selector, BORDER_SIZE, mode)
-      set_border_color(selector, BORDER_COLOR, mode)
+    def shine(selector)
+      js = JavaScript::Minifier.new.minify
+      script = JavaScript::FunctionBuilder.new(js).build_with(selector)
+      page.execute_script(script) rescue false
     end
 
     def shine_link(selector)
-      set_background_color selector, BACKGROUND_COLOR
+      set_background_color selector, '#ff0000'
     end
 
     private
 
-    def set_border_size(selector, size, mode)
-      if mode == :css
-        page.execute_script %-document.querySelector("#{selector}").style.borderWidth='#{size}'- rescue false
-      elsif mode == :xpath
-        page.execute_script %-document.evaluate("#{selector}", document, null, 9, null).singleNodeValue.style.borderWidth='#{size}';- rescue false
-      else
-        raise "Mode #{mode} not found"
-      end
-    end
-
-    def set_border_color(selector, color, mode = :css)
-      if mode == :css
-        page.execute_script %-document.querySelector("#{selector}").style.borderColor='#{color}'- rescue false
-      elsif mode == :xpath
-        page.execute_script %-document.evaluate("#{selector}", document, null, 9, null).singleNodeValue.style.borderColor='#{color}';- rescue false
-      else
-        raise "Mode #{mode} not found"
-      end
-    end
-
     def set_background_color(selector, color)
       page.execute_script %-document.querySelector("#{selector}").style.backgroundColor='#{color}'-
     end
   end
 end
+

data/lib/swamp/collections/input_buttons.rb

@@ -2,7 +2,7 @@ module Swamp
   class InputButtons < Elements
     def get
       elements = []
-      page.all('input[type="submit"]').map do | element |
+      page.all('input[type="submit"],input[type="button"]').map do | element |
         if element.visible?
           if has_value?(element)
             if has_id?(element)
@@ -11,7 +11,7 @@ module Swamp
               button.prism_selector = %\'##{element['id']}'\
               elements << button
             elsif has_class?(element)
-              shine %/input.#{formatter.format_class(element["class"])}[value='#{element["value"]}']/
+              shine %/input.#{formatter.format_class(element["class"])}[value="#{element["value"]}"]/
               capybara_selector = "input.#{formatter.format_class(element["class"])}[value='#{element["value"]}']"
               button = Swamp::InputButton.new(element["value"], capybara_selector)
               button.prism_selector = %\"#{capybara_selector}"\

data/lib/swamp/collections/select_boxes.rb

@@ -10,7 +10,7 @@ module Swamp
             select_box.prism_selector = "'##{element['id']}'"
             elements << select_box
           elsif has_name?(element)
-            shine %/select[name='#{element["name"]}']/
+            shine %/select[name="#{element["name"]}"]/
             select_box = Swamp::SelectBox.new(element["name"], element["name"])
             select_box.prism_selector = %\"select[name='#{element['name']}']"\
             elements << select_box

data/lib/swamp/js-adapters/function_builder.rb

@@ -0,0 +1,26 @@
+module JavaScript
+  class FunctionBuilder
+    def initialize(minified_js)
+      @minified_js = minified_js
+    end
+
+    def build_with(css_selector)
+      minified_js + ' ' + element_declaration + ' ' + query_dom(css_selector) + ' ' + function_caller
+    end
+
+    private
+    attr_reader :minified_js
+
+    def element_declaration
+      'var element ='
+    end
+
+    def query_dom(css_selector)
+      "document.querySelector('#{css_selector}');"
+    end
+
+    def function_caller
+      'HIGHLIGHT.glow(element);'
+    end
+  end
+end

data/lib/swamp/js-adapters/minifier.rb

@@ -0,0 +1,23 @@
+module JavaScript
+  class Minifier
+    def initialize
+      @file_path = File.join(File.dirname(__FILE__), '../', 'js-modules', 'highlight.js')
+    end
+
+    def minify
+      minified_js = ''
+      file = File.new(file_path, 'r')
+      file.each_line do |l|
+        minified_js += l unless l.include?('module.exports')
+      end
+      file.close
+      minified_js = minified_js.gsub("\n", "")
+      minified_js = minified_js.gsub("\"", "'")
+      minified_js = minified_js.gsub("    ", " ")
+      minified_js = minified_js.gsub("  ", " ")
+    end
+
+    private
+    attr_reader :file_path
+  end
+end

data/lib/swamp/js-modules/highlight.js

@@ -0,0 +1,13 @@
+var HIGHLIGHT = (function(){
+  var boxShadow = "0 0 15px rgba(81, 250, 200, 1)";
+  var border = "1px solid rgba(81, 250, 200, 1)";
+
+  return {
+    glow: function(element) {
+      element.style.boxShadow = boxShadow;
+      element.style.border = border;
+    }
+  };
+})();
+
+module.exports = HIGHLIGHT;

data/lib/swamp/version.rb

@@ -1,3 +1,3 @@
 module Swamp
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/lib/swamp/wrapper.rb

@@ -10,7 +10,7 @@ module Swamp
 
     def explore(url)
       if !page_visited
-        visit url
+        visit url.gsub("\n", "")
         @page_visited = true
       end
     end

data/lib/swamp.rb

@@ -4,6 +4,8 @@ require 'swamp/setup'
 require 'swamp/interface'
 require 'swamp/evaluator'
 require 'swamp/base'
+require 'swamp/js-adapters/minifier'
+require 'swamp/js-adapters/function_builder'
 require 'swamp/collections/elements'
 require 'swamp/wrapper'
 require 'swamp/elements/element'

data/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "swamp",
+  "version": "0.0.1",
+  "repository": "github.com/Juraci/swamp",
+  "license": "GPL-1.0+",
+  "devDependencies": {
+    "jasmine": "^2.3.2"
+  },
+  "scripts": {
+      "test": "jasmine"
+  }
+}

data/spec/highlightSpec.js

@@ -0,0 +1,18 @@
+describe('Highlight', function (){
+    var HIGHLIGHT = require('../lib/swamp/js-modules/highlight.js');
+    var element;
+
+    it('should set the boxShadow property of the element', function (){
+        element = { style: { boxShadow: '' } };
+        spyOn(element, 'style');
+        HIGHLIGHT.glow(element);
+        expect(element.style.boxShadow).toBe('0 0 15px rgba(81, 250, 200, 1)');
+    });
+
+    it('should set the border property of the element', function (){
+        element = { style: { border: '' } };
+        spyOn(element, 'style');
+        HIGHLIGHT.glow(element);
+        expect(element.style.border).toBe('1px solid rgba(81, 250, 200, 1)');
+    });
+});

data/spec/support/jasmine.json

@@ -0,0 +1,9 @@
+{
+  "spec_dir": "spec",
+  "spec_files": [
+    "**/*[sS]pec.js"
+  ],
+  "helpers": [
+    "helpers/**/*.js"
+  ]
+}

data/spec/swamp/buttons_spec.rb

@@ -23,7 +23,7 @@ module Swamp
         end
 
         it "highlights the element" do
-          expect(buttons.page).to receive(:execute_script).twice
+          expect(buttons.page).to receive(:execute_script).once
           buttons.get
         end
 
@@ -31,8 +31,8 @@ module Swamp
           allow(buttons.page).to receive(:execute_script).and_return(nil)
           expect(buttons.get.size).to eq(1)
           expect(buttons.get.first.name).to eq("Sign Up")
-          expect(buttons.get.first.selector).to eq("Sign Up")
-          expect(buttons.get.first.prism_selector).to eq(%\'button', text: 'Sign Up'\)
+          expect(buttons.get.first.selector).to eq("u_0_2")
+          expect(buttons.get.first.prism_selector).to eq("'#u_0_2'")
         end
       end
 
@@ -47,7 +47,7 @@ module Swamp
           end
 
           it "highlights the element" do
-            expect(buttons.page).to receive(:execute_script).twice
+            expect(buttons.page).to receive(:execute_script).once
             buttons.get
           end
 
@@ -71,7 +71,7 @@ module Swamp
             end
 
             it "highlights the element" do
-              expect(buttons.page).to receive(:execute_script).twice
+              expect(buttons.page).to receive(:execute_script).once
               buttons.get
             end
 

data/spec/swamp/fields_spec.rb

@@ -24,7 +24,7 @@ module Swamp
           end
 
           it "highlights the element" do
-            expect(fields.page).to receive(:execute_script).twice
+            expect(fields.page).to receive(:execute_script).once
             fields.get
           end
 
@@ -51,7 +51,7 @@ module Swamp
           end
 
           it "highlights the element" do
-            expect(fields.page).to receive(:execute_script).twice
+            expect(fields.page).to receive(:execute_script).once
             fields.get
           end
 
@@ -78,7 +78,7 @@ module Swamp
           end
 
           it "highlights the element" do
-            expect(fields.page).to receive(:execute_script).twice
+            expect(fields.page).to receive(:execute_script).once
             fields.get
           end
 

data/spec/swamp/input_buttons_spec.rb

@@ -7,7 +7,7 @@ module Swamp
       element = {'value' => "Log In", 'id' => "u_0_b"}
       allow(element).to receive(:visible?).and_return(true)
       allow(input_buttons.page).to receive(:execute_script).and_return(nil)
-      expect(input_buttons.page).to receive(:all).with('input[type="submit"]').and_return([element])
+      expect(input_buttons.page).to receive(:all).with('input[type="submit"],input[type="button"]').and_return([element])
       input_buttons.get
     end
 
@@ -17,11 +17,11 @@ module Swamp
 
         before(:each) do
           allow(element).to receive(:visible?).and_return(true)
-          allow(input_buttons.page).to receive(:all).with('input[type="submit"]').and_return([element])
+          allow(input_buttons.page).to receive(:all).with('input[type="submit"],input[type="button"]').and_return([element])
         end
 
         it "highlights the element" do
-          expect(input_buttons.page).to receive(:execute_script).twice
+          expect(input_buttons.page).to receive(:execute_script).once
           input_buttons.get
         end
 
@@ -43,11 +43,11 @@ module Swamp
 
         before(:each) do
           allow(element).to receive(:visible?).and_return(true)
-          allow(input_buttons.page).to receive(:all).with('input[type="submit"]').and_return([element])
+          allow(input_buttons.page).to receive(:all).with('input[type="submit"],input[type="button"]').and_return([element])
         end
 
         it "highlights the element" do
-          expect(input_buttons.page).to receive(:execute_script).twice
+          expect(input_buttons.page).to receive(:execute_script).once
           input_buttons.get
         end
 
@@ -70,7 +70,7 @@ module Swamp
       it "returns an empty array" do
         element = {'value' => "Log In", 'id' => "u_0_b"}
         allow(element).to receive(:visible?).and_return(false)
-        allow(input_buttons.page).to receive(:all).with('input[type="submit"]').and_return([element])
+        allow(input_buttons.page).to receive(:all).with('input[type="submit"],input[type="button"]').and_return([element])
         expect(input_buttons.get).to eq([])
       end
     end

data/spec/swamp/select_boxes_spec.rb

@@ -21,7 +21,7 @@ module Swamp
         end
 
         it "highlights the element" do
-          expect(select_boxes.page).to receive(:execute_script).twice
+          expect(select_boxes.page).to receive(:execute_script).once
           select_boxes.get
         end
 
@@ -48,7 +48,7 @@ module Swamp
         end
 
         it "highlights the element" do
-          expect(select_boxes.page).to receive(:execute_script).twice
+          expect(select_boxes.page).to receive(:execute_script).once
           select_boxes.get
         end
 
@@ -75,7 +75,7 @@ module Swamp
         end
 
         it "highlights the element" do
-          expect(select_boxes.page).to receive(:execute_script).twice
+          expect(select_boxes.page).to receive(:execute_script).once
           select_boxes.get
         end
 

data/swamp.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "capybara", '~> 2.4'
-  spec.add_dependency "selenium-webdriver", '~> 2.46'
+  spec.add_dependency "capybara", '~> 2.5'
+  spec.add_dependency "selenium-webdriver", '~> 2.48'
 
   spec.add_development_dependency "bundler", '~> 1.6'
   spec.add_development_dependency "rake", '~> 10.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swamp
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Juraci de Lima Vieira Neto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.46'
+        version: '2.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.46'
+        version: '2.48'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,9 @@ files:
 - lib/swamp/evaluator.rb
 - lib/swamp/formatter.rb
 - lib/swamp/interface.rb
+- lib/swamp/js-adapters/function_builder.rb
+- lib/swamp/js-adapters/minifier.rb
+- lib/swamp/js-modules/highlight.js
 - lib/swamp/scopes/page.rb
 - lib/swamp/scopes/prism.rb
 - lib/swamp/scopes/scope.rb
@@ -242,7 +245,10 @@ files:
 - lib/swamp/setup.rb
 - lib/swamp/version.rb
 - lib/swamp/wrapper.rb
+- package.json
+- spec/highlightSpec.js
 - spec/spec_helper.rb
+- spec/support/jasmine.json
 - spec/swamp/builders/basic_spec.rb
 - spec/swamp/builders/prism_spec.rb
 - spec/swamp/buttons_spec.rb
@@ -277,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Swamp, where capybaras belong
@@ -314,7 +320,9 @@ test_files:
 - features/support/page_examples/select_box_with_name_only.html
 - features/support/page_examples/select_without_id_and_name.html
 - features/support/setup.rb
+- spec/highlightSpec.js
 - spec/spec_helper.rb
+- spec/support/jasmine.json
 - spec/swamp/builders/basic_spec.rb
 - spec/swamp/builders/prism_spec.rb
 - spec/swamp/buttons_spec.rb