challah 0.7.0.pre2 → 0.7.0

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-## Challah 0.7.0 (Unreleased)
+## Challah 0.7.0
 
-* Decoupling permissions and roles into its own gem [challah-rolls](http://github.com/jdtornow/challah-rolls) and thus removing all references to roles and permissions within this gem.
+* Removed roles and permissions functionality to keep the gem completely geared towards user authentication. In a future release this functionality will be added back into its own separate gem.
 * User model is automatically unpacked into the app upon install
 
 ## Challah 0.6.2

data/README.md

@@ -18,7 +18,7 @@ Challah doesn’t provide any fancy controllers or views that clutter your app o
 
 Or, in your `Gemfile`
 
-    gem ‘challah’
+    gem 'challah'
 
 ## Set up
 

data/lib/challah/session.rb

@@ -47,7 +47,7 @@ module Challah
       persistence_token, user_id = self.store.read
       return false if persistence_token.nil? or user_id.nil?
 
-      store_user = Challah.user_model.find_by_id(user_id)
+      store_user = ::User.find_by_id(user_id)
 
       if store_user and store_user.active? and store_user.persistence_token == persistence_token
         if store_user.valid_session?
@@ -103,7 +103,7 @@ module Challah
     class << self
       # Manually create a new Session
       def create(user_or_user_id, request = nil, params = nil)
-        user_record = Challah.user_model === user_or_user_id ? user_or_user_id : Challah.user_model.find_by_id(user_or_user_id)
+        user_record = ::User === user_or_user_id ? user_or_user_id : ::User.find_by_id(user_or_user_id)
 
         session = Session.new(request, params)
 

data/lib/challah/techniques/api_key_technique.rb

@@ -11,7 +11,7 @@ module Challah
       return nil unless Challah.options[:api_key_enabled]
 
       unless @key.to_s.blank?
-        user = Challah.user_model.find_by_api_key(@key)
+        user = ::User.find_by_api_key(@key)
 
         if user and user.active?
           return user

data/lib/challah/techniques/password_technique.rb

@@ -10,7 +10,7 @@ module Challah
     # if we can successfully authenticate, return a User instance, otherwise nil
     def authenticate
       if username? and password?
-        user = Challah.user_model.find_for_session(username)
+        user = ::User.find_for_session(username)
 
         if user
           if user.active?

data/lib/challah/user.rb

@@ -6,9 +6,6 @@ module Challah
         extend ClassMethods
       end
 
-      # Set the reference to the model name for challah_user
-      Challah.user_model = self
-
       class_eval do
         cattr_accessor :protected_attributes
 

data/lib/challah/version.rb

@@ -1,3 +1,3 @@
 module Challah
-  VERSION = "0.7.0.pre2" unless defined?(::Challah::VERSION)
+  VERSION = "0.7.0" unless defined?(::Challah::VERSION)
 end

data/lib/challah.rb

@@ -16,8 +16,6 @@ module Challah
 
   # Configuration options
   class << self
-    attr_accessor :user_model
-
     # Get or set options for the current Challah instance. In most cases these should be
     # changed within a config/initializers/ file in your app.
     #

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre2
-  prerelease: 6
+  version: 0.7.0
+  prerelease: 
 platform: ruby
 authors:
 - John Tornow
@@ -13,7 +13,7 @@ date: 2012-08-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70303020485460 !ruby/object:Gem::Requirement
+  requirement: &70126733377560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303020485460
+  version_requirements: *70126733377560
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70303020484760 !ruby/object:Gem::Requirement
+  requirement: &70126733376880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70303020484760
+  version_requirements: *70126733376880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70303020483920 !ruby/object:Gem::Requirement
+  requirement: &70126733376160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70303020483920
+  version_requirements: *70126733376160
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70303020483340 !ruby/object:Gem::Requirement
+  requirement: &70126733375400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70303020483340
+  version_requirements: *70126733375400
 description: A simple Rails engine gem for authentication, authorization, users, roles
   and permissions.
 email:
@@ -5180,9 +5180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15