devise-approvable 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de5148ee11a32aa00bb79e559911a873ccc07953
-  data.tar.gz: 36095351c6822ddee8f5eecc8544dfa175af4740
+  metadata.gz: 1bf6254958c077f9db90bb7ec5dc6d6ef447ca7e
+  data.tar.gz: 531778b042291c73449f14ec291da0c11113b943
 SHA512:
-  metadata.gz: 889b074e0469a091c7074140052e179d16e19aa4adecc0a56276f87eb88e72a6374f290ba2820984701ee0e33c8f604ff30d6f13bb0699cfe95b72940c6498c8
-  data.tar.gz: 0cadf9790002c786561f0f77246ec4417e06be7afd018b98411cdb548cd7e6c72ed9bbc0c49bf92025d3bec8af20a2068e8760ce989cdef7a8a1a7d4696bf468
+  metadata.gz: 30c89efcedb4d1787decb362dfeb58b154dd618518e885c90fb0900ca4681dc9a766750e95e265c5bceeaebc1de82477217310a1afb86c9102eb60a8b5f9bbda
+  data.tar.gz: 064b9c741ad42d97192e334d89afc7206799cee2f20a064d67d2a6c8db139d9e4057c7ef484f794a8657793be900b4c09743ae70966938f054f2ed62e0040c1e

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/app/controllers/approvals_controller.rb

@@ -0,0 +1,14 @@
+class Devise::ApprovalsController < DeviseController
+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.approve_by_token(params[:approval_token])
+    yield resource if block_given?
+
+    if resource.errors.empty?
+      set_flash_message(:notice, :approved) if is_flashing_format?
+      respond_with_navigational(resource){ redirect_to after_approval_path_for(resource_name, resource) }
+    else
+      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+    end
+  end
+end

data/app/views/devise/approvals/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Dev Account Approval</h2>
+
+<%= form_for(resource, as: resource_name, url: approval_path(resource_name), html: { method: :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div class="field">
+    <%= f.label :email %><br />
+    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> 
+  </div>
+
+  <div class="actions">
+    <%= f.submit "Resend confirmation instructions" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/devise-approvable.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: devise-approvable 0.2.0 ruby lib
+# stub: devise-approvable 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise-approvable"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Alex Egg"]
-  s.date = "2015-04-03"
+  s.date = "2015-04-06"
   s.description = "adds feature to devise"
   s.email = "eggie5@gmail.com"
   s.extra_rdoc_files = [
@@ -23,10 +23,16 @@ Gem::Specification.new do |s|
     "README",
     "Rakefile",
     "VERSION",
+    "app/controllers/approvals_controller.rb",
+    "app/views/devise/approvals/new.html.erb",
     "config/initializers/devise.rb",
     "devise-approvable.gemspec",
-    "lib/approvable.rb",
     "lib/approvable_mailer.rb",
+    "lib/devise_approvable.rb",
+    "lib/devise_approvable/mailer.rb",
+    "lib/devise_approvable/model.rb",
+    "lib/devise_approvable/routes.rb",
+    "lib/devise_approvable/version.rb",
     "test/approvable_test.rb",
     "views/devise_mailer/approval_instructions.html.erb"
   ]

data/lib/devise_approvable.rb

@@ -0,0 +1,21 @@
+module DeviseApprovable
+  autoload :Mailer, 'devise_approvable/mailer'
+end
+
+require 'devise'
+require 'devise_approvable/routes'
+# require 'devise_approvable/rails'
+
+module Devise
+  # Public: Validity period of the invitation token (default: 0). If
+  # invite_for is 0 or nil, the invitation will never expire.
+  # Set invite_for in the Devise configuration file (in config/initializers/devise.rb).
+  #
+  #   config.invite_for = 2.weeks # => The invitation token will be valid 2 weeks
+  mattr_accessor :admin_email
+  @@admin_email = "admin@curbcall.com"
+
+
+end
+
+Devise.add_module :approvable, :controller => :approvals, :model => 'devise_approvable/model', :route => {:approval => [nil, :new, :accept, :show]}

data/lib/devise_approvable/mailer.rb

@@ -0,0 +1,11 @@
+require 'devise/version'
+
+module DeviseInvitable
+  module Mailer
+
+    def approval_instructions(record, token, opts={})
+      @token = token
+      devise_mail(record, :approval_instructions, opts)
+    end
+  end
+end

data/lib/devise_approvable/model.rb

@@ -0,0 +1,95 @@
+module Devise
+  module Models
+    module Approvable
+
+      def self.included(base)
+        puts "Devise::Models::Approvable module injected into #{self.class} class"
+
+        base.class_eval do
+          extend ClassMethods
+
+          before_create :generate_approval_token, :if => :approval_required?
+          after_create  :send_approval_instructions, :unless => :approved?
+        end
+      end
+
+      #override
+      def active_for_authentication? 
+          super && approved? 
+      end 
+
+      #override
+      def inactive_message 
+        if !approved? 
+          :not_approved 
+        else 
+          super # Use whatever other message 
+        end 
+      end
+
+
+      def approve!
+        self.approved_at = Time.now.utc
+        self.approval_token = nil
+        save(:validate => false)
+      end
+
+      # Verifies whether a user is confirmed or not
+      def approved?
+        !!self.approved_at
+      end
+
+      def skip_approval!
+        self.approved_at = Time.now.utc
+        @skip_approval = true
+      end
+      
+      # Send approval instructions by email
+      def send_approval_instructions
+        unless @raw_approval_token
+          generate_approval_token!
+        end
+        
+        opts = { to: "dev-approvals@curbcall.com" }
+        send_devise_notification(:approval_instructions, @raw_approval_token, opts)
+      end
+      
+
+      protected
+        def approval_required?
+          !@skip_approval
+        end
+
+        def generate_approval_token!
+          generate_approval_token && save(validate: false)
+        end
+
+        def generate_approval_token
+          raw, enc = Devise.token_generator.generate(self.class, :approval_token)
+          @raw_approval_token   = raw
+          self.approval_token   = enc
+          self.approval_sent_at = Time.now.utc
+        end
+
+      module ClassMethods
+        # Find a user by its approvable token and try to approve it.
+        # If no user is found, returns a new user with an error.
+        # If the user is already approved, create an error for the user
+        # Options must have the approval_token
+        def approve_by_token(approval_token)
+          original_token     = approval_token
+          approval_token = Devise.token_generator.digest(self, :approval_token, approval_token)
+
+          approvable = find_or_initialize_with_error_by(:approval_token, approval_token)
+          approvable.approve! if approvable.persisted?
+          approvable.approval_token = original_token
+          approvable
+        end
+              
+        Devise::Models.config(self, :approver_class)
+      end
+    end
+  end
+end
+
+# Devise.add_module :approvable, :model => 'approvable'

data/lib/devise_approvable/routes.rb

@@ -0,0 +1,9 @@
+module ActionDispatch::Routing
+  class Mapper
+
+  protected
+    def devise_approval(mapping, controllers) 
+      resource :approval, only: [:new, :create, :show], path: mapping.path_names[:approval], controller: controllers[:approvals]
+    end
+
+  end

data/lib/devise_approvable/version.rb

@@ -0,0 +1,3 @@
+module DeviseApprovable
+  VERSION = '1.4.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-approvable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alex Egg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -92,10 +92,16 @@ files:
 - README
 - Rakefile
 - VERSION
+- app/controllers/approvals_controller.rb
+- app/views/devise/approvals/new.html.erb
 - config/initializers/devise.rb
 - devise-approvable.gemspec
-- lib/approvable.rb
 - lib/approvable_mailer.rb
+- lib/devise_approvable.rb
+- lib/devise_approvable/mailer.rb
+- lib/devise_approvable/model.rb
+- lib/devise_approvable/routes.rb
+- lib/devise_approvable/version.rb
 - test/approvable_test.rb
 - views/devise_mailer/approval_instructions.html.erb
 homepage: http://github.com/eggie5/devise-approvable

data/lib/approvable.rb

@@ -1,176 +0,0 @@
-module Devise
-  module Models
-    module Approvable
-      # extend ActiveSupport::Concern #RAILS 3
-      include Devise::Models::Activatable
-
-      def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-
-          before_create :generate_approval_token, :if => :approval_required?
-          # after_create  :send_approval_instructions unless approved?
-        end
-      end
-
-      # Confirm a user by setting it's confirmed_at to actual time. If the user
-      # is already confirmed, add en error to email field
-      def confirm!
-        unless_confirmed do
-          self.confirmation_token = nil
-          self.confirmed_at = Time.now
-          save(false)
-        end
-      end
-
-      # Verifies whether a user is confirmed or not
-      def confirmed?
-        !new_record? && !confirmed_at.nil?
-      end
-
-      # Send confirmation instructions by email
-      def send_confirmation_instructions
-        generate_confirmation_token if self.confirmation_token.nil?
-        ::DeviseMailer.deliver_confirmation_instructions(self)
-      end
-
-      # Resend confirmation token. This method does not need to generate a new token.
-      def resend_confirmation_token
-        unless_confirmed { send_confirmation_instructions }
-      end
-
-      # Overwrites active? from Devise::Models::Activatable for confirmation
-      # by verifying whether an user is active to sign in or not. If the user
-      # is already confirmed, it should never be blocked. Otherwise we need to
-      # calculate if the confirm time has not expired for this user.
-      def active?
-        super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
-      end
-
-      # The message to be shown if the account is inactive.
-      def inactive_message
-        !confirmed? ? :unconfirmed : super
-      end
-
-      # If you don't want confirmation to be sent on create, neither a code
-      # to be generated, call skip_confirmation!
-      def skip_confirmation!
-        self.confirmed_at  = Time.now
-        @skip_confirmation = true
-      end
-
-      def skip_confirm_and_approve!
-        skip_confirmation!
-        skip_approval!
-      end
-
-      def approve!
-        self.is_approved = true
-        self.approval_token = nil
-        send_confirmation_instructions
-        save(:validate => false)
-      end
-
-      # Verifies whether a user is confirmed or not
-      def approved?
-        self.is_approved
-      end
-
-      def skip_approval!
-        self.is_approved = true
-        @skip_approval = true
-      end
-      
-      # Send confirmation instructions by email
-      def send_approval_instructions
-        generate_approval_token if self.approval_token.nil?
-        ::DeviseMailer.deliver_approval_instructions(self)
-      end
-
-      protected
-
-        # Callback to overwrite if confirmation is required or not.
-        def confirmation_required?
-          !@skip_confirmation
-        end
-        
-        def approval_required?
-          !@skip_approval
-        end
-
-        # Checks if the confirmation for the user is within the limit time.
-        # We do this by calculating if the difference between today and the
-        # confirmation sent date does not exceed the confirm in time configured.
-        # Confirm_in is a model configuration, must always be an integer value.
-        #
-        # Example:
-        #
-        #   # confirm_within = 1.day and confirmation_sent_at = today
-        #   confirmation_period_valid?   # returns true
-        #
-        #   # confirm_within = 5.days and confirmation_sent_at = 4.days.ago
-        #   confirmation_period_valid?   # returns true
-        #
-        #   # confirm_within = 5.days and confirmation_sent_at = 5.days.ago
-        #   confirmation_period_valid?   # returns false
-        #
-        #   # confirm_within = 0.days
-        #   confirmation_period_valid?   # will always return false
-        #
-        def confirmation_period_valid?
-          confirmation_sent_at && confirmation_sent_at.utc >= self.class.confirm_within.ago
-        end
-
-        # Checks whether the record is confirmed or not, yielding to the block
-        # if it's already confirmed, otherwise adds an error to email.
-        def unless_confirmed
-          unless confirmed?
-            yield
-          else
-            self.class.add_error_on(self, :email, :already_confirmed)
-            false
-          end
-        end
-
-        # Generates a new random token for confirmation, and stores the time
-        # this token is being generated
-        def generate_confirmation_token
-          self.confirmed_at = nil
-          self.confirmation_token = Devise.friendly_token
-          self.confirmation_sent_at = Time.now.utc
-        end
-
-        def generate_approval_token
-          self.is_approved = false
-          self.approval_token = Devise.friendly_token
-          self.approval_sent_at = Time.now.utc
-        end
-
-      module ClassMethods
-        # Attempt to find a user by it's email. If a record is found, send new
-        # confirmation instructions to it. If not user is found, returns a new user
-        # with an email not found error.
-        # Options must contain the user email
-        def send_confirmation_instructions(attributes={})
-          confirmable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
-          confirmable.resend_confirmation_token unless confirmable.new_record?
-          confirmable
-        end
-
-        # Find a user by it's confirmation token and try to confirm it.
-        # If no user is found, returns a new user with an error.
-        # If the user is already confirmed, create an error for the user
-        # Options must have the confirmation_token
-        def confirm_by_token(confirmation_token)
-          confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          confirmable.confirm! unless confirmable.new_record?
-          confirmable
-        end
-
-        Devise::Models.config(self, :confirm_within)
-      end
-    end
-  end
-end
-
-Devise.add_module :approvable, :model => 'approvable'