effective_developer 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f51117606ee26c0266dfac742502712dc318a8b09148d722f928b3efd8dc404e
-  data.tar.gz: 4fd2b3a0fd954b1c0f0d9716e6ee33c911365a3f71aa0141c7e60b5294c8a7bc
+  metadata.gz: c86580e62fc1a59098e658e5b98c05391113df75d13ab858cdc49ff045ff0cdd
+  data.tar.gz: 2a99640bbb2152e3ac88c4d7f360e1f9075016c218fc4b3054c0e5052b688430
 SHA512:
-  metadata.gz: f5c5588277544f359c0e8481f9f273dc90f34f3831c8e2b3a8e3394a93657a0c863b1d699db00aa707fd7c716e29c47e9904319ac4405b1f82bac8ca89a4c759
-  data.tar.gz: 6f55724df58ff196884dcd26ff7e2e274b800eae283bacf1b9ef5759f338edc8dfca73d0bc7b1fbf5ba90e6c3e1f9bbfabd434bc88bedb8dbcbe5a6f040a1975
+  metadata.gz: b0943fad39d092da9bd58075184fa2fafdb78e48d33c48857ad775af9b319986cb1bf273610a2ac7c9ad801dca50033f39f28374074605f627d12c35b63c1a5d
+  data.tar.gz: 65bf51e762c888b44fb5e3d2aeddc88e7eb66b5b8b67227d72a347e1da44c9f72cc474ed681d661ac61dbcdcab2c1c7b3551a1e6f965a525a41b06729e1464b7

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

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.6.8'.freeze
+  VERSION = '0.6.9'.freeze
 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."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-21 00:00:00.000000000 Z
+date: 2022-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails