fix alto_guisso_rails requires.

update find_or_create_user to support Rails 4.* due to change sin find_or_create_by methods
instedd · Nov 29, 2014 · 20c177f · 20c177f
1 parent a68fcbb
commit 20c177f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/alto_guisso_rails/engine.rb b/lib/alto_guisso_rails/engine.rb
@@ -1,5 +1,6 @@
 require_relative "rails/routes"
-require_relative "../../app/helpers/guisso/application_helper"
+require_relative "../../app/helpers/alto_guisso_rails/application_helper"
+require 'omniauth-openid'
 require 'openid/store/filesystem'
 
 class AltoGuissoRails::Railtie < Rails::Railtie

diff --git a/lib/alto_guisso_rails/rails/routes.rb b/lib/alto_guisso_rails/rails/routes.rb
@@ -88,7 +88,12 @@ def authenticate_api_#{mapping}!
           end
 
           def find_or_create_user(email)
-            user = #{mapping.to_s.capitalize}.find_or_create_by_email(email)
+            user = if Rails::VERSION::MAJOR >= 4
+              #{mapping.to_s.capitalize}.find_or_create_by(email: email)
+            else
+              #{mapping.to_s.capitalize}.find_or_create_by_email(email)
+            end
+
             if user.new_record?
               user.confirmed_at = Time.now
               user.password = Devise.friendly_token