token_authenticate_me 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 229ecb84a5060e5d18c67bfe11ded27a73771e7a
-  data.tar.gz: 75f47933a25a6b961f277b7856d956527e23fa9a
+  metadata.gz: 1b0b4986c15318e2b049d77c161bb49ddb54cd40
+  data.tar.gz: 753233dd4e2f98c51f5add6d3543a7c72e1744cb
 SHA512:
-  metadata.gz: 020f1fbaa8a83ff17be432305293880ae0de0d4089d70434e04c07d9cc4c7a0c08dd623eb7a98239123b7e5ecfcec968c88f92da5edeab4f6428d546dea540dd
-  data.tar.gz: b2e713b0a2817b615bbecefc9b291025bb41f9d46dc09918d7100ac43fae982be05d40b88164514a6a2e7d143ffbacfa97f257c472132fd78fd7cab692cf8416
+  metadata.gz: 13c59c0d210c88e9b4de37b69c0bcd899670421202233f608228f09ce10412620ab12239937a8793ea5b690df811a3fb17c428cb594d227a9c9fa31ec23a8674
+  data.tar.gz: 2f0ba37bfd6c7d8f2065543e0ecde7e8f46cddfa87fb1ed0b4e77ae141b8bd015d143dc62ca458c8373187bc9dd978a8ed1dfece7a2007d68542bdc197d184f1

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+## 0.4.2 / 2015-09-08
+* [BUGFIX] fixed bug #26.

data/README.md

@@ -65,3 +65,6 @@ This model will have a set of [validators](https://github.com/inigo-llc/token_au
 - [ ] Make it so any resource name can be used for authentication (initial thought is either specify the default or pass resource name in token string?).
 - [ ] Allow users to specify the API namespace default.
 - [ ] Add a way to override/change/configure validations.
+
+## Code Of Conduct
+Wildland Open Source [Code Of Conduct](https://github.com/wildland/code-of-conduct)

data/lib/generators/token_authenticate_me/controllers/controllers_generator.rb

@@ -9,19 +9,12 @@ module TokenAuthenticateMe
         template 'sessions.rb', 'app/controllers/api/sessions_controller.rb'
 
         # Inject /api/sesssion route into routes file
-        route <<-ROUTE
-namespace :api do
-    resource :session, only: [:create, :show, :destroy]
-  end
-        ROUTE
+        insert_after_api("    resource :session, only: [:create, :show, :destroy]\n")
       end
 
       def create_password_reset_controller # rubocop:disable Metrics/MethodLength
         template 'password_reset.rb', 'app/controllers/api/password_resets_controller.rb'
-
-        # Inject /api/password_resets route into routes file
-        route <<-ROUTE
-namespace :api do
+        insert_after_api(<<-ROUTE
     resources(
       :password_resets,
       only: [:create, :update],
@@ -29,32 +22,60 @@ namespace :api do
         id: TokenAuthenticateMe::UUID_REGEX
       }
     )
-  end
-        ROUTE
+ROUTE
+        )
       end
 
       def create_users_controller
         template 'users.rb', 'app/controllers/api/v1/users_controller.rb'
+        insert_after_version("      resources :users\n")
+      end
+
+      private
+
+      def insert_after_api(string)
+        maybe_create_api_v1_namespace
+
+        in_root do
+          insert_into_file(
+            'config/routes.rb',
+            string,
+            after: "namespace :api do\n"
+          )
+        end
+      end
+
+      def insert_after_version(string)
+        maybe_create_api_v1_namespace
+
+        in_root do
+          insert_into_file(
+            'config/routes.rb',
+            string,
+            after: "namespace :v1 do\n"
+          )
+        end
+      end
 
-        # Inject /api/v1/users route into routes file
-        route <<-ROUTE
+      def maybe_create_api_v1_namespace
+        in_root do
+          unless File.readlines('config/routes.rb').grep('namespace :api do')
+            route <<-ROUTE
 namespace :api do
     namespace :v1 do
-      resources :users
     end
   end
-        ROUTE
+ROUTE
+          end
+        end
       end
 
-      private
-
       def inject_before_actions_into_users_controllers
         inject_into_class(
           Rails.root.join('app', 'controllers', 'api', 'v1', 'users_controller.rb'),
-          UsersController
-        ) do
+          UsersController,
           "  skip_before_action :authenticate, only: [:create]\n"
-        end
+        )
       end
     end
   end

data/lib/generators/token_authenticate_me/models/templates/authentication_model.rb

@@ -3,9 +3,9 @@ require 'token_authenticate_me/models/authenticatable'
 class User < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Authenticatable
 
-  has_many :#{session_model_plural_name}
+  has_many :<%= session_model_plural_name %>
 
   def as_json(options=nil)
-    { #{authenticate_model_singular_name}: super(options) }
+    { <%= authenticate_model_singular_name %>: super(options) }
   end
 end

data/lib/generators/token_authenticate_me/models/templates/session_model.rb

@@ -3,10 +3,10 @@ require 'token_authenticate_me/models/sessionable'
 class Session < ActiveRecord::Base
   include TokenAuthenticateMe::Models::Sessionable
 
-  belongs_to :#{authenticate_model_singular_name}
+  belongs_to :<%= authenticate_model_singular_name %>
 
   def as_json(options={})
-    { #{session_model_singular_name}: super({ include: :#{authenticate_model_singular_name} }.merge(options)) }
+    { <%= session_model_singular_name %>: super({ include: :<%= authenticate_model_singular_name %> }.merge(options)) }
   end
 
 end

data/lib/token_authenticate_me/models/authenticatable.rb

@@ -73,7 +73,11 @@ module TokenAuthenticateMe
         end
 
         def current_password_required?
-          !new_record? && (email_changed? || attempting_to_change_password?)
+          !new_record? && (email_changed? || attempting_to_change_password?) && !password_resetting?
+        end
+
+        def password_resetting?
+          reset_password_token_changed? && reset_password_token_exp_changed?
         end
 
         def password_required?
@@ -81,7 +85,7 @@ module TokenAuthenticateMe
         end
 
         def attempting_to_change_password?
-          !password.blank? || !password_confirmation.blank?
+          (!password.blank? || !password_confirmation.blank?) && password_digest_changed?
         end
       end
     end

data/lib/token_authenticate_me/version.rb

@@ -1,3 +1,3 @@
 module TokenAuthenticateMe
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: token_authenticate_me
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,6 +174,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This gem adds simple token authentication to users.