challah 1.2.11 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b7f7aafe00bd68792aaa586744a0c1c4fd17ef
-  data.tar.gz: 0abcdf6cbc896e58d22b6162e9cf64738b22cb70
+  metadata.gz: c3d6fd80f0638cb01d51f3160c92792a9d12924c
+  data.tar.gz: 0641b3c92b52c2f8c3e9b1cf47c11c7fa55b6e7d
 SHA512:
-  metadata.gz: 88553420a641dfcf045d591901da345a746efbaa0c480a4d8c2817b0f8c2377c268787c14a1a3ee8000cde87fb3d18f3027bc22b19839efac90f8e246afd35d9
-  data.tar.gz: 59f9dffaced9dd0f6ca958334f1109e54d5defc4b63d0e4c8b36bfa6d5f9aec466b725ed49893557f474aa4d4fc7bac72ec1dfb03928a4701d0c10dbdb024f55
+  metadata.gz: 98dbd14406c791f07ee32a0f053100949cc90ad4dfa33d59a8c2c3e9094bc984c1348ea2e40d7039dec8ee935e0886ca54eb3b110e46146f1c69fc12a3aab9ce
+  data.tar.gz: 719ddddb95e07ce9036b22d04f28132e35a2465f23caaa32f695f4cc6f163c4f43d315b96c680716371e0f8f3575cd1b8db2ab8195e77e1b73c375563393a205

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Challah 1.3.0
+
+* Compatibility with Rails5 (beta3)
+
 ## Challah 1.2.10/11
 
 * Adds an `email` parameter for sign-in in addition to `username`. [PR #18](https://github.com/jdtornow/challah/pull/18) @thewatts

data/README.md

@@ -1,6 +1,6 @@
 # Challah
 
-[![Build Status](https://travis-ci.org/jdtornow/challah.svg?branch=master)](https://travis-ci.org/jdtornow/challah) [![Code Climate](https://codeclimate.com/github/jdtornow/challah.png)](https://codeclimate.com/github/jdtornow/challah) [![Dependency Status](https://gemnasium.com/jdtornow/challah.png?travis)](https://gemnasium.com/jdtornow/challah) [![Gem Version](https://badge.fury.io/rb/challah.png)](http://badge.fury.io/rb/challah)
+[![Build Status](https://travis-ci.org/jdtornow/challah.svg?branch=master)](https://travis-ci.org/jdtornow/challah) [![Code Climate](https://codeclimate.com/github/jdtornow/challah/badges/gpa.svg)](https://codeclimate.com/github/jdtornow/challah) [![Dependency Status](https://gemnasium.com/jdtornow/challah.svg)](https://gemnasium.com/jdtornow/challah) [![Gem Version](https://badge.fury.io/rb/challah.svg)](https://badge.fury.io/rb/challah)
 
 Challah (pronounced HAH-lah) is a simple Rails authentication gem that provides users a way to authenticate with your app. Most of the functionality within the gem lives within a Rails engine and tries to stay out of the way of your app.
 
@@ -8,16 +8,16 @@ Challah doesn’t provide any fancy controllers or views that clutter your app o
 
 ## Requirements
 
-* Ruby 1.9.3+
+* Ruby 2.1.2+
 * Bundler
-* Rails 4.0+
+* Rails 4.2+
 
 ## Installation
 
 In your `Gemfile`
 
 ```ruby
-gem 'challah'
+gem "challah"
 ```
 
 ## Set up
@@ -71,11 +71,11 @@ For example, restrict the second list item to only users that have logged in:
 </ul>
 ```
 
-Controllers can also be restricted using `before_filter`:
+Controllers can also be restricted using `before_action`:
 
 ```ruby
 class WidgetsController < ApplicationController
-  before_filter :signin_required
+  before_action :signin_required
 
   # ...
 end
@@ -91,7 +91,7 @@ class WidgetsController < ApplicationController
 end
 ```
 
-All normal Rails `before_filter` options apply, so you can always limit this restriction to a specific action:
+All normal Rails `before_action` options apply, so you can always limit this restriction to a specific action:
 
 
 ```ruby
@@ -116,8 +116,6 @@ If you’d prefer to set up your own “sign in” and “sign out” actions, y
 
     Challah.options[:skip_routes] = true
 
-Note: These routes have changed from previous versions of Challah. `signin_path` and `signout_path` are now the preferred routes, instead of the legacy `login_path` and `logout_path`. However, the legacy routes still remain for backward compatibility.
-
 ## Sign In Form
 
 By default, the sign in form is tucked away within the Challah gem. If you’d like to customize the markup or functionality of the sign in form, you can unpack it into your app by running:
@@ -132,12 +130,6 @@ If necessary, the sessions controller which handles creating new sessions and si
 
 Documentation is available at: [http://rubydoc.info/gems/challah](http://rubydoc.info/gems/challah)
 
-## Example App
-
-A fully-functional example app, complete with some basic tests, is available at [http://challah-example.herokuapp.com/](http://challah-example.herokuapp.com/).
-
-The source code to the example is available at [https://github.com/jdtornow/challah-example](https://github.com/jdtornow/challah-example).
-
 ### Issues
 
 If you have any issues or find bugs running Challah, please [report them on Github](https://github.com/jdtornow/challah/issues). While most functions should be stable, Challah is still in its infancy and certain issues may be present.

data/VERSION

@@ -1 +1 @@
-1.2.11
+1.3.0

data/app/controllers/sessions_controller.rb

@@ -1,6 +1,12 @@
 if defined?(ApplicationController)
   class SessionsController < ApplicationController
-    before_filter :destroy_session, except: :create
+    if respond_to?(:before_action)
+      # Rails >= 4.0
+      before_action :destroy_session, except: :create
+    else
+      # Rails <= 3.2
+      before_filter :destroy_session, except: :create
+    end
 
     unloadable
 

data/db/migrate/20120127150433_create_users.rb

@@ -1,5 +1,6 @@
 class CreateUsers < ActiveRecord::Migration
-  def up
+
+  def change
     create_table :users do |t|
       t.string      :first_name
       t.string      :last_name
@@ -27,7 +28,4 @@ class CreateUsers < ActiveRecord::Migration
     add_index :users, :role_id
   end
 
-  def down
-    drop_table :users
-  end
-end
+end

data/db/migrate/20121116210759_create_authorizations.rb

@@ -1,4 +1,5 @@
 class CreateAuthorizations < ActiveRecord::Migration
+
   def change
     create_table :authorizations do |t|
       t.integer     :user_id
@@ -17,4 +18,5 @@ class CreateAuthorizations < ActiveRecord::Migration
     add_index :authorizations, :uid
     add_index :authorizations, :token
   end
+
 end

data/lib/challah/controller.rb

@@ -11,7 +11,7 @@ module Challah
     module ClassMethods
       # Restrict the current controller to only users that have authenticated. All actions
       # in the controller will be restricted unless otherwise stated. All normal options
-      # for a before_filter are observed.
+      # for a before_action are observed.
       #
       # @example
       #   class YourController < ApplicationController
@@ -29,8 +29,14 @@ module Challah
       #
       # @see Controller::InstanceMethods#signin_required signin_required
       def restrict_to_authenticated(options = {})
-        before_filter(options) do |controller|
-          controller.send(:signin_required)
+        block = proc { |controller| controller.send(:signin_required) }
+
+        if respond_to?(:before_action)
+          # Rails >= 4.0
+          before_action(options, &block)
+        else
+          # Rails <= 3.2
+          before_filter(options, &block)
         end
       end
 
@@ -90,14 +96,14 @@ module Challah
     #
     # @example
     #   class YourController < ApplicationController
-    #     before_filter :login_required
+    #     before_action :login_required
     #
     #     # ...
     #   end
     #
     # @example Specifing certain actions.
     #   class YourOtherController < ApplicationController
-    #     before_filter :login_required, :only => [ :create, :update, :destroy ]
+    #     before_action :login_required, :only => [ :create, :update, :destroy ]
     #
     #     # ...
     #   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.2.11
+  version: 1.3.0
 platform: ruby
 authors:
 - John Tornow
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -36,16 +36,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,28 +80,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ files:
 - lib/tasks/crud.rake
 - lib/tasks/setup.rake
 - lib/tasks/unpack.rake
-homepage: http://github.com/jdtornow/challah
+homepage: https://github.com/jdtornow/challah
 licenses:
 - MIT
 metadata: {}
@@ -193,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Rails 4 authentication and sessions
+summary: Rails authentication and sessions
 test_files: []