effective_developer 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f683ab9dcda556c93330af2e81a50c584768c8f0464c1124a6d0af2a9eadf99
-  data.tar.gz: 2935dd2fef5e23e7a8470e436f1c7e613c561b556737f6c741273276b1372c5a
+  metadata.gz: 39fe3d6e71379807005ff5d46cf33e48e737b77d87e955bddaf6e6553453594a
+  data.tar.gz: 11dac114ce2e61603fc215c05ae40ecd232ed9d3d12e1d69c5f7764e60cdb336
 SHA512:
-  metadata.gz: 706e83a7ed877f3fd686ca4b251db6dc68d393c89401e7266b2f3bfea9cec0c7d8364deda7f1dc3ba393d9f7edec3ec59c2a4d44d2a53e44e443993b5d9e67e9
-  data.tar.gz: 639e094e77930330bbd6bc2695b058bea2ddf2333b7b74cfc115be8afadd6f454626b13f77060d8dbb0f0b540ea71bce83953154588e5a7b58e4519045bb8be0
+  metadata.gz: 47dc5389da4b549cd036456bdde5a08e9312077df43fbc7903c2e3c9dd916b9d013c4bd2434b317e82098a08e72aa5fca569d52adab7e0ff3ada2b4ed5e3949b
+  data.tar.gz: 3cd87bac6fb08a62e32e798e9e2ed1db0e6f8bf727033b2c1103529f15c1bd7962826185363e65dc68c969969d21093b0a44fc31b989f7110e1daf10815e1aac

data/lib/effective_developer/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDeveloper
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.8.3'.freeze
 end

data/lib/generators/effective/ability_generator.rb

@@ -53,9 +53,11 @@ module Effective
             abilities += non_crud_actions
           end
 
-          abilities = ['manage'] if abilities.blank? || abilities == (crud_actions - ['show'])
+          abilities = ['crud'] if abilities.blank? || abilities == (crud_actions - ['show'])
 
-          if abilities.length == 1
+          if abilities == ['crud']
+            abilities = "#{abilities.first}"
+          elsif abilities.length == 1
             abilities = ":#{abilities.first}"
           else
             abilities = '[' + abilities.map { |action| ':' + action }.join(', ') + ']'
@@ -67,7 +69,7 @@ module Effective
             resource.class_name
           end
 
-          "can #{abilities}, #{name}"
+          "can(#{abilities}, #{name})"
         )
       end
     end

data/lib/scaffolds/admin_effective/views/_form.html.haml

@@ -1,5 +1,5 @@
 = tabs do
-  = tab '<%= resource.human_name.titleize %>' do
+  = tab(<%= resource.name %>) do
     = render '<%= resource.view_file_path("form_#{resource.name}").sub('effective/', '') %>', <%= resource.name %>: <%= resource.name %>
 
 <%- if resource.nested_resources.present? || resource.instance.respond_to?(:logs_datatable) %>

data/lib/scaffolds/basic/views/_form.html.haml

@@ -1,5 +1,5 @@
 = tabs do
-  = tab '<%= resource.human_name.titleize %>' do
+  = tab(<%= resource.name %>) do
     = render '<%= resource.view_file_path("form_#{resource.name}") %>', <%= resource.name %>: <%= resource.name %>
 
 <%- if resource.nested_resources.present? %>

data/lib/scaffolds/effective/views/_form.html.haml

@@ -1,5 +1,5 @@
 = tabs do
-  = tab '<%= resource.human_name.titleize %>' do
+  = tab(<%= resource.name %>) do
     = render '<%= resource.view_file_path("form_#{resource.name}") %>', <%= resource.name %>: <%= resource.name %>
 
 <%- if resource.nested_resources.present? || resource.instance.respond_to?(:logs_datatable) %>

data/lib/tasks/pg_pull.rake

@@ -14,10 +14,10 @@ namespace :pg do
   # DATABASE=example bundle exec rake pg:load
   desc 'Creates a new backup on remote server and downloads it to latest.dump'
   task :pull, [:remote] => :environment do |t, args|
-    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump', logs: 'false' }
-    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'].to_s.presence }
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump', logs: 'false' }.compact
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'] }.compact
     keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
-    args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
+    args.with_defaults(defaults.merge(env_keys).merge(keywords))
 
     # Validate Config
     configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
@@ -42,7 +42,7 @@ namespace :pg do
       end
 
       # Download it to local
-      unless system("curl -o #{args.filename} `heroku pg:backups:public-url --remote #{args.remote}`")
+      unless system("curl -o #{args.filename} `heroku pg:backups:url --remote #{args.remote}`")
         abort("Error downloading database")
       end
 
@@ -93,10 +93,10 @@ namespace :pg do
   # DATABASE=example bundle exec rake pg:load
   desc 'Loads a postgresql .dump file into the development database (latest.dump by default)'
   task :load, [:filename] => :environment do |t, args|
-    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }
-    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump' }.compact
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'] }.compact
     keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
-    args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
+    args.with_defaults(defaults.merge(env_keys).merge(keywords))
 
     # Validate filename
     unless File.exist?(Rails.root + args.filename)
@@ -143,10 +143,10 @@ namespace :pg do
   # bundle exec rake pg:save[something.dump] => Will dump the database to something.dump
   desc 'Saves the development database to a postgresql .dump file (latest.dump by default)'
   task :save, [:filename] => :environment do |t, args|
-    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump', logs: 'false' }
-    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'].to_s.presence }
+    defaults = { database: nil, filename: (ENV['DATABASE'] || 'latest') + '.dump', logs: 'false' }.compact
+    env_keys = { database: ENV['DATABASE'], filename: ENV['FILENAME'], logs: ENV['LOGS'] }.compact
     keywords = ARGV.map { |a| a.split('=') if a.include?('=') }.compact.inject({}) { |h, (k, v)| h[k.to_sym] = v; h }
-    args.with_defaults(defaults.compact.merge(env_keys.compact).merge(keywords))
+    args.with_defaults(defaults.merge(env_keys).merge(keywords))
 
     db = if ENV['DATABASE_URL'].to_s.length > 0 && args.database.blank?
       uri = URI.parse(ENV['DATABASE_URL']) rescue nil
@@ -210,10 +210,10 @@ namespace :pg do
         abort "Error capturing heroku backup"
       end
 
-      url = (`heroku pg:backups:public-url --app #{args.source}`).chomp
+      url = (`heroku pg:backups:url --app #{args.source}`).chomp
 
       unless (url || '').length > 0
-        abort "Error reading public-url from app #{args.source}"
+        abort "Error reading url from app #{args.source}"
       end
 
       unless system("heroku pg:backups:restore '#{url}' DATABASE_URL --app #{args.target}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_developer
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-19 00:00:00.000000000 Z
+date: 2024-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails