morito 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c55decebb4c9e07810ea06f3f21d8f40088faa5
-  data.tar.gz: 1268725db5c75afe009299dbd5f3c29e3780ba80
+  metadata.gz: a412f513664688f5e6e21294420c1ddfb5e45912
+  data.tar.gz: 8e086dc2f01c5d77afd1510e032e617494a03593
 SHA512:
-  metadata.gz: f36208dbab6355df0c691c3f4cef8783abbf10ae211c7b8440df5bd951380d4db4c0f452391f95e3b7a8e9b54c93f1a5aedea890edcaf495784ef2a1e0c120ee
-  data.tar.gz: 58dae02a4a09fa4529f6889a8da4597431a857285938c03e887813797347069ac34995dbde8ca756eec89537e4026c26f5929c4570bbc289fe27d55fa60af63c
+  metadata.gz: 7e5032b8ce8aabed98cdd427fbf8e72439073a16afda6cafce49107176fbdbb5c682378a1524cab46a77fa31c8198651c4c2b07e146195ac93aad8f9d7d15778
+  data.tar.gz: ec019f3ffd0c72b9895180811770c65cad776b281cba50e5a0ee91b8d7bdedc837d5ba4dd9ede71260aef72ff6e1f6ea95e68c8fb999a552cd904094a3e828c1

data/README.md

@@ -27,7 +27,6 @@ client.allowed?('http://example.com/some/path', cache: false) # => true / false
 ## TODO
 
 - Handle `Allow:` description.
-- Pattern matching like `Disallow: /*?`
 
 ## Contributing
 

data/lib/morito/processor.rb

@@ -5,63 +5,101 @@ module Morito
     end
 
     def allowed?(user_agent, path)
-      disallows = disallows_for(user_agent)
-
-      if disallows.empty?
-        true
-      else
-        regexp = Regexp.new("\\A(?:#{disallows.join('|')})")
-        regexp !~ path
-      end
+      UserAgentPermission.new(user_agent, whole_permission).allowed?(path)
     end
 
     private
 
-    def disallows_for(user_agent)
-      build
+    def whole_permission
+      return @whole_permission if @whole_permission
+
+      @whole_permission = Hash.new {|h, k| h[k] = Hash.new {|h2, k2| h2[k2] = [] } }
+      parser = LineParser.new
 
-      if !@disallows[user_agent].empty?
-        @disallows[user_agent]
-      else
-        @disallows['*']
+      @body.split(/\n+/).each do |line|
+        parser.parse(line)
+        if parser.disallow?
+          @whole_permission[parser.user_agent][:disallow] << parser.disallow
+        elsif parser.allow?
+          @whole_permission[parser.user_agent][:allow] << parser.allow
+        end
       end
+
+      @whole_permission
     end
 
-    def build
-      return if @disallows
-      @disallows = Hash.new {|h, k| h[k] = [] }
+    class UserAgentPermission
+      def initialize(user_agent, whole_permission)
+        @user_agent = user_agent
 
-      parser = LineParser.new
-      @body.split(/\n+/).each do |line|
-        parser.parse(line)
-        @disallows[parser.user_agent] << parser.disallow if parser.disallow?
+        if whole_permission[user_agent].empty?
+          @permission = whole_permission['*']
+        else
+          @permission = whole_permission[user_agent]
+        end
+      end
+
+      def allowed?(path)
+        return true if disallow_unavailable?
+
+        if !allow_unavailable? && regexp(:allow) =~ path
+          true
+        else
+          regexp(:disallow) !~ path
+        end
+      end
+
+      private
+
+      def allow_unavailable?
+        @permission[:allow].empty?
+      end
+
+      def disallow_unavailable?
+        @permission[:disallow].empty?
       end
 
-      @disallows
+      def regexp(type)
+        raise ArgumentError unless @permission.keys.include?(type)
+
+        raw_regexps = @permission[type].map do |permission|
+          Regexp.escape(permission).gsub('\*', '.*').gsub('\$', '$')
+        end
+
+        Regexp.new("\\A(?:#{raw_regexps.join('|')})")
+      end
     end
 
     class LineParser
-      attr_reader :user_agent
+      attr_reader :user_agent, :allow, :disallow
 
       def parse(line)
+        clear_permissions
+
         case line
         when /\AUser-agent:\s+(.+?)\s*(?:#.+)?\z/i
           @user_agent = $1
-          @disallow = nil
         when /\ADisallow:\s+(.+?)\s*(?:#.+)?\z/i
           @disallow = $1
-        else
-          @disallow = nil
+        when /\AAllow:\s+(.+?)\s*(?:#.+)?\z/i
+          @allow = $1
         end
       end
 
-      def disallow
-        Regexp.escape(@disallow).gsub('\*', '.*').gsub('\$', '$')
+      def allow?
+        @user_agent && @allow
       end
 
       def disallow?
         @user_agent && @disallow
       end
+
+      private
+
+      def clear_permissions
+        @disallow = nil
+        @allow = nil
+      end
     end
   end
 end

data/lib/morito/version.rb

@@ -1,3 +1,3 @@
 module Morito
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/morito/client_spec.rb

@@ -14,6 +14,7 @@ describe Morito::Client do
 User-agent: *
 Disallow: /private
 Disallow: /*?$
+Allow: /private/photo
 
 # Comment
 User-agent: restricted agent # Comment
@@ -67,6 +68,15 @@ EOS
         end
       end
 
+      context 'with private but allowed path' do
+        let(:requesting_url) { 'http://example.com/private/photo/1' }
+
+        context 'with some agent' do
+          let(:user_agent) { 'some agent' }
+          it { should == true }
+        end
+      end
+
       context 'with patternized path' do
         let(:user_agent) { 'some agent' }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morito
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - negipo