switch_user 0.9.4 → 0.9.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmQwZjYwMDUxNGZmNGVjMjY2ZWQ2YTE3MzUwYWUwOTA5NjA1MWEzZQ==
-  data.tar.gz: !binary |-
-    ZTBiZTg2NDBkOGE3OTM3NDQ1ODczNzIyOWUxNzYwZGQwYzFlNDRjMg==
+SHA1:
+  metadata.gz: 924cc5fa100afa7570a5123a211b67c238c7d502
+  data.tar.gz: 499e47bb57936f4ba85346dd715de82f7992754e
 SHA512:
-  metadata.gz: !binary |-
-    NGRkMDQwOGIzYjA2YThiMDc2NzU2OGUzYThhY2UyMDE2NGRiYTFlNGJiYWI5
-    MTU4YTBjMTIyOTBkNDdlM2U4MzVmZTBkODEzZTI5ZDJjYzQyMmNmMzk1MGNl
-    MmY4MjU1OTQ3NWM1NWU1NGUyZDI5ZTY3YTNhYTNjMWYwODEyNGQ=
-  data.tar.gz: !binary |-
-    YThmODEyMjBmNjUzMjNiNGZmMTUzYzUxOWMzMWZlYmQ2NzU4ZjZjYzA0MTFj
-    M2EyMjcyNGRmZWI2MWUxNWY2MjNkM2NmMjg3ODE1ZTdjMWIyODEwYTQwNDUz
-    YjQ5NWViMWIyZGEyMjU3NmMzNWIwOTdlMmQxNGMxMjQyZTI2NWI=
+  metadata.gz: 9f64a50974a3e93a2d880b1d09e3b122d0bfcbbf76be3f9cd0211a95e827c5e1a6e1924d9354c5106688211bd4c52a25b45856e32efed9ceba5df83fdbf2b545
+  data.tar.gz: 8afe11f071e813f079299dddbc235409ab0284811f33c55429022ad3e35bfc5826a85d70938a3b7f62eb3211c9319a46803736403d81748cb61b8a926795eca2

data/app/controllers/switch_user_controller.rb

@@ -30,11 +30,15 @@ class SwitchUserController < ApplicationController
     if params[:scope_identifier].blank?
       provider.logout_all
     else
-      loader = SwitchUser::UserLoader.prepare(params)
+      record = SwitchUser.data_sources.find_scope_id(params[:scope_identifier])
+      unless record
+        provider.logout_all
+        return
+      end
       if SwitchUser.login_exclusive
-        provider.login_exclusive(loader.user, :scope => loader.scope)
+        provider.login_exclusive(record.user, :scope => record.scope)
       else
-        provider.login_inclusive(loader.user, :scope => loader.scope)
+        provider.login_inclusive(record.user, :scope => record.scope)
       end
     end
   end

data/app/helpers/switch_user_helper.rb

@@ -2,14 +2,16 @@ module SwitchUserHelper
   SelectOption = Struct.new(:label, :scope_id)
   def switch_user_select
     return unless available?
-    options = []
-    selected_user = nil
 
-    users = SwitchUser::UserSet.users
-    users << SelectOption.new("Guest", "") if SwitchUser.helper_with_guest
+    if provider.current_user
+      selected_user = "user_#{current_user.id}"
+    else
+      selected_user = nil
+    end
+
     render :partial => "switch_user/widget",
            :locals => {
-             :options => users,
+             :options => SwitchUser.all_users,
              :current_scope => selected_user
            }
   end

data/lib/switch_user.rb

@@ -3,6 +3,7 @@ if defined?(Rails)
 end
 
 module SwitchUser
+  require 'switch_user/data_source'
   autoload :UserSet, "switch_user/user_set"
   autoload :UserLoader, "switch_user/user_loader"
   autoload :Provider, "switch_user/provider"
@@ -36,6 +37,20 @@ module SwitchUser
     @@guard_class = klass.constantize
   end
 
+  def self.all_users
+    data_sources.users
+  end
+
+  def self.data_sources
+    sources = available_users.map do |scope, loader|
+      identifier = available_users_identifiers.fetch(scope)
+      name = available_users_names.fetch(scope)
+      DataSource.new(loader, scope, identifier, name)
+    end
+    sources.unshift(GuestDataSource.new("Guest")) if helper_with_guest
+    DataSources.new(sources)
+  end
+
   def self.reset_config
     self.provider = :devise
     self.available_users = { :user => lambda { User.all } }

data/lib/switch_user/data_source.rb

@@ -0,0 +1,58 @@
+module SwitchUser
+  DataSource = Struct.new(:loader, :scope, :identifier, :name) do
+    def users
+      loader.call.map {|u| Record.new(u, self) }
+    end
+  end
+
+  GuestRecord = Struct.new(:scope) do
+    def equivalent?(other_scope_id)
+      scope_id == other_scope_id
+    end
+
+    def label
+      "Guest"
+    end
+
+    def scope_id
+    end
+  end
+
+  class GuestDataSource
+    def initialize(name)
+      @name = name
+    end
+
+    def users
+      [ GuestRecord.new(self) ]
+    end
+  end
+
+  DataSources = Struct.new(:sources) do
+    def users
+      sources.flat_map {|source| source.users }
+    end
+
+    def find_scope_id(scope_id)
+      users.flat_map.detect {|u| u.scope_id == scope_id }
+    end
+  end
+
+  Record = Struct.new(:user, :source) do
+    def equivalent?(other_scope_id)
+      scope_id == other_scope_id
+    end
+
+    def scope_id
+      "#{source.scope}_#{user.send(source.identifier)}"
+    end
+
+    def label
+      user.send(source.name)
+    end
+
+    def scope
+      source.scope
+    end
+  end
+end

data/lib/switch_user/version.rb

@@ -1,3 +1,3 @@
 module SwitchUser
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/spec/switch_user/data_source_spec.rb

@@ -0,0 +1,49 @@
+require 'switch_user/data_source'
+
+module SwitchUser
+  describe DataSource do
+    it "can load users" do
+      loader = lambda { [ double, double] }
+      source = DataSource.new(loader, :user, :id, :email)
+
+      source.users.should have(2).records
+    end
+  end
+
+  describe DataSources do
+    it "aggregates multiple data_sources" do
+      user = double(:user)
+      s1 = double(:s1, :users => [user])
+      source = DataSources.new([s1,s1])
+
+      source.users.should == [user, user]
+    end
+
+    describe "#find_source_id" do
+      it "can find a corresponding record across data sources" do
+        user = double(:user, :scope_id => "user_10")
+        s1 = double(:s1, :users => [])
+        s2 = double(:s1, :users => [user])
+        source = DataSources.new([s1,s2])
+
+        source.find_scope_id("user_10").should == user
+      end
+    end
+  end
+
+  describe Record do
+    it "can be compared to a identifier string" do
+      id1 = "user_100"
+      id2 = "user_101"
+      id3 = "staff_100"
+      user = double(:user, :id => 100, :email => "test@example.com")
+      source = DataSource.new(nil, :user, :id, :email)
+
+      record = Record.new(user, source)
+
+      record.should be_equivalent(id1)
+      record.should_not be_equivalent(id2)
+      record.should_not be_equivalent(id3)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switch_user
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Richard Huang
@@ -9,146 +9,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   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'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   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'
 - !ruby/object:Gem::Dependency
   name: railties
   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'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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'
 - !ruby/object:Gem::Dependency
   name: activerecord
   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'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   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'
 - !ruby/object:Gem::Dependency
   name: pry
   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: Easily switch current user to speed up development
@@ -158,8 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -174,6 +174,7 @@ files:
 - lib/generators/switch_user/install/templates/switch_user.rb
 - lib/switch_user.rb
 - lib/switch_user/base_guard.rb
+- lib/switch_user/data_source.rb
 - lib/switch_user/lambda_guard.rb
 - lib/switch_user/provider.rb
 - lib/switch_user/provider/authlogic.rb
@@ -201,6 +202,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/application.rb
 - spec/support/provider.rb
+- spec/switch_user/data_source_spec.rb
 - spec/switch_user/lambda_guard_spec.rb
 - spec/switch_user/user_loader_spec.rb
 - spec/switch_user/user_set_spec.rb
@@ -215,17 +217,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: switch_user
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Easily switch current user to speed up development