shopapp 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8b086df684418a632bbb172dca983a2ee2693878d3473704e20133b93bbb690a
-  data.tar.gz: 96e22bcc01c1c2a232b66ad1e36dae8514cec6b3dc3fadf868acce399cb8c61e
+SHA1:
+  metadata.gz: 2ebf5f5a5dd3c9c9fb200cb4b96bc4f3a2a2c6ae
+  data.tar.gz: 291b00c4e845fbefa7a18746d79c2ab78d68ebcb
 SHA512:
-  metadata.gz: d6a37e7a9477be6ae43dddc3395d6ab806ea821901d83e9270117e4fcf0f04911fa8280827ba95139a201ddb284d1a55578200c29900da2ebf3b8c19a0157239
-  data.tar.gz: 9ed8b41fd88e41b7f77018eb97614405b93e96ce819f831ca896c642cf846d049e9d4ae707eec479bce419897bbd8b1dd828f14b5678f2878e7c3cf7f2c63def
+  metadata.gz: 45ac320617f3312e573971ba82f344a054c72edaa1e64955940f6ff063c5ffc2cf1699bc359ade1fa9b2bf9570822cb2c328b5106423b32b058484cdf93bffed
+  data.tar.gz: cff9e9a68b5c4c9ab25c0c15b71d8d0de33eae950467e6c176e552e55926949dcdfe9be00228f27e6f970126da73e8c89f5677257df0703a13e28c6f976cd865

data/lib/shopapp/templates/shopapp_rails_new.rb

@@ -21,6 +21,7 @@ gem 'uglifier', '>= 1.3.0'
 gem 'therubyracer', platforms: :ruby
 gem 'jbuilder', '~> 2.5'
 gem 'bootsnap', '>= 1.1.0', require: false
+gem "audited", "~> 4.7"
 gem_group :development do
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -57,11 +58,47 @@ route 'shoplift_single_sign_on'
 
 generate(:model, "company", "code:string", "name:string", "info:json")
 generate(:model, "company_state", "code:string", "state:string")
+generate('audited:install')
+
+insert_into_file "app/models/company.rb", "  audited\n", :after => "ApplicationRecord\n"
+insert_into_file "app/models/company_state.rb", "  audited\n", :after => "ApplicationRecord\n"
+
 
 rails_command "db:drop", env: 'development'
 rails_command "db:create", env: 'development'
 rails_command "db:migrate", env: 'development'
 
+remove_file "app/assets/stylesheets/application.css"
+create_file "app/assets/stylesheets/application.scss", <<~SCSS
+  /*
+   *= require_self
+   *
+   * Insert what you need after require_self, such as "require rails_bootstrap_forms".
+   */
+  @import "shopapp";
+  SCSS
+
+remove_file "app/assets/javascript/application.js"
+create_file "app/assets/javascript/application.js", <<~JS
+  //= require shopapp
+  //= require_tree .
+  JS
+
+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"}/
+      %title #{@app_name}
+      = csrf_meta_tags
+      = stylesheet_link_tag    'application', media: 'all'
+      = javascript_include_tag 'application'
+    %body
+      = render 'shopapp/shopapp' do
+        = yield
+  LAYOUT
+
 create_file '.gitignore', <<~GITIGNORE
   # Ignore bundler config.
   /.bundle
@@ -81,20 +118,22 @@ create_file '.gitignore', <<~GITIGNORE
 
   # this is so we can develop shopapp gem inside this project
   /vendor/shopapp
-  /vendor/klarna-ruby
+
   /config/local.yml
 
   /public/assets
   GITIGNORE
 
+@app_dev_port = ENV['dev_port'] ||  3999
+
 create_file 'config/settings.yml', <<~SETTINGS
   # Authlift setup
-  port: 3999 # << TODO: CHANGE THIS AND SAME BELLOW IN authlift_redirect_uri
+  port: #{@app_dev_port} # << TODO: CHANGE THIS AND SAME BELLOW IN authlift_redirect_uri
   shopapp_name: #{@app_name}
   authlift_url: <%= ((Rails.env == 'development') ? 'http://localhost:3031/' : 'https://accounts.shoplift.fi/') %>
-  authlift_app_id: #{SecureRandom.hex 32}
-  authlift_app_secret: #{SecureRandom.hex 32}
-  authlift_redirect_uri: http://localhost:3999/auth/
+  authlift_app_id: #{@app_id = SecureRandom.hex 32}
+  authlift_app_secret: #{@app_secret = SecureRandom.hex 32}
+  authlift_redirect_uri: http://localhost:#{@app_dev_port}/auth/
   authlift_default_app_key:
   authlift_default_scope:
 
@@ -113,3 +152,11 @@ git remote: "add origin git@github.com:zmilojko/#{@app_name}.git"
 git push: '-u origin master'
 
 puts "Shopapp #{@app_name} created!"
+puts
+puts "To activate app in Authlift, execute the following:"
+puts "  app = Doorkeeper::Application.find_or_create_by(name: '#{@app_name}')"
+puts "  app.update_attributes uid: '#{@app_id}',"
+puts "                        secret: '#{@app_secret}',"
+puts "                        redirect_uri: 'http://localhost:#{@app_dev_port}/auth/'"
+puts "  Company.find_by_code(:zwr).applications << app unless Company.find_by_code(:zwr).applications.include? app"
+

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.1.32'
-  s.date        = '2018-06-09'
+  s.version     = '0.1.33'
+  s.date        = '2018-06-10'
   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.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Do a shoplift.