mobile_workflow 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 843610afaa8207693d3f1be346698ca58e4022a3575b6953ef52c343781c649c
-  data.tar.gz: b787b24ab9fbf0f47910a889f23a59094d214db55c6eb0950609b674ba01ed64
+  metadata.gz: 713ccaaf463cd2815599e145de07b2b2cc5f838242f49e8e97a9eafebb691d10
+  data.tar.gz: f95cdbe9e1474adc2813c2c14edc113bd56b13bbb0661de16b2abe27368d1c30
 SHA512:
-  metadata.gz: 427d7c382ebc60cdf5ebd79f4257d2ec268cd0f52d7c7bd583afc1774c3adecaef910b163e06d1a754fa2340dfd352f23ae3c06056d97762e7b6fe878713b7cc
-  data.tar.gz: e98d3ebb68a12e42b3911d63fe16e4fe578ece0fc8e86814ac401d80a171fcd854d7a42f1a522fc535fc06d56eed1bb902e2a597b3d9d73a4c3c2b4603ce59a7
+  metadata.gz: 936c2c40cf080691b9c867214d09dea90dd4a16f2370e6f2b7b0d307a965e78863dfb3a761839f8fc46463727e96a7d0e7f37e4767aade6132b202715faa6917
+  data.tar.gz: 126597e1a681f59d770b40c8c2c830398932b2d69c8b8d81c5e3a5fbd52e9e3f858d15e857b10ecede4c1caf2600090406cf2d0ea2212122c0fd705e19a6e7dd

data/lib/generators/mobile_workflow/controller_generator.rb

@@ -8,13 +8,18 @@ module MobileWorkflow
       
       class_option :attributes, type: :array, default: [], banner: "field:type field:type"
       class_option :actions, type: :array, default: [], banner: "index create update destroy"
+      class_option :doorkeeper_oauth, type: :boolean, default: false
       
       def copy_controller_and_spec_files
         template "controller.rb.erb", File.join("app/controllers", controller_class_path, "#{controller_file_name}_controller.rb")
         template "controller_spec.rb.erb", File.join("spec/controllers", controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
       
-      private  
+      private
+      def doorkeeper_oauth?
+        options[:doorkeeper_oauth]
+      end
+      
       def attributes_names
         options[:attributes].map{ |attribute| attribute.split(":").first }
       end

data/lib/generators/mobile_workflow/install/install_generator.rb

@@ -32,6 +32,11 @@ module MobileWorkflow
         template("user.rb.erb", "app/models/user.rb")
         template("sessions_controller.rb.erb", "app/controllers/sessions_controller.rb")
         route "resources :sessions, only: [:new, :create]"
+        
+        # View related for login screen
+        copy_file("views/layout/application.html.erb")
+        copy_file("views/sessions/new.html.erb")
+        copy_file("helpers/application_helper.rb")
       end
       
       def generate_models

data/lib/generators/mobile_workflow/install/templates/Gemfile.erb

@@ -12,12 +12,12 @@ gem 'turbolinks', '~> 5'
 # Mobile Workflow
 #gem 'mobile_workflow', path: '../mobile_workflow'
 #gem 'mobile_workflow', github: 'FutureWorkshops/mobile_workflow'
-gem 'mobile_workflow', '0.5.5'
+gem 'mobile_workflow'
 
 # Authorisation / Authentication
 <%- if options[:doorkeeper_oauth] %>
 gem 'doorkeeper'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 <%- end %>
 gem 'cancancan', '~> 3.1'
 

data/lib/generators/mobile_workflow/install/templates/api_controller.rb.erb

@@ -8,7 +8,7 @@ class ApiController < ActionController::API
   before_action :doorkeeper_authorize!, unless: :anonymous_action?
   
   def current_resource_owner
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
+    @current_resource_owner ||= User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token&.accessible?
   end
   alias_method :current_user, :current_resource_owner
   

data/lib/generators/mobile_workflow/install/templates/helpers/application_helper.rb

@@ -0,0 +1,13 @@
+module ApplicationHelper
+  
+  def bootstrap_class_for(flash_type)
+    { success: "alert-success", error: "alert-danger", alert: "alert-warning", notice: "alert-info" }.stringify_keys[flash_type.to_s] || flash_type.to_s
+  end
+  
+  def flash_messages
+    flash.each do |flash_type, message|
+      concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(flash_type)}", role: 'alert'))
+    end
+    nil
+  end
+end

data/lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb

@@ -3,7 +3,7 @@ class SessionsController < ApplicationController
   end
 
   def create
-    @user = User.find_by(email: params[:email])
+    @user = User.find_by("LOWER(email)= ?", params[:email].downcase)
     if @user && @user.authenticate(params[:password])
       session[:user_id] = @user.id
       redirect_to params[:return_to] || root_url, notice: "Logged in!"

data/lib/generators/mobile_workflow/install/templates/user.rb.erb

@@ -1,4 +1,4 @@
 class User < ApplicationRecord
   has_secure_password
-  validates :email, presence: true
+  validates :email, presence: true, uniqueness: true
 end

data/lib/generators/mobile_workflow/install/templates/views/layouts/application.html.erb

@@ -0,0 +1,18 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+
+    <!-- Bootstrap CSS -->
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
+
+    <title>MW Project</title>
+  </head>
+  <body>
+    <div class="container">
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/lib/generators/mobile_workflow/install/templates/views/sessions/new.html.erb

@@ -0,0 +1,20 @@
+<h1>Sign In</h1>
+
+<%= flash_messages %>
+
+<%= form_tag sessions_path, method: :post do %>
+  <%= hidden_field_tag :return_to, params[:return_to] %>
+  
+  <div class="form-group">
+    <%= label_tag :email %>
+    <%= email_field_tag :email, nil, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= label_tag :password %>
+    <%= password_field_tag :password, nil, class: "form-control" %>
+  </div>
+
+  <%= submit_tag 'Sign In', class: "btn btn-primary" %>
+<% end %>
+

data/lib/generators/mobile_workflow/templates/controller_spec.rb.erb

@@ -6,10 +6,19 @@ require 'json'
 RSpec.describe <%= controller_class_name %>Controller do
   let(:params) { {} }
   let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
+  <% if doorkeeper_oauth? -%>
+  let(:user) { create(:user) }
+  let(:token) { instance_double('Doorkeeper::AccessToken', :accessible? => true, :acceptable? => true, resource_owner_id: user.id) }
+  <% end -%>
   
   describe 'GET #index' do
     let!(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
-    before(:each) { get :index, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    get :index, params: params
+	  end
     
     context 'ok' do
       it { expect(json_response[0][:id]).to eq <%= controller_class_name.singularize.underscore %>.id }               
@@ -20,7 +29,12 @@ RSpec.describe <%= controller_class_name %>Controller do
   describe 'GET #show' do
     let(:<%= controller_class_name.singularize.underscore %>) { create(:<%= controller_class_name.singularize.underscore %>) }
     let(:params) { { id: <%= controller_class_name.singularize.underscore %>.id } }
-    before(:each) { get :show, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    get :show, params: params
+	  end
     
     context 'ok' do                
       it { expect(response.status).to eq 200 }
@@ -30,7 +44,12 @@ RSpec.describe <%= controller_class_name %>Controller do
   describe 'POST #create' do
     let(:payload_params) { {text: 'OK'} }
     let(:params) { { payload: payload_params, binaries: [{identifier: 'record', mimetype: 'video/mp4'}] } }
-    before(:each) { post :create, params: params }
+    before(:each) do
+      <% if doorkeeper_oauth? -%>
+      allow(subject).to receive(:doorkeeper_token) { token }
+      <% end -%>
+	    post :create, params: params
+	  end
     
     context 'ok' do
       it { expect(<%= controller_class_name.singularize %>.count).to eq 1 }          

data/lib/mobile_workflow/version.rb

@@ -1,5 +1,5 @@
 module MobileWorkflow
-  VERSION = '0.5.7'
+  VERSION = '0.5.8'
   RUBY_VERSION = '2.5.5'
   RAILS_VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_workflow
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,10 +112,13 @@ files:
 - lib/generators/mobile_workflow/install/templates/README.md.erb
 - lib/generators/mobile_workflow/install/templates/ability.rb
 - lib/generators/mobile_workflow/install/templates/api_controller.rb.erb
+- lib/generators/mobile_workflow/install/templates/helpers/application_helper.rb
 - lib/generators/mobile_workflow/install/templates/seeds.rb.erb
 - lib/generators/mobile_workflow/install/templates/sessions_controller.rb.erb
 - lib/generators/mobile_workflow/install/templates/storage.s3.yml
 - lib/generators/mobile_workflow/install/templates/user.rb.erb
+- lib/generators/mobile_workflow/install/templates/views/layouts/application.html.erb
+- lib/generators/mobile_workflow/install/templates/views/sessions/new.html.erb
 - lib/generators/mobile_workflow/templates/controller.rb.erb
 - lib/generators/mobile_workflow/templates/controller_spec.rb.erb
 - lib/mobile_workflow.rb
@@ -148,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: A Rails engine to provide API support for Mobile Workflow Apps.