redbreast 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 345104526de4e2d5a6b0d8bf70a2afb23ddc42b3305f05c31045aec5f661435b
-  data.tar.gz: 0b711b3ebe9df7d1f27edc471d895d71b9766d6d3b3f7ad13fbb3abee108acd2
+  metadata.gz: f7a8875e2b36cd094a3d8dc5c74c7c1acf9d29de22c1d1efcbd9b545dfd469a8
+  data.tar.gz: 67e244c0e183fc8d03d8edf45dc271a2f7e8dc40fd1efe7a732779ff618d83c3
 SHA512:
-  metadata.gz: 9a35c633ac705ddf2afaffcb15d91ae6649def315e84c7e71e29a82a21783d952cddec01ea603e7b57f787ee1a7fcba5ae4b3e8bd9d13c33f26fcddbb3fa897b
-  data.tar.gz: 8c3a3d5ea38141551eff53ce852c9262f51a295c5ec96379c2d3800a504a293db07d7bb6308e36782f75faf2c92adee4dcc85bd3017c774dc1e2b8c74351bbad
+  metadata.gz: 3a01ac2f7e449861ce5697bf5f79a69a801d5e02b87804a7d88f704b10f3412da8636e8d0a7b06c7939759fbe37552a7bac3f5569b88dc6d94db7d9daab75d64
+  data.tar.gz: c4fa84840d2fce0395367b503971327cdab83c2e997d8a7a28d0c48c26d246074072e395411a90476ff3268f2d943406d1672c39c69bee2153005f9c550d1a8c

data/.ruby-version

@@ -1 +1 @@
-2.7.0
+3.1.0

data/lib/redbreast/serializers/objc_serializer.rb

@@ -22,7 +22,7 @@ module Redbreast
       end
 
       def write(output_source_path, template, file_name)
-        file = ERB.new(template, nil, '-').result(binding)
+        file = ERB.new(template, trim_mode: '-').result(binding)
         File.write(File.join(output_source_path, file_name), file)
       end
 

data/lib/redbreast/serializers/swift_serializer.rb

@@ -11,7 +11,7 @@ module Redbreast
         directory = File.dirname(output_source_path)
         FileUtils.mkdir_p directory unless File.exist? directory
 
-        file = ERB.new(template_generator.template, nil, '-').result(binding)
+        file = ERB.new(template_generator.template, trim_mode: '-').result(binding)
         File.write(output_source_path, file)
       end
 
@@ -50,11 +50,12 @@ module Redbreast
       end
 
       def generate_extension(extended_class, app_name)
-        text = 'public extension ' + extended_class + " {\n"
-
+        text = 'extension ' + extended_class + " {"
         return text if app_name.nil? || app_name.empty?
 
+        text = 'public extension ' + extended_class + " {\n"
         text + SPACER + "enum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+
       end
 
       def create_swift_test_cases(names:, declaration:, app_name:)

data/lib/redbreast/serializers/swiftui_serializer.rb

@@ -5,12 +5,13 @@ module Redbreast
     # Used to save swift files
     class SwiftUI < Base
       include Helper::General
+      SPACER = "    "
 
       def save(output_source_path:, template_generator:, generate_colors:)
         directory = File.dirname(output_source_path)
         FileUtils.mkdir_p directory unless File.exist? directory
 
-        file = ERB.new(template_generator.template, nil, '-').result(binding)
+        file = ERB.new(template_generator.template, trim_mode: '-').result(binding)
         File.write(output_source_path, file)
       end
 
@@ -34,13 +35,13 @@ module Redbreast
 
           if !names_new_enum.empty? && new_enum_name == enum_name
             indentation += indentation.empty? || indentation[-1] == '/' ? '' : '/'
-            text += "\n" + generate_file_swift(names: names_new_enum, spacing: spacing + "\t", indentation: indentation + enum_name, variable: variable, bundle: bundle)
+            text += "\n" + generate_file_swift(names: names_new_enum, spacing: spacing + SPACER, indentation: indentation + enum_name, variable: variable, bundle: bundle)
           end
 
           unless names_new.empty?
 
             indentation += indentation.empty? || indentation[-1] == '/' ? '' : '/'
-            text += generate_file_swift(names: names_new, spacing: spacing + "\t", indentation: indentation + enum_name, variable: variable, bundle: bundle)
+            text += generate_file_swift(names: names_new, spacing: spacing + SPACER, indentation: indentation + enum_name, variable: variable, bundle: bundle)
           end
 
           text += "\n" + spacing + '}' + "\n"
@@ -49,11 +50,11 @@ module Redbreast
       end
 
       def generate_extension(extended_class, app_name)
-        text = 'extension ' + extended_class + " {\n"
-
+        text = 'extension ' + extended_class + " {"
         return text if app_name.nil? || app_name.empty?
 
-        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+        text = 'public extension ' + extended_class + " {\n"
+        text + SPACER + "enum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
       end
 
       def create_swift_test_cases(names:, declaration:, app_name:)
@@ -64,7 +65,7 @@ module Redbreast
           temp_array = name.split('/')
           variable = temp_array.pop
           additional_text = temp_array.count.zero? ? '' : '.'
-          text += "\t\t" + declaration + app_name_text + temp_array.join('.') + additional_text + clean_variable_name(variable)
+          text += SPACER + SPACER + declaration + app_name_text + temp_array.join('.') + additional_text + clean_variable_name(variable)
           text += name == names.last ? '' : "\n"
         end
 

data/lib/redbreast/template_generators/colors/swift_colors_template_generator.rb

@@ -11,9 +11,9 @@ module Redbreast
             import UIKit
 
             // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
-            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command extension_access_modifier
             <%= generate_extension('UIColor', app_name) %>
-            <%= generate_file_swift(names: asset_names, variable: 'static var %s: UIColor { return UIColor(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: UIColor { return UIColor(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
             }
           TEMPLATE
         end

data/lib/redbreast/template_generators/colors/swiftui_colors_template_generator.rb

@@ -11,9 +11,9 @@ module Redbreast
             import SwiftUI
 
             // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
-            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command extension_access_modifier
             <%= generate_extension('Color', app_name) %>
-            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Color { Color("%s", bundle: %s) }', bundle: bundle) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: Color { Color("%s", bundle: %s) }', bundle: bundle) %>
             }
           TEMPLATE
         end

data/lib/redbreast/template_generators/images/swift_images_template_generator.rb

@@ -12,9 +12,9 @@ module Redbreast
             import UIKit
 
             // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
-            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command extension_access_modifier
             <%= generate_extension('UIImage', app_name) %>
-            <%= generate_file_swift(names: asset_names, variable: 'static var %s: UIImage { return UIImage(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: UIImage { return UIImage(named: "%s", in: %s, compatibleWith: nil)! }', bundle: bundle) %>
             }
           TEMPLATE
         end

data/lib/redbreast/template_generators/images/swiftui_images_template_generator.rb

@@ -12,9 +12,9 @@ module Redbreast
             import SwiftUI
 
             // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
-            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_commandextension_access_modifier
             <%= generate_extension('Image', app_name) %>
-            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Image { Image("%s", bundle: %s) }', bundle: bundle) %>
+            <%= generate_file_swift(names: asset_names, variable: 'public static var %s: Image { Image("%s", bundle: %s) }', bundle: bundle) %>
             }
           TEMPLATE
         end

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Maroje
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: A CLI for safe and strongly typed resources