omniauth-aai 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdae5549161cd845e70e3823576e1aae2b2c14b8
-  data.tar.gz: 771fecbecc7edb1190e24deb917b1672acb4d528
+  metadata.gz: bfd7c32bfb00f107c948bb00a4454a51040150cd
+  data.tar.gz: b7a304f90ed28e0b9cc5ae99aea534d887fb58d6
 SHA512:
-  metadata.gz: fcf4a09e8dbae3baf2c51e326054a100fcb9a29acc9bdb65aa657202687ca4ed574219b7e27ec67140a90523417a931879029b8b6e22edd770e661052dae5ad2
-  data.tar.gz: 18311634f0456abae0de78c4ce713b5b14ca0b580cb6535bd57517e593a1171cdb1266c356480f7ad5db13b02f8b34e7d756be667f6f23deae857d856b827ad7
+  metadata.gz: 9e9579c114e8d9a3488d1b80972ff1aa65662ef8c39f6ef60a5865b5bdb561c4a6a2e812ce8c658f4176ec6fff0978bc250117d334525d1eb12e511dab8d1f0e
+  data.tar.gz: 32895afe76f3bd9d3ef71fcb3bf4d22aa6e724438d60baf7886ac5808cf9cb151a7e50f4b1846967f278773990c39c72974109d5de90d40ab78e43d0143fee3d

data/Gemfile.lock

@@ -8,8 +8,8 @@ GIT
 PATH
   remote: .
   specs:
-    omniauth-aai (0.6.2)
-      omniauth-shibboleth
+    omniauth-aai (0.6.4)
+      omniauth-shibboleth (~> 1.2)
 
 GEM
   remote: http://rubygems.org/
@@ -51,12 +51,6 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.0)
     builder (3.2.2)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
@@ -168,20 +162,17 @@ GEM
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
-  guard-rspec
+  guard-rspec (~> 4.5)
   omniauth-aai!
   omniauth-shibboleth!
-  rack-test
-  rails
-  rake
+  rack-test (~> 0.6)
+  rails (~> 4.2)
+  rake (~> 10.4)
   rspec (~> 3.2)
 
 BUNDLED WITH

data/README.md

@@ -30,6 +30,8 @@ This will generate some basic authenthication objects for rails:
 
 You can run it with '--persist false' if you don't want to persist the user to the local db.
 
+You'll need to run 'rake db:migrate' afterwards to create the user table.
+
 ### Additional Shibboleth attributes
 
 By default, you will get all the core SWITCHaai values, or you can configure it via options:

data/lib/generators/aai/USAGE

@@ -1,12 +1,13 @@
 Description:
-    Create Config / User / Session / Migration for Omniauth Aai Authentication
+  Create Config / User / Session / Migration for Omniauth Aai Authentication
 
 Example:
-    rails generate aai:install [--persist]
+  rails generate aai:setup [--persist]
 
-    This will create:
-      config/omniauth.rb
-      app/controller/session_controller.rb
-      app/models/user.rb
-      db/migrate/create_users_adapt_and_copy_to_migration.rb #configure this
+  This will create:
+    config/initializers/omniauth.rb
+    app/controller/session_controller.rb
+    app/models/user.rb
+    db/migrate/<timestamp>_create_aai_user.rb
 
+  "rake db:migrate" will be executed at the end. Additionally the has_current_user method is being added to ApplicationController.

data/lib/generators/aai/setup_generator.rb

@@ -29,7 +29,7 @@ module Aai
     def copy_user_file
       template "user.rb", "app/models/user.rb"
       migration_template "migration.rb", "db/migrate/create_aai_user.rb" if options[:persist]
-      rake "db:migrate"
+      # rake "db:migrate"
     end
 
     def self.next_migration_number(path)

data/lib/omniauth-aai/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Aai
-    VERSION = "0.6.4"
+    VERSION = "0.6.5"
   end
 end

data/lib/omniauth/strategies/aai.rb

@@ -57,34 +57,34 @@ module OmniAuth
         ]
       end
 
-      def request_params
-        super
-      end
+      # def request_params
+      #   super
+      # end
 
-      def request_param(key)
-        super
-      end
+      # def request_param(key)
+      #   super
+      # end
 
-      def callback_phase
-        super
-      end
+      # def callback_phase
+      #   super
+      # end
 
-      def option_handler(option_field)
-        super
-      end
+      # def option_handler(option_field)
+      #   super
+      # end
 
 
-      uid do
-        option_handler(options.uid_field)
-      end
+      # uid do
+      #   option_handler(options.uid_field)
+      # end
 
-      info do
-        super
-      end
+      # info do
+      #   super
+      # end
 
-      extra do
-        super
-      end
+      # extra do
+      #   super
+      # end
 
     end
   end

data/spec/omniauth/has_current_user_spec.rb

@@ -1,9 +1,12 @@
 require 'spec_helper'
 
 describe Omniauth::HasCurrentUser do
+  let(:extended_class) { Class.new { extend Omniauth::HasCurrentUser } }
+  let(:including_class) { Class.new { include Omniauth::HasCurrentUser } }
 
-  def test_to_squawk_prepends_the_word_squawk
-    assert_equal "squawk! Hello World", "Hello World".to_squawk
-  end
+  # it "returns nil of no user exists" do
+  #   # expect(extended_class.current_user).to eq nil
+  #   expect(including_class.current_user).to eq nil
+  # end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-aai
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Christian Rohrer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-shibboleth
@@ -121,6 +121,7 @@ files:
 - lib/omniauth-aai/version.rb
 - lib/omniauth/has_current_user.rb
 - lib/omniauth/strategies/aai.rb
+- omniauth-aai-0.6.4.gem
 - omniauth-aai.gemspec
 - spec/example_rails3_app/.DS_Store
 - spec/example_rails3_app/.gitignore