simple_admin_auth 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a986cc9e5ccad0067a27efcb24d31decc3e7a12
-  data.tar.gz: fd798bfdf54add7433fa9310bf2c274e82b0446c
+  metadata.gz: 778f7b2792642130800e0aef4ad721a01dd88e16
+  data.tar.gz: 31b9f1072e04c83111dc2a474940492e8f772b24
 SHA512:
-  metadata.gz: e077f215921a2a723d8f27dae8f91144f683921e020c438d0bde2fc6c0bb300a802ca4040e85931e1ed475ac6da67ca663710cc59907147b060b5a361d9ee429
-  data.tar.gz: a5e16f8d88a326d973e240e1960371b274225f36a3b45b737972fc97da1ddba10cb1d61bdb9a8e7403bb469d463968259e5340cc563a64f81a8b917e5b023756
+  metadata.gz: e036b37199c206b719a78d891c6323fe75dd3bc9ddf54f077aa42f4beee9a2325744e469834f04c8390a1fc8f682e8254e871c1443c5ac147d29282211165948
+  data.tar.gz: 4bbf83c4be4ca06576796991c5cf5d8ccda44b002b1e85ee83c3efb286b5ff1a3e493c4f1c13d90ab161c2ed450b265a59e922df9c72dc92bee34fed32d3010d

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 script: "bundle exec rspec"
 
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.1.2
 
 gemfile:
   - gemfiles/rack1.5.gemfile

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_admin_auth (0.1.0)
+    simple_admin_auth (0.1.2)
       omniauth
       sinatra
 

data/README.md

@@ -123,6 +123,10 @@ Note that this relies on internal behaviour of this gem, and might not be compat
 
 ## Changelog
 
+### 0.1.2
+
+* Rails 4.1 compatibility, contributed by @drubin.
+
 ### 0.1.1
 
 * Allow whitelisting of emails. Contributed by @drubin.

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+
+task :update_gemfiles do
+  puts "Run all of the following:"
+  puts "bundle install"
+  Dir['gemfiles/*.gemfile'].each do |gemfile|
+    puts "BUNDLE_GEMFILE=#{gemfile} bundle install"
+  end
+end

data/gemfiles/rack1.5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    simple_admin_auth (0.1.0)
+    simple_admin_auth (0.1.2)
       omniauth
       sinatra
 

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    simple_admin_auth (0.1.0)
+    simple_admin_auth (0.1.2)
       omniauth
       sinatra
 
@@ -77,7 +77,7 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.5.0)
+    rack-protection (1.5.3)
       rack
     rack-ssl (1.3.3)
       rack
@@ -109,10 +109,10 @@ GEM
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.13.1)
-    sinatra (1.3.6)
+    sinatra (1.4.5)
       rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)

data/gemfiles/rails4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    simple_admin_auth (0.1.0)
+    simple_admin_auth (0.1.2)
       omniauth
       sinatra
 

data/gemfiles/rails4.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    simple_admin_auth (0.1.0)
+    simple_admin_auth (0.1.2)
       omniauth
       sinatra
 

data/lib/simple_admin_auth/authenticated.rb

@@ -16,9 +16,10 @@ module SimpleAdminAuth
     end
 
     def self.is_admin?(session)
+      admin_session = get_session_key(session, :admin_user)
       valid_admin = false
-      if !session[:admin_user].nil? && !session[:admin_user][:email].nil?
-        email = session[:admin_user][:email]
+      if !admin_session.nil? && !get_session_key(admin_session, :email).nil?
+        email = get_session_key(admin_session, :email)
         if !SimpleAdminAuth::Configuration.email_white_list.nil?
           if SimpleAdminAuth::Configuration.email_white_list.include?(email)
             valid_admin = true
@@ -29,6 +30,11 @@ module SimpleAdminAuth
       end
       valid_admin
     end
+
+    private 
+    def self.get_session_key(hash, symbol)
+      (hash[symbol] || hash[symbol.to_s])
+    end
   end
 
 

data/lib/simple_admin_auth/version.rb

@@ -1,3 +1,3 @@
 module SimpleAdminAuth
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/authenticate_spec.rb

@@ -26,6 +26,15 @@ describe SimpleAdminAuth::Authenticate do
     }
   end
 
+  let(:admin_string_sessions) do 
+    {
+      admin_user:{
+        'email'=> 'admin@example.com',
+        'name'=> 'dummy'
+      } 
+    }
+  end
+
   before do
     SimpleAdminAuth::Configuration.email_white_list = nil
   end
@@ -34,6 +43,10 @@ describe SimpleAdminAuth::Authenticate do
     auth.is_admin?(admin_session).should eq(true)
   end
 
+  it 'should authenticate if admin email is set in a string key' do 
+    auth.is_admin?(admin_string_sessions).should eq(true)
+  end
+
   it 'should not authenticate with empty session ' do 
     auth.is_admin?({}).should eq(false)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_admin_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ralf Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth