saasable 5.1.0 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9dc8dd947afc8c56339fa59ce86ef19cb983eb4b
-  data.tar.gz: a874a829f17e294628dab4c7e831fe733703b3f2
+SHA256:
+  metadata.gz: 6e4bbbee0d596446c8754a9547b610e1714622f82b987f2183753bc53cb08cae
+  data.tar.gz: 7dea38971b1b0475c07def31cf38def7229c03811bc514ba85e8c8073d6b80bf
 SHA512:
-  metadata.gz: a2ec18297bb0bc340390e342f05e3b643e82331828a891eafe275a789a83987b5d62e748f53cf35a05b1bd013a7244e6fd56c111a2438949e09aa6281878d298
-  data.tar.gz: 6cc6e22fd3b23be9c61887a58abaf01021fd1a37d146236113cddf7c470058756c560d00c71629b3f651fef0bcc9fb164dc4c47ae88633a64369932f6a492dee
+  metadata.gz: 0fbf6abc93af55d8b75e61b3d5c35bf59004a9cfdbff2337a24d53e06428fa6e6725c223a64a917e0d85fe01466dba8beff282f4f1150e03da9549cdb3c091a7
+  data.tar.gz: e9bea358f774295dd5b5bad685f3aaa1b6388188eca2f2ab835ab620c0027b3da7f902c1b581a79fd902afef7767ffaf157530e9c0a856889a4208968602bbcb

data/.rubocop.yml

@@ -1,17 +1,18 @@
 AllCops:
   TargetRubyVersion: 2.4
-
-Metrics/AbcSize:
   Exclude:
-    - "lib/saasable/mongoid/scoped_document.rb"
+    - 'saasable.gemspec'
 
-Metrics/BlockLength:
+Metrics/AbcSize:
   Exclude:
-    - "saasable.gemspec"
+    - 'lib/saasable/mongoid/scoped_document.rb'
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 16
+  Exclude:
+    - 'lib/saasable/mongoid/saas_document.rb'
+    - 'lib/saasable/mongoid/scoped_document.rb'
+    - 'lib/saasable/railties/helpers.rb'
 
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
 # URISchemes: http, https

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4
+ruby-2.6

data/Gemfile

@@ -2,7 +2,9 @@
 
 source 'http://rubygems.org'
 
-gem 'mongoid', '~> 5.0'
+gem 'mongoid', '>= 6.0'
+gem 'nokogiri', '>= 1.8.5'
+gem 'rack', '>= 2.0.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,25 +1,24 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activesupport (4.2.10)
-      i18n (~> 0.7)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activesupport (5.2.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    ast (2.3.0)
-    bson (4.2.2)
+    ast (2.4.0)
+    bson (4.5.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.3.0)
+    git (1.5.0)
     github_api (0.16.0)
       addressable (~> 2.4.0)
       descendants_tracker (~> 0.0.4)
@@ -27,80 +26,76 @@ GEM
       hashie (>= 3.4)
       mime-types (>= 1.16, < 3.0)
       oauth2 (~> 1.0)
-    hashie (3.5.6)
-    highline (1.7.8)
-    i18n (0.9.0)
+    hashie (3.6.0)
+    highline (2.0.2)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jeweler (2.3.7)
+    jaro_winkler (1.5.2)
+    jeweler (2.3.9)
       builder
-      bundler (>= 1)
+      bundler
       git (>= 1.2.5)
       github_api (~> 0.16.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
-      psych (~> 2.2)
+      psych
       rake
       rdoc
       semver2
-    jwt (1.5.6)
+    jwt (2.2.1)
     mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    mongo (2.4.3)
-      bson (>= 4.2.1, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
-      mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    multi_json (1.12.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.1)
+    mongo (2.8.0)
+      bson (>= 4.4.2, < 5.0.0)
+    mongoid (7.0.3)
+      activemodel (>= 5.1, < 6.0.0)
+      mongo (>= 2.5.1, < 3.0.0)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.8)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    origin (2.3.1)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    powerpack (0.1.1)
-    psych (2.2.4)
-    rack (2.0.3)
-    rainbow (2.2.2)
-      rake
-    rake (12.2.1)
-    rdoc (5.1.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
+      ast (~> 2.4.0)
+    psych (3.1.0)
+    rack (2.0.8)
+    rainbow (3.0.0)
+    rake (13.0.1)
+    rdoc (6.1.1)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.0)
-    rubocop (0.51.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     semver2 (3.4.2)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -108,10 +103,12 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  mongoid (~> 5.0)
+  mongoid (>= 6.0)
+  nokogiri (>= 1.8.5)
+  rack (>= 2.0.6)
   rdoc
   rspec
   rubocop
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.17.3

data/VERSION

@@ -1 +1 @@
-5.1.0
+6.1.4

data/lib/saasable/mongoid/scoped_document.rb

@@ -21,7 +21,8 @@ module Saasable::Mongoid::ScopedDocument
       index({saas_id: 1, _id: 1}, unique: true)
 
       class << self
-        alias_method_chain :index, :saasable
+        alias_method :index_without_saasable, :index
+        alias_method :index, :index_with_saasable
       end
     end
   end

data/lib/saasable/railties/helpers.rb

@@ -8,11 +8,13 @@ module Saasable::Railties
       klass.class_eval do
         helper_method :current_saas
 
-        before_filter :_redirect_if_saas_not_found unless Rails.env.development?
+        before_action :_redirect_if_saas_not_found unless Rails.env.development?
         saas_not_found_redirect_to '/404.html'
 
         private
 
+        def _redirect_if_saas_not_found; end
+
         def _skip_saasable
           current_saas&.deactivate!
         end
@@ -25,15 +27,18 @@ module Saasable::Railties
           private
             def _redirect_if_saas_not_found
               unless current_saas
-                redirect_to "#{path_or_url}"
+                respond_to do |format|
+                  format.html { redirect_to "#{path_or_url}" }
+                  format.any { head :not_found }
+                end
               end
             end
         METHOD
       end
 
       def skip_saasable(options)
-        skip_before_filter :_redirect_if_saas_not_found, options
-        before_filter :_skip_saasable, options
+        skip_before_action :_redirect_if_saas_not_found, options.merge(raise: false)
+        before_action :_skip_saasable, options
       end
     end
 

data/saasable.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: saasable 5.1.0 ruby lib
+# stub: saasable 6.1.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "saasable".freeze
-  s.version = "5.1.0"
+  s.version = "6.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Eadbox".freeze, "Rafael Gaspar".freeze]
-  s.date = "2017-10-31"
+  s.date = "2020-05-27"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid".freeze
   s.email = "suporte@eadbox.com".freeze
   s.extra_rdoc_files = [
@@ -45,21 +45,25 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/eadbox/saasable".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rubygems_version = "3.0.8".freeze
   s.summary = "A gem for making a Multi-Tenant SaaS using Mongoid".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>.freeze, ["~> 5.0"])
+      s.add_runtime_dependency(%q<mongoid>.freeze, [">= 6.0"])
+      s.add_runtime_dependency(%q<nokogiri>.freeze, [">= 1.8.5"])
+      s.add_runtime_dependency(%q<rack>.freeze, [">= 2.0.6"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_development_dependency(%q<rspec>.freeze, [">= 0"])
       s.add_development_dependency(%q<rubocop>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<mongoid>.freeze, ["~> 5.0"])
+      s.add_dependency(%q<mongoid>.freeze, [">= 6.0"])
+      s.add_dependency(%q<nokogiri>.freeze, [">= 1.8.5"])
+      s.add_dependency(%q<rack>.freeze, [">= 2.0.6"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, [">= 0"])
@@ -67,7 +71,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rubocop>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<mongoid>.freeze, ["~> 5.0"])
+    s.add_dependency(%q<mongoid>.freeze, [">= 6.0"])
+    s.add_dependency(%q<nokogiri>.freeze, [">= 1.8.5"])
+    s.add_dependency(%q<rack>.freeze, [">= 2.0.6"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<jeweler>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saasable
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.1.4
 platform: ruby
 authors:
 - Eadbox
@@ -9,22 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -145,8 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A gem for making a Multi-Tenant SaaS using Mongoid