shimmer 0.0.13 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa623a504a48b7e6f3a1c0d4ccf748b2068b8934288094524a8039c52588c384
-  data.tar.gz: 67ccb1224024c812aad171ddca3437c3d130fb1bbf71dc5c9326da143061be1c
+  metadata.gz: d82a8e015623e83b0381e182752ede22419e26c40b9a730536f6020793818b75
+  data.tar.gz: 00766a05189358517092bcbc6ef958d26acbfae14efb98b45f81c3b848cfaffa
 SHA512:
-  metadata.gz: 9de1f128d5baafb0c5effb645c59ccecec08b7c7319761802cfb8ed7bbeb55cc01abb9f365f85e0397ceff692e835dc5131683bac01f514619bf1623be831c37
-  data.tar.gz: 856718e8800d539c1c31c9b867768c9db4939fe979019f44e6eebf6203cb1d60f8daca6ce42d3b21cab1027d00106345a531cb28bd912bcdea31028885042803
+  metadata.gz: d9e72dcab3004ea3c720a1b7041ee0714e4beded68cfa8caa9f5a1213fbe3ece9cf82030437be32c1532c85c67e489b159fa39f13392664c9c5f3520f8ba67f6
+  data.tar.gz: e8e15ddcc1aedbad180f0b62dd11af6791d8ef35aa5139e7f0e7ffdead8551052f8ccbed36c143ae39868e44ca381ed27737e036d93dca8b9e5b8cffd125fae5

data/lib/shimmer/auth/apple_provider.rb

@@ -15,8 +15,8 @@ module Shimmer
         form = {
           grant_type: "authorization_code",
           code: params[:code],
-          client_id: ENV.fetch("APPLE_BUNDLE_ID"),
-          client_secret: ENV.fetch("APPLE_CLIENT_SECRET"),
+          client_id: Config.instance.apple_bundle_id!,
+          client_secret: Config.instance.apple_client_secret,
           scope: "name email"
         }
         response = HTTParty.post("https://appleid.apple.com/auth/token", body: URI.encode_www_form(form), headers: headers)

data/lib/shimmer/auth/google_provider.rb

@@ -8,7 +8,7 @@ module Shimmer
       private
 
       def request_details(params)
-        payload = GoogleIDToken::Validator.new.check(params[:credential], ENV.fetch("GOOGLE_CLIENT_ID"))
+        payload = GoogleIDToken::Validator.new.check(params[:credential], Config.instance.google_client_id!)
         UserDetails.new token: payload["sub"], email: payload["email"], first_name: payload["given_name"].presence, last_name: payload["family_name"].presence
       end
     end

data/lib/shimmer/helpers/meta_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Shimmer
+  module MetaHelper
+    def meta
+      @meta ||= Meta.new.tap do |meta|
+        meta.canonical = url_for(only_path: false)
+      end
+    end
+
+    def title(value)
+      meta.title = value
+    end
+
+    def description(value)
+      meta.description = value
+    end
+
+    def image(value)
+      meta.image = image_file_url(value, width: 1200)
+    end
+
+    def render_meta
+      tags = meta.tags.map do |tag|
+        type = tag.delete(:type) || "meta"
+        value = tag.delete(:value)
+        content_tag(type, value, tag)
+      end
+      safe_join tags, "\n"
+    end
+  end
+end

data/lib/shimmer/railtie.rb

@@ -8,3 +8,11 @@ module Shimmer
     end
   end
 end
+
+ActiveSupport.on_load(:action_view) do
+  Dir.glob("#{File.expand_path(__dir__)}/helpers/**/*.rb").each do |file|
+    load file
+    name = file.split("/").last.delete_suffix(".rb").classify
+    include "Shimmer::#{name}".constantize
+  end
+end

data/lib/shimmer/tasks/db.rake

@@ -43,4 +43,13 @@ namespace :db do
 
   desc "Download all app data, including assets"
   task pull: [:pull_data, :pull_assets]
+
+  desc "Migrates if the database has any tables."
+  task migrate_if_tables: :environment do
+    if ActiveRecord::Base.connection.tables.any?
+      Rake::Task["db:migrate"].invoke
+    else
+      puts "No tables in database yet, skipping migration"
+    end
+  end
 end

data/lib/shimmer/tasks/s3.rake

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+namespace :s3 do
+  desc "Creates a new S3 bucket and outputs or uploads the credentials."
+  task :create_bucket do
+    puts "Please enter the name for your new bucket"
+    name = $stdin.gets.strip
+    region = "eu-central-1"
+    sh "aws s3 mb s3://#{name} --region #{region}"
+    sh "aws iam create-user --user-name #{name}"
+    policy = <<~JSON
+      {
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Effect": "Allow",
+                "Action": [
+                    "s3:CreateBucket",
+                    "s3:DeleteObject",
+                    "s3:Put*",
+                    "s3:Get*",
+                    "s3:List*"
+                ],
+                "Resource": [
+                    "arn:aws:s3:::#{name}",
+                    "arn:aws:s3:::#{name}/*"
+                ]
+            }
+        ]
+      }
+    JSON
+    File.write("policy.json", policy)
+    sh "aws iam put-user-policy --user-name #{name} --policy-name #{name} --policy-document file://policy.json"
+    File.delete("policy.json")
+    content = JSON.parse `aws iam create-access-key --user-name #{name}`
+    id = content.dig("AccessKey", "AccessKeyId")
+    secret = content.dig("AccessKey", "SecretAccessKey")
+    puts "Credentials and bucket were generated. Automatically assign them to the associated Heroku project? This will override and delete all current keys on Heroku. (y/n)"
+    vars = {AWS_REGION: region, AWS_BUCKET: name, AWS_ACCESS_KEY_ID: id, AWS_SECRET_ACCESS_KEY: secret}
+    if $stdin.gets.strip == "y"
+      sh "heroku config:set #{vars.map { |k, v| "#{k}=#{v}" }.join(" ")}"
+    else
+      vars.each { |k, v| puts "#{k}=#{v}" }
+    end
+  end
+end

data/lib/shimmer/utils/meta.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Shimmer
+  class Meta
+    class_attribute :app_name
+    attr_accessor :title, :description, :image, :canonical
+
+    def tags
+      tags = []
+      title = self.title.present? ? "#{self.title} | #{app_name}" : app_name
+      tags.push(type: :title, value: title)
+      tags.push(property: "og:title", content: title)
+      if description.present?
+        tags.push(name: :description, content: description)
+        tags.push(property: "og:description", content: description)
+      end
+      if image.present?
+        tags.push(property: "og:image", content: image)
+      end
+      if canonical.present?
+        tags.push(type: :link, rel: :canonical, href: canonical)
+        tags.push(property: "og:url", content: canonical)
+      end
+      tags.push(property: "og:type", content: :website)
+      tags.push(property: "og:locale", content: I18n.locale)
+      tags.push(name: "twitter:card", content: :summary_large_image)
+      tags
+    end
+  end
+end

data/lib/shimmer/utils/remote_navigation.rb

@@ -22,8 +22,12 @@ module Shimmer
       end
 
       helper_method :close_modal_path
-      def close_modal_path(id: nil)
-        "javascript:ui.modal.close(#{{id: id}.to_json})"
+      def close_modal_path(id = nil)
+        if id.present?
+          "javascript:ui.modal.close(#{{id: id}.to_json})"
+        else
+          "javascript:ui.modal.close()"
+        end
       end
 
       helper_method :popover_path
@@ -87,7 +91,7 @@ module Shimmer
 
     def close_modal(id = nil)
       if id.present?
-        run_javascript "ui.modal.close('#{id}')"
+        run_javascript "ui.modal.close(#{{id: id}.to_json})"
       else
         run_javascript "ui.modal.close()"
       end

data/lib/shimmer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shimmer
-  VERSION = "0.0.13"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.16
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,16 +145,19 @@ files:
 - lib/shimmer/auth/user.rb
 - lib/shimmer/controllers/files_controller.rb
 - lib/shimmer/controllers/sitemaps_controller.rb
+- lib/shimmer/helpers/meta_helper.rb
 - lib/shimmer/jobs/sitemap_job.rb
 - lib/shimmer/middlewares/cloudflare.rb
 - lib/shimmer/railtie.rb
 - lib/shimmer/tasks/auth.rake
 - lib/shimmer/tasks/db.rake
 - lib/shimmer/tasks/lint.rake
+- lib/shimmer/tasks/s3.rake
 - lib/shimmer/utils/config.rb
 - lib/shimmer/utils/file_helper.rb
 - lib/shimmer/utils/file_proxy.rb
 - lib/shimmer/utils/localizable.rb
+- lib/shimmer/utils/meta.rb
 - lib/shimmer/utils/remote_navigation.rb
 - lib/shimmer/utils/sitemap_adapter.rb
 - lib/shimmer/version.rb