effective_developer 0.6.7 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca9f6ec3b73f4a7f2e31b382f9030769e13b82b43835bd7a74f4efa41a07c24
-  data.tar.gz: f21c929b19f4d9c4e645f90cc85cda28f4d0e3c1413689b294b7326bde095359
+  metadata.gz: ce8857439e77912b69f4d782989c25125a30adfa38bdfa098a0ee099d45b5158
+  data.tar.gz: 8c81459bbbc23a9e582cb3e18789bf8923e35744e1d851b6cc282d01d32019c2
 SHA512:
-  metadata.gz: 8ce3d22243ef79b452009c2e20e993bea861489b4cca95f4eba7d27f0fa11a305e272298d19cbd8fab2b829d1004b690202c6769dfab239f671e82ddcc49a524
-  data.tar.gz: 54fd14f769c558937de317edb4e00dc3114775a1f58b948fe5723bea590cecd1a0c9d7958aefac45b06a82558582b527f3bf0dd0224f6dc6d61fd3eabe6cfb61
+  metadata.gz: 4fb7415f3045e979db76b27025696b4c891624813accec70e9832c65dce0d0a639f2b82ff7f39ce1b18ebb4ad233d7ae09df12a2de37adbecdcc5319aa284aab
+  data.tar.gz: 68b07f9aeb57b8c0c0a3b4ec1211bdb645920c3f78ac733fdaedfb16e008dba4efe3642a3697c2ae6d34c26f3f2920b50540441b0ff332f96721c7d359e1df61

data/app/models/effective/form_upgrader.rb

@@ -38,6 +38,8 @@ module Effective
     private
 
     SIMPLE_FORM_FOR_REGEX = /simple_form_for( |\()(\[:[^,]+, ?[^,]+\])?(([^,]+),)?.+do \|(\w+)\|/
+    SIMPLE_FORM_FOR_REGEX2 = /simple_form_for\((\w+).+?\) do \|(\w+)\|/
+
     SIMPLE_FORM_INPUT_ATTRIBUTE = /\.input( |\():(\w+)/
     SIMPLE_FORM_INPUT_AS_ONE = /(as: :(\w+))/
     SIMPLE_FORM_INPUT_AS_TWO = /(:as => :(\w+))/
@@ -53,17 +55,38 @@ module Effective
       # Replace simple_form_for
       writer.all { |line| line.include?('simple_form_for') }.each do |line|
         content = writer.lines[line]
+
+        # Try first time
         matched = content.match(SIMPLE_FORM_FOR_REGEX)
-        raise("unable to match simple_form_for from:\n#{content}") unless matched.present?
 
-        original = matched[0]
-        model = matched[2] || matched[4]
-        letter = matched[5]
+        if matched.present?
+          original = matched[0]
+          model = matched[2] || matched[4]
+          letter = matched[5]
 
-        raise("unable to determine simple_form_for subject from:\n#{content}") unless original && model && letter
+          if original && model && letter
+            content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
+            writer.replace(line, content)
+            next
+          end
+        end
 
-        content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
-        writer.replace(line, content)
+        # Try second time
+        matched = content.match(SIMPLE_FORM_FOR_REGEX2)
+
+        if matched.present?
+          original = matched[0]
+          model = matched[1]
+          letter = matched[2]
+
+          if original && model && letter
+            content.sub!(original, "effective_form_with(model: #{model}) do |#{letter}|")
+            writer.replace(line, content)
+            next
+          end
+        end
+
+        puts("unable to determine simple_form_for subject from:\n#{content}")
       end
 
       # Try to figure out klass again if its missing from filename
@@ -189,7 +212,8 @@ module Effective
       when 'text' then 'text_area'
       when 'url' then 'url_field'
       else
-        raise("unknown input type #{input_type} (for attribute :#{attribute})")
+        puts("unknown input type #{input_type} (for attribute :#{attribute})")
+        'text_field'
       end
     end
 

data/lib/effective_developer/engine.rb

@@ -2,9 +2,6 @@ module EffectiveDeveloper
   class Engine < ::Rails::Engine
     engine_name 'effective_developer'
 
-    config.autoload_paths += Dir["#{config.root}/models/jobs/"]
-    config.eager_load_paths += Dir["#{config.root}/models/jobs/"]
-
     # Set up our default configuration options.
     initializer 'effective_developer.defaults', before: :load_config_initializers do |app|
       # Set up our defaults, as per our initializer template

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.7'.freeze
+  VERSION = '0.6.10'.freeze
 end

data/lib/tasks/hatchbox.rake

@@ -0,0 +1,11 @@
+# bundle exec rake hb:ssh
+# bundle exec rake hb:staging
+namespace :hb do
+  task :ssh do
+    system("ssh -t deploy@#{ENV.fetch('HATCHBOX_IP')} \"cd ~/arta/current ; bash --login\"")
+  end
+
+  task :staging do
+    system("ssh -t deploy@#{ENV.fetch('HATCHBOX_IP')} \"cd ~/arta-staging/current ; bash --login\"")
+  end
+end

data/lib/tasks/pg_pull.rake

@@ -18,8 +18,8 @@ namespace :pg do
     args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
 
     # Validate Config
-    config = ActiveRecord::Base.configurations[Rails.env]
     configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+    config = configs.first
 
     if configs.length > 1 && args.database.blank?
       puts "Multiple database configs exist for #{Rails.env} environment."
@@ -102,8 +102,8 @@ namespace :pg do
     end
 
     # Validate Config
-    config = ActiveRecord::Base.configurations[Rails.env]
     configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+    config = configs.first
 
     if configs.length > 1 && args.database.blank?
       puts "Multiple database configs exist for #{Rails.env} environment."
@@ -151,8 +151,8 @@ namespace :pg do
       { username: uri.user, password: uri.password, host: uri.host, port: (uri.port || 5432), database: uri.path.sub('/', '') }
     else
       # Validate Config
-      config = ActiveRecord::Base.configurations[Rails.env]
       configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+      config = configs.first
 
       if configs.length > 1 && args.database.blank?
         puts "Multiple database configs exist for #{Rails.env} environment."
@@ -189,11 +189,10 @@ namespace :pg do
   desc 'Clones the production (--remote heroku by default) database to staging (--remote staging by default)'
   task :clone, [:source_remote, :target_remote] => :environment do |t, args|
     args.with_defaults(:source_remote => 'heroku', :target_remote => 'staging')
-    db = ActiveRecord::Base.configurations[Rails.env]
 
     puts "=== Cloning remote '#{args.source_remote}' to '#{args.target_remote}'"
 
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       unless system("heroku pg:backups:capture --remote #{args.source_remote}")
         abort "Error capturing heroku backup"
       end
@@ -240,7 +239,7 @@ namespace :pg do
     puts "=== Cloning local table '#{args.table}' to remote #{args.remote} database"
 
     # Dump my local database table
-    db = ActiveRecord::Base.configurations[Rails.env]
+    db = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env).first
     tmpfile = "tmp/#{args.table}.sql"
 
     unless system("pg_dump --data-only --table=#{args.table} -h localhost -U '#{db['username']}' '#{db['database']}' > #{tmpfile}")

data/lib/tasks/sidekiq_clear.rake

@@ -0,0 +1,22 @@
+# bundle exec rake sidekiq:start
+# bundle exec rake sidekiq:clear
+
+namespace :sidekiq do
+  desc 'Starts the sidekiq background job server'
+  task :start do
+    system('bundle exec sidekiq -C config/sidekiq.yml')
+  end
+
+  desc 'Clears all in progress sidekiq jobs'
+  task clear: :environment do
+    unless Rails.env.development?
+      puts "Cannot run in non-development mode"; exit
+    end
+
+    require 'sidekiq/api'
+    Sidekiq::Queue.all.each { |q| q.clear }
+
+    puts "All sidekiq queues cleared"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,16 +48,12 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/jobs/effective/asset_replacer_job.rb
-- app/jobs/effective/snippet_replacer_job.rb
 - app/models/effective/annotator.rb
-- app/models/effective/asset_replacer.rb
 - app/models/effective/code_writer.rb
 - app/models/effective/csv_importer.rb
 - app/models/effective/form_upgrader.rb
 - app/models/effective/live_generator.rb
 - app/models/effective/profiler.rb
-- app/models/effective/snippet_replacer.rb
 - config/effective_developer.rb
 - lib/effective_developer.rb
 - lib/effective_developer/engine.rb
@@ -103,11 +99,11 @@ files:
 - lib/scaffolds/views/_resource.html.haml
 - lib/tasks/annotate.rake
 - lib/tasks/effective_csv_importer.rake
+- lib/tasks/hatchbox.rake
 - lib/tasks/pg_pull.rake
 - lib/tasks/rename_class.rake
-- lib/tasks/replace_effective_assets.rake
-- lib/tasks/replace_effective_snippets.rake
 - lib/tasks/reset_pk_sequence.rake
+- lib/tasks/sidekiq_clear.rake
 - lib/tasks/upgrade_forms.rake
 - lib/tasks/validate.rake
 homepage: https://github.com/code-and-effect/effective_developer

data/app/jobs/effective/asset_replacer_job.rb

@@ -1,17 +0,0 @@
-module Effective
-  class AssetReplacerJob < ::ApplicationJob
-
-    queue_as :default
-
-    if defined?(Sidekiq)
-      # The retry setting works. But none of these waits seem to. Still getting exponential backoff.
-      sidekiq_options retry: 2, retry_in: 10, wait: 10
-      sidekiq_retry_in { |count, exception| 10 }
-    end
-
-    def perform(attachment, box)
-      Effective::AssetReplacer.new.replace_attachment!(attachment, box)
-    end
-
-  end
-end

data/app/jobs/effective/snippet_replacer_job.rb

@@ -1,17 +0,0 @@
-module Effective
-  class SnippetReplacerJob < ::ApplicationJob
-
-    queue_as :default
-
-    if defined?(Sidekiq)
-      # The retry setting works. But none of these waits seem to. Still getting exponential backoff.
-      sidekiq_options retry: 2, retry_in: 10, wait: 10
-      sidekiq_retry_in { |count, exception| 10 }
-    end
-
-    def perform(region)
-      Effective::SnippetReplacer.new.replace_region!(region)
-    end
-
-  end
-end

data/app/models/effective/asset_replacer.rb

@@ -1,156 +0,0 @@
-# Looks at the Effective::Asset and Effective::Attachments and converts to ActiveStorage
-#
-# 1. Put in the has_attached_files to each model to be upgraded
-# 2. Remove the acts_as_asset_box
-
-require 'timeout'
-
-module Effective
-  class AssetReplacer
-    include ActiveStorage::Blob::Analyzable
-
-    BATCH_SIZE = 500
-    TIMEOUT = 120
-
-    def replace!(skip_existing: false)
-      verify!
-
-      attachments = attachments_to_process().to_a
-
-      while(true)
-        wait_for_active_job!
-
-        puts "\nEnqueuing #{attachments.length} attachments with ids #{attachments.first.id} to #{attachments.last.id}"
-
-        attachments.each do |attachment|
-          asset = attachment.asset
-          attachable = attachment.attachable
-          next if asset.blank? || attachable.blank?
-
-          box = attachment.box.singularize
-          boxes = attachment.box
-
-          one = attachable.respond_to?(box) && attachable.send(box).kind_of?(ActiveStorage::Attached::One)
-          many = attachable.respond_to?(boxes) && attachable.send(boxes).kind_of?(ActiveStorage::Attached::Many)
-          box = (one ? box : boxes)
-
-          if skip_existing
-            existing = Array(attachable.send(box))
-
-            if existing.any? { |obj| obj.respond_to?(:filename) && obj.filename.to_s == asset.file_name }
-              puts("Skipping existing #{attachable.class.name} #{attachable.id} #{box} #{asset.file_name}.")
-              next
-            end
-          end
-
-          Effective::AssetReplacerJob.perform_later(attachment, box)
-        end
-
-        attachments = attachments_to_process().where.not(id: attachments.map(&:id))
-        break if attachments.to_a.blank?
-
-        GC.start
-      end
-
-      puts "\nAll Done. Have a great day."
-      true
-    end
-
-    # This is called on the background by the AssetReplacerJob
-    def replace_attachment!(attachment, box)
-      raise('expected an Effective::Attachment') unless attachment.kind_of?(Effective::Attachment)
-      puts("Processing attachment ##{attachment.id}")
-
-      asset = attachment.asset
-      attachable = attachment.attachable
-
-      attachable.replacing_asset = true if attachable.respond_to?(:replacing_asset=)
-
-      Timeout.timeout(TIMEOUT) do
-        attachable.send(box).attach(
-          io: URI.open(asset.url),
-          filename: asset.file_name,
-          content_type: asset.content_type.presence,
-          identify: (asset.content_type.blank?)
-        )
-
-        attachment.update_column(:replaced, true)
-      end
-
-      true
-    end
-
-    def verify!
-      raise('expected effective assets') unless defined?(Effective::Asset)
-      raise('expected active storage') unless defined?(ActiveStorage)
-
-      unless Effective::Attachment.new.respond_to?(:replaced?)
-        raise('please add a replaced boolean to Effective::Attachment. add_column :attachments, :replaced, :boolean')
-      end
-
-      (Effective::Attachment.all.pluck(:attachable_type, :box).uniq).each do |name, boxes|
-        next if name.blank? || boxes.blank?
-
-        box = boxes.singularize
-
-        klass = name.safe_constantize
-        raise("invalid class #{klass}") unless klass.present?
-
-        instance = klass.new
-
-        if instance.respond_to?(:effective_assets)
-          raise("please remove acts_as_asset_box() from #{klass.name}")
-        end
-
-        unless instance.respond_to?(box) || instance.respond_to?(boxes)
-          raise("expected #{klass.name} to has_one_attached :#{box} or has_many_attached :#{boxes}")
-        end
-
-        one = instance.respond_to?(box) && instance.send(box).kind_of?(ActiveStorage::Attached::One)
-        many = instance.respond_to?(boxes) && instance.send(boxes).kind_of?(ActiveStorage::Attached::Many)
-
-        unless one.present? || many.present?
-          raise("expected #{klass.name} to has_one_attached :#{box} or has_many_attached :#{boxes}")
-        end
-      end
-
-      puts 'All attachment classes verified.'
-
-      true
-    end
-
-    def reset!
-      Effective::Attachment.update_all(replaced: false)
-    end
-
-    private
-
-    def wait_for_active_job!
-      while(true)
-        if(jobs = enqueued_jobs_count) > (BATCH_SIZE / 10)
-          print '.'; sleep(3)
-        else
-          break
-        end
-      end
-    end
-
-    # The last BATCH_SIZE attachments
-    def attachments_to_process
-      Effective::Attachment.all
-        .includes(:asset)
-        .where(replaced: [nil, false])
-        .reorder(id: :desc)
-        .limit(BATCH_SIZE)
-    end
-
-    def enqueued_jobs_count
-      if Rails.application.config.active_job.queue_adapter == :sidekiq
-        Sidekiq::Stats.new.enqueued.to_i
-      else
-        ActiveJob::Base.queue_adapter.enqueued_jobs.count
-      end
-    end
-
-  end
-end

data/app/models/effective/snippet_replacer.rb

@@ -1,67 +0,0 @@
-# Replaces the [snippet_x] in all effective regions with static content
-
-module Effective
-  class SnippetReplacer
-    include ActiveStorage::Blob::Analyzable
-    include ActionView::Helpers::UrlHelper
-    include ActionView::Helpers::AssetTagHelper
-
-    def replace!
-      raise('expected effective regions') unless defined?(Effective::Region)
-      raise('expected effective assets') unless defined?(Effective::Asset)
-      raise('expected active storage') unless defined?(ActiveStorage)
-
-      Effective::Region.with_snippets.find_each do |region|
-        Effective::SnippetReplacerJob.perform_later(region)
-      end
-
-      puts 'All Done. Background jobs are running. Have a great day.'
-      true
-    end
-
-    def replace_region!(region)
-      region.snippet_objects.each do |snippet|
-        print('.')
-
-        begin
-          case snippet.class.name
-          when 'Effective::Snippets::EffectiveAsset'
-            replace_effective_asset(region, snippet)
-          else
-            raise("unsupported snippet: #{snippet.class.name}")
-          end
-        rescue => e
-          puts "\nError: #{e}\n"
-          remove_snippet(region, snippet)
-        end
-      end
-
-      region.save!
-    end
-
-    def replace_effective_asset(region, snippet)
-      asset = snippet.asset
-      raise("Effective:Asset id=#{snippet.asset_id || 'none'} does not exist") unless asset.present?
-
-      blob = ActiveStorage::Blob.create_and_upload!(io: URI.open(asset.url), filename: asset.file_name)
-      url = Rails.application.routes.url_helpers.rails_blob_url(blob, only_path: true)
-
-      content = if asset.image?
-        image_tag(url, class: snippet.html_class, alt: snippet.link_title)
-      else
-        link_to(snippet.link_title, url, class: snippet.html_class, title: snippet.link_title)
-      end
-
-      region.content.sub!("[#{snippet.id}]", content.to_s)
-      region.snippets.delete(snippet.id)
-
-      true
-    end
-
-    def remove_snippet(region, snippet)
-      region.content.sub!("[#{snippet.id}]", '')
-      region.snippets.delete(snippet.id)
-    end
-
-  end
-end

data/lib/tasks/replace_effective_assets.rake

@@ -1,5 +0,0 @@
-# bundle exec rake replace_effective_assets
-desc 'Replaces effective_assets with ActiveStorage'
-task :replace_effective_assets => :environment do
-  Effective::AssetReplacer.new.replace!
-end

data/lib/tasks/replace_effective_snippets.rake

@@ -1,5 +0,0 @@
-# bundle exec rake replace_effective_snippets
-desc 'Replaces effective_assets snippets with ActiveStorage uploads'
-task :replace_effective_snippets => :environment do
-  Effective::SnippetReplacer.new.replace!
-end