carnival 0.0.45 → 0.0.47

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ffc2753f9b67ad49fe598591d927d8fb3e27aa04
+  data.tar.gz: 1cece4769f4d618a0c28c963f2adc7e64d48716b
+SHA512:
+  metadata.gz: a21205e689c40f1d1666b659055c468991cbed5185964afe81026bdca38e4707009121702a14b3f94f04af0fa58556a59ec6d051da185f691cd73f7722be661b
+  data.tar.gz: e3752804cb8e39d30d5efa26e78976ed4675ca48eb9d4efab0104f1e166a7846a9b9bbe2cdfa286077ceef5c98c59e9cb79c5afd68cbba03166215a27166eae0

data/app/controllers/carnival/omniauth_callbacks_controller.rb

@@ -1,26 +1,34 @@
-class Carnival::OmniauthCallbacksController < Devise::OmniauthCallbacksController
-  def facebook
-    # You need to implement the method below in your model (e.g. app/models/user.rb)
-    @user = Carnival::AdminUser.find_for_omni_auth(request.env["omniauth.auth"])
+module Carnival
+  class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+    def facebook
+      # You need to implement the method below in your model (e.g. app/models/user.rb)
+      @user = Carnival::AdminUser.find_for_omni_auth(request.env["omniauth.auth"])
 
-    if @user.persisted?
-      sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
-      set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format?
-    else
-      session["devise.facebook_data"] = request.env["omniauth.auth"]
-      redirect_to new_user_registration_url
+      if @user.nil?
+        flash.notice = I18n.t("user_not_found")
+        redirect_to new_admin_user_session_path
+      elsif @user.persisted?
+        sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
+        set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format?
+      else
+        session["devise.facebook_data"] = request.env["omniauth.auth"]
+        redirect_to new_user_registration_url
+      end
     end
-  end
 
-  def google_oauth2
-    user = Carnival::AdminUser.find_for_omni_auth(request.env["omniauth.auth"])
-    if user.persisted?
-      flash.notice = "Signed in Through Google!"
-      sign_in_and_redirect user
-    else
-      session["devise.user_attributes"] = user.attributes
-      flash.notice = "You are almost Done! Please provide a password to finish setting up your account"
-      redirect_to new_user_registration_url
+    def google_oauth2
+      @user = Carnival::AdminUser.find_for_omni_auth(request.env["omniauth.auth"])
+      if @user.nil?
+        flash.notice = I18n.t("user_not_found")
+        redirect_to new_admin_user_session_path
+      elsif @user.persisted?
+        flash.notice = "Signed in Through Google!"
+        sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
+      else
+        session["devise.user_attributes"] = @user.attributes
+        flash.notice = "You are almost Done! Please provide a password to finish setting up your account"
+        redirect_to new_user_registration_url
+      end
     end
   end
 end

data/app/datatable/carnival/generic_datatable.rb

@@ -88,20 +88,20 @@ module Carnival
 
         if render_type == RENDER_CSV
           @presenter.fields_for_action(:csv).each do |key, field|
-            data_item[i.to_label] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => true}
+            data_item[i.to_s] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => true}
             i = i + 1
           end
         elsif render_type == RENDER_PDF
           @presenter.fields_for_action(:pdf).each do |key, field|
-            data_item[i.to_label] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => true}
+            data_item[i.to_s] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => true}
             i = i + 1
           end
         else render_type == RENDER_TABLE
           @presenter.fields_for_action(:index).each do |key, field|
-            data_item[i.to_label] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => false}
+            data_item[i.to_s] = ac.render_to_string :formats => [:html] , :partial => '/carnival/shared/list_cel', :locals => {:presenter => @presenter,:field=> key, :record=> record, :only_render_fields => false}
             i = i + 1
           end
-          data_item[i.to_label] = ac.render_to_string :formats => [:html], :partial => '/carnival/shared/item_buttons', :locals => {:record=>record, :presenter => @presenter}
+          data_item[i.to_s] = ac.render_to_string :formats => [:html], :partial => '/carnival/shared/item_buttons', :locals => {:record=>record, :presenter => @presenter}
           i = i + 1
         end
         data << data_item

data/app/helpers/carnival/base_admin_helper.rb

@@ -59,7 +59,7 @@ module Carnival
       current_type = field_type(presenter,field)
       if current_type == :relation
         if show_only_value
-          record.send(field.to_s).to_s
+          record.send(field.to_s).to_label
         else
           return link_to presenter.relation_label(field.to_sym, record), presenter.relation_path(field.to_sym, record)
         end

data/app/models/carnival/admin_user.rb

@@ -1,10 +1,19 @@
 module Carnival
 
   class AdminUser < ActiveRecord::Base
+    include Carnival::ModelHelper
+    devise_flags = *Carnival::Config.devise_config
+    devise_flags << :recoverable
+    devise_flags << :rememberable
 
-    devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+    if devise_flags.include?(:omniauthable)
+      devise :database_authenticatable, *devise_flags.uniq, omniauth_providers: Carnival::Config.omniauth_providers
+    else
+      devise :database_authenticatable, *devise_flags.uniq
+    end
 
     has_many :admin_user_notifications
+    has_many :notifications, through: :admin_user_notifications
 
     def unread_notifications
       self.admin_user_notifications.where(:read => false).to_a
@@ -23,7 +32,7 @@ module Carnival
         user.provider = auth.provider
         user.uid = auth.uid
         user
-      else
+      elsif Carnival::Config.devise_config.include?(:registerable)
         where(auth.slice(:provider, :uid)).first_or_create do |user|
           user.provider = auth.provider
           user.uid = auth.uid
@@ -35,5 +44,4 @@ module Carnival
       end
     end
   end
-
 end

data/app/models/carnival/admin_user_notification.rb

@@ -1,6 +1,8 @@
 module Carnival
   class AdminUserNotification < ActiveRecord::Base
     include ActionView::Helpers::UrlHelper
+    include Carnival::ModelHelper
+
     belongs_to :admin_user
     belongs_to :notification
 
@@ -16,5 +18,8 @@ module Carnival
       self.notification.link
     end
 
+    def to_label
+      self.notification.title
+    end
   end
 end

data/app/models/carnival/model_helper.rb

@@ -13,9 +13,9 @@ module Carnival::ModelHelper
       select = []
       select << ['', ''] if params[:add_empty_option]
       if params[:reverse]
-        select.concat all.collect{|c|[c.to_s, c.id]}
+        select.concat all.collect{|c|[c.to_label, c.id]}
       else
-        select.concat all.collect{|c|[c.id, c.to_s]}
+        select.concat all.collect{|c|[c.id, c.to_label]}
       end
       select
     end

data/app/models/carnival/notification.rb

@@ -1,5 +1,10 @@
 module Carnival
   class Notification < ActiveRecord::Base
+    include Carnival::ModelHelper
     has_many :admin_user_notifications
+
+    def to_label
+      self.title
+    end
   end
 end

data/app/views/admin_users/shared/_links.html.haml

@@ -11,4 +11,4 @@
   .oauth
     - resource_class.omniauth_providers.each do |provider|
       %div{class: provider}
-        = link_to "Login com #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+        = link_to "Login com #{provider.to_s.titleize}", admin_user_omniauth_authorize_path(provider: provider)

data/config/initializers/devise.rb

@@ -251,4 +251,17 @@ Devise.setup do |config|
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+  if Carnival::Config.omniauth.present?
+    puts "=" * 100
+    puts Carnival::Config.omniauth.inspect
+    if Carnival::Config.omniauth[:facebook].present?
+      require "omniauth-facebook"
+      config.omniauth :facebook, Carnival::Config.omniauth[:facebook][0], Carnival::Config.omniauth[:facebook][1]
+    end
+    if Carnival::Config.omniauth[:google_oauth2].present?
+      require "omniauth-google-oauth2"
+      config.omniauth :google_oauth2, Carnival::Config.omniauth[:google_oauth2][0], Carnival::Config.omniauth[:google_oauth2][1]
+    end
+  end
 end

data/lib/carnival/config.rb

@@ -1,8 +1,11 @@
 module Carnival
 
   class Config
-    mattr_accessor :menu
+    mattr_accessor :menu, :devise_config, :omniauth, :omniauth_providers
     @@menu
+    @@devise_config
+    @@omniauth
+    @@omniauth_providers
   end
 
 end

data/lib/carnival/routes.rb

@@ -5,7 +5,11 @@ module ActionDispatch::Routing
         get "admin_user_notification/read/:id" => 'carnival/admin_user_notifications#read', as: :carnival_read_admin_user_notification
         resources :admin_user_notifications, controller: "carnival/admin_user_notifications", :as => :carnival_admin_user_notifications
         resources :admin_users, controller: "carnival/admin_users", :as => :carnival_admin_users
-        devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "sessions", :controllers => { :sessions => "carnival/sessions" }
+        if Carnival::Config.devise_config.include?(:omniauthable) and Carnival::Config.omniauth.present?
+          devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "sessions", :controllers => { :sessions => "carnival/sessions", :omniauth_callbacks => "carnival/omniauth_callbacks" }
+        else
+          devise_for :admin_users, :class_name => "Carnival::AdminUser", :path => "sessions", :controllers => { :sessions => "carnival/sessions"}
+        end
         root to: "carnival/admin_users#index", :as => :admin_root
       end
     end

data/lib/carnival/version.rb

@@ -1,3 +1,3 @@
 module Carnival
-  VERSION = "0.0.45"
+  VERSION = "0.0.47"
 end

data/lib/generators/carnival/templates/carnival_initializer.rb

@@ -39,3 +39,10 @@ Carnival::Config.menu = {
                           ]
                         }
                       }
+Carnival::Config.devise_config = :registerable, :recoverable, :rememberable, :trackable, :validatable,
+                                 :omniauthable
+
+Carnival::Config.omniauth_providers = [:facebook, :google_oauth2]
+
+Carnival::Config.omniauth = {facebook: ["324810390938005", "3c16625e74189a3708cc586dc050a6b2"],
+                            google_oauth2: ['431077382019-mumumjahr5cn6cooubtskc6ohael7923.apps.googleusercontent.com', 'ilH4B-KXN3tqG6qF9gGN1F_J']}

data/test/dummy/config/initializers/carnival_initializer.rb

@@ -39,3 +39,276 @@ Carnival::Config.menu = {
                           ]
                         }
                       }
+
+Carnival::Config.devise_config = :registerable, :recoverable, :rememberable, :trackable, :validatable, :omniauthable
+
+Carnival::Config.omniauth_providers = [:facebook, :google_oauth2]
+
+Carnival::Config.omniauth = {facebook: ["324810390938005", "3c16625e74189a3708cc586dc050a6b2"],
+                            google_oauth2: ['431077382019-mumumjahr5cn6cooubtskc6ohael7923.apps.googleusercontent.com', 'ilH4B-KXN3tqG6qF9gGN1F_J']}
+
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # The secret key used by Devise. Devise uses this key to generate
+  # random tokens. Changing this key will render invalid all existing
+  # confirmation, reset password and unlock tokens in the database.
+  config.secret_key = '34c7fc396b3c8671d7009261e6a6bc30a47d4f048b1d646b4fc868dc6666b58fe4e9087bf2462054b9677660de1592f88e2aefacd75bb47c7e2d1c770291620b'
+
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class
+  # with default "from" parameter.
+  config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = 'Devise::Mailer'
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  # config.authentication_keys = [ :email ]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [ :email ]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:database]` will
+  # enable it only for database authentication. The supported strategies are:
+  # :database      = Support basic authentication with authentication key + password
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. 'Application' by default.
+  # config.http_authentication_realm = 'Application'
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # particular strategies by setting this option.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # By default, Devise cleans up the CSRF token on authentication to
+  # avoid CSRF token fixation attacks. This means that, when using AJAX
+  # requests for sign in and sign up, you need to get a new CSRF token
+  # from the server. You can disable this option at your own risk.
+  # config.clean_up_csrf_token_on_authentication = true
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = 'f87de298ab9a4d0239a5409f8a780e8369a501e96a2629d62fc4f63ad0b139071896351c3e5200bedca5932c3f580a9c846a6f9d2e363af79329483f0ea975d7'
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length. Default is 8..128.
+  config.password_length = 8..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # Warn on the last attempt before the account is locked.
+  # config.last_attempt_warning = false
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper).
+  #
+  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # config.encryptor = :sha512
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  config.scoped_views = true
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ['*/*', :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: '/my_engine'
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = '/my_engine/users/auth'
+
+  if Carnival::Config.devise_config.include?(:omniauthable) and Carnival::Config.omniauth.present?
+    if Carnival::Config.omniauth[:facebook].present?
+      require "omniauth-facebook"
+      config.omniauth :facebook, Carnival::Config.omniauth[:facebook][0], Carnival::Config.omniauth[:facebook][1]
+    end
+    if Carnival::Config.omniauth[:google_oauth2].present?
+      require "omniauth-google-oauth2"
+      config.omniauth :google_oauth2, Carnival::Config.omniauth[:google_oauth2][0], Carnival::Config.omniauth[:google_oauth2][1]
+    end
+  end
+end