wayfarer-jruby 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 295c1dd844209a188bfac6929bfc3085b8e757c2
-  data.tar.gz: 94ed8f5f78858c334c727bf5de4b2f870129e436
+  metadata.gz: 3a9a69bfbbda65a5e38bc9354f4a748257ad7aab
+  data.tar.gz: a82bf0193ef66897008c3921b2f20c3655ff6556
 SHA512:
-  metadata.gz: 31d3e3fc05ccec48e995eb05bc8207faf96efc907217ac75575d61f0a4f40eb8217b206df76d97d6897b6f2244b4cc3672e2687ead3b9bb8e74b098e8a926bcf
-  data.tar.gz: c1510f79a039cfbe6faf585689a5726f386249244dd8d932614bb4459f1a753aeed645b624d7e5ff4fc3d0e244f8cde8e17912c5d9feb6e2bf733d2b5c00f0de
+  metadata.gz: 00a9858095e9db1f5ab535fa6d3501e990def78024ea9c561edcdcf0fef8d60821c18ad20e74f190c203f05bcc93ab40fa3f50179e65004e75aa31e5c9c09dc2
+  data.tar.gz: 80e2e9300198604248a0286f9bd4723d21351794c44fc75e2fabfde3001380c4c348b22949da23a2748a00aceeb42dd8b2e90e5d3d8ffb47f36f35a4f06b7e94

data/docs/_includes/navigation.html

@@ -110,6 +110,11 @@
               Protocol rules
             </a>
           </li>
+          <li class="navigation__page">
+            <a class="navigation__link" href="{{base}}/routing/filetypes_rules.html">
+              Filetypes rules
+            </a>
+          </li>
           <li class="navigation__page">
             <a class="navigation__link" href="{{base}}/routing/custom_rules.html">
               Custom rules

data/docs/_layouts/default.html

@@ -11,7 +11,7 @@
             <a href="{{base}}" class="site-header__link">{{ site.title }}</a>
           </h1>
           <div class="site-header__version">
-            0.0.2
+            0.0.3
           </div>
         </header>
 

data/docs/routing/filetypes_rules.md

@@ -0,0 +1,21 @@
+---
+layout: default
+title: Filetypes rules
+---
+
+# Filetypes rules
+
+Filetypes rules match against the URI path's file extension.
+
+{% highlight ruby %}
+class DummyJob < Wayfarer::Job
+  route.filetypes [:png, :jpg], to: :image
+  route.forbid.filetypes [:php, :js]
+end
+{% endhighlight %}
+
+Matches:
+
+* `http://example.com/foo.png`
+* `http://example.com/foo.jpg`
+* `https://example.com/qux/bar.jpg`

data/lib/wayfarer.rb

@@ -14,6 +14,7 @@ require_relative "wayfarer/routing/host_rule"
 require_relative "wayfarer/routing/path_rule"
 require_relative "wayfarer/routing/query_rule"
 require_relative "wayfarer/routing/protocol_rule"
+require_relative "wayfarer/routing/filetypes_rule"
 require_relative "wayfarer/routing/custom_rule"
 require_relative "wayfarer/routing/router"
 
@@ -49,7 +50,7 @@ require_relative "wayfarer/dispatcher"
 require_relative "wayfarer/processor"
 
 module Wayfarer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
   def self.logger
     return @logger if @logger

data/lib/wayfarer/job.rb

@@ -159,7 +159,15 @@ module Wayfarer
         end
       end
 
-      @staged_uris.push(*expanded)
+      # This method has somewhat become the guard keeper for invalid URIs that
+      # would lead to exceptions otherwise down the line
+      supported = expanded.select do |uri|
+        HTTPAdapters::NetHTTPAdapter::RECOGNIZED_URI_TYPES.any? do |type|
+          uri.is_a?(type)
+        end
+      end
+
+      @staged_uris.push(*supported)
     end
 
     # The {Page} representing the URI currently processed by an action.

data/lib/wayfarer/routing/filetypes_rule.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+require "uri"
+
+module Wayfarer
+  module Routing
+    # @private
+    class FiletypesRule < Rule
+      def initialize(types, opts = {}, &proc)
+        @types = types
+        super(opts, &proc)
+      end
+
+      private
+
+      def match!(uri)
+        @types.any? { |type| uri.path =~ /\.#{type}$/ }
+      end
+    end
+  end
+end

data/lib/wayfarer/routing/rule.rb

@@ -87,6 +87,10 @@ module Wayfarer
         append_child_rule(CustomRule.new(*argv, &proc))
       end
 
+      def filetypes(*argv, &proc)
+        append_child_rule(FiletypesRule.new(*argv, &proc))
+      end
+
       private
 
       def append_child_rule(other)

data/spec/job_spec.rb

@@ -106,5 +106,17 @@ describe Wayfarer::Job do
         job_instance.send(:stage, *uris)
       }.to change { job_instance.staged_uris }.from([]).to(expected)
     end
+
+    context "with non-HTTP(s) URIs" do
+      it "ignores them and does not raise an exception" do
+        job_instance = job.new
+
+        expect {
+          job_instance.send(:stage, "ftp://example.com")
+        }.not_to raise_error
+
+        expect(job_instance.staged_uris).to be_empty
+      end
+    end
   end
 end

data/spec/routing/filetypes_rule_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require "spec_helpers"
+
+describe Wayfarer::Routing::FiletypesRule do
+  subject(:rule) { FiletypesRule.new([:png, :js]) }
+
+  describe "#matches?" do
+    context "with matching URI" do
+      it "returns true" do
+        uris = %w(
+          http://example.com/foo.png
+          https://example.com/a/b.png/c.png
+          http://example.com/foobar.html.png
+          https://example.com/foo.png/bar.png
+        ).map { |u| URI(u) }
+
+        uris.each do |uri|
+          expect(rule.matches?(uri)).to be true
+        end
+      end
+    end
+
+    context "with mismatching URI" do
+      it "returns false" do
+        uris = %w(
+          http://example.png
+          http://example.com.png
+          https://example.com/a/b.png/c
+          http://example.com.html
+          http://example.com/foobar.html
+          https://example.com/foo.png/bar.png.html
+        ).map { |u| URI(u) }
+
+        uris.each do |uri|
+          expect(rule.matches?(uri)).to be false
+        end
+      end
+    end
+  end
+end

data/spec/routing/rule_spec.rb

@@ -190,6 +190,17 @@ describe Wayfarer::Routing::Rule do
     end
   end
 
+    describe "#filetypes" do
+      it "adds a FiletypesRule as a sub-rule" do
+        rule.filetypes [:png, :jpg]
+        expect(rule.child_rules.first).to be_a FiletypesRule
+      end
+
+      it "returns the added FiletypeRule" do
+        expect(rule.filetypes [:png]).to be_a FiletypesRule
+      end
+    end
+
   describe "#build_child_rule_chain_from_options" do
     subject(:rule) do
       rule = Rule.new

data/wayfarer-jruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = "wayfarer-jruby"
-  s.version       = "0.0.2"
+  s.version       = "0.0.3"
   s.license       = "MIT"
 
   s.homepage      = "http://github.com/bauerd/wayfarer"

data/wayfarer.gemspec

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 Gem::Specification.new do |s|
   s.name          = "wayfarer"
-  s.version       = "0.0.2"
+  s.version       = "0.0.3"
   s.license       = "MIT"
 
   s.homepage      = "http://github.com/bauerd/wayfarer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wayfarer-jruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dominic Bauer
@@ -518,6 +518,7 @@ files:
 - docs/recipes/multiple_uris.md
 - docs/recipes/screenshots.md
 - docs/routing/custom_rules.md
+- docs/routing/filetypes_rules.md
 - docs/routing/host_rules.md
 - docs/routing/path_rules.md
 - docs/routing/protocol_rules.md
@@ -549,6 +550,7 @@ files:
 - lib/wayfarer/parsers/xml_parser.rb
 - lib/wayfarer/processor.rb
 - lib/wayfarer/routing/custom_rule.rb
+- lib/wayfarer/routing/filetypes_rule.rb
 - lib/wayfarer/routing/host_rule.rb
 - lib/wayfarer/routing/path_rule.rb
 - lib/wayfarer/routing/protocol_rule.rb
@@ -577,6 +579,7 @@ files:
 - spec/parsers/xml_parser_spec.rb
 - spec/processor_spec.rb
 - spec/routing/custom_rule_spec.rb
+- spec/routing/filetypes_rule_spec.rb
 - spec/routing/host_rule_spec.rb
 - spec/routing/path_rule_spec.rb
 - spec/routing/protocol_rule_spec.rb