milia 1.3.1.beta1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ed96e5afeb4152e44970a6664278b86cd09502a
-  data.tar.gz: 63c802985d9d2de9c28414ff75c953bac2367762
+  metadata.gz: a27735e7a3f4034129b5c4b83b9a8d62b5806fd3
+  data.tar.gz: 31c951fbc829362f5c51b945d877a296e4852481
 SHA512:
-  metadata.gz: d11276fda2e906bd83a3a0753c13191929e137e1cd8fee143561ec05ac7b2069d91314b341dea79e75758c482683648c6718af33e68cb94a1049f187d11eb922
-  data.tar.gz: 0f496a172b226040e8f8be3f04b371122219d175b67563328abd4d374899637ca0ded64bc0ee05b5314f40ff07f32cfd46534f7b38aef3ba6315aac9f531a5e9
+  metadata.gz: bf6411548d3151e57e5a4e7918a080726396bf99a7c01fbb5deace5a58462623cf3c1ce9095d4068f3bbdc712ce2c1360c71255c2687462993d5fe3a0206dd32
+  data.tar.gz: 9ffb6bf8f72e2d4034093c59f912f86e61b1c0b4711e5f06369fd58f54a31350965fe33383c4af03639d9e1364b7587d36a4ff7cc94ba9908f1b76ba3697365f

data/app/controllers/confirmations_controller.rb

@@ -21,7 +21,7 @@ module Milia
 
       if resource.errors.empty?
         log_action( "invitee confirmed" )
-        set_flash_message(:notice, :confirmed) if is_flashing_format?
+        set_flash_message(:notice, :confirmed)
           # sign in automatically
         sign_in_tenanted_and_redirect(resource)
 

data/app/controllers/registrations_controller.rb

@@ -104,30 +104,33 @@ end   # def create
     # same as in devise gem EXCEPT need to prep signup form variables
 # ------------------------------------------------------------------------------
   def devise_create( user_params )
-
     build_resource(user_params)
 
-      # if we're using milia's invite_member helpers
+    # if we're using milia's invite_member helpers
     if ::Milia.use_invite_member
-        # then flag for our confirmable that we won't need to set up a password
+      # then flag for our confirmable that we won't need to set up a password
       resource.skip_confirm_change_password  = true
     end
 
-    if resource.save
-      yield resource if block_given?
-      log_action( "devise: signup user success", resource )
+    resource.save
+    yield resource if block_given?
+    log_action( "devise: signup user success", resource )
+
+    if resource.persisted?
       if resource.active_for_authentication?
-        set_flash_message :notice, :signed_up if is_flashing_format?
+        set_flash_message! :notice, :signed_up
         sign_up(resource_name, resource)
-        respond_with resource, :location => after_sign_up_path_for(resource)
+        respond_with resource, location: after_sign_up_path_for(resource)
       else
-        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_flashing_format?
+        set_flash_message! :notice, :"signed_up_but_#{resource.inactive_message}"
         expire_data_after_sign_in!
-        respond_with resource, :location => after_inactive_sign_up_path_for(resource)
+        respond_with resource, location: after_inactive_sign_up_path_for(resource)
       end
     else
+      # re-show signup view
       clean_up_passwords resource
       log_action( "devise: signup user failure", resource )
+      set_minimum_password_length
       prep_signup_view(  @tenant, resource, params[:coupon] )
       respond_with resource
     end

data/lib/milia/base.rb

@@ -90,6 +90,7 @@ module Milia
         after_create do |new_user|
           tenant = Tenant.find(Thread.current[:tenant_id])
           unless tenant.users.include?(new_user)
+						new_user.skip_reconfirmation! # For details why this is needed see milia issue #68
             tenant.users << new_user # add user to this tenant if not already there
           end
         end # before_create do

data/lib/milia/invite_member.rb

@@ -3,7 +3,7 @@ module Milia
   module InviteMember
 
 # #############################################################################
-    
+
     def self.included(base)
       base.extend ClassMethods
     end
@@ -11,13 +11,13 @@ module Milia
 # #############################################################################
 # #############################################################################
     module ClassMethods
-      
+
     end  # module ClassMethods
 # #############################################################################
 # #############################################################################
 
 # ------------------------------------------------------------------------
-# new function to set the password without knowing the current password 
+# new function to set the password without knowing the current password
 # ------------------------------------------------------------------------
   def attempt_set_password(params)
     p = {}
@@ -32,7 +32,7 @@ module Milia
   def has_no_password?
     self.encrypted_password.blank?
   end
-  
+
 # ------------------------------------------------------------------------
   # new function to provide access to protected method unless_confirmed
 # ------------------------------------------------------------------------
@@ -43,35 +43,35 @@ module Milia
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
 
-# ------------------------------------------------------------------------  
+# ------------------------------------------------------------------------
 # save_and_invite_member -- saves the new user record thus inviting member
     # via devise
     # if password missing; gens a password
     # ensures email exists and that email is unique and not already in system
-# ------------------------------------------------------------------------  
-    def save_and_invite_member(  )
+# ------------------------------------------------------------------------
+    def save_and_invite_member
       status = nil
 
       if (self.email.blank?)
         self.errors.add(:email, :blank)
       elsif User.where([ "lower(email) = ?", self.email.downcase ]).present?
         self.errors.add(:email, :taken)
-      else
-        check_or_set_password()
+			else
+				check_or_set_password()
         status = self.save && self.errors.empty?
       end
 
       return status
     end
 
-# ------------------------------------------------------------------------  
+# ------------------------------------------------------------------------
 # check_or_set_password -- if password missing, generates a password
 # ASSUMES: Milia.use_invite_member
-# ------------------------------------------------------------------------  
-  def check_or_set_password( )
+# ------------------------------------------------------------------------
+  def check_or_set_password
 
     if self.password.blank?
-      self.password = 
+      self.password =
         ::Milia::Password.generate(
           8, Password::ONE_DIGIT | Password::ONE_CASE
         )

data/lib/milia/version.rb

@@ -1,3 +1,3 @@
 module Milia
-  VERSION = "1.3.1.beta1"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milia
 version: !ruby/object:Gem::Version
-  version: 1.3.1.beta1
+  version: 1.3.1
 platform: ruby
 authors:
 - dsaronin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -57,44 +57,44 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 description: Transparent multi-tenanting for web applications based on Rails and Devise
 email:
 - jekuno@users.noreply.github.com
@@ -135,12 +135,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Easy multi-tenanting for Rails + Devise