solidus_auth_devise 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1440854a89c64473660d7835feca81a8c89d09
-  data.tar.gz: e6e2487d560ce3db50639ea1d147f25ef992d406
+  metadata.gz: 68251ee8c8dbd193472c5d9e77c082699d99cbec
+  data.tar.gz: 9230ce9f639bd25adaa884ec143131a963279777
 SHA512:
-  metadata.gz: f3a5d7f70b629b8bd2a3dc6be84d5ae86861e8ba71496ac5cd2fdb7bb7bc6402b10746539c5943dc9f5f7d8ea31382804dbe5f62c98e45f4e6faf861669ff9ab
-  data.tar.gz: fc13b19405d30b23b4984038fd12cf0e587df59521841c0f90a2acac04593202e79d06594ee74ac073c5a7036b65427ea4715c1a593407d91be188a41badf3ec
+  metadata.gz: abfef5712300c46f1af842e9107ce7484e5a313a98ec04e16a00fdb4ba764f62387aeb64ac55c62a1d69423ff83ad99b9328e1691b40346e170a994ddedc10b6
+  data.tar.gz: 9e090cb6ddbfda0e779e9b5159f3f8a78e67d8becc9050d0124aeac557c421601e19fbbdd9da816d7d24b07db3e711ba5d7f24f4266a41b3a9d9b35b53a4dce4

data/app/overrides/auth_shared_login_bar.rb

@@ -2,6 +2,5 @@ Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
                      :name => "auth_shared_login_bar",
                      :insert_before => "li#search-bar",
                      :partial => "spree/shared/login_bar",
-                     :disabled => false, 
+                     :disabled => false,
                      :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')
-

data/config/locales/de.yml

@@ -1,5 +1,7 @@
 ---
 de:
+  spree:
+    admin_login: Admin anmelden
   devise:
     confirmations:
       confirmed: Ihr Konto wurde erfolgreich aktiviert.
@@ -38,6 +40,7 @@ de:
     user_sessions:
       signed_in: Erfolgreich angemeldet.
       signed_out: Erfolgreich abgemeldet.
+      already_signed_in: Bereits angemeldet.
   errors:
     messages:
       already_confirmed: wurde berreits bestätigt

data/config/locales/en.yml

@@ -1,7 +1,7 @@
 ---
 en:
   spree:
-    admin_login: "Admin Login"
+    admin_login: Admin Login
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -21,8 +21,6 @@ en:
         subject: Reset password instructions
       unlock_instructions:
         subject: Unlock Instructions
-      confirmation_instructions:
-        subject: Confirmation instructions
     oauth_callbacks:
       failure: 'Could not authorize you from %{kind} because %{reason}.'
       success: 'Successfully authorized from %{kind} account.'

data/lib/views/backend/spree/admin/shared/_navigation_footer.html.erb

@@ -0,0 +1,25 @@
+<% if spree_current_user %>
+  <ul id="login-nav" class="admin-login-nav">
+    <li data-hook="user-account-link">
+      <%= link_to spree.edit_user_path(spree_current_user) do %>
+        <i class='fa fa-user'></i>
+        <%= spree_current_user.email %>
+      <% end %>
+    </li>
+    <li data-hook="user-logout-link">
+      <%= link_to spree.admin_logout_path do %>
+        <i class='fa fa-sign-out'></i>
+        <%= Spree.t(:logout) %>
+      <% end %>
+    </li>
+
+    <% if spree.respond_to? :root_path %>
+      <li data-hook="store-frontend-link">
+        <%= link_to spree.root_path, :target => '_blank' do %>
+          <i class='fa fa-external-link'></i>
+          <%= Spree.t(:back_to_store) %>
+        <% end %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.2.3"
+  s.version     = "1.3.0"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -33,11 +33,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails", "~> 3.3"
   s.add_development_dependency "simplecov", "~> 0.9.0"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sass-rails", "~> 4.0.0"
-  s.add_development_dependency "coffee-rails", "~> 4.0.0"
+  s.add_development_dependency "sass-rails"
+  s.add_development_dependency "coffee-rails"
   s.add_development_dependency "shoulda-matchers", "~> 2.6.2"
   s.add_development_dependency "factory_girl", "~> 4.4"
   s.add_development_dependency "capybara", "~> 2.4.1"
   s.add_development_dependency "poltergeist", "~> 1.5"
   s.add_development_dependency "database_cleaner", "~> 1.2.0"
+  s.add_development_dependency "capybara-screenshot"
 end

data/spec/features/admin/sign_in_spec.rb

@@ -38,7 +38,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     fill_in 'Password', with: 'secret'
     click_button 'Login'
 
-    expect(page).to have_text 'Logged in as: admin@person.com'
+    expect(page).to have_text 'admin@person.com'
     expect(current_path).to eq '/admin/orders'
   end
 end

data/spec/features/sign_in_spec.rb

@@ -38,7 +38,7 @@ RSpec.feature 'Sign In', type: :feature do
     fill_in 'Password', with: user.password
     click_button 'Login'
 
-    expect(page).to have_text 'Logged in as: admin@person.com'
+    expect(page).to have_text 'admin@person.com'
     expect(current_path).to eq '/admin/orders'
   end
 

data/spec/support/capybara.rb

@@ -2,6 +2,9 @@ require 'capybara/rspec'
 require 'capybara/rails'
 require 'capybara/poltergeist'
 
+require 'capybara-screenshot/rspec'
+Capybara.save_and_open_page_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
+
 RSpec.configure do |config|
   Capybara.javascript_driver = :poltergeist
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -186,30 +186,30 @@ dependencies:
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +280,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: capybara-screenshot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides authentication and authorization services for use with Solidus
   by using Devise and CanCan.
 email: contact@solidus.io
@@ -344,6 +358,7 @@ files:
 - lib/spree/auth/engine.rb
 - lib/spree/authentication_helpers.rb
 - lib/tasks/auth.rake
+- lib/views/backend/spree/admin/shared/_navigation_footer.html.erb
 - lib/views/backend/spree/admin/user_passwords/edit.html.erb
 - lib/views/backend/spree/admin/user_passwords/new.html.erb
 - lib/views/backend/spree/admin/user_sessions/authorization_failure.html.erb
@@ -420,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by