devise-guests 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7329fab1798a4c760c934f5fc78731361295dd2
-  data.tar.gz: 946773a13249939a4a2096e85e875b970f753aeb
+  metadata.gz: 116261fdbf67744f52cab29287d611418338fa5f
+  data.tar.gz: 2cd6be05426becf115076b2a50beddc3e244edd1
 SHA512:
-  metadata.gz: 50b69c022469f239b6a48a31384522ac5e732ebc2a922f1731a53a76bb1823782f47e1a540907634367738ef486b3735272ddceb67eee5b5f283583f2ad9e377
-  data.tar.gz: 8f15f1ba4d180f7f257cb2cbefb9e6bc44764fdccc8348714f022dd7a629feeb0e38676d8b66f0b3deb630f0fbc6d8c280aac6cab6a25f25388b63de07a51010
+  metadata.gz: 9245e301b525acfd1fda18165050cac14dc3df60ebcce886160eb266fbab76c6654f9f6ada49afa6ef9aaf481be5f876d17b116f7533f77673210ab26d3554f1
+  data.tar.gz: 4ca01fcb81c4fa20147c3e1de2a5b8a7a95425b4e7bd6d651d72bc3ff3faf46951cb05d9ffbf2aca10d1f256b457a0d7dfaac4ac3647dd177f109d0641479cd8

data/.gitignore

@@ -0,0 +1,14 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log

data/Gemfile

@@ -9,3 +9,5 @@ group :test do
   gem 'activerecord'
   gem 'actionmailer'
 end
+
+gem 'transpec'

data/devise-guests.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'devise'
 
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "combustion", '~> 0.4.0'
   s.add_development_dependency "rspec-rails"

data/lib/devise-guests/controllers/helpers.rb

@@ -33,13 +33,13 @@ module DeviseGuests::Controllers
           return @guest_#{mapping} if @guest_#{mapping}
 
           if session[:guest_#{mapping}_id]
-            @guest_#{mapping} = #{class_name}.find_by_email(session[:guest_#{mapping}_id]) rescue nil
+            @guest_#{mapping} = #{class_name}.find_by(#{class_name}.authentication_keys.first => session[:guest_#{mapping}_id]) rescue nil
             @guest_#{mapping} = nil if @guest_#{mapping}.respond_to? :guest and !@guest_#{mapping}.guest 
           end
 
           @guest_#{mapping} ||= begin
             u = create_guest_#{mapping}(session[:guest_#{mapping}_id])
-            session[:guest_#{mapping}_id] = u.email
+            session[:guest_#{mapping}_id] = u.send(#{class_name}.authentication_keys.first)
             u
           end
 
@@ -61,16 +61,19 @@ module DeviseGuests::Controllers
         end
 
         private
-        def create_guest_#{mapping} email = nil
-          email &&= nil unless email.to_s.match(/^guest/)
-          email ||= "guest_" + guest_#{mapping}_unique_suffix + "@example.com"
-          u = #{class_name}.new.tap do |g|
-            g.email = email
-            g.save
+        def create_guest_#{mapping} key = nil
+          auth_key = #{class_name}.authentication_keys.first
+          #{class_name}.new do |g|
+            g.send("\#{auth_key}=", send(:"guest_\#{auth_key}_authentication_key", key))
+            g.guest = true if g.respond_to? :guest
+            g.skip_confirmation! if g.respond_to?(:skip_confirmation!)
+            g.save(validate: false)
           end
-          u.password = u.password_confirmation = email
-          u.guest = true if u.respond_to? :guest
-          u
+        end
+
+        def guest_email_authentication_key key
+          key &&= nil unless key.to_s.match(/^guest/)
+          key ||= "guest_" + guest_#{mapping}_unique_suffix + "@example.com"
         end
 
         def guest_#{mapping}_unique_suffix

data/lib/devise-guests/version.rb

@@ -1,3 +1,3 @@
 module DeviseGuests
-  VERSION = '0.3.3'
+  VERSION = '0.5.0'
 end

data/spec/controllers/application_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe ApplicationController do
+describe ApplicationController, :type => :controller do
   controller do
 
   end
@@ -12,16 +12,16 @@ describe ApplicationController do
   end
 
   it "should create an anonymous user for a guest" do
-    @mock_warden.stub(:authenticate).with(anything).and_return(false)
+    allow(@mock_warden).to receive(:authenticate).with(anything).and_return(false)
 
-    @controller.current_or_guest_user.email.should =~ /guest/
+    expect(@controller.current_or_guest_user.email).to match(/guest/)
   end
 
   it "should use the current user when available" do
     m = double()
-    @mock_warden.stub(:authenticate).with(anything).and_return(m)
+    allow(@mock_warden).to receive(:authenticate).with(anything).and_return(m)
 
-    @controller.current_or_guest_user.should == m
+    expect(@controller.current_or_guest_user).to eq(m)
   end
 
 end

data/spec/helpers/devise_guests_helpers_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
 
-describe "devise guest helpers" do
+describe "devise guest helpers", :type => :helper do
 
 end

data/spec/integration/simple_integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Simple Integration" do
+describe "Simple Integration", :type => :request do
   it "should work" do
   end
 end

data/spec/internal/config/initializers/devise.rb

@@ -3,4 +3,5 @@ Devise.setup do |config|
   require 'devise-guests'
 
   config.helpers << DeviseGuests::Controllers::Helpers
+  config.secret_key = '71da52cff5ef1a77c9ccdc5153993e0e58054c288c86e005d9f7eca6ac7a9279825c7903f1de5960e900543ab0cf7f85b6d307c43b53719bebcdb9cdcfe8b7e7'
 end

data/spec/spec_helper.rb

@@ -16,3 +16,7 @@ Combustion.initialize!(:active_record,:action_mailer)
 require 'rspec/rails'
 require 'capybara/rails'
 
+RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-guests
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2016-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -28,16 +28,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -139,6 +140,7 @@ files:
 - spec/internal/config/database.yml
 - spec/internal/config/initializers/devise.rb
 - spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico
@@ -163,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Guest user implementation for devise
@@ -176,6 +178,7 @@ test_files:
 - spec/internal/config/database.yml
 - spec/internal/config/initializers/devise.rb
 - spec/internal/config/routes.rb
+- spec/internal/db/combustion_test.sqlite
 - spec/internal/db/schema.rb
 - spec/internal/log/.gitignore
 - spec/internal/public/favicon.ico