page_magic 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6584627499e544f3e30b7c7627042c703e35aa70
-  data.tar.gz: 2161eb43addf19c631b13095372e5408e0a67c5f
+  metadata.gz: 5f5e27b2a270ba1333f9ae3b00500892ca2db6ea
+  data.tar.gz: adb6f8c204b92c581ae8d05198899f1fe54decb9
 SHA512:
-  metadata.gz: 460b8db34d301ae3af7998b67ddcefe85025b6dd4268c1ecd58828d69b98f1391beea75eaf2f59e554a721d48af6f0de87640ea434f126d799fe856ba687f350
-  data.tar.gz: b2c6b553cb38681a2a489c583efa938b672da97ebdbc55e76e840e24d15fdd74901df61c0c84959d678d7c99c1c8aba78766598432a297b927db08fab7b4252d
+  metadata.gz: 220f194ecca9dc7ddcb6f912d0ea45caf922dc2704011e4fc5d897382d8af1d0a2a9725db585767d23a9913ad0f387e258dc0d9b73545290a25bb181b9e82578
+  data.tar.gz: aeefe035655fc201c01d4539026be9162fea73fe7e173314ce0fe7389529d089507af383299727307598b1e0c406a576a55f160f38f5128df201dde38f2fa167

data/.rubocop.yml

@@ -14,4 +14,7 @@ Metrics/ParameterLists:
   CountKeywordArgs: false
 
 Metrics/MethodLength:
-  Max: 11
+  Max: 11
+
+Style/MethodMissing:
+  Enabled: false

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arbre (1.0.3)
+    arbre (1.1.1)
       activesupport (>= 3.0.0)
     ast (2.3.0)
     builder (3.2.2)
@@ -31,15 +31,15 @@ GEM
     docile (1.1.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.10)
+    ffi (1.9.14)
     git (1.3.0)
     github-markup (1.4.0)
-    github_api (0.14.2)
+    github_api (0.14.4)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
       hashie (>= 3.4)
-      oauth2
+      oauth2 (~> 1.0.0)
     hashie (3.4.4)
     highline (1.7.8)
     i18n (0.7.0)
@@ -54,7 +54,7 @@ GEM
       rdoc
       semver
     json (1.8.3)
-    jwt (1.5.1)
+    jwt (1.5.4)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
@@ -66,12 +66,12 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    oauth2 (1.1.0)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0, < 1.5.2)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (~> 1.2)
     parser (2.3.1.2)
       ast (~> 2.2)
     pkg-config (1.1.7)
@@ -93,20 +93,20 @@ GEM
     rdoc (4.2.2)
       json (~> 1.4)
     redcarpet (3.3.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.1)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.41.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
@@ -119,9 +119,9 @@ GEM
       rubyzip (~> 1.0)
       websocket (~> 1.0)
     semver (1.0.1)
-    simplecov (0.11.2)
+    simplecov (0.12.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     sinatra (1.4.7)
@@ -141,7 +141,7 @@ GEM
     websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.7.6)
+    yard (0.9.5)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.2.6

data/lib/page_magic/matcher.rb

@@ -4,6 +4,9 @@ module PageMagic
   class Matcher
     attr_reader :path, :parameters, :fragment
 
+    # @param [Object] path String or Regular expression to match with
+    # @param [Hash] parameters mapping of parameter name to literal or regex to match with
+    # @param [Object] fragment String or Regular expression to match with
     # @raise [MatcherInvalidException] if at least one component is not specified
     def initialize(path = nil, parameters: nil, fragment: nil)
       raise MatcherInvalidException unless path || parameters || fragment
@@ -41,9 +44,10 @@ module PageMagic
     # @param [Matcher] other
     # @return [Fixnum] -1 = smaller, 0 = equal to, 1 = greater than
     def <=>(other)
-      [:path, :parameters, :fragment].inject(0) do |result, component|
-        result == 0 ? compare(send(component), other.send(component)) : result
+      results = [:path, :parameters, :fragment].collect do |component|
+        compare(send(component), other.send(component))
       end
+      results.find { |result| !result.zero? } || 0
     end
 
     # check equality

data/lib/page_magic.rb

@@ -35,6 +35,14 @@ module PageMagic
       end
     end
 
+    # Create a more complex mapping to identify when a page should be loaded
+    # @example
+    #   PageMagic.mapping '/', parameters: {project: 'page_magic'}, fragment: 'display'
+    # @see Matchers#initialize
+    def mapping(path = nil, parameters: nil, fragment: nil)
+      Matcher.new(path, parameters: parameters, fragment: fragment)
+    end
+
     # Visit this page based on the class level registered url
     # @param [Object] application rack application (optional)
     # @param [Symbol] browser name of browser

data/page_magic.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: page_magic 1.2.5 ruby lib
+# stub: page_magic 1.2.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "page_magic"
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/spec/page_magic/matcher_spec.rb

@@ -206,28 +206,129 @@ module PageMagic
     end
 
     describe '<=>' do
-      it 'compares paths' do
-        subject = described_class.new('/')
-        expect(subject).to receive(:compare).with('/', nil).and_return(:result)
-        expect(subject <=> described_class.new(parameters: {})).to eq(:result)
+      let(:literal_path_matcher) { '/' }
+      let(:fuzzy_path_matcher) { // }
+      let(:literal_parameter_matchers) { { param: 'value' } }
+      let(:fuzzy_parameter_matchers) { { param: // } }
+
+      let(:literal_fragment_matcher) { 'fragment' }
+      let(:fuzzy_fragment_matcher) { // }
+
+      context 'path' do
+        context 'path is of same class as path on other' do
+          subject(:a) { described_class.new('/a') }
+          subject(:b) { described_class.new('/b') }
+          it 'returns self and other as equivalent' do
+            expect(a <=> b).to eq(0)
+          end
+        end
+
+        context 'path on other is fuzzy' do
+          subject(:a) { described_class.new(literal_path_matcher) }
+          subject(:b) { described_class.new(fuzzy_path_matcher) }
+          it 'returns other as lesser' do
+            expect(a <=> b).to eq(-1)
+          end
+        end
       end
 
-      context 'paths are equal' do
-        it 'compares parameters' do
-          subject = described_class.new('/', parameters: :params1)
-          expect(subject).to receive(:compare).with('/', '/').and_call_original
-          expect(subject).to receive(:compare).with(:params1, :params2).and_return(:params_result)
-          expect(subject <=> described_class.new('/', parameters: :params2)).to eq(:params_result)
+      context 'parameters' do
+        context 'parameters on self and other contain literal values' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers)
+          end
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers)
+          end
+          it 'returns self and other as equivalent' do
+            expect(a <=> b).to eq(0)
+          end
+        end
+
+        context 'parameters on self literal values and other has fuzzy values' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers)
+          end
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: fuzzy_parameter_matchers)
+          end
+          it 'returns other as lesser' do
+            expect(a <=> b).to eq(-1)
+          end
+        end
+        context 'parameters on self fuzzy values and other has literal values' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: fuzzy_parameter_matchers)
+          end
+
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers)
+          end
+
+          it 'returns other as greater' do
+            expect(a <=> b).to eq(1)
+          end
         end
       end
 
-      context 'parameters are equal' do
-        it 'compares fragments' do
-          subject = described_class.new('/', parameters: :params, fragment: :frag1)
-          expect(subject).to receive(:compare).with('/', '/').and_call_original
-          expect(subject).to receive(:compare).with(:params, :params).and_call_original
-          expect(subject).to receive(:compare).with(:frag1, :frag2).and_return(:fragment_result)
-          expect(subject <=> described_class.new('/', parameters: :params, fragment: :frag2)).to eq(:fragment_result)
+      context 'fragment' do
+        context 'fragment is of same class as path on other' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: literal_fragment_matcher)
+          end
+
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: literal_fragment_matcher)
+          end
+
+          it 'returns self and other as equivalent' do
+            expect(a <=> b).to eq(0)
+          end
+        end
+
+        context 'fragment is literal on self and fuzzy on other' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: literal_fragment_matcher)
+          end
+
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: fuzzy_fragment_matcher)
+          end
+
+          it 'returns other as lesser' do
+            expect(a <=> b).to eq(-1)
+          end
+        end
+
+        context 'fragment is fuzzy on self and literal on other' do
+          subject(:a) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: fuzzy_fragment_matcher)
+          end
+
+          subject(:b) do
+            described_class.new(literal_path_matcher,
+                                parameters: literal_parameter_matchers,
+                                fragment: literal_fragment_matcher)
+          end
+          it 'returns other as lesser' do
+            expect(a <=> b).to eq(1)
+          end
         end
       end
     end

data/spec/page_magic_spec.rb

@@ -48,6 +48,13 @@ describe PageMagic do
     end
   end
 
+  describe '#mapping' do
+    it 'returns a matcher' do
+      mapping = described_class.mapping('/', parameters: {}, fragment: '')
+      expect(mapping).to eq(PageMagic::Matcher.new('/', parameters: {}, fragment: ''))
+    end
+  end
+
   describe '.session' do
     let(:url) { 'http://url.com/' }
     let(:application) { rack_application.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Leon Davis