haml-rails 2.0.1 → 3.0.0

data/test/test_helper.rb

@@ -1,79 +1,70 @@
+# frozen_string_literal: true
+
 require 'rubygems'
+require 'bundler/setup'
+require 'logger'
 require 'minitest/autorun'
-require 'rails/all'
+require 'action_pack'
+require 'action_controller'
+require 'action_view'
+require 'active_model'
+require 'rails'
 require 'rails/generators'
 require 'rails/generators/test_case'
+Bundler.require(:default)
 
 class TestApp < Rails::Application
-  config.root = File.dirname(__FILE__)
+  config.root = Pathname.new(File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails')))
+  config.eager_load = false
 end
 
-module Rails
-  def self.root
-    @root ||= File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'rails'))
-  end
-end
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+TestApp.initialize!
 
-# Call configure to load the settings from
-# Rails.application.config.generators to Rails::Generators
-Rails.application.load_generators
+Rails.application.routes.draw do
+  resources :people
+end
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-def copy_routes
-  routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
-  destination = File.join(Rails.root, "config")
-  FileUtils.mkdir_p(destination)
-  FileUtils.cp File.expand_path(routes), File.expand_path(destination)
-end
+module Haml
+  module Rails
+    module GeneratorTestHelpers
+      private
 
-# Asserts the given class exists in the given content. When a block is given,
-# it yields the content of the class.
-#
-#   assert_file "test/functional/accounts_controller_test.rb" do |controller_test|
-#     assert_class "AccountsControllerTest", controller_test do |klass|
-#       assert_match /context "index action"/, klass
-#     end
-#   end
-#
-def assert_class(klass, content)
-  assert content =~ /class #{klass}(\(.+\))?(.*?)\nend/m, "Expected to have class #{klass}"
-  yield $2.strip if block_given?
+      def copy_routes
+        routes = File.join(File.dirname(__FILE__), 'fixtures', 'routes.rb')
+        destination = File.join(::Rails.root, "config")
+        FileUtils.mkdir_p(destination)
+        FileUtils.cp File.expand_path(routes), File.expand_path(destination)
+      end
+    end
+  end
 end
 
-def generator_list
-  {
-    :rails        => ['scaffold', 'controller', 'mailer'],
-    :haml         => ['scaffold', 'controller', 'mailer']
-  }
-end
+::Rails::Generators::TestCase.include Haml::Rails::GeneratorTestHelpers
+
+class Person
+  include ActiveModel::Model
+
+  attr_accessor :id, :name
 
-def path_prefix(name)
-  case name
-  when :rails
-    'rails/generators'
-  else
-    'generators'
+  def initialize(id, name)
+    @id, @name = id, name
   end
-end
 
-def require_generators(generator_list)
-  generator_list.each do |name, generators|
-    generators.each do |generator_name|
-      if name.to_s == 'rails' && generator_name.to_s == 'mailer'
-        require File.join(path_prefix(name), generator_name.to_s, "#{generator_name}_generator")
-      else
-        require File.join(path_prefix(name), name.to_s, generator_name.to_s, "#{generator_name}_generator")
-      end
-    end
+  def to_param
+    {id: @id}
   end
 end
-alias :require_generator :require_generators
 
-require_generators generator_list
+class ApplicationController < ActionController::Base
+end
 
 # Remove tmp directory when test suite is completed
-MiniTest.after_run do
+Minitest.after_run do
   tmp_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
   FileUtils.rm_r(tmp_dir)
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: haml-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - André Arko
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,9 +16,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +23,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +72,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -104,16 +97,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -128,40 +121,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-description: Haml-rails provides Haml generators for Rails 4. It also enables Haml
-  as the templating engine for you, so you don't have to screw around in your own
-  application.rb when your Gemfile already clearly indicated what templating engine
-  you have installed. Hurrah.
+description: Haml-rails provides Haml generators for Rails 5.1 and above. It also
+  enables Haml as the templating engine for you, so you don't have to screw around
+  in your own application.rb when your Gemfile already clearly indicated what templating
+  engine you have installed. Hurrah.
 email:
 - andre@arko.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
-- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6.beta2.gemfile
 - haml-rails.gemspec
 - lib/generators/haml/controller/controller_generator.rb
 - lib/generators/haml/controller/templates/view.html.haml
@@ -171,10 +146,45 @@ files:
 - lib/generators/haml/mailer/templates/view.html.haml
 - lib/generators/haml/mailer/templates/view.text.haml
 - lib/generators/haml/scaffold/scaffold_generator.rb
+- lib/generators/haml/scaffold/templates/5_1/_form.html.haml
+- lib/generators/haml/scaffold/templates/5_1/edit.html.haml
+- lib/generators/haml/scaffold/templates/5_1/index.html.haml
+- lib/generators/haml/scaffold/templates/5_1/new.html.haml
+- lib/generators/haml/scaffold/templates/5_1/show.html.haml
+- lib/generators/haml/scaffold/templates/5_2/_form.html.haml
+- lib/generators/haml/scaffold/templates/5_2/edit.html.haml
+- lib/generators/haml/scaffold/templates/5_2/index.html.haml
+- lib/generators/haml/scaffold/templates/5_2/new.html.haml
+- lib/generators/haml/scaffold/templates/5_2/show.html.haml
+- lib/generators/haml/scaffold/templates/6_0/_form.html.haml
+- lib/generators/haml/scaffold/templates/6_0/edit.html.haml
+- lib/generators/haml/scaffold/templates/6_0/index.html.haml
+- lib/generators/haml/scaffold/templates/6_0/new.html.haml
+- lib/generators/haml/scaffold/templates/6_0/show.html.haml
+- lib/generators/haml/scaffold/templates/6_1/_form.html.haml
+- lib/generators/haml/scaffold/templates/6_1/edit.html.haml
+- lib/generators/haml/scaffold/templates/6_1/index.html.haml
+- lib/generators/haml/scaffold/templates/6_1/new.html.haml
+- lib/generators/haml/scaffold/templates/6_1/show.html.haml
+- lib/generators/haml/scaffold/templates/7_0/_form.html.haml
+- lib/generators/haml/scaffold/templates/7_0/edit.html.haml
+- lib/generators/haml/scaffold/templates/7_0/index.html.haml
+- lib/generators/haml/scaffold/templates/7_0/new.html.haml
+- lib/generators/haml/scaffold/templates/7_0/partial.html.haml
+- lib/generators/haml/scaffold/templates/7_0/show.html.haml
+- lib/generators/haml/scaffold/templates/7_1
+- lib/generators/haml/scaffold/templates/7_2/_form.html.haml
+- lib/generators/haml/scaffold/templates/7_2/edit.html.haml
+- lib/generators/haml/scaffold/templates/7_2/index.html.haml
+- lib/generators/haml/scaffold/templates/7_2/new.html.haml
+- lib/generators/haml/scaffold/templates/7_2/partial.html.haml
+- lib/generators/haml/scaffold/templates/7_2/show.html.haml
+- lib/generators/haml/scaffold/templates/8_0
 - lib/generators/haml/scaffold/templates/_form.html.haml
 - lib/generators/haml/scaffold/templates/edit.html.haml
 - lib/generators/haml/scaffold/templates/index.html.haml
 - lib/generators/haml/scaffold/templates/new.html.haml
+- lib/generators/haml/scaffold/templates/partial.html.haml
 - lib/generators/haml/scaffold/templates/show.html.haml
 - lib/haml-rails.rb
 - lib/haml-rails/version.rb
@@ -184,13 +194,13 @@ files:
 - test/lib/generators/haml/controller_generator_test.rb
 - test/lib/generators/haml/mailer_generator_test.rb
 - test/lib/generators/haml/scaffold_generator_test.rb
-- test/lib/generators/haml/testing_helper.rb
+- test/lib/generators/haml/scaffold_template_contents_test.rb
 - test/test_helper.rb
-homepage: https://github.com/indirect/haml-rails
+homepage: https://github.com/haml/haml-rails
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -205,8 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: let your Gemfile do the configuring
 test_files: []

data/.travis.yml

@@ -1,23 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-before_install:
-  - "gem update --system"
-  - "gem install bundler"
-rvm:
-  - 2.5.3
-  - 2.4.5
-  - 2.3.8
-  - jruby-9.2.5.0
-gemfile:
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6.beta2.gemfile
-matrix:
-  exclude:
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails_6.beta2.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails_6.beta2.gemfile
-script: "bundle exec rake test"

data/Appraisals

@@ -1,27 +0,0 @@
-appraise "rails_4_0" do
-  gem "rails", "~> 4.0.1"
-end
-
-appraise "rails_4_1" do
-  gem "rails", "4.1"
-end
-
-appraise "rails_4_2" do
-  gem "rails", "4.2"
-end
-
-appraise "rails_5_0" do
-  gem "rails", "5.0"
-end
-
-appraise "rails_5_1" do
-  gem "rails", "5.1"
-end
-
-appraise "rails_5_2" do
-  gem "rails", "5.2"
-end
-
-appraise "rails_6.beta2" do
-  gem "rails", "6.0.0.beta2"
-end

data/gemfiles/rails_5_1.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "~> 5.1.5"
-
-gemspec :path => "../"

data/gemfiles/rails_5_2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "~> 5.2.0"
-
-gemspec :path => "../"

data/gemfiles/rails_6.beta2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rubysl", "~> 2.0", :platforms => :rbx
-gem "minitest", :platforms => :rbx
-gem "html2haml"
-gem "rails", "6.0.0.beta2"
-
-gemspec :path => "../"

data/lib/generators/haml/scaffold/templates/_form.html.haml

@@ -1,15 +0,0 @@
-= form_for @<%= singular_table_name %> do |f|
-  - if @<%= singular_table_name %>.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@<%= singular_table_name %>.errors.count, "error")} prohibited this <%= singular_table_name %> from being saved:"
-      %ul
-        - @<%= singular_table_name %>.errors.full_messages.each do |message|
-          %li= message
-
-<% for attribute in attributes -%>
-  .field
-    = f.label :<%= attribute.name %>
-    = f.<%= attribute.field_type %> :<%= attribute.name %>
-<% end -%>
-  .actions
-    = f.submit 'Save'

data/lib/generators/haml/scaffold/templates/edit.html.haml

@@ -1,7 +0,0 @@
-%h1 Editing <%= singular_table_name %>
-
-= render 'form'
-
-= link_to 'Show', @<%= singular_table_name %>
-\|
-= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/index.html.haml

@@ -1,25 +0,0 @@
-%h1 Listing <%= plural_table_name %>
-
-%table
-  %thead
-    %tr
-<% for attribute in attributes -%>
-      %th <%= attribute.human_name %>
-<% end -%>
-      %th
-      %th
-      %th
-
-  %tbody
-    - @<%= plural_table_name %>.each do |<%= singular_table_name %>|
-      %tr
-<% for attribute in attributes -%>
-        %td= <%= singular_table_name %>.<%= attribute.name %>
-<% end -%>
-        %td= link_to 'Show', <%= singular_table_name %>
-        %td= link_to 'Edit', edit_<%= singular_table_name %>_path(<%= singular_table_name %>)
-        %td= link_to 'Destroy', <%= singular_table_name %>, method: :delete, data: { confirm: 'Are you sure?' }
-
-%br
-
-= link_to 'New <%= human_name %>', new_<%= singular_table_name %>_path

data/lib/generators/haml/scaffold/templates/new.html.haml

@@ -1,5 +0,0 @@
-%h1 New <%= singular_table_name %>
-
-= render 'form'
-
-= link_to 'Back', <%= index_helper %>_path

data/lib/generators/haml/scaffold/templates/show.html.haml

@@ -1,11 +0,0 @@
-%p#notice= notice
-
-<% for attribute in attributes -%>
-%p
-  %b <%= attribute.human_name %>:
-  = @<%= singular_table_name %>.<%= attribute.name %>
-<% end -%>
-
-= link_to 'Edit', edit_<%= singular_table_name %>_path(@<%= singular_table_name %>)
-\|
-= link_to 'Back', <%= index_helper %>_path

data/test/lib/generators/haml/testing_helper.rb

@@ -1 +0,0 @@
-require_generators :haml => ['scaffold', 'controller', 'mailer']