b4um_generators 0.3.0 → 0.4.2

data/lib/generators/b4um/scaffold/templates/_form.html.erb.tt

@@ -15,6 +15,8 @@
   <%% end %>
 
 <% attributes.each do |attribute| -%>
+<% required = required_fields.include?(attribute.name) -%>
+<% label = attribute.name.humanize + (required ? " *" : "") -%>
 <% if attribute.name == "password_digest" -%>
   <div class="form-field">
     <%%= form.password_field :password,
@@ -35,7 +37,7 @@
     <%%= form.email_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:password|password_confirmation)(?:_|$)/) -%>
@@ -43,7 +45,7 @@
     <%%= form.password_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:phone|telephone|mobile)(?:_|$)/) -%>
@@ -51,7 +53,7 @@
     <%%= form.telephone_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.name.match?(/(?:^|_)(?:url|website|homepage)(?:_|$)/) -%>
@@ -59,12 +61,12 @@
     <%%= form.url_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif select_field?(attribute.name) -%>
   <div class="form-field form-field--select">
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
 
     <%%= form.select :<%= attribute.name %>,
           <%= select_configuration[:values].inspect %>.map { |choice|
@@ -76,7 +78,7 @@
 
 <% elsif radio_field?(attribute.name) -%>
   <div class="form-field form-field--radio">
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
 
     <div class="form-radio-options">
       <%% <%= radio_configuration[:values].inspect %>.each do |choice| %>
@@ -94,7 +96,7 @@
 <% elsif attribute.type == :boolean -%>
   <div class="form-field form-field--checkbox">
     <%%= form.check_box :<%= attribute.name %>, class: "form-checkbox" %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label form-label--checkbox" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label form-label--checkbox" %>
   </div>
 
 <% elsif attribute.type == :text -%>
@@ -102,7 +104,7 @@
     <%%= form.text_area :<%= attribute.name %>,
           class: "form-textarea",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :integer -%>
@@ -111,7 +113,7 @@
           class: "form-input",
           placeholder: " ",
           step: 1 %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif [:float, :decimal].include?(attribute.type) -%>
@@ -120,7 +122,7 @@
           class: "form-input",
           placeholder: " ",
           step: "any" %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :date -%>
@@ -128,7 +130,7 @@
     <%%= form.date_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif [:datetime, :timestamp].include?(attribute.type) -%>
@@ -136,7 +138,7 @@
     <%%= form.datetime_local_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :time -%>
@@ -144,7 +146,7 @@
     <%%= form.time_field :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 
 <% elsif attribute.type == :attachment -%>
@@ -153,6 +155,7 @@
 
     <div class="form-file-control">
       <%%= form.label :<%= attribute.name %>,
+            "<%= label %>",
             class: "form-file-label" %>
 
       <%%= form.file_field :<%= attribute.name %>,
@@ -189,6 +192,7 @@
 
     <div class="form-file-control">
       <%%= form.label :<%= attribute.name %>,
+            "<%= label %>",
             class: "form-file-label" %>
 
       <%% <%= singular_table_name %>.<%= attribute.name %>.each do |image| %>
@@ -246,7 +250,7 @@
     <%%= form.<%= attribute.field_type %> :<%= attribute.name %>,
           class: "form-input",
           placeholder: " " %>
-    <%%= form.label :<%= attribute.name %>, class: "form-label" %>
+    <%%= form.label :<%= attribute.name %>, "<%= label %>", class: "form-label" %>
   </div>
 <% end -%>
 <% end -%>

data/lib/generators/b4um/sortable/sortable_generator.rb

@@ -51,30 +51,80 @@ module B4um
         )
       end
 
+      def update_fixtures
+        return unless File.exist?(fixture_path)
+
+        fixtures = File.read(fixture_path)
+        position = 0
+
+        updated_fixtures = fixtures.gsub(
+          /^([^\s#][^:\n]*:\s*\n)((?:^[ \t]+.*\n?)*)/
+        ) do
+          fixture_header = Regexp.last_match(1)
+          fixture_body = Regexp.last_match(2)
+
+          next "#{fixture_header}#{fixture_body}" if fixture_header.start_with?("_")
+
+          position += 1
+
+          if fixture_body.match?(/^[ \t]+position:\s+/)
+            fixture_body = fixture_body.sub(
+              /^[ \t]+position:\s+.*$/,
+              "  position: #{position}"
+            )
+
+            "#{fixture_header}#{fixture_body}"
+          else
+            "#{fixture_header}  position: #{position}\n#{fixture_body}"
+          end
+        end
+
+        return if updated_fixtures == fixtures
+
+        File.write(fixture_path, updated_fixtures)
+
+        say_status(
+          :fixture,
+          "#{plural_table_name}.yml now includes sortable positions",
+          :green
+        )
+      end
+
       def update_model
         model_content = File.read(model_path)
 
-        return if model_content.include?("before_create :b4um_set_sortable_position")
+        return if model_content.include?(
+          "before_create :b4um_set_sortable_position"
+        )
 
-        inject_into_class(
-          model_path,
-          class_name,
-          <<~RUBY.indent(2)
-            before_create :b4um_set_sortable_position
-            after_destroy :b4um_compact_sortable_positions
+        existing_model_body = model_content
+                              .lines[1...-1]
+                              .to_a
+                              .any? { |line| line.match?(/\S/) }
 
-            def b4um_set_sortable_position
-              return if position.present?
+        sortable_model_code = <<~RUBY.indent(2)
+          before_create :b4um_set_sortable_position
+          after_destroy :b4um_compact_sortable_positions
 
-              self.position = self.class.maximum(:position).to_i + 1
-            end
+          def b4um_set_sortable_position
+            return if position.present?
 
-            def b4um_compact_sortable_positions
-              self.class
-                  .where("position > ?", position)
-                  .update_all("position = position - 1")
-            end
-          RUBY
+            self.position = self.class.maximum(:position).to_i + 1
+          end
+
+          def b4um_compact_sortable_positions
+            self.class
+                .where("position > ?", position)
+                .update_all("position = position - 1")
+          end
+        RUBY
+
+        sortable_model_code << "\n" if existing_model_body
+
+        inject_into_class(
+          model_path,
+          class_name,
+          sortable_model_code
         )
 
         say_status(
@@ -217,6 +267,14 @@ module B4um
         )
       end
 
+      def fixture_path
+        File.join(
+          destination_root,
+          "test/fixtures",
+          "#{plural_table_name}.yml"
+        )
+      end
+
       def model_path
         File.join(
           destination_root,
@@ -322,15 +380,16 @@ module B4um
 
             head :no_content
           end
-
         RUBY
 
+        action = action.rstrip
+
         private_marker = "\n  private\n"
 
         if controller_content.include?(private_marker)
           insert_into_file(
             controller_path,
-            action,
+            "\n#{action}\n",
             before: private_marker
           )
         else
@@ -341,10 +400,10 @@ module B4um
                   "Could not find the end of app/controllers/#{plural_table_name}_controller.rb"
           end
 
-          insert_into_file(
+          gsub_file(
             controller_path,
-            "\n#{action}",
-            before: controller_end
+            controller_end,
+            "\n\n#{action}\nend\n"
           )
         end
       end
@@ -354,7 +413,7 @@ module B4um
         return if controller_content.include?("if request.get?")
 
         sort_action =
-          /^(\s*)def sort\s*$/
+          /^([ \t]*)def sort[ \t]*$/
 
         unless controller_content.match?(sort_action)
           raise Thor::Error,
@@ -365,15 +424,15 @@ module B4um
           controller_path,
           sort_action
         ) do |match|
-          indentation = match[/\A\s*/]
-
-          <<~RUBY.chomp
-            #{match}
-            #{indentation}  if request.get?
-            #{indentation}    @#{plural_table_name} = #{class_name}.order(:position, :id)
-            #{indentation}    return
-            #{indentation}  end
-          RUBY
+          indentation = match[/\A[ \t]*/]
+
+          [
+            match,
+            "#{indentation}  if request.get?",
+            "#{indentation}    @#{plural_table_name} = #{class_name}.order(:position, :id)",
+            "#{indentation}    return",
+            "#{indentation}  end"
+          ].join("\n")
         end
       end
 
@@ -510,19 +569,28 @@ module B4um
       end
 
       def schema_contains_position?
-        schema_path = File.join(destination_root, "db/schema.rb")
+        schema_path = File.join(
+          destination_root,
+          "db/schema.rb"
+        )
 
         return false unless File.exist?(schema_path)
 
         schema = File.read(schema_path)
 
         table_pattern = /
-          create_table\s+"#{Regexp.escape(plural_table_name)}".*?^  end
+          ^[ \t]*create_table\s+"#{Regexp.escape(plural_table_name)}".*?\n
+          (?<table_body>.*?)
+          ^[ \t]{2}end\s*$
         /mx
 
-        table = schema[table_pattern]
+        match = schema.match(table_pattern)
 
-        table&.match?(/t\.integer\s+"position"/) || false
+        return false unless match
+
+        match[:table_body].match?(
+          /^[ \t]+t\.integer\s+"position"/
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: b4um_generators
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Alexander Baum
@@ -49,6 +49,14 @@ files:
 - bin/setup
 - lib/b4um_generators.rb
 - lib/b4um_generators/version.rb
+- lib/generators/b4um/admin/admin_generator.rb
+- lib/generators/b4um/admin/templates/add_admin_fields_migration.rb.tt
+- lib/generators/b4um/admin/templates/admin_base_controller.rb.tt
+- lib/generators/b4um/admin/templates/admin_dashboard.html.erb.tt
+- lib/generators/b4um/admin/templates/admin_dashboard_controller.rb.tt
+- lib/generators/b4um/admin/templates/admin_users_controller.rb.tt
+- lib/generators/b4um/admin/templates/admin_users_index.html.erb.tt
+- lib/generators/b4um/admin/templates/b4um_admin.rake.tt
 - lib/generators/b4um/attachment/attachment_generator.rb
 - lib/generators/b4um/authentication/authentication_generator.rb
 - lib/generators/b4um/authentication/templates/new.html.erb.tt
@@ -64,6 +72,13 @@ files:
 - lib/generators/b4um/comments/templates/comments_controller.rb.tt
 - lib/generators/b4um/comments/templates/create_comments.rb.tt
 - lib/generators/b4um/controller/controller_generator.rb
+- lib/generators/b4um/guest/guest_generator.rb
+- lib/generators/b4um/guest/templates/add_guest_fields_migration.rb.tt
+- lib/generators/b4um/guest/templates/b4um_guests.rake.tt
+- lib/generators/b4um/guest/templates/edit.html.erb.tt
+- lib/generators/b4um/guest/templates/guest_expiration_warning.html.erb.tt
+- lib/generators/b4um/guest/templates/guests_controller.rb.tt
+- lib/generators/b4um/guest/templates/new.html.erb.tt
 - lib/generators/b4um/help/help_generator.rb
 - lib/generators/b4um/in_place/in_place_generator.rb
 - lib/generators/b4um/in_place/templates/_flash.html.erb