shopapp 0.2.73 → 0.2.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12e7042b3d671013da12c99d025c6bb44c6cc3e058a08cdb6d9ceba213de1293
-  data.tar.gz: 55627d6f0aced17a560474185cbaf4c1dbee2926d258f4d9fd4bf36e03bcead1
+  metadata.gz: '053200578211b7f8614e2dc372590698dfb88cd580fb1e0853a128370f94e6be'
+  data.tar.gz: 297b4d823627019fefbec25de3954865909cbe617a23a3e7800f23d46053537e
 SHA512:
-  metadata.gz: 68e3d39563a9779b3e151c5d519ce818eb618735477445a3773b17dac44a5220824765b66bc953b0126f15c1d6a900a5a941b19da7ffa121653ff53c7dea26af
-  data.tar.gz: d8c35d82417f004100967fa9460c3d08440d514d84a208d59d87ce78c13b4f7f3ff0f6c24964448a8cc3863316156bb94f09ed16f229bf25bd583da5cadbd5c0
+  metadata.gz: 81d173090b0a83e5a4d451f514799e416c614e953fb4caa5b536d509b5b203a87c950c58204893f3395efdb01504b0e4cc5f3cc87c1f2fcbb53086e693aef245
+  data.tar.gz: 39d8d058113a62263a251c7710dd7c6b52f8f7c51761d31c84d2f5e431ef7a2a7d1726967e65dc55875367de57b18503239304fd2f7307e4cafa508d5dd27470

data/README.md

@@ -93,4 +93,4 @@ shopapp to support i18n, add two methods to your ApplicationController:
 
 To build new version of this gem, change the version in shopapp.gemspec and run:
 
-    gem build shopapp.gemspec ; gem push shopapp-0.2.73.gem; gem install shopapp
+    gem build shopapp.gemspec ; gem push shopapp-0.2.74.gem; gem install shopapp

data/app/models/concerns/shopapp_company.rb

@@ -0,0 +1,16 @@
+require 'oauth2'
+
+module ShopappCompany
+  extend ActiveSupport::Concern
+
+  def app_info
+    @app_info ||= JSON.parse client.request(:get, "http://localhost:3031/api/company/app_info.json?key=#{info['shoplift_key']}").body
+  end
+
+  def client
+    @oauth ||= OAuth2::Client.new Rails.configuration.settings['authlift_app_id'],
+                                  Rails.configuration.settings['authlift_app_secret'],
+                                  site: Rails.configuration.settings['authlift_url']
+    @token ||= @oauth.client_credentials.get_token scope: [Rails.configuration.settings['authlift_default_scope'], 'public'].compact.join(' ')
+  end
+end

data/lib/shopapp/templates/shopapp_rails_new.rb

@@ -71,7 +71,7 @@ generate(:model, "company", "code:string", "name:string", "info:json")
 generate(:model, "company_state", "company:belongs_to", "code:string", "state:string")
 generate('audited:install')
 
-insert_into_file "app/models/company.rb", "  has_many :application_states\n", :after => "ApplicationRecord\n"
+insert_into_file "app/models/company.rb", "  has_many :company_states\n", :after => "ApplicationRecord\n"
 insert_into_file "app/models/company.rb", "  audited\n", :after => "ApplicationRecord\n"
 insert_into_file "app/models/company.rb", "  include Panicker\n", :after => "ApplicationRecord\n"
 insert_into_file "app/models/company_state.rb", "  audited\n", :after => "ApplicationRecord\n"
@@ -90,7 +90,7 @@ create_file "app/assets/stylesheets/application.scss", <<~SCSS
    * Replace material with own compiled material from shopwindow project.
    */
   @import "material";
-  @import "shopapp";
+  @import "shopapp3";
   SCSS
 
 remove_file "app/assets/javascripts/application.js"
@@ -104,19 +104,19 @@ remove_file "app/views/layouts/application.html.erb"
 create_file "app/views/layouts/application.html.haml", <<~LAYOUT
   !!!
   %html
-  %head
-    %meta(content="text/html; charset=UTF-8" http-equiv="Content-Type")/
-    %meta(charset="utf-8")/
-    %meta(content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport")/
-    %link(href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet")/
-    %link(href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,700" rel="stylesheet")/
-    %title #{@app_name}
-    = csrf_meta_tags
-    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload'
-    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
-  %body
-    = render 'shopapp/shopapp3' do
-      = yield
+    %head
+      %meta(content="text/html; charset=UTF-8" http-equiv="Content-Type")/
+      %meta(charset="utf-8")/
+      %meta(content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport")/
+      %link(href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet")/
+      %link(href="https://fonts.googleapis.com/css?family=Fira+Sans:400,500,700" rel="stylesheet")/
+      %title #{@app_name}
+      = csrf_meta_tags
+      = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload'
+      = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+    %body
+      = render 'shopapp/shopapp3' do
+        = yield
   LAYOUT
 
 create_file '.gitignore', <<~GITIGNORE

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.73'
-  s.date        = '2020-01-13'
+  s.version     = '0.2.74'
+  s.date        = '2020-05-12'
   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!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.73
+  version: 0.2.74
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -424,6 +424,7 @@ files:
 - app/helpers/shopapp_helper.rb
 - app/jobs/shopapp_monit_job.rb
 - app/models/concerns/panicker.rb
+- app/models/concerns/shopapp_company.rb
 - app/views/layouts/_header_menu.html.haml
 - app/views/shopapp/403.html.haml
 - app/views/shopapp/_display_flag.haml