saasable 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc8dd947afc8c56339fa59ce86ef19cb983eb4b
-  data.tar.gz: a874a829f17e294628dab4c7e831fe733703b3f2
+  metadata.gz: 6e4c9bd61775a500d5632ed5e3d0d0ee0dd255b3
+  data.tar.gz: 2d04fe9d1eb5cf70ca8e8c229a6cfdb77b88960e
 SHA512:
-  metadata.gz: a2ec18297bb0bc340390e342f05e3b643e82331828a891eafe275a789a83987b5d62e748f53cf35a05b1bd013a7244e6fd56c111a2438949e09aa6281878d298
-  data.tar.gz: 6cc6e22fd3b23be9c61887a58abaf01021fd1a37d146236113cddf7c470058756c560d00c71629b3f651fef0bcc9fb164dc4c47ae88633a64369932f6a492dee
+  metadata.gz: 59d932451e95931cbbac60382319c421f4a1a4ac64454c88f3e5249c70695940de14d834215fdd7d125c4b5490900c4500972b3c1bc2bd089ef72af3bd7d8499
+  data.tar.gz: 07a7dbfb31adeca3bd0b92a175dc01acdeb3e4a6af08ef8a656c9dc1f3fc164a944bb13a5894c830a65456a0821d32c76b2371bd7c39b04ae640fdb9a01c12e0

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/Gemfile

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

data/Gemfile.lock

@@ -1,13 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.10)
-      activesupport (= 4.2.10)
-      builder (~> 3.1)
-    activesupport (4.2.10)
+    activemodel (5.1.4)
+      activesupport (= 5.1.4)
+    activesupport (5.1.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     ast (2.3.0)
@@ -27,9 +26,9 @@ 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.5.7)
+    highline (1.7.10)
+    i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     jeweler (2.3.7)
       builder
@@ -45,15 +44,13 @@ GEM
     jwt (1.5.6)
     mime-types (2.99.3)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
+    minitest (5.11.1)
     mongo (2.4.3)
       bson (>= 4.2.1, < 5.0.0)
-    mongoid (5.2.1)
-      activemodel (~> 4.0)
+    mongoid (6.2.1)
+      activemodel (~> 5.1)
       mongo (>= 2.4.1, < 3.0.0)
-      origin (~> 2.3)
-      tzinfo (>= 0.3.37)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nokogiri (1.8.1)
@@ -64,22 +61,20 @@ GEM
       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)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     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)
+    rainbow (3.0.0)
+    rake (12.3.0)
+    rdoc (6.0.1)
     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-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -88,11 +83,11 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.51.0)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
@@ -108,10 +103,10 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler
-  mongoid (~> 5.0)
+  mongoid (~> 6.0)
   rdoc
   rspec
   rubocop
 
 BUNDLED WITH
-   1.16.0.pre.3
+   1.16.0

data/VERSION

@@ -1 +1 @@
-5.1.0
+6.0.0

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
@@ -32,8 +34,8 @@ module Saasable::Railties
       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.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "saasable".freeze
-  s.version = "5.1.0"
+  s.version = "6.0.0"
 
   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 = "2018-01-11"
   s.description = "A gem for making a Multi-Tenant SaaS using Mongoid".freeze
   s.email = "suporte@eadbox.com".freeze
   s.extra_rdoc_files = [
@@ -52,14 +52,14 @@ Gem::Specification.new do |s|
     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_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<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<jeweler>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, [">= 0"])
@@ -67,7 +67,7 @@ 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<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.0.0
 platform: ruby
 authors:
 - Eadbox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement