rack-domain-filter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39fe6503eec58cd1f89d6c012c32bec90546d11
-  data.tar.gz: 890c524df68a3fe57b494ccd3b5b4b1897b7e15e
+  metadata.gz: ecad2be7765f37121b0adcce79f408ee0eefc089
+  data.tar.gz: 6c46aa80f6a4af20434246db6fbab7e874bcfb42
 SHA512:
-  metadata.gz: 7f95b9847a25e7e4e368b3e899a9f05d75ed83dd64b11f8c6ba644d07cac618d7fe555812cfe97f632c300bb83d7f988bfce0e6af398bd96390bd2e52994d87c
-  data.tar.gz: a1d2521809ebaf33c025e98bfd92889d579380c414401c0d81a2ba4f9da7aeb6c8f489da1b5bd4fe56b9ec025e59010c1022675cb199faaa8767e07960b580ee
+  metadata.gz: 915dd5d8a5299c746ce40afe428fe229bc336167330223f3ad71910f5e18041710d1cfde6139900b26cc94d90604e24e52f2d82c2a65704060eeba3f1141f842
+  data.tar.gz: e4ab369e3f4c931e6d38c30960def317d19b8853880d151f145bbe920ec06a764a9908aa06aa014306428d4d074f70af142feb2824fba6e9036d8f2ffc35b1b0

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+sudo: false
+
+rvm:
+  - 2.1.10
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1

data/README.md

@@ -1,4 +1,6 @@
-# Gitlab Status: A simple command to check the availability of Gitlab Site
+# Rack Domain Filter
+
+[![Build Status](https://travis-ci.org/mufid/rack-domain-filter.svg?branch=master)](https://travis-ci.org/mufid/rack-domain-filter)
 
 ## Prerequisites
 
@@ -21,7 +23,10 @@ See Yarddoc for more information.
 Suppose you have `Company` model. In Rails, you can do
 like this:
 
-    Rack::SubdomainCompany.configure do |config|
+    # Put this inside application.rb, or
+    # any environment file in config/environments/*.rb
+
+    Rack::DomainFilter.configure do |config|
       config.filter_for /(.+).local.dev/ do |slug|
         Thread.current[:company] = Company.find_by!(slug)
       end
@@ -47,7 +52,7 @@ like this:
       end
     end
 
-    config.middleware.use Rack::SubdomainCompany
+    config.middleware.use Rack::DomainFilter
 
 In your controller, you can get your current company with
 this syntax:
@@ -63,3 +68,27 @@ this syntax:
         Thread.current[:company]
       end
     end
+
+You may want to put this into global filter. This
+is quick but dirty solution.
+
+    class ApplicationRecord < ActiveRecord::Base
+      default_scope do
+        if Thread.current[:company]
+          where(company_id: Thread.current[:company].id)
+        else
+          nil
+        end
+      end
+    end
+
+The best way to use this is to explictly
+ask Model to search in current company scope
+
+    class ApplicationRecord < ActiveRecord::Base
+      scope :in_current_company, -> { where(company: Thread.current[:company]) }
+    end
+
+    class Manager < ApplicationRecord; end
+
+    @managers = Manager.in_current_company

data/Rakefile

@@ -11,4 +11,4 @@ RuboCop::RakeTask.new
 require 'reek/rake/task'
 Reek::Rake::Task.new
 
-task default: %i[spec reek rubocop]
+task default: %i[spec]

data/lib/rack/domain_filter/ext/after_request_handler.rb

@@ -0,0 +1,11 @@
+module Rack
+  class DomainFilter
+    module AfterRequestHandler
+      def run_after_request
+        config.after_requests_list.each do |block|
+          block.call
+        end
+      end
+    end
+  end
+end

data/lib/rack/domain_filter/ext/configuration.rb

@@ -0,0 +1,53 @@
+module Rack
+  class DomainFilter
+
+    module ConfigurationDSL
+      def filter_for(pattern, &block)
+        @uri_mapping[pattern] = block
+      end
+
+      def after_request(&block)
+        @after_requests_list << block
+      end
+
+      def catch(klazz, &block)
+        @exception_catcher_mapping[klazz] = block
+      end
+
+      def no_match(&block)
+        raise 'Only allowed 1 no_match block!' if !@no_match.nil?
+
+        @no_match = block
+      end
+    end
+
+    # private
+    class Configuration
+
+      attr_accessor :uri_mapping
+      attr_accessor :after_requests_list
+      attr_accessor :exception_catcher_mapping
+
+      def initialize
+        @uri_mapping = {}
+        @after_requests_list = []
+        @exception_catcher_mapping = {}
+        @no_match = nil
+      end
+
+      include ConfigurationDSL
+
+      def no_match_block
+        @no_match
+      end
+
+      def allow_passthrough
+        @allow_passthrough = true
+      end
+
+      def allow_passthrough?
+        @allow_passthrough
+      end
+    end
+  end
+end

data/lib/rack/domain_filter/ext/exception_handler.rb

@@ -0,0 +1,15 @@
+module Rack
+  class DomainFilter
+    module ExceptionHandler
+      def catch_exception(e)
+        config.exception_catcher_mapping.each_pair do |klazz, block|
+          if e.is_a?(klazz)
+            return block.call(e)
+          end
+        end
+
+        raise e
+      end
+    end
+  end
+end

data/lib/rack/domain_filter/ext/matcher.rb

@@ -0,0 +1,50 @@
+module Rack
+  class DomainFilter
+    module Matcher
+      # See https://www.youtube.com/watch?v=b77V0rkr5rk
+      # Use host_with_port for better performance
+      # See: https://github.com/rack/rack/blob/master/lib/rack/request.rb
+      def match_uri(env)
+        req = Rack::Request.new(env)
+        config.uri_mapping.each_pair do |pattern, block|
+          if pattern.is_a?(String)
+            break if match_string(pattern, req, block)
+          elsif pattern.is_a?(Regexp)
+            break if match_regex(pattern, req, block)
+          else
+            raise "Unknown pattern: #{pattern}. It must be a regex or a string!"
+          end
+        end
+      end
+
+      def can_respond_no_match?
+        !config.no_match_block.nil?
+      end
+
+      def trigger_no_match(env)
+        config.no_match_block.call(env)
+      end
+
+      def match_regex(regex, req, block)
+        matchdata = req.host_with_port.match(regex)
+        return if matchdata.nil?
+
+        block.call(matchdata[1], req.env)
+
+        @match_found = true
+
+        true
+      end
+
+      def match_string(string, req, block)
+        return if string != req.host_with_port
+
+        block.call(req.env)
+
+        @match_found = true
+
+        true
+      end
+    end
+  end
+end

data/lib/rack/domain_filter/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class DomainFilter
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/rack/domain_filter.rb

@@ -1,76 +1,13 @@
+Dir["#{File.dirname(__FILE__)}/domain_filter/ext/*.rb"].sort.each do |path|
+  require "rack/domain_filter/ext/#{File.basename(path, '.rb')}"
+end
+
 module Rack
   class DomainFilter
-
-    module ExceptionHandler
-      def catch_exception(e)
-        config.exception_catcher_mapping.each_pair do |klazz, block|
-          if e.is_a?(klazz)
-            return block.call(e)
-          end
-        end
-
-        raise e
-      end
-    end
-
-    module AfterRequestHandler
-      def run_after_request
-        config.after_requests_list.each do |block|
-          block.call
-        end
-      end
-    end
-
-    module Matcher
-      # See https://www.youtube.com/watch?v=b77V0rkr5rk
-      # Use host_with_port for better performance
-      # See: https://github.com/rack/rack/blob/master/lib/rack/request.rb
-      def match_uri(env)
-        req = Rack::Request.new(env)
-        config.uri_mapping.each_pair do |pattern, block|
-          if pattern.is_a?(String)
-            break if match_string(pattern, req, block)
-          elsif pattern.is_a?(Regexp)
-            break if match_regex(pattern, req, block)
-          else
-            raise "Unknown pattern: #{pattern}. It must be a regex or a string!"
-          end
-        end
-      end
-
-      def can_respond_no_match?
-        !config.no_match_block.nil?
-      end
-
-      def trigger_no_match(env)
-        config.no_match_block.call(env)
-      end
-
-      def match_regex(regex, req, block)
-        matchdata = req.host_with_port.match(regex)
-        return if matchdata.nil?
-
-        block.call(matchdata[1], req.env)
-
-        @match_found = true
-
-        true
-      end
-
-      def match_string(string, req, block)
-        return if string != req.host_with_port
-
-        block.call(req.env)
-
-        @match_found = true
-
-        true
-      end
-    end
-
     def initialize(app, options={})
       @app = app
       @config = options[:config] || DomainFilter.global_configuration
+      @match_found = false
     end
 
     def call(env)
@@ -118,48 +55,5 @@ module Rack
     def verify_configuration!
 
     end
-
-    class Configuration
-
-      attr_accessor :uri_mapping
-      attr_accessor :after_requests_list
-      attr_accessor :exception_catcher_mapping
-
-      def initialize
-        @uri_mapping = {}
-        @after_requests_list = []
-        @exception_catcher_mapping = {}
-      end
-
-      def filter_for(pattern, &block)
-        @uri_mapping[pattern] = block
-      end
-
-      def after_request(&block)
-        @after_requests_list << block
-      end
-
-      def catch(klazz, &block)
-        @exception_catcher_mapping[klazz] = block
-      end
-
-      def no_match(&block)
-        raise 'Only allowed 1 no_match block!' if !@no_match.nil?
-
-        @no_match = block
-      end
-
-      def no_match_block
-        @no_match
-      end
-
-      def allow_passthrough
-        @allow_passthrough = true
-      end
-
-      def allow_passthrough?
-        @allow_passthrough
-      end
-    end
   end
 end

data/rack-domain-filter.gemspec

@@ -4,7 +4,7 @@ require 'rack/domain_filter/version'
 
 Gem::Specification.new do |spec|
   spec.authors       = ['Muhammad Mufid Afif']
-  spec.description   = 'Check Gitlab Web Status via HTTP Response.'
+  spec.description   = 'Per-domain filter for Rack.'
   spec.email         = ['mufidafif@icloud.com']
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?('spec/') }
   spec.homepage      = 'https://github.com/wazaundtechnik/rack-subdomain-company'
@@ -16,7 +16,6 @@ Gem::Specification.new do |spec|
   spec.version       = Rack::DomainFilter::VERSION
 
   spec.add_dependency 'rack'
-  spec.add_dependency 'activesupport'
 
   # Test and build tools
   # The test shouldn't broken by the incompatible RSpec version.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-domain-filter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Muhammad Mufid Afif
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Check Gitlab Web Status via HTTP Response.
+description: Per-domain filter for Rack.
 email:
 - mufidafif@icloud.com
 executables: []
@@ -205,6 +191,7 @@ files:
 - ".reek"
 - ".rspec"
 - ".rubocop.yml"
+- ".travis.yml"
 - ".yardopts"
 - Gemfile
 - LICENSE.md
@@ -212,6 +199,10 @@ files:
 - Rakefile
 - lib/rack-domain-filter.rb
 - lib/rack/domain_filter.rb
+- lib/rack/domain_filter/ext/after_request_handler.rb
+- lib/rack/domain_filter/ext/configuration.rb
+- lib/rack/domain_filter/ext/exception_handler.rb
+- lib/rack/domain_filter/ext/matcher.rb
 - lib/rack/domain_filter/version.rb
 - rack-domain-filter.gemspec
 homepage: https://github.com/wazaundtechnik/rack-subdomain-company
@@ -237,5 +228,5 @@ rubyforge_project:
 rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Check Gitlab Web Status via HTTP Response.
+summary: Per-domain filter for Rack.
 test_files: []