page_magic 1.0.0.alpha9 → 1.0.0.alpha10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913ffb021a5d651dd495d38676e28a3db2d0f51d
-  data.tar.gz: b61ef053d8a6de10e24386904f5e469f5a34e72e
+  metadata.gz: 6d169c7cf7a4d49cfe0424e561f0a52cc732ec56
+  data.tar.gz: c8c26faa46d799b27f985e88bbec7ae21839b227
 SHA512:
-  metadata.gz: ae0c743e1683f12841c77ba81d53ebe985faedbf0cd71d9560abe898a6b7f5473feb4ac256c58e8d1f2b3998843a32b7bc3665cc414e88f9502f584c832d86ef
-  data.tar.gz: 48d8d12ad1dbb5008987e0fca4a78b897c84001826a72069ecf605b3412cb4c89c809473e0ad77168757ca236ef2ebbbdca967449b6319b42598f680d73be08f
+  metadata.gz: f9c32d2a85aad55ab12396ff2fad7da5b3e8bc319eef54ba34ec27182f24564853ed110b5b450ec8aea3bdeca2a70a2a992336a0e82186a5c9d32d66fa3e478c
+  data.tar.gz: 002e9bc54cc7e99e4c0d05996d1afeed3a68d141264d44bcef6e1ff47231f1083cc611bc0bb3a8445cbe30d96f37ee5d766a08c79e49df356156bd85bc57b7bf

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha9
+1.0.0.alpha10

data/lib/page_magic/session.rb

@@ -1,16 +1,23 @@
 require 'wait'
 module PageMagic
+  class InvalidURLException < Exception;end
+
   class Session
+    URL_MISSING_MSG = 'a url must be specified as either a parameter or on the page class'
+    REGEXP_MAPPING_MSG = 'URL could not be derived because mapping is a Regexp'
+
     attr_accessor :current_page, :raw_session, :transitions
 
     def initialize(browser)
       @raw_session = browser
+      @transitions = {}
     end
 
     def define_page_mappings(transitions)
       @transitions = transitions
     end
 
+
     def current_page
       if transitions
         mapping = find_mapped_page(current_path)
@@ -26,12 +33,29 @@ module PageMagic
       transitions[mapping]
     end
 
-    def visit(page, url: nil)
-      raw_session.visit url || page.url
-      @current_page = page.new self
+
+
+    def visit(page_or_url, url:nil)
+      if page_or_url.is_a?(String)
+        raw_session.visit page_or_url
+      elsif page_or_url.ancestors.include?(PageMagic)
+        page = page_or_url
+        if url
+          raw_session.visit(url)
+        elsif page.url
+          raw_session.visit(page.url)
+        elsif path = transitions.key(page)
+          raise InvalidURLException, REGEXP_MAPPING_MSG if path.is_a?(Regexp)
+          raw_session.visit("#{current_url}#{path}")
+        else
+          raise InvalidURLException, URL_MISSING_MSG
+        end
+        @current_page = page.new self
+      end
       self
     end
 
+
     def current_path
       raw_session.current_path
     end

data/spec/page_magic/session_spec.rb

@@ -1,124 +1,172 @@
-describe PageMagic::Session do
-  let(:page) do
-    Class.new do
-      include PageMagic
-      url '/page1'
+module PageMagic
+  describe Session do
+    let(:page) do
+      Class.new do
+        include PageMagic
+        url '/page1'
+      end
     end
-  end
 
-  subject { PageMagic::Session.new(browser) }
+    subject { described_class.new(browser) }
 
-  let(:browser) { double('browser', current_url: 'url', visit: nil, current_path: :current_path) }
+    let(:browser) { double('browser', current_url: 'url', visit: nil, current_path: :current_path) }
 
-  describe '#current_url' do
-    it "returns the browser's current url" do
-      expect(subject.current_url).to eq(browser.current_url)
+    describe '#current_url' do
+      it "returns the browser's current url" do
+        expect(subject.current_url).to eq(browser.current_url)
+      end
     end
-  end
 
-  describe '#current_path' do
-    it "returns the browser's current path" do
-      expect(subject.current_path).to eq(browser.current_path)
+    describe '#current_path' do
+      it "returns the browser's current path" do
+        expect(subject.current_path).to eq(browser.current_path)
+      end
     end
-  end
 
-  describe '#current_page' do
-    let(:another_page_class) do
-      Class.new do
-        include PageMagic
-        url '/another_page1'
+    describe '#current_page' do
+      let(:another_page_class) do
+        Class.new do
+          include PageMagic
+          url '/another_page1'
+        end
       end
-    end
 
-    before do
-      subject.define_page_mappings another_page_class.url => another_page_class
-      subject.visit(page)
-    end
+      before do
+        subject.define_page_mappings another_page_class.url => another_page_class
+        subject.visit(page)
+      end
 
-    context 'page url has not changed' do
-      it 'returns the original page' do
-        allow(browser).to receive(:current_path).and_return(page.url)
-        expect(subject.current_page).to be_an_instance_of(page)
+      context 'page url has not changed' do
+        it 'returns the original page' do
+          allow(browser).to receive(:current_path).and_return(page.url)
+          expect(subject.current_page).to be_an_instance_of(page)
+        end
       end
-    end
 
-    context 'page url has changed' do
-      it 'returns the mapped page object' do
-        allow(browser).to receive(:current_path).and_return(another_page_class.url)
-        expect(subject.current_page).to be_an_instance_of(another_page_class)
+      context 'page url has changed' do
+        it 'returns the mapped page object' do
+          allow(browser).to receive(:current_path).and_return(another_page_class.url)
+          expect(subject.current_page).to be_an_instance_of(another_page_class)
+        end
       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
+    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
-    end
 
-    context 'mapping is string' do
-      it 'returns the page class' do
-        expect(subject.find_mapped_page('/page')).to be(:mapped_page_using_string)
+      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
-    end
-    context 'mapping is regex' do
-      it 'returns the page class' do
-        expect(subject.find_mapped_page('/page2')).to be(:mapped_page_using_regex)
+      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
-    end
 
-    context 'mapping is not found' do
-      it 'returns nil' do
-        expect(subject.find_mapped_page('/fake_page')).to be(nil)
+      context 'mapping is not found' do
+        it 'returns nil' do
+          expect(subject.find_mapped_page('/fake_page')).to be(nil)
+        end
       end
     end
-  end
 
-  describe '#visit' do
-    context 'url supplied' do
-      it 'uses this url instead of the one defined on the page class' do
-        expect(browser).to receive(:visit).with(:custom_url)
-        session = PageMagic::Session.new(browser).visit(page, url: :custom_url)
-        expect(session.current_page).to be_a(page)
+    describe '#visit' do
+
+      let(:session) do
+        PageMagic::Session.new(browser)
       end
-    end
 
-    it 'visits the url on defined on the page class' do
-      browser.should_receive(:visit).with(page.url)
-      session = PageMagic::Session.new(browser).visit(page)
-      expect(session.current_page).to be_a(page)
-    end
-  end
+      context 'page supplied' do
+        context 'url supplied' do
+          it 'uses this url instead of the one defined on the page class' do
+            expect(browser).to receive(:visit).with(:custom_url)
+            session.visit(page, url: :custom_url)
+            expect(session.current_page).to be_a(page)
+          end
+        end
+
+        context 'url defined on page_class' do
+          it 'visits the url on defined on the page class' do
+            browser.should_receive(:visit).with(page.url)
+            session.visit(page)
+            expect(session.current_page).to be_a(page)
+          end
+        end
+
+        context 'url not specified' do
+          context 'url not specified on page class' do
+            before do
+              page.instance_variable_set(:@url, nil)
+            end
+            it 'uses the current url and the path in the page mappings' do
+              session.define_page_mappings '/page' => page
+              expect(browser).to receive(:visit).with("#{browser.current_url}/page")
+              session.visit(page)
+            end
+
+            context 'no mappings found' do
+              it 'raises an error' do
+                expect { session.visit(page) }.to raise_exception InvalidURLException, described_class::URL_MISSING_MSG
+              end
+            end
+
+            context 'mapping is a regular expression' do
+              it 'raises an error' do
+                session.define_page_mappings %r{mapping} => page
+                expect { session.visit(page) }.to raise_exception InvalidURLException, described_class::REGEXP_MAPPING_MSG
+              end
+            end
+          end
+        end
 
-  context '#method_missing' do
-    it 'should delegate to current page' do
-      page.class_eval do
-        def my_method
-          :called
+        context 'url supplied' do
+          it 'visits that url' do
+            expected_url = 'http://url.com'
+            expect(browser).to receive(:visit).with(expected_url)
+            session.visit(expected_url)
+          end
         end
       end
 
-      session = PageMagic::Session.new(browser).visit(page)
-      session.my_method.should be(:called)
+
     end
-  end
 
-  context '#respond_to?' do
-    subject do
-      PageMagic::Session.new(browser).tap do |s|
-        s.current_page = page.new
+    context '#method_missing' do
+      it 'should delegate to current page' do
+        page.class_eval do
+          def my_method
+            :called
+          end
+        end
+
+        session = PageMagic::Session.new(browser).visit(page)
+        session.my_method.should be(:called)
       end
     end
-    it 'checks self' do
-      expect(subject.respond_to?(:current_url)).to eq(true)
-    end
 
-    it 'checks the current page' do
-      page.class_eval do
-        def my_method; end
+    context '#respond_to?' do
+      subject do
+        PageMagic::Session.new(browser).tap do |s|
+          s.current_page = page.new
+        end
+      end
+      it 'checks self' do
+        expect(subject.respond_to?(:current_url)).to eq(true)
+      end
+
+      it 'checks the current page' do
+        page.class_eval do
+          def my_method;
+          end
+        end
+        expect(subject.respond_to?(:my_method)).to eq(true)
       end
-      expect(subject.respond_to?(:my_method)).to eq(true)
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha9
+  version: 1.0.0.alpha10
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara