rails_cerberus 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e5653c6e47c9306b5e19591351c5b0937366ba9
-  data.tar.gz: a596e72507cbd2d9ce671f05a52af69bcb3a3710
+  metadata.gz: 7ec9ebc2b0b15ab9162c41b48d1362329ee87356
+  data.tar.gz: 2319001da788f897595fcecffbbb5686bc6e0201
 SHA512:
-  metadata.gz: 03d0c1489afb0e700b74baf30f21bdddbc6a9767f66f1428378c884ed789a6c4fdde4695b993f01bce9b0bb9e528195fa5173709d92a4a0ccae324e2c52f3a7c
-  data.tar.gz: d81b801e16ca79eaf34cc30c9200a248908a1c66a3d3a88774dfbb91f3803031a39bccdfa7de8df7273de7093a76baf98a15525b59e72e41d2a0a850363ab4de
+  metadata.gz: 31ec585915f081d467c849ad8dcfe9044314be5b3790baef87e309ec6e3c3b438f68b1eb5a463285e36292fdaaf879d58058d7006164396893fa5c633f088c62
+  data.tar.gz: 3bd83c1a6d79350bef98fafc61e46cee0703108ee28e241202eaf9ccbc757a35e00cc9618ed260c4184b6b128d72d557f2bdbcc19310537381c086a8d9293d11

data/lib/cerberus/controller_helpers.rb

@@ -6,7 +6,7 @@ module Cerberus::ControllerHelpers
   end
 
   def current_user
-    Cerberus.config[:identity][:user_class_name]
+    Cerberus.config[:identities][:user_class_name]
     .constantize.find(session[:user_id]) if session[:user_id]
   end
 end

data/lib/cerberus/identity.rb

@@ -1,6 +1,6 @@
 class Cerberus::Identity < ActiveRecord::Base
   self.table_name = 'cerberus_identities'
-  belongs_to :user, class_name: Cerberus.config[:identity][:user_class_name]
+  belongs_to :user, class_name: Cerberus.config[:identities][:user_class_name]
 
   validates :provider, :uid, presence: true
 end

data/lib/cerberus/sessions_controller.rb

@@ -3,7 +3,7 @@ require 'cerberus/identity'
 class Cerberus::SessionsController < ActionController::Base
   def create
     identity = Cerberus::Identity.find_or_create_by! auth.slice(:provider, :uid)
-    identity.user ||= Cerberus.config[:identities][:user_class_name].constantize.find_or_create_by! auth.slice(:email)
+    identity.user ||= Cerberus.config[:identities][:user_class_name].constantize.find_or_create_by! email: auth[:info][:email]
     identity.save
 
     session[:user_id] = identity.user.id
@@ -19,4 +19,3 @@ class Cerberus::SessionsController < ActionController::Base
 
   def auth() env['omniauth.auth'] end
 end
-

data/lib/cerberus/version.rb

@@ -1,3 +1,3 @@
 module Cerberus
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cerberus.rb

@@ -7,13 +7,17 @@ module Cerberus
   def self.root() File.dirname(__dir__) end
   def self.config
     config_defaults.deep_merge(
-      YAML.load_file(
-        File.join(Dir.pwd, 'config/cerberus.yaml')
-      ).with_indifferent_access
-    )
+      begin
+        YAML.load_file(
+          File.join(Dir.pwd, 'config/cerberus.yaml')
+        )
+      rescue Errno::ENOENT
+        {}
+      end
+    ).with_indifferent_access
   end
   def self.config_defaults
-    { identity: { user_class_name: 'User' } }
+    { identities: { user_class_name: 'User' } }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_cerberus
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nicolas Oga