openstax_accounts 0.3.0 → 1.0.0

data/spec/dummy/config/application.rb

@@ -48,6 +48,9 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    # Suppress warning
+    config.i18n.enforce_available_locales = true
   end
 end
 

data/spec/dummy/config/initializers/openstax_accounts.rb

@@ -8,4 +8,5 @@ OpenStax::Accounts.configure do |config|
   config.openstax_application_id = 'secret'
   config.openstax_application_secret = 'secret'
   config.logout_via = :delete
+  config.max_matching_users = 47
 end

data/spec/dummy/config/routes.rb

@@ -6,10 +6,11 @@ Rails.application.routes.draw do
   namespace :api do
     post 'dummy', :to => 'dummy#dummy'
 
-    resource :application_users, :only => :create
-
-    resource :users, :only => [] do
-      get 'search'
+    resources :application_users, :only => [:index, :create] do
+      collection do
+        get 'updates'
+        put 'updated'
+      end
     end
   end
 

data/spec/lib/openstax_accounts_spec.rb

@@ -12,20 +12,28 @@ module OpenStax
       expect(Api::DummyController.last_params).to include 'test' => 'true'
     end
 
-    it 'makes api call to create application_user' do
-      expect(Api::ApplicationUsersController.last_action).to be_nil
-      expect(Api::ApplicationUsersController.last_params).to be_nil
-      Accounts.create_application_user(user)
-      expect(Api::ApplicationUsersController.last_action).to eq :create
+    it 'makes api call to application_user index' do
+      Api::ApplicationUsersController.last_action = nil
+      Api::ApplicationUsersController.last_params = nil
+      Accounts.application_users_index('sth')
+      expect(Api::ApplicationUsersController.last_action).to eq :index
+      expect(Api::ApplicationUsersController.last_params).to include :q => 'sth'
+    end
+
+    it 'makes api call to application_user updates' do
+      Api::ApplicationUsersController.last_action = nil
+      Api::ApplicationUsersController.last_params = nil
+      Accounts.application_users_updates
+      expect(Api::ApplicationUsersController.last_action).to eq :updates
       expect(Api::ApplicationUsersController.last_params).not_to be_nil
     end
 
-    it 'makes api call to user search' do
-      expect(Api::UsersController.last_action).to be_nil
-      expect(Api::UsersController.last_params).to be_nil
-      Accounts.user_search('sth')
-      expect(Api::UsersController.last_action).to eq :search
-      expect(Api::UsersController.last_params).to include :q => 'sth'
+    it 'makes api call to application_user updated' do
+      Api::ApplicationUsersController.last_action = nil
+      Api::ApplicationUsersController.last_params = nil
+      Accounts.application_users_updated({1 => 1})
+      expect(Api::ApplicationUsersController.last_action).to eq :updated
+      expect(Api::ApplicationUsersController.last_params[:application_users]).to include '1' => '1'
     end
   end
 end

data/spec/routines/openstax/accounts/dev/create_user_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module OpenStax
+  module Accounts
+    module Dev
+
+      describe CreateUser do
+
+        it 'creates users' do
+
+          expect(User.where(username: 'bob').first).to be_nil
+
+          outputs = CreateUser.call(username: 'bob', last_name: 'jones').outputs
+
+          expect(outputs[:user]).not_to be_nil
+          expect(outputs[:user].username).to eq 'bob'
+          expect(outputs[:user].last_name).to eq 'jones'
+          expect(User.where(username: 'bob').first).to eq outputs[:user]
+
+        end
+
+      end
+
+    end
+  end
+end

data/spec/routines/openstax/accounts/search_users_spec.rb

@@ -0,0 +1,129 @@
+require 'spec_helper'
+
+module OpenStax
+  module Accounts
+
+    describe SearchUsers do
+      
+      let!(:user_1)          { FactoryGirl.create :openstax_accounts_user,
+                                                  first_name: 'John',
+                                                  last_name: 'Stravinsky',
+                                                  username: 'jstrav' }
+      let!(:user_2)          { FactoryGirl.create :openstax_accounts_user,
+                                                  first_name: 'Mary',
+                                                  last_name: 'Mighty',
+                                                  full_name: 'Mary Mighty',
+                                                  username: 'mary' }
+      let!(:user_3)          { FactoryGirl.create :openstax_accounts_user,
+                                                  first_name: 'John',
+                                                  last_name: 'Stead',
+                                                  username: 'jstead' }
+
+      let!(:user_4)          { FactoryGirl.create :openstax_accounts_user,
+                                                  first_name: 'Bob',
+                                                  last_name: 'JST',
+                                                  username: 'bigbear' }
+
+      it "should match based on username" do
+        outcome = SearchUsers.call('username:jstra').outputs.users.all
+        expect(outcome).to eq [user_1]
+      end
+
+      it "should ignore leading wildcards on username searches" do
+        outcome = SearchUsers.call('username:%rav').outputs.users.all
+        expect(outcome).to eq []
+      end
+
+      it "should match based on one first name" do
+        outcome = SearchUsers.call('first_name:"John"').outputs.users.all
+        expect(outcome).to eq [user_3, user_1]
+      end
+
+      it "should match based on one full name" do
+        outcome = SearchUsers.call('full_name:"Mary Mighty"').outputs.users.all
+        expect(outcome).to eq [user_2]
+      end
+
+      it "should return all results if the query is empty" do
+        outcome = SearchUsers.call("").outputs.users.all
+        expect(outcome).to eq [user_4, user_3, user_1, user_2]
+      end
+
+      it "should match any field when no prefix given" do
+        outcome = SearchUsers.call("jst").outputs.users.all
+        expect(outcome).to eq [user_4, user_3, user_1]
+      end
+
+      it "should match any field when no prefix given and intersect when prefix given" do
+        outcome = SearchUsers.call("jst username:jst").outputs.users.all
+        expect(outcome).to eq [user_3, user_1]
+      end
+
+      it "shouldn't allow users to add their own wildcards" do
+        outcome = SearchUsers.call("username:'%ar'").outputs.users.all
+        expect(outcome).to eq []
+      end
+
+      it "should gather space-separated unprefixed search terms" do
+        outcome = SearchUsers.call("john mighty").outputs.users.all
+        expect(outcome).to eq [user_3, user_1, user_2]
+      end
+
+      context "pagination and sorting" do
+
+        let!(:billy_users) {
+          (0..45).to_a.collect{|ii|
+            FactoryGirl.create :openstax_accounts_user,
+                               first_name: "Billy#{ii.to_s.rjust(2, '0')}",
+                               last_name: "Bob_#{(45-ii).to_s.rjust(2,'0')}",
+                               username: "billy_#{ii.to_s.rjust(2, '0')}"
+          }
+        }
+
+        it "should return the first page of values by default in default order" do
+          outcome = SearchUsers.call("username:billy").outputs.users.all
+          expect(outcome.length).to eq 20
+          expect(outcome[0]).to eq User.where{username.eq "billy_00"}.first
+          expect(outcome[19]).to eq User.where{username.eq "billy_19"}.first
+        end
+
+        it "should return the 2nd page when requested" do
+          outcome = SearchUsers.call("username:billy", page: 1).outputs.users.all
+          expect(outcome.length).to eq 20
+          expect(outcome[0]).to eq User.where{username.eq "billy_20"}.first
+          expect(outcome[19]).to eq User.where{username.eq "billy_39"}.first
+        end
+
+        it "should return the incomplete 3rd page when requested" do
+          outcome = SearchUsers.call("username:billy", page: 2).outputs.users.all
+          expect(outcome.length).to eq 6
+          expect(outcome[5]).to eq User.where{username.eq "billy_45"}.first
+        end
+
+        it "should return no results if the limit is exceeded" do
+          outcome = SearchUsers.call("").outputs.users.all
+          expect(outcome).to be_empty
+        end
+
+      end
+
+      context "sorting" do
+
+        let!(:bob_brown) { FactoryGirl.create :openstax_accounts_user, first_name: "Bob", last_name: "Brown", username: "foo_bb" }
+        let!(:bob_jones) { FactoryGirl.create :openstax_accounts_user, first_name: "Bob", last_name: "Jones", username: "foo_bj" }
+        let!(:tim_jones) { FactoryGirl.create :openstax_accounts_user, first_name: "Tim", last_name: "Jones", username: "foo_tj" }
+
+        it "should allow sort by multiple fields in different directions" do
+          outcome = SearchUsers.call("username:foo", order_by: "first_name, last_name DESC").outputs.users.all
+          expect(outcome).to eq [bob_jones, bob_brown, tim_jones]
+
+          outcome = SearchUsers.call("username:foo", order_by: "first_name, last_name ASC").outputs.users.all
+          expect(outcome).to eq [bob_brown, bob_jones, tim_jones]
+        end
+
+      end
+
+    end
+
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: openstax_accounts
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - JP Slavinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,39 +55,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: squeel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: roar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: lev
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: openstax_utilities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,15 +146,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: keyword_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +188,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +202,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +209,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -238,7 +223,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: quiet_assets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -246,7 +230,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -254,7 +237,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -262,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -274,36 +255,42 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/openstax/accounts/application.js
 - app/assets/stylesheets/openstax/accounts/application.css
 - app/assets/stylesheets/openstax/accounts/dev.css.scss
 - app/controllers/openstax/accounts/application_controller.rb
-- app/controllers/openstax/accounts/dev/dev_controller.rb
+- app/controllers/openstax/accounts/dev/base_controller.rb
 - app/controllers/openstax/accounts/dev/users_controller.rb
 - app/controllers/openstax/accounts/sessions_controller.rb
-- app/handlers/openstax/accounts/dev/users_search.rb
+- app/handlers/openstax/accounts/dev/users_index.rb
 - app/handlers/openstax/accounts/sessions_omniauth_authenticated.rb
 - app/helpers/openstax/accounts/application_helper.rb
+- app/models/openstax/accounts/application_user.rb
 - app/models/openstax/accounts/user.rb
 - app/representers/openstax/accounts/api/v1/application_user_representer.rb
-- app/representers/openstax/accounts/api/v1/contact_info_representer.rb
-- app/representers/openstax/accounts/api/v1/email_address_representer.rb
+- app/representers/openstax/accounts/api/v1/application_user_search_representer.rb
+- app/representers/openstax/accounts/api/v1/application_users_representer.rb
 - app/representers/openstax/accounts/api/v1/user_representer.rb
 - app/representers/openstax/accounts/api/v1/user_search_representer.rb
 - app/routines/openstax/accounts/dev/create_user.rb
+- app/routines/openstax/accounts/dev/search_users.rb
 - app/routines/openstax/accounts/search_users.rb
+- app/routines/openstax/accounts/sync_users.rb
 - app/views/layouts/openstax/accounts/application.html.erb
+- app/views/openstax/accounts/dev/users/_search_results.html.erb
+- app/views/openstax/accounts/dev/users/index.js.erb
 - app/views/openstax/accounts/dev/users/login.html.erb
-- app/views/openstax/accounts/dev/users/search.js.erb
 - app/views/openstax/accounts/shared/_attention.html.erb
-- app/views/openstax/accounts/users/_action_create_form.html.erb
-- app/views/openstax/accounts/users/_action_dialog.html.erb
-- app/views/openstax/accounts/users/_action_list.html.erb
-- app/views/openstax/accounts/users/_action_search.html.erb
-- app/views/openstax/accounts/users/action_search.js.erb
+- app/views/openstax/accounts/shared/users/_index.html.erb
 - config/initializers/extend_builtins.rb
 - config/routes.rb
 - db/migrate/0_create_openstax_accounts_users.rb
+- lib/generators/openstax/accounts/schedule/USAGE
+- lib/generators/openstax/accounts/schedule/schedule_generator.rb
+- lib/generators/openstax/accounts/schedule/templates/schedule.rb
 - lib/omniauth/strategies/openstax.rb
 - lib/openstax/accounts/action_list.rb
 - lib/openstax/accounts/current_user_manager.rb
@@ -312,20 +299,18 @@ files:
 - lib/openstax/accounts/user_provider.rb
 - lib/openstax/accounts/version.rb
 - lib/openstax_accounts.rb
-- spec/factories/openstax_accounts_user.rb
-- MIT-LICENSE
-- Rakefile
-- README.md
 - spec/controllers/openstax/accounts/dev/users_controller_spec.rb
 - spec/controllers/openstax/accounts/sessions_controller_spec.rb
+- spec/dummy/README.md
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/api/application_users_controller.rb
 - spec/dummy/app/controllers/api/dummy_controller.rb
-- spec/dummy/app/controllers/api/users_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/oauth_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -342,47 +327,40 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/config.ru
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/Rakefile
-- spec/dummy/README.md
 - spec/dummy/script/rails
+- spec/factories/openstax_accounts_user.rb
 - spec/lib/openstax_accounts_spec.rb
 - spec/models/openstax/accounts/user_spec.rb
+- spec/routines/openstax/accounts/dev/create_user_spec.rb
+- spec/routines/openstax/accounts/search_users_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/openstax/accounts-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2332363655345696983
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2332363655345696983
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails common code and bindings and for 'accounts' API
 test_files:
 - spec/controllers/openstax/accounts/dev/users_controller_spec.rb
@@ -391,7 +369,6 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/api/application_users_controller.rb
 - spec/dummy/app/controllers/api/dummy_controller.rb
-- spec/dummy/app/controllers/api/users_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/oauth_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -423,4 +400,6 @@ test_files:
 - spec/factories/openstax_accounts_user.rb
 - spec/lib/openstax_accounts_spec.rb
 - spec/models/openstax/accounts/user_spec.rb
+- spec/routines/openstax/accounts/dev/create_user_spec.rb
+- spec/routines/openstax/accounts/search_users_spec.rb
 - spec/spec_helper.rb