page_magic 1.0.0.alpha → 1.0.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd89ee316817755f4b899d4e09dc5c985c34e97f
-  data.tar.gz: 24d259f187207b3ad600ab807c19f6202d2988af
+  metadata.gz: f197806fbf5357bdcf84663abfbf87902c89f835
+  data.tar.gz: da30e148aa6cc6782c0d0c399fc45c43d00ee3d2
 SHA512:
-  metadata.gz: 060f54874232cb6447596a75ee5c7251185bc1b1d93f2c0e265999d321c9de4c512354cf14e55e5f6e19f86c619d874d34ae86a71f795be70d17700b2b1abd32
-  data.tar.gz: 9347c6789a93e2e4854763dea8ca8fe5ffd0b45f25873fdab51acd733f3b368402ecdc590b3ee3b0a355903d1589ad7304daf964260233bfc97b5a41b37be19e
+  metadata.gz: 8c3b3277416e23f0767b0e0f4b63879882fd9c1872fedb290fb727be512d91b06b53056dac552c539a65cec17f20e831e4d17cd7e97ef1bdfeee941eb528e6a9
+  data.tar.gz: 8d953ec0f7af0749bedca9396caf556098b7b74b5d09f2c82a4b904bbb41fc604bc7e3b0bae87e10d367e2496546342ac31f07652be996b799ddea4b7c71ec3a

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha
+1.0.0.alpha2

data/lib/page_magic/session.rb

@@ -7,20 +7,35 @@ module PageMagic
       @raw_session = browser
     end
 
-    def define_transitions transitions
+    def define_page_mappings transitions
       @transitions = transitions
     end
 
     def current_page
       if transitions
-        mapping = transitions.keys.find do |key|
-          current_url.include?(key)
-        end
-        @current_page = transitions[mapping].new(self) if transitions[mapping]
+        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
       @current_page = page.new self

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
@@ -23,26 +23,50 @@ describe PageMagic::Session do
   describe '#current_page' do
     subject do
       PageMagic::Session.new(browser).tap do |session|
-        session.define_transitions '/another_page1' => another_page_class
+        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_url).and_return('http://example.com/another_page1')
+        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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha
+  version: 1.0.0.alpha2
 platform: ruby
 authors:
 - Leon Davis