page_magic 0.11.0.alpha5 → 0.11.0.alpha6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd7f970881ca342aebac6a622629e2256c7b3772
-  data.tar.gz: c1a87cb1706b7d2bc40fc521a9cc5af55fea6c40
+  metadata.gz: 56f774d5606a8b3fbe8f0e8ea337bd54bd360d70
+  data.tar.gz: 318201438260f08156d1afa43a5baa2479143eb5
 SHA512:
-  metadata.gz: 00119f1eacd5c3d0001a020fe938b1dfd3fa1340b21800f7a7087ecc43e375d3ffae769c4f3eca2b96404e7c19d605a448e4b35b2f2202bb43e58bfa11ffdf43
-  data.tar.gz: 243f27af8b0adfd0c58a9e254b128d0c60e4da10eff2d1e421435b1d65b22e30324adba474d92499df6bd0b2f008e203389e45510aa0dd24e82c1e0ffce1165f
+  metadata.gz: ce887cd3a1b4e3d8fbd6cd0c82b9d78036d46f075c821d213049ef60ff6ec453c601bb55f79359dae1bfab91d4aa1443dfbd8e4aef10b6ea873aee5c618c5a0f
+  data.tar.gz: 5b0b401f94a6d9fb856efc935157fb3a9754fb98d004c1fdb1590e440b79353ad97ba923970fe8c968bf0b0b686bb0f88b7e88812d46f8a61dc320d82c4b0531

data/VERSION

@@ -1 +1 @@
-0.11.0.alpha5
+1.0.0.alpha2

data/lib/page_magic/element_context.rb

@@ -18,15 +18,8 @@ module PageMagic
       return @caller.send(method, *args) if @executing_hooks
       return @page_element.send(method, *args) if @page_element.methods.include?(method)
 
-
       element_locator_factory =  @page_element.element_definitions[method]
 
-      action = nil
-      unless element_locator_factory
-        action = resolve_action(method)
-        element_locator_factory = @page_element.element_definitions[method.to_s.gsub("#{action}_", '').to_sym]
-      end
-
       raise ElementMissingException, "Could not find: #{method}" unless element_locator_factory
 
       if args.empty?
@@ -37,7 +30,7 @@ module PageMagic
 
       result = element_locator.browser_element
 
-      return element_locator if element_locator.section? && action.nil?
+      return element_locator if element_locator.section?
 
       [:set, :select_option, :unselect_option, :click].each do |action_method|
         apply_hooks(page_element: result,
@@ -47,13 +40,7 @@ module PageMagic
         )
       end
 
-      action ? result.send(action) : result
-    end
-
-    def resolve_action(field)
-      {/^click_/ => :click}.each do |prefix, action|
-        return action if field.to_s =~ prefix
-      end
+      result
     end
 
     def apply_hooks(options)

data/lib/page_magic/session.rb

@@ -1,30 +1,53 @@
 require 'wait'
 module PageMagic
   class Session
-    attr_accessor :current_page, :raw_session
+    attr_accessor :current_page, :raw_session, :transitions
 
     def initialize browser
       @raw_session = browser
     end
 
+    def define_page_mappings transitions
+      @transitions = transitions
+    end
+
+    def current_page
+      if transitions
+        mapping = find_mapped_page(current_path)
+        @current_page = mapping.new(self) if mapping
+      end
+      @current_page
+    end
+
+    def find_mapped_page path
+      mapping = transitions.keys.find do |key|
+        string_matches?(path, key)
+      end
+      transitions[mapping]
+    end
+
+    def string_matches?(string, matcher)
+      if matcher.is_a?(Regexp)
+        string =~ matcher
+      elsif matcher.is_a?(String)
+        string == matcher
+      else
+        false
+      end
+    end
+
     def visit page
-      @raw_session.visit page.url
+      raw_session.visit page.url
       @current_page = page.new self
       self
     end
 
     def current_path
-      @raw_session.current_path
+      raw_session.current_path
     end
 
     def current_url
-      @raw_session.current_url
-    end
-
-    def move_to page_class
-      page_class = eval(page_class) if page_class.is_a?(String)
-      @current_page = page_class.new self
-      wait_until { raw_session.current_url == page_class.url }
+      raw_session.current_url
     end
 
     def wait_until &block
@@ -33,7 +56,7 @@ module PageMagic
     end
 
     def method_missing name, *args, &block
-      @current_page.send(name, *args, &block)
+      current_page.send(name, *args, &block)
     end
 
   end

data/page_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "page_magic"
-  s.version = "0.11.0.alpha3"
+  s.version = "0.11.0.alpha6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2014-04-05"
+  s.date = "2015-07-03"
   s.description = "Framework for modeling and interacting with webpages which wraps capybara"
   s.email = "info@lad-tech.com"
   s.extra_rdoc_files = [
@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "README.md",
     "Rakefile",
     "VERSION",
     "lib/ext/string.rb",
     "lib/page_magic.rb",
-    "lib/page_magic/ajax_support.rb",
     "lib/page_magic/browser.rb",
     "lib/page_magic/element.rb",
     "lib/page_magic/element_context.rb",
@@ -36,18 +36,18 @@ Gem::Specification.new do |s|
     "lib/page_magic/page_magic.rb",
     "lib/page_magic/session.rb",
     "page_magic.gemspec",
-    "spec/browser_spec.rb",
-    "spec/element_context_spec.rb",
     "spec/element_spec.rb",
     "spec/helpers/capybara.rb",
     "spec/member_methods_spec.rb",
+    "spec/page_magic/browser_spec.rb",
+    "spec/page_magic/element_context_spec.rb",
     "spec/page_magic/elements_spec.rb",
+    "spec/page_magic/session_spec.rb",
     "spec/page_magic/usage/defining_page_elements_spec.rb",
     "spec/page_magic/usage/defining_pages_spec.rb",
     "spec/page_magic/usage/include_page_magic_spec.rb",
     "spec/page_magic/usage/interacting_with_pages_spec.rb",
     "spec/page_magic/usage/starting_a_session_spec.rb",
-    "spec/session_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "https://github.com/ladtech/page_magic"

data/spec/page_magic/element_context_spec.rb

@@ -61,18 +61,6 @@ describe PageMagic::ElementContext do
     end
   end
 
-  describe 'actions' do
-    it 'should click the element' do
-      page = page1.new
-      page.visit
-
-      described_class.new(page, page.browser, self).click_next
-      page.session.current_path.should == '/page2'
-      page.text.should == 'page 2 content'
-    end
-  end
-
-
   describe 'accessing page sections' do
     it 'should go through page sections' do
 
@@ -89,20 +77,6 @@ describe PageMagic::ElementContext do
       described_class.new(page, page.browser, self).form
     end
 
-    it 'they are clickable too' do
-      elements_page.class_eval do
-        section :section do
-          selector id: 'form_link'
-        end
-      end
-
-      page = elements_page.new
-      page.visit
-
-
-      described_class.new(page, page.browser, self).click_section
-      page.session.current_path.should == '/page2'
-    end
 
     it 'should delegate to page element if method not found' do
       #TODO call page method, look for subelement, delagate to capybara object

data/spec/page_magic/session_spec.rb

@@ -3,7 +3,7 @@ describe PageMagic::Session do
   let(:page) do
     Class.new do
       include PageMagic
-      url :url
+      url '/page1'
 
       def my_method
         :called
@@ -20,6 +20,56 @@ describe PageMagic::Session do
 
   let(:browser) { double('browser', current_url: 'url') }
 
+  describe '#current_page' do
+    subject do
+      PageMagic::Session.new(browser).tap do |session|
+        session.define_page_mappings '/another_page1' => another_page_class
+      end
+    end
+    context 'page url has not changed' do
+      it 'returns the original page' do
+        browser.should_receive(:visit).with(page.url)
+        allow(browser).to receive(:current_path).and_return('/page1')
+        subject.visit(page)
+        expect(subject.current_page).to be_an_instance_of(page)
+      end
+    end
+
+    context 'page url has changed' do
+      it 'returns the mapped page object' do
+        browser.should_receive(:visit).with(page.url)
+        subject.visit(page)
+        allow(browser).to receive(:current_path).and_return('/another_page1')
+        expect(subject.current_page).to be_an_instance_of(another_page_class)
+      end
+    end
+  end
+
+  describe '#find_mapped_page' do
+    subject do
+      described_class.new(nil).tap do |session|
+        session.define_page_mappings '/page' => :mapped_page_using_string, /page\d/ => :mapped_page_using_regex
+      end
+    end
+
+    context 'mapping is string' do
+      it 'returns the page class' do
+        expect(subject.find_mapped_page('/page')).to be(:mapped_page_using_string)
+      end
+    end
+    context 'mapping is regex' do
+      it 'returns the page class' do
+        expect(subject.find_mapped_page('/page2')).to be(:mapped_page_using_regex)
+      end
+    end
+
+    context 'mapping is not found' do
+      it 'returns nil' do
+        expect(subject.find_mapped_page('/fake_page')).to be(nil)
+      end
+    end
+  end
+
   it 'should visit the given url' do
     browser.should_receive(:visit).with(page.url)
     session = PageMagic::Session.new(browser).visit(page)
@@ -38,30 +88,4 @@ describe PageMagic::Session do
       session.my_method.should be(:called)
     end
   end
-
-  context 'move_to moves the session object to another page' do
-    it 'can take a class' do
-      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/another_page1'))
-      page_magic_session.move_to(another_page_class)
-      page_magic_session.current_page.should be_a(another_page_class)
-    end
-
-    it 'can take the name of the class as a string' do
-      class ThePage
-        include PageMagic
-        url '/the_page'
-      end
-
-      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/the_page'))
-      page_magic_session.move_to("ThePage")
-      page_magic_session.current_page.should be_a(ThePage)
-    end
-
-    it 'should wait until the browser url has changed' do
-      mock_browser = double(:browser, current_url: 'a')
-      page_magic_session = PageMagic::Session.new(mock_browser)
-
-      expect { page_magic_session.move_to(another_page_class) }.to raise_error(Wait::ResultInvalid)
-    end
-  end
 end

data/spec/page_magic/usage/defining_pages_spec.rb

@@ -43,7 +43,7 @@ describe 'The Elements of a Page' do
 
     it 'should access a field' do
       @page.visit
-      @page.click_next
+      @page.next.click
       @page.text.should == 'page 2 content'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 0.11.0.alpha5
+  version: 0.11.0.alpha6
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -52,34 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-ctags-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Framework for modeling and interacting with webpages which wraps capybara
 email: info@lad-tech.com
 executables: []
@@ -140,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Framework for modeling and interacting with webpages