magicka 1.1.0 → 1.2.0

data/lib/magicka/form_element.rb

@@ -23,7 +23,7 @@ module Magicka
     #
     # @return [String]
     def label
-      @label ||= field.to_s.capitalize.gsub(/_/, ' ')
+      @label ||= field.to_s.capitalize.gsub('_', ' ')
     end
 
     # @api private

data/lib/magicka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Magicka
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/magicka.gemspec

@@ -12,40 +12,12 @@ Gem::Specification.new do |gem|
   gem.homepage              = 'https://github.com/darthjee/magicka'
   gem.description           = 'Gem for easy form templating'
   gem.summary               = gem.description
-  gem.required_ruby_version = '>= 2.7.0'
+  gem.required_ruby_version = '>= 3.3.1'
 
   gem.files                 = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables           = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  gem.test_files            = gem.files.grep(%r{^(test|gem|features)/})
   gem.require_paths         = ['lib']
 
-  gem.add_runtime_dependency 'activesupport',       '~> 7.0.x'
-  gem.add_runtime_dependency 'sinclair',            '>= 2.0.1'
-
-  gem.add_development_dependency 'actionpack',               '7.0.4.3'
-  gem.add_development_dependency 'activerecord',             '7.0.4.3'
-  gem.add_development_dependency 'bundler',                  '>= 2.3.25'
-  gem.add_development_dependency 'factory_bot',              '5.2.0'
-  gem.add_development_dependency 'nokogiri',                 '1.12.5'
-  gem.add_development_dependency 'pry',                      '0.12.2'
-  gem.add_development_dependency 'pry-nav',                  '0.3.0'
-  gem.add_development_dependency 'rails',                    '7.0.4.3'
-  gem.add_development_dependency 'rails-controller-testing', '1.0.4'
-  gem.add_development_dependency 'rake',                     '13.0.1'
-  gem.add_development_dependency 'reek',                     '6.0.3'
-  gem.add_development_dependency 'rspec',                    '3.9.0'
-  gem.add_development_dependency 'rspec-core',               '3.9.3'
-  gem.add_development_dependency 'rspec-expectations',       '3.9.4'
-  gem.add_development_dependency 'rspec-mocks',              '3.9.1'
-  gem.add_development_dependency 'rspec-rails',              '3.9.1'
-  gem.add_development_dependency 'rspec-support',            '3.9.4'
-  gem.add_development_dependency 'rubocop',                  '0.80.1'
-  gem.add_development_dependency 'rubocop-rspec',            '1.38.1'
-  gem.add_development_dependency 'rubycritic',               '4.6.1'
-  gem.add_development_dependency 'simplecov',                '0.17.1'
-  gem.add_development_dependency 'sprockets-rails',          '3.4.2'
-  gem.add_development_dependency 'sqlite3',                  '1.4.2'
-  gem.add_development_dependency 'tzinfo-data',              '~> 1.2022.1'
-  gem.add_development_dependency 'yard',                     '0.9.26'
-  gem.add_development_dependency 'yardstick',                '0.9.9'
+  gem.add_dependency 'activesupport',       '~> 7.2.x'
+  gem.add_dependency 'sinclair',            '>= 3.1.0'
 end

data/spec/dummy/app/models/document.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class Document < ActiveRecord::Base
+class Document < ApplicationRecord
   validates :name, presence: true
 end

data/spec/dummy/bin/setup

@@ -17,7 +17,6 @@ chdir APP_ROOT do
   # This script is a starting point to setup your application.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
@@ -29,12 +28,9 @@ chdir APP_ROOT do
   #   cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
-  puts "\n== Preparing database =="
   system! 'bin/rails db:setup'
 
-  puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
 
-  puts "\n== Restarting application server =="
   system! 'bin/rails restart'
 end

data/spec/dummy/bin/update

@@ -17,19 +17,15 @@ chdir APP_ROOT do
   # This script is a way to update your development environment automatically.
   # Add necessary update steps to this file.
 
-  puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
 
-  puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
 
-  puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'
 
-  puts "\n== Restarting application server =="
   system! 'bin/rails restart'
 end

data/spec/dummy/config/environments/development.rb

@@ -18,7 +18,7 @@ Rails.application.configure do
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  if Rails.root.join('tmp', 'caching-dev.txt').exist?
+  if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
 
     config.cache_store = :memory_store

data/spec/dummy/config/environments/production.rb

@@ -89,7 +89,7 @@ Rails.application.configure do
   config.active_support.deprecation = :notify
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
+  config.log_formatter = Logger::Formatter.new
 
   # Use a different logger for distributed setups.
   # require 'syslog/logger'
@@ -98,7 +98,7 @@ Rails.application.configure do
   # )
 
   if ENV['RAILS_LOG_TO_STDOUT'].present?
-    logger           = ActiveSupport::Logger.new(STDOUT)
+    logger           = ActiveSupport::Logger.new($stdout)
     logger.formatter = config.log_formatter
     config.logger    = ActiveSupport::TaggedLogging.new(logger)
   end

data/spec/dummy/config/puma.rb

@@ -6,17 +6,17 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
+threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
 threads threads_count, threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests;
 # default is 3000.
 #
-port        ENV.fetch('PORT') { 3000 }
+port        ENV.fetch('PORT', 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
-environment ENV.fetch('RAILS_ENV') { 'development' }
+environment ENV.fetch('RAILS_ENV', 'development')
 
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked webserver processes. If using threads and workers together

data/spec/integration/yard/magicka/helper_spec.rb

@@ -20,7 +20,7 @@ describe 'yard for Magicka::Helper' do
       before { get "/documents/#{document.id}" }
 
       it do
-        expect(response.status).to eq(200)
+        expect(response).to have_http_status(:ok)
       end
 
       it do

data/spec/lib/magicka/aggregator/class_methods_spec.rb

@@ -7,7 +7,7 @@ describe Magicka::Aggregator::ClassMethods do
 
   let(:aggregator_class) { Class.new(Magicka::Aggregator) }
   let(:model)            { :my_model }
-  let(:renderer)         { instance_double('renderer') }
+  let(:renderer)         { instance_double(ActionView::Base) }
   let(:template)         { 'templates/forms/input' }
   let(:locals)           { {} }
 

data/spec/lib/magicka/aggregator_spec.rb

@@ -7,7 +7,7 @@ describe Magicka::Aggregator do
 
   let(:aggregator_class) { Class.new(described_class) }
   let(:model)            { :my_model }
-  let(:renderer)         { instance_double('renderer') }
+  let(:renderer)         { instance_double(ActionView::Base) }
   let(:template)         { 'templates/forms/input' }
   let(:locals)           { {} }
 

data/spec/lib/magicka/button_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Magicka::Button do
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/button' }
 
   let(:ng_click)    { 'controler.click()' }

data/spec/lib/magicka/display_spec.rb

@@ -6,7 +6,7 @@ describe Magicka::Display do
   subject(:form) { described_class.new(renderer, model) }
 
   let(:model)    { :my_model }
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/display/text' }
   let(:locals)   { {} }
 

data/spec/lib/magicka/element/class_methods_spec.rb

@@ -9,7 +9,7 @@ describe Magicka::Element::ClassMethods do
     Class.new(Magicka::Element)
   end
 
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/element' }
   let(:locals)   { {} }
 

data/spec/lib/magicka/element_spec.rb

@@ -9,7 +9,7 @@ describe Magicka::Element do
     Class.new(described_class)
   end
 
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/element' }
   let(:folder)   { 'templates/forms' }
   let(:locals)   { {} }

data/spec/lib/magicka/form_element_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Magicka::FormElement do
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/custom_template' }
 
   let(:expected_template) { template }

data/spec/lib/magicka/form_spec.rb

@@ -6,7 +6,7 @@ describe Magicka::Form do
   subject(:form) { described_class.new(renderer, model) }
 
   let(:model)    { :my_model }
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/input' }
   let(:locals)   { {} }
 

data/spec/lib/magicka/input_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Magicka::Input do
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/input' }
 
   let(:model)       { :my_model }

data/spec/lib/magicka/select_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Magicka::Select do
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/forms/select' }
 
   let(:model)       { :my_model }

data/spec/lib/magicka/text_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Magicka::Text do
-  let(:renderer) { instance_double('renderer') }
+  let(:renderer) { instance_double(ActionView::Base) }
   let(:template) { 'templates/display/text' }
 
   let(:model) { :my_model }

data/spec/spec_helper.rb

@@ -2,6 +2,12 @@
 
 require 'simplecov'
 
+if ENV['CI']
+  require 'simplecov-lcov'
+  SimpleCov::Formatter::LcovFormatter.config.report_with_single_file = true
+  SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
+end
+
 SimpleCov.start do
   add_filter '/spec/'
 end
@@ -21,7 +27,7 @@ require 'active_support/railtie'
 require 'sinclair/matchers'
 
 support_files = File.expand_path('spec/support/**/*.rb')
-Dir[support_files].sort.each { |file| require file }
+Dir[support_files].each { |file| require file }
 
 RSpec::Matchers.define_negated_matcher :not_change, :change
 RSpec::Matchers.define_negated_matcher :not_add_method, :add_method