shimmer 0.0.14 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737a560e741a968270a0c57bd4185c7063de49d254f5ccb1d180c4d720b3e1e3
-  data.tar.gz: fcc86365d2676fff9da6dbe1e02c9794ec431225d32fe45a9101857d977ac950
+  metadata.gz: ef9968ad0ba48627fb9adb95ae2702575de2f9fa1b1e56ba3f30c9872d9cde38
+  data.tar.gz: c8bef4d12c776820c96e810a1e3ae1cb7c6717f029d5ac532b7fc05e595005d2
 SHA512:
-  metadata.gz: 0f3121eae9bb3df396973ddded3ffb4b7a0f62bbdf0367bd402bc00e1fcda1086ec3b7528a628a8c7473433d66fd17d5c612e6040b8ac983d331c03368845462
-  data.tar.gz: 72b94b0ebf4ef841d6c544723627fdf69825c04f2ef74739658243dc4bc4c18dde81544db05982f11a279e0a34471d9ff43ee8e7034d999fd6cdd1911f0f39bb
+  metadata.gz: 2c2dfb753bd6ac9afc4a4ba726c99a53a1dce6e1843c6b5bcdc320671ffcb2da0a8575ff357fd1294b3c25beed7a2026e144dffc0873a1a6ded6b78318ac737a
+  data.tar.gz: 9c00815fe851db16bd4ebf925d2ba2beb8b84c729351982f430721d6c7a395d21fd162add118a82a80df13ed8b97c67f76ac8177dadac29573c9e9604d8f9687

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/file_helper.rb

@@ -2,6 +2,16 @@
 
 module Shimmer
   module FileHelper
+    extend ActiveSupport::Concern
+
+    included do
+      ActiveSupport.on_load(:action_view) do
+        include Shimmer::FileAdditions
+      end
+    end
+  end
+
+  module FileAdditions
     def image_tag(source, **options)
       return nil if source.blank?
 
@@ -9,19 +19,27 @@ module Shimmer
         attachment = source
         width = options[:width]
         height = options[:height]
-        source = image_file_url(source, width: width, height: height)
+        source = image_file_path(source, width: width, height: height)
         options[:loading] = :lazy
-        options[:srcset] = "#{source} 1x, #{image_file_url(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)} 2x" if options[:width].present?
+        options[:srcset] = "#{source} 1x, #{image_file_path(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)} 2x" if options[:width].present?
       end
       super source, options
     end
 
+    def image_file_path(source, width: nil, height: nil)
+      image_file_proxy(source, width: width, height: height).path
+    end
+
     def image_file_url(source, width: nil, height: nil)
+      image_file_proxy(source, width: width, height: height).url
+    end
+
+    def image_file_proxy(source, width: nil, height: nil)
       return if source.blank?
       return source if source.is_a?(String)
 
       blob = source.try(:blob) || source
-      Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height).url
+      Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height)
     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.14"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.17
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-22 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