shopapp 0.2.58 → 0.2.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5642e3de1bfc4b78908970794bb1bdbcd67f114ea2371f4d3a14b621aff072
-  data.tar.gz: 41fd31d1439768e50a56dab7fa2eb11ee0b836d95d0c9640f33eb74d64ca261a
+  metadata.gz: c3f32a8bb9da2ba3bde17d6a54bec3472a41427d9d39747d02ec23bd694eb1e8
+  data.tar.gz: f9f4637f3dbdb80dc9e711316361a81572f58d5f82229648ee6bdd92cf77f2db
 SHA512:
-  metadata.gz: e7d1d3e32ce3db851986bbad5f8c3934bc627d39966a569391069bc5246a0931756cb04cd349d5a6f3d657c4099e36215ceeb20dcd29432da15e62d856783aa3
-  data.tar.gz: b5dae765cce80eb8531df0c882873df4358e8bd790564cd70e34a747173d2002eabeeb21ac8ac62d72b6e7b4b52837939477fc2ff33973a14f6046096454fbae
+  metadata.gz: 05c578664bb08a36689302c52ae037d3d7e9c6fb709a9ec5166fc14814d19370aa4decd0bd78dcf5f6322ca5fd0c0c1e608ae56e2e5de70fa1eff49210abb6b7
+  data.tar.gz: f28cc6a9fcb1190681a8f5111e2ae4aeb2db8bff62988c14b80d0b8454c74d00c69f576b7f775df1ae44e90bb94b84202cbb16b447699936a40508370b2c0068

data/README.md

@@ -4,15 +4,16 @@ Shopapp gem - gem for Shoplift clients.
 
 # Shoplift apps: ShopApps
 
-ShopApps are Shoplift applications, and if they are written in Rails, they can
-be made with Shopapp gem. It provides quick start, UI template and controllers
-that force authentication with Authlift, Shoplift OAuth provider.
+ShopApps (or shopapps when refering to a set of them) are Shoplift applications,
+and if they are written in Rails, they can be made with Shopapp gem. It provides
+quick start, UI template and controllers that force authentication with Authlift,
+Shoplift OAuth provider.
 
 # Development Setup
 
 * You must have account with Shoplift with membership for "zwr" company,
   which is used for all app development.
-* ShopApp will work on any \*nix, but is designed on and for OSX
+* ShopApp will work on any \*nix, but is designed on and for development on OSX
 * Postgres (latest), typically via Brew
 * You will need Ruby 2.5.1, and typically via RVM, and few gems:
 
@@ -62,19 +63,34 @@ Following creates default remote (zwr/demolift), but does not push:
 
     skip_github_push=1 shopitapp demolift
 
+# Developing shopapps
+
 ### Favicon
 
 Make a 610x610 PNG, for Z-ware colors use 7800a1 -> 7086d6. Then drag that icon
 to https://faviconit.com and copy all returned files except the instructions to
 /public/favicon/ folder.
 
-Add the following line to the header and make sure it does not contain anything
-else regarding favicons:
+Add the following line to the head of your layouts and make sure it does not
+contain anything else regarding favicons:
 
     = shopapp3_favicon
 
+### Localized shopapps
+
+Shopapp gem and authlift provide all you need for localization. If you want your
+shopapp to support i18n, add two methods to your ApplicationController:
+
+* Create method supported_locales which should return an array of language codes, for
+  example ['fi', 'en', 'sv'].
+* Override method set_locale, most likely like this:
+
+    def set_locale
+      I18n.locale = current_user['language'].to_sym || I18n.default_locale
+    end
+
 # Developing this gem
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.58.gem; gem install shopapp
+    git push; gem build shopapp.gemspec ; gem push shopapp-0.2.59.gem; gem install shopapp

data/app/controllers/auth_controller.rb

@@ -35,4 +35,13 @@ class AuthController < ActionController::Base
     signouttoken = session_cookie
     redirect_to "#{Rails.configuration.settings['authlift_url']}users/change_companyx/#{new_company_code}?change_company_token=#{signouttoken}"
   end
+
+  def change_language
+    authenticate_user!
+    return if current_user.blank?
+    new_language_code = params.except(:_method, :authenticity_token).permit(:new_language_code)[:new_language_code]
+
+    signouttoken = session_cookie
+    redirect_to "#{Rails.configuration.settings['authlift_url']}users/change_languagex/#{new_language_code}?change_language_token=#{signouttoken}&return_to=#{request.base_url}"
+  end
 end

data/app/controllers/concerns/shoplift_client.rb

@@ -14,6 +14,7 @@ module ShopliftClient
     attr_reader :search_path
     attr_accessor :search_placeholder
     helper_method :company_logo_path_defined
+    helper_method :supported_locales_defined
     helper_method :home_link_path
   end
 
@@ -125,16 +126,24 @@ module ShopliftClient
       @current_company ||= Company.find_or_create_by! code: code do |new_company|
         fail if parameters.empty?
         new_company.name = parameters[:name]
-        new_company.info = parameters.to_json
+        # following is an ugly yet backwards conpatible and safe way to store
+        # the company info if and in the best way possible, until all the apps
+        # are updated to have json there.
+        case new_company.column_for_attribute('info').type
+        when :json
+          new_company.info = parameters
+        when :string
+          new_company.info = parameters.to_json
+        end
       end
     rescue ActiveRecord::StatementInvalid
       if $!.cause.is_a? PG::UndefinedTable
         fail <<-ERROR.strip_heredoc
           You have not defined a company, and that is compulsory even if
-          you are not planning to add any additional fields. You do not need to
-          seed it, so following is enough forever:
+          you are not planning to add any additional fields. You do not
+          need to seed it, so following is enough forever:
 
-              rails g model company code:string; rake db:migrate
+              rails g model company code:string name:string info:json; rake db:migrate
         ERROR
       end
     end
@@ -146,6 +155,7 @@ module ShopliftClient
       begin
         x = srv.get '/api/users/profile'
         @current_user_json_hash = @current_user = JSON.parse x.response.body
+
         unless @current_user['scopes'].is_a? String
           user_scopes = @current_user['scopes']
         else
@@ -279,13 +289,21 @@ module ShopliftClient
   end
 
   def company_logo_path_defined
-    if  defined? self.company_logo_path
+    if defined? self.company_logo_path
       company_logo_path
     else
       "https://media.shoplift.fi/company_logos/#{@current_user_json_hash['company']['logo_code']}_company_logo_24.png"
     end
   end
 
+  def supported_locales_defined
+    if defined? self.supported_locales
+      supported_locales
+    else
+      []
+    end
+  end
+
   def home_link_path
     root_path
   end

data/app/controllers/user_authenticated_controller.rb

@@ -1,5 +1,5 @@
 class UserAuthenticatedController < ApplicationController
   include ShopliftClient
   protect_from_forgery with: :exception
-  before_action :authenticate_user!
+  prepend_before_action :authenticate_user!
 end

data/app/controllers/user_authenticated_or_api_controller.rb

@@ -1,5 +1,5 @@
 class UserAuthenticatedOrApiController < ApplicationController
   include ShopliftClient
   protect_from_forgery with: :exception
-  before_action :authenticate_user_or_api!
+  prepend_before_action :authenticate_user_or_api!
 end

data/app/views/shopapp/_shopapp3.html.haml

@@ -23,6 +23,13 @@
           .dropdown-header
             %strong Company:
             =@current_user_json_hash['company']['name']
+          - if supported_locales_defined.present?
+            .dropdown-divider
+            .dropdown-header Change language
+            %span.px-3.py-2(display="block" clear="none" style="width: 32px; margin-right: 6px;")
+              - supported_locales_defined.each do |loc|
+                = link_to change_language_path(loc), method: :post, class: 'mr-2' do
+                  = image_tag "flags/#{loc}.png", style: "height: 24; width: 36px;"
           - if (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.present?
             .dropdown-divider
             .dropdown-header Change company

data/config/initializers/active_settings.rb

@@ -36,4 +36,4 @@ GravatarImageTag.configure do |config|
   config.secure                  = true # Set this to true if you require secure images on your pages.
 end
 
-Rails.application.config.assets.precompile += %w( shopapp3/*.svg )
+Rails.application.config.assets.precompile += %w( shopapp3/*.svg flags/*.png )

data/lib/shopapp/routes.rb

@@ -2,6 +2,7 @@ class ActionDispatch::Routing::Mapper
   def shoplift_single_sign_on
     get 'auth', to: 'auth#auth'
     post 'auth/change_company/:new_company_code', to: 'auth#change_company', as: 'change_company'
+    post 'auth/change_language/:new_language_code', to: 'auth#change_language', as: 'change_language'
     delete 'auth', to: 'auth#destroy', as: 'logout'
   end
 end

data/shopapp.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.58'
+  s.version     = '0.2.59'
   s.date        = '2019-05-24'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.58
+  version: 0.2.59
 platform: ruby
 authors:
 - Zeljko
@@ -334,6 +334,57 @@ files:
 - app/assets/images/blue_icon.svg
 - app/assets/images/dot.svg
 - app/assets/images/empty.svg
+- app/assets/images/flags/ad.png
+- app/assets/images/flags/ae.png
+- app/assets/images/flags/am.png
+- app/assets/images/flags/ar.png
+- app/assets/images/flags/at.png
+- app/assets/images/flags/au.png
+- app/assets/images/flags/ax.png
+- app/assets/images/flags/az.png
+- app/assets/images/flags/ba.png
+- app/assets/images/flags/bb.png
+- app/assets/images/flags/be.png
+- app/assets/images/flags/bg.png
+- app/assets/images/flags/bt.png
+- app/assets/images/flags/ca.png
+- app/assets/images/flags/ch.png
+- app/assets/images/flags/cl.png
+- app/assets/images/flags/cn.png
+- app/assets/images/flags/cr.png
+- app/assets/images/flags/cu.png
+- app/assets/images/flags/cz.png
+- app/assets/images/flags/de.png
+- app/assets/images/flags/dk.png
+- app/assets/images/flags/en.png
+- app/assets/images/flags/es.png
+- app/assets/images/flags/fi.png
+- app/assets/images/flags/fr.png
+- app/assets/images/flags/ge.png
+- app/assets/images/flags/gn.png
+- app/assets/images/flags/gr.png
+- app/assets/images/flags/gw.png
+- app/assets/images/flags/it.png
+- app/assets/images/flags/jm.png
+- app/assets/images/flags/jp.png
+- app/assets/images/flags/ne.png
+- app/assets/images/flags/ng.png
+- app/assets/images/flags/pr.png
+- app/assets/images/flags/sc.png
+- app/assets/images/flags/sd.png
+- app/assets/images/flags/se.png
+- app/assets/images/flags/sl.png
+- app/assets/images/flags/sr.png
+- app/assets/images/flags/td.png
+- app/assets/images/flags/tg.png
+- app/assets/images/flags/th.png
+- app/assets/images/flags/tj.png
+- app/assets/images/flags/tr.png
+- app/assets/images/flags/ua.png
+- app/assets/images/flags/uk.png
+- app/assets/images/flags/us.png
+- app/assets/images/flags/ve.png
+- app/assets/images/flags/vn.png
 - app/assets/images/lamppu.jpg
 - app/assets/images/logo.png
 - app/assets/images/purple_icon.svg