openstax_connect 0.0.6 → 0.0.7

data/app/controllers/openstax/connect/dev/users_controller.rb

@@ -2,20 +2,8 @@ module OpenStax
   module Connect
     module Dev
       class UsersController < DevController
-
-        def index; end
         
-        def create
-          handle_with(Dev::UsersCreate,
-                      success: lambda { redirect_to dev_users_path },
-                      failure: lambda { render 'index' })
-        end
-
-        def generate
-          handle_with(Dev::UsersGenerate,
-                      success: lambda { redirect_to dev_users_path, notice: 'Success!'},
-                      failure: lambda { render 'index', alert: 'Error' })
-        end
+        def login; end
 
         def search
           handle_with(Dev::UsersSearch,

data/app/controllers/openstax/connect/sessions_controller.rb

@@ -7,7 +7,6 @@ module OpenStax
       skip_before_filter :authenticate_user!
 
       def new
-        session[:return_to] = request.referrer
         redirect_to RouteHelper.get_path(:login)
       end
 
@@ -21,11 +20,15 @@ module OpenStax
 
       def destroy
         sign_out!
-        # Need to sign out on the services site so can't log back in automagically
-        redirect_to OpenStax::Utilities.generate_url(
-                      OpenStax::Connect.configuration.openstax_services_url + "/logout",
-                      return_to: return_url
-                    )
+
+        # If we're using the Services server, need to sign out of it so can't 
+        # log back in automagically
+        redirect_to OpenStax::Connect.configuration.enable_stubbing? ?
+                      return_url :
+                      OpenStax::Utilities.generate_url(
+                        OpenStax::Connect.configuration.openstax_services_url + "/logout",
+                        return_to: return_url
+                      )
       end
 
       def failure

data/app/views/openstax/connect/dev/users/login.html.erb

@@ -0,0 +1,17 @@
+
+<div class="openstax-connect development-login">
+
+  <% handler_errors.each do |error| %>
+    <%= error.translate %>
+  <% end %>
+
+  <%= osu.section_block "Development Login" do %>
+
+    <p>You need to login, but we're not connected to the Services server. Search for a user below 
+       and click the sign in link next to him or her.</p>
+
+    <%= render 'openstax/connect/users/action_search', action_search_path: dev_users_search_path %>
+
+  <% end %>
+
+</div>

data/app/views/openstax/connect/users/_action_search.html.erb

@@ -10,7 +10,7 @@
 
 <%= lev_form_for :search, 
                  url: action_search_path, 
-                 id: 'action_search_form',
+                 html: {id: 'action-search-form'},
                  remote: true do |f| %>
 
   Search for 

data/config/initializers/02_extend_builtins.rb

@@ -29,7 +29,9 @@ class ActionController::Base
 
   # Useful in before_filters
   def authenticate_user!
-    redirect_to openstax_connect.login_path unless signed_in?
+    return if signed_in?
+    session[:return_to] = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
+    redirect_to openstax_connect.login_path
   end
 
 protected

data/config/routes.rb

@@ -9,12 +9,7 @@ OpenStax::Connect::Engine.routes.draw do
 
   if OpenStax::Connect.configuration.enable_stubbing?
     namespace :dev do
-      # get 'sessions/new'
-      # post 'sessions/create'
-      # post 'sessions/search'
-      get 'users', to: 'users#index'
-      post 'users/create'
-      post 'users/generate'
+      get 'users/login'
       post 'users/search'
     end
   end
@@ -25,7 +20,7 @@ module OpenStax
   module Connect
     hh = Engine.routes.url_helpers
 
-    RouteHelper.register_path(:login, hh.openstax_login_path) { hh.dev_users_path }
+    RouteHelper.register_path(:login, hh.openstax_login_path) { hh.dev_users_login_path }
   end
 end
 

data/lib/openstax/connect/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Connect
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_connect
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -139,17 +139,14 @@ files:
 - app/controllers/openstax/connect/dev/dev_controller.rb
 - app/controllers/openstax/connect/dev/users_controller.rb
 - app/controllers/openstax/connect/sessions_controller.rb
-- app/handlers/openstax/connect/dev/users_create.rb
-- app/handlers/openstax/connect/dev/users_generate.rb
 - app/handlers/openstax/connect/dev/users_search.rb
 - app/handlers/openstax/connect/sessions_omniauth_authenticated.rb
 - app/helpers/openstax/connect/application_helper.rb
 - app/helpers/openstax/connect/sessions_helper.rb
 - app/models/openstax/connect/user.rb
-- app/routines/openstax/connect/dev/create_user.rb
 - app/routines/openstax/connect/search_users.rb
 - app/views/layouts/openstax/connect/application.html.erb
-- app/views/openstax/connect/dev/users/index.html.erb
+- app/views/openstax/connect/dev/users/login.html.erb
 - app/views/openstax/connect/dev/users/search.js.erb
 - app/views/openstax/connect/shared/_attention.html.erb
 - app/views/openstax/connect/users/_action_create_form.html.erb
@@ -189,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1536200191300701933
+      hash: 4441139255658210770
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1536200191300701933
+      hash: 4441139255658210770
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/app/handlers/openstax/connect/dev/users_create.rb

@@ -1,30 +0,0 @@
-module OpenStax::Connect::Dev
-  class UsersCreate
-    lev_handler
-
-  # this code might be OBE
-
-  protected
-
-    def authorized?
-      !Rails.env.production?
-    end
-
-    def handle
-      outputs[:user] = User.create do |user|
-        user.first_name = params[:register][:first_name]
-        user.last_name = params[:register][:last_name]
-        user.username = params[:register][:username]
-        # user.is_administrator = params[:register][:is_administrator]
-        user.openstax_uid = available_openstax_uid
-      end
-    
-      transfer_errors_from(outputs[:user], {scope: :register})
-    end
-
-    def available_openstax_uid
-      (User.order("openstax_uid DESC").first.try(:openstax_uid) || 0) + 1
-    end
-
-  end 
-end

data/app/handlers/openstax/connect/dev/users_generate.rb

@@ -1,38 +0,0 @@
-module OpenStax::Connect::Dev
-  class UsersGenerate
-    lev_handler
-
-  protected
-
-    paramify :generate do
-      attribute :count, type: Integer
-      validates :count, numericality: { only_integer: true,
-                                        greater_than_or_equal_to: 0 }
-    end
-
-    def authorized?
-      !Rails.env.production?
-    end
-
-    def handle
-      generate_params.count.times do 
-        while !(User.where(:username => (username = SecureRandom.hex(4))).empty?) do; end
-
-        u = User.create do |user|
-          user.first_name = "Jane#{username}"
-          user.last_name = "Doe#{username}"
-          user.username = username
-          user.is_administrator = false
-          user.openstax_uid = available_openstax_uid
-        end
-
-        result.outputs.add(:users, u)
-      end
-    end
-
-    def available_openstax_uid
-      (User.order("openstax_uid DESC").first.try(:openstax_uid) || 0) + 1
-    end
-
-  end 
-end

data/app/routines/openstax/connect/dev/create_user.rb

@@ -1,33 +0,0 @@
-module OpenStax::Connect::Dev
-  class CreateUser
-    lev_routine
-
-  protected
-
-    def exec(inputs={})
-
-      username = inputs[:username]
-
-      if username.nil? || inputs[:ensure_no_errors]
-        loop do 
-          break if !username.nil? && OpenStax::Connect::User.where(username: username).none?
-          username = "#{inputs[:username] || 'user'}#{rand(1000000)}"
-        end
-      end
-
-      outputs[:user] = OpenStax::Connect::User.create do |user|
-        user.first_name = inputs[:first_name]
-        user.last_name = inputs[:last_name]
-        user.username = username
-        user.openstax_uid = available_negative_openstax_uid
-      end
-    
-      transfer_errors_from(outputs[:user], {type: :verbatim})
-    end
-
-    def available_negative_openstax_uid
-      (OpenStax::Connect::User.order("openstax_uid DESC").last.try(:openstax_uid) || 0) - 1
-    end
-
-  end
-end

data/app/views/openstax/connect/dev/users/index.html.erb

@@ -1,30 +0,0 @@
-
-<% handler_errors.each do |error| %>
-  <%= error.translate %>
-<% end %>
-
-<%= osu.section_block "Register a new user" do %>
-
-  <%= lev_form_for :register, url: dev_users_create_path do |f| %>
-
-    First name <%= f.text_field :first_name %><br/>
-    Last name <%= f.text_field :last_name %><br/>
-    Username <%= f.text_field :username %><br/>
-    Admin? <%= f.check_box :is_administrator %><br/>
-
-    <%= submit_tag 'Register' %>
-  <% end %>
-
-<% end %>
-
-<%= osu.section_block "Generate new users" do %>
-    <%= lev_form_for :generate, url: dev_users_generate_path do |f| %>
-      Generate <%= f.text_field :count, style: 'width:30px' %> user(s) <%= submit_tag 'Do it now!' %>
-    <% end %>
-<% end %>
-
-<%= osu.section_block "Login as an existing user" do %>
-
-  <%= render 'openstax/connect/users/action_search', action_search_path: dev_users_search_path %>
-
-<% end %>