challah 1.1.1 → 1.2.0.rc

data/lib/challah/concerns/user/validateable.rb

@@ -0,0 +1,21 @@
+module Challah
+  module UserValidateable
+    extend ActiveSupport::Concern
+
+    included do
+      email_validation_hash = {
+        presence: true,
+        uniqueness: true
+      }
+
+      email_validator_key = Challah.options[:email_validator].to_s.underscore
+      email_validation_hash[email_validator_key] = true
+
+      validates :email,           email_validation_hash
+      validates :first_name,      presence: true
+      validates :last_name,       presence: true
+
+      validates_with Challah.options[:password_validator], force: false
+    end
+  end
+end

data/lib/challah/concerns/userable.rb

@@ -0,0 +1,20 @@
+module Challah
+  module Userable
+    extend ActiveSupport::Concern
+
+    include UserAttributeable
+    include UserAuthenticateable
+    include UserAuthorizable
+    include UserFindable
+    include UserPasswordable
+    include UserProvideable
+
+    unless Challah.options[:skip_user_validations]
+      include UserValidateable
+    end
+
+    included do
+      Challah.include_user_plugins!
+    end
+  end
+end

data/lib/challah/engine.rb

@@ -45,8 +45,7 @@ module Challah
         if defined?(ActiveRecord)
           Challah.options[:logger] = ActiveRecord::Base.logger
 
-          ActiveRecord::Base.send(:extend, Challah::User)
-          ActiveRecord::Base.send(:extend, Challah::Authorization)
+          ActiveRecord::Base.send(:include, Challah::ActiveRecordExtensions)
           ActiveRecord::Base.send(:include, Challah::Audit)
 
           # Load any ActiveRecord/Challah plugins

data/lib/challah/test.rb

@@ -1,45 +1,65 @@
-# Used to persist session data in test mode instead of using cookies. Stores the session
-# data lazily in a global var, accessible across the testing environment.
-class TestSessionStore
-  def initialize(session = nil)
-    @session = session
-  end
+module Challah
+  # Used to persist session data in test mode instead of using cookies. Stores the session
+  # data lazily in a global var, accessible across the testing environment.
+  class TestSessionStore
+    def initialize(session = nil)
+      @session = session
+    end
 
-  def destroy
-    $challah_test_session = nil
-  end
+    def destroy
+      $challah_test_session = nil
+    end
+
+    def read
+      if $challah_test_session
+        return $challah_test_session.to_s.split(":")
+      end
 
-  def read
-    if $challah_test_session
-      return $challah_test_session.to_s.split(':')
+      nil
     end
 
-    nil
+    def save(token, user_id)
+      $challah_test_session = "#{ token }:#{ user_id }"
+      true
+    end
   end
 
-  def save(token, user_id)
-    $challah_test_session = "#{token}:#{user_id}"
-    true
+  module Testing
+
+    # Sign the given user instance in
+    def signin_as(user)
+      Session.create!(user, nil, nil, user.class)
+    end
+    alias_method :login_as, :signin_as
+
+    # Sign the given user instance out
+    def signout
+      Session.destroy
+    end
+    alias_method :logout, :signout
+
   end
 end
 
-Challah.options[:storage_class] = TestSessionStore
-
 class ActiveSupport::TestCase
-  # Sign the given user instance in
-  def signin_as(user)
-    Challah::Session.create!(user, nil, nil, user.class)
-  end
-  alias_method :login_as, :signin_as
+  include Challah::Testing
+  setup :signout
+end
 
-  # Sign the given user instance out
-  def signout
-    Challah::Session.destroy
-  end
-  alias_method :logout, :signout
+if defined?(RSpec)
+  RSpec.configure do |config|
+
+    config.before(:all) do
+      # make sure challah is using test session in test mode
+      Challah.options[:storage_class] = Challah::TestSessionStore
+    end
+
+    config.before(:each) do
+      # Reset any challah user sessions for each test.
+      $challah_test_session = nil
+    end
+
+    config.include Challah::Testing, type: :controller
 
-  setup do
-    # Reset any challah user sessions for each test.
-    $challah_test_session = nil
   end
-end
+end

data/lib/challah/version.rb

@@ -1,3 +1,3 @@
 module Challah
-  VERSION = "1.1.1" unless defined?(::Challah::VERSION)
+  VERSION = "1.2.0.rc" unless defined?(::Challah::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0.rc
 platform: ruby
 authors:
 - John Tornow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -81,75 +81,20 @@ files:
 - config/locales/en.yml
 - db/migrate/20120127150433_create_users.rb
 - db/migrate/20121116210759_create_authorizations.rb
-- test/controllers/controller_test.rb
-- test/controllers/restrictions_controller_test.rb
-- test/controllers/sessions_controller_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/controllers/restrictions_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/models/user.rb
-- test/dummy/app/models/widget.rb
-- test/dummy/app/views/bakery/templates/layouts/sample.erb
-- test/dummy/app/views/bakery/templates/partials/sample.html.haml
-- test/dummy/app/views/bakery/templates/themes/sample.haml
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/i18n.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/migrate/20140114212939_create_widgets.rb
-- test/dummy/db/migrate/20140307205735_create_users.challah_engine.rb
-- test/dummy/db/migrate/20140307205736_create_authorizations.challah_engine.rb
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
-- test/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
-- test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
-- test/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
-- test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
-- test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
-- test/factories.rb
-- test/models/authorization_test.rb
-- test/models/user_test.rb
-- test/services/audit_test.rb
-- test/services/cookie_store_test.rb
-- test/services/encrypter_test.rb
-- test/services/plugins_test.rb
-- test/services/random_test.rb
-- test/services/routes_test.rb
-- test/services/session_test.rb
-- test/services/signup_test.rb
-- test/services/simple_cookie_store_test.rb
-- test/support/stubs.rb
-- test/test_helper.rb
+- lib/challah/active_record_extensions.rb
 - lib/challah/audit.rb
 - lib/challah/authenticators/api_key.rb
 - lib/challah/authenticators/password.rb
 - lib/challah/authenticators.rb
-- lib/challah/authorization.rb
+- lib/challah/concerns/authorizeable.rb
+- lib/challah/concerns/user/attributeable.rb
+- lib/challah/concerns/user/authenticateable.rb
+- lib/challah/concerns/user/authorizable.rb
+- lib/challah/concerns/user/findable.rb
+- lib/challah/concerns/user/passwordable.rb
+- lib/challah/concerns/user/provideable.rb
+- lib/challah/concerns/user/validateable.rb
+- lib/challah/concerns/userable.rb
 - lib/challah/controller.rb
 - lib/challah/cookie_store.rb
 - lib/challah/encrypter.rb
@@ -166,13 +111,6 @@ files:
 - lib/challah/techniques/password_technique.rb
 - lib/challah/techniques.rb
 - lib/challah/test.rb
-- lib/challah/user/attributes.rb
-- lib/challah/user/authentication.rb
-- lib/challah/user/finders.rb
-- lib/challah/user/password.rb
-- lib/challah/user/providers.rb
-- lib/challah/user/reflector.rb
-- lib/challah/user.rb
 - lib/challah/validators/email_validator.rb
 - lib/challah/validators/password_validator.rb
 - lib/challah/version.rb
@@ -197,9 +135,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/lib/challah/user.rb

@@ -1,128 +0,0 @@
-require 'challah/user/attributes'
-require 'challah/user/authentication'
-require 'challah/user/finders'
-require 'challah/user/password'
-require 'challah/user/providers'
-require 'challah/user/reflector'
-
-module Challah
-  module User
-    def challah_user
-      unless included_modules.include?(InstanceMethods)
-        include Attributes
-        include Authentication
-        include InstanceMethods
-        include Providers
-        include Password
-        extend Finders
-        extend Reflector
-      end
-
-      email_validation_hash = {
-        presence: true,
-        uniqueness: true
-      }
-
-      email_validator_key = Challah.options[:email_validator].to_s.underscore
-      email_validation_hash[email_validator_key] = true
-
-      class_eval do
-        # Attributes
-        ################################################################
-
-        attr_reader :password, :password_confirmation, :password_updated
-
-        # Validation
-        ################################################################
-
-        unless Challah.options[:skip_user_validations]
-          validates :email,           email_validation_hash
-          validates :first_name,      presence: true
-          validates :last_name,       presence: true
-
-          validates_with Challah.options[:password_validator], force: false
-        end
-
-        # Scoped Finders
-        ################################################################
-
-        scope :active,      -> { where(active: true) }
-        scope :inactive,    -> { where(active: false) }
-
-        # Callbacks
-        ################################################################
-
-        before_save :check_tokens
-        after_save  :save_updated_providers
-        after_save  :clear_cache
-        before_destroy :clear_authorizations
-      end
-
-      Challah.include_user_plugins!
-    end
-
-    # Instance methods to be included once challah_user is set up.
-    module InstanceMethods
-      def method_missing(method, *args)
-        method_name = method.to_s
-
-        if method_name =~ /^([a-z]*)_provider\?$/
-          return provider?($1)
-        elsif method_name =~ /^([a-z]*)_provider$/
-          return provider($1)
-        end
-
-        super
-      end
-
-      protected
-        # If password or username was changed, update the authorization record
-        def save_updated_providers
-          # Save password provider
-          if @password_updated or @username_updated
-            Challah.providers[:password].save(self)
-            @password_updated = false
-            @username_updated = false
-            @password = nil
-          end
-
-          # Save any other providers
-          Challah.custom_providers.each do |name, klass|
-            custom_provider_attributes = provider_attributes[name]
-
-            if custom_provider_attributes.respond_to?(:fetch)
-              if klass.valid?(self)
-                klass.save(self)
-              end
-            end
-          end
-        end
-
-        # Before a record is saved, make sure all tokens are set properly
-        def check_tokens
-          if self.persistence_token.to_s.blank?
-            self.persistence_token = Random.token(125)
-          end
-
-          if self.api_key.to_s.blank?
-            self.api_key = Random.token(50)
-          end
-
-          # Store a hashed email if the column exists
-          if respond_to?("email_hash=")
-            if email_changed?
-              self.email_hash = Encrypter.md5(email.to_s.downcase.strip)
-            end
-          end
-        end
-
-        def clear_authorizations
-          authorizations.destroy_all
-        end
-
-        def clear_cache
-          @providers = nil
-        end
-    end
-  end
-end

data/lib/challah/user/attributes.rb

@@ -1,28 +0,0 @@
-module Challah::User
-
-  module Attributes
-    # Returns true if this user is active, and should be able to log in. If
-    # the active column is false, the user will not be able to authenticate
-    def active?
-      !!self.active
-    end
-
-    # First name and last name together
-    def name
-      "#{first_name} #{last_name}".strip
-    end
-
-    # shortened name, just includes the first name and last initial
-    def small_name
-      "#{first_name.to_s.titleize} #{last_name.to_s.first.upcase}."
-    end
-
-    # Is this user valid and ready for a user session?
-    #
-    # Override this method if you need to check for a particular configuration on each page request.
-    def valid_session?
-      self.active?
-    end
-  end
-
-end

data/lib/challah/user/finders.rb

@@ -1,31 +0,0 @@
-module Challah::User
-
-  module Finders
-    # Find a user instance by username first, or email address if needed.
-    # If no user is found matching, return nil
-    def find_for_session(username_or_email)
-      return nil if username_or_email.to_s.blank?
-
-      result = nil
-
-      if username_or_email.to_s.include?('@')
-        result = where(email: username_or_email).first
-      end
-
-      if !result
-        uid = username_or_email.to_s.downcase.strip
-
-        authorization = self.authorization_model
-        authorization = authorization.where(provider: :password, uid: uid)
-        authorization = authorization.first
-
-        if authorization
-          result = authorization.user
-        end
-      end
-
-      result
-    end
-  end
-
-end