redbreast 1.0.3 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e655bee32f96732f77f8b5f88d0bb1fdade6fd1c142758aafc6b17afb771457
-  data.tar.gz: 82ecee365aa0bc210b45dca522bfd868468950d38babfe1abb3f787125746f49
+  metadata.gz: 4333c7695d94182141a09737fe4d5c298f2c7f48ef2b0235170436cb1746f41d
+  data.tar.gz: b2616e3e40e1958b58cae329046e25c3619903dd90b93af89c59da8242d34205
 SHA512:
-  metadata.gz: 327a93d2fe2ecc30185cbda0d1b8bbc4a9a17f0e7a99f5fed9547d050e438d9881fb9d4aee2cf4ed99456333f4fafd9984bbe78b86567ade1ac570b9e1d0807b
-  data.tar.gz: ea2cdc2572af400207fc6e9f12804cf66858ea1a90dac2abc748686f76a456b67fecbc2a9e7929f4baa5c936c3191d723d32f286c3c2227860ae39d1faa8cfaa
+  metadata.gz: ac62100673841d410911b49bb8dfa6c2d2992ecaec3b0fac8371a8af3c6f592e907809abfbc54d6673f8e450976017ec1d47f23dae352efa69011d3cac560885
+  data.tar.gz: fdccea173c982b8969ee4d5cfcf4377ec615cf84b7137503a3120bcf2bd9a66541eb13a7925da21a1a215dc40b9ae631f287c238f01a9bc7331bdb9b6049e9dc

data/lib/redbreast/commands/color_generator.rb

@@ -39,6 +39,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::Color::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::Color::SwiftUI
         end
         serializer.new(color_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: true)
       end

data/lib/redbreast/commands/color_test_generator.rb

@@ -41,6 +41,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::ColorTest::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::ColorTest::SwiftUI
         end
         serializer.new(color_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: true)
 

data/lib/redbreast/commands/image_generator.rb

@@ -39,6 +39,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::Image::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::Image::SwiftUI
         end
         serializer.new(image_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: false)
 

data/lib/redbreast/commands/image_test_generator.rb

@@ -41,6 +41,9 @@ module Redbreast
         when 'swift'
           serializer = Redbreast::Serializer::Swift
           template_generator = Redbreast::TemplateGenerator::ImageTest::Swift
+        when 'swiftui'
+          serializer = Redbreast::Serializer::SwiftUI
+          template_generator = Redbreast::TemplateGenerator::ImageTest::SwiftUI
         end
         serializer.new(image_names, bundle, app_name).save(output_source_path: output_path, template_generator: template_generator.new, generate_colors: false)
 

data/lib/redbreast/commands/setup.rb

@@ -56,7 +56,7 @@ module Redbreast
       # Language
 
       def language_prompt
-        languages = { 'Swift' => 'swift', 'Objective-C' => 'objc' }
+        languages = { 'Swift' => 'swift', 'SwiftUI' => 'swiftui', 'Objective-C' => 'objc', }
         prompt.select('Choose a language: ', languages)
       end
 
@@ -76,6 +76,8 @@ module Redbreast
           prompt.ask(prompt_text, default: 'mainBundle')
         when 'swift'
           prompt.ask(prompt_text, default: 'main')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: 'main')
         end
       end
 
@@ -85,6 +87,8 @@ module Redbreast
           "[NSBundle #{bundle_name}]"
         when 'swift'
           ".#{bundle_name}"
+        when 'swiftui'
+          ".#{bundle_name}"
         end
       end
 
@@ -97,6 +101,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/Images')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIImageExtension.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ImageExtension.swift')
         end
       end
 
@@ -109,6 +115,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/Colors')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIColorExtension.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ColorExtension.swift')
         end
       end
 
@@ -125,6 +133,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/ImagesTest')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIImageExtensionTest.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ImageExtensionTest.swift')
         end
       end
 
@@ -135,6 +145,8 @@ module Redbreast
           prompt.ask(prompt_text, default: './Common/Categories/ColorsTest')
         when 'swift'
           prompt.ask(prompt_text, default: './Common/Extensions/UIColorExtensionTest.swift')
+        when 'swiftui'
+          prompt.ask(prompt_text, default: './Common/Extensions/ColorExtensionTest.swift')
         end
       end
 
@@ -144,6 +156,8 @@ module Redbreast
           nil
         when 'swift'
           prompt.ask("Please enter a name that will be used for testable import in #{bundle} bundle?", default: "#{app_name}", required: true)
+        when 'swiftui'
+          prompt.ask("Please enter a name that will be used for testable import in #{bundle} bundle?", default: "#{app_name}", required: true)
         end
       end
 

data/lib/redbreast/helpers/general.rb

@@ -45,6 +45,17 @@ module Redbreast
         escape_with_underscore_if_needed(clean_name)
       end
 
+      def upper_camel_case(name)
+        clean_name = name
+                     .split(/[^0-9a-zA-Z]/)
+                     .reject(&:empty?)
+                     .each_with_index
+                     .map { |v, i| i.zero? ? v.tap { |char| char[0] = char[0].upcase } : v.capitalize }
+                     .join
+
+        escape_with_underscore_if_needed(clean_name)
+      end
+
       def clean_case_name(name)
         clean_variable_name(name)
       end

data/lib/redbreast/io/config.rb

@@ -2,7 +2,7 @@ module Redbreast
   module IO
     # Used for reading and writing to config file
     class Config
-      CONFIG_FILE_PATH = "#{Dir.pwd}/.redbrest.yml"
+      CONFIG_FILE_PATH = "#{Dir.pwd}/.redbreast.yml"
 
       class << self
         def write(data)

data/lib/redbreast/serializers/objc_serializer.rb

@@ -40,7 +40,7 @@ module Redbreast
         text = ''
 
         names.each do |name|
-          temp_arr = name.split('/')
+          temp_arr = name.split('/').map { |folder| upper_camel_case(folder) }
 
           variable_name = temp_arr.length == 1 ? clean_variable_name(name) : temp_arr.unshift(temp_arr.shift.downcase).join('')
           text += variable_declaration % variable_name + variable_implementation % [name, bundle_name[:reference]]
@@ -54,7 +54,7 @@ module Redbreast
         text = ''
 
         names.each do |name|
-          temp_arr = name.split('/')
+          temp_arr = name.split('/').map { |folder| upper_camel_case(folder) }
           variable_name = temp_arr.length == 1 ? clean_variable_name(name) : temp_arr.unshift(temp_arr.shift.downcase).join('')
           text += variable % variable_name
         end

data/lib/redbreast/serializers/swift_serializer.rb

@@ -23,13 +23,13 @@ module Redbreast
         vars, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: arr)
 
         arr = arr.uniq
-        #text += indentation.empty? && text.empty? ? "\n" : ''
+
         arr.each do |enum_name|
           names_new = []
           names_new_enum = []
           new_enum_name = enum_name
 
-          text += "\n" + spacing + 'enum ' + enum_name + ' {'
+          text += "\n" + spacing + 'enum ' + upper_camel_case(enum_name) + ' {'
           names_new, names_new_enum = separate_variables_from_folders(names: names, enum_name: enum_name, new_enum_name: new_enum_name, names_new_enum: names_new_enum, names_new: names_new)
 
           if !names_new_enum.empty? && new_enum_name == enum_name
@@ -64,7 +64,8 @@ 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 += "\t\t" + declaration + app_name_text + temp_array.map { |enum| upper_camel_case(enum) }.join('.') + additional_text + clean_variable_name(variable)
           text += name == names.last ? '' : "\n"
         end
 

data/lib/redbreast/serializers/swiftui_serializer.rb

@@ -0,0 +1,107 @@
+require_relative 'serializer' 
+
+module Redbreast
+  module Serializer
+    # Used to save swift files
+    class SwiftUI < Base
+      include Helper::General
+
+      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.write(output_source_path, file)
+      end
+
+      def generate_file_swift(names:, spacing: "\t", indentation: '', variable:, bundle:)
+        return if names.empty?
+
+        text = ''
+        arr = []
+
+        vars, arr = generate_variables(names: names, spacing: spacing, indentation: indentation, variable: variable, bundle: bundle, text: text, array: arr)
+
+        arr = arr.uniq
+
+        arr.each do |enum_name|
+          names_new = []
+          names_new_enum = []
+          new_enum_name = enum_name
+
+          text += "\n" + spacing + 'enum ' + upper_camel_case(enum_name) + ' {'
+          names_new, names_new_enum = separate_variables_from_folders(names: names, enum_name: enum_name, new_enum_name: new_enum_name, names_new_enum: names_new_enum, names_new: names_new)
+
+          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)
+          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)
+          end
+
+          text += "\n" + spacing + '}' + "\n"
+        end
+        text + vars
+      end
+
+      def generate_extension(extended_class, app_name)
+        text = 'extension ' + extended_class + " {\n"
+
+        return text if app_name.nil? || app_name.empty?
+
+        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+      end
+
+      def create_swift_test_cases(names:, declaration:, app_name:)
+        text = ''
+        app_name_text = app_name.nil? || app_name.empty? ? '' : app_name + '.'
+
+        names.each do |name|
+          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 += name == names.last ? '' : "\n"
+        end
+
+        text
+      end
+
+      def generate_variables(names:, spacing:, indentation:, bundle:, variable:, text:, array:)
+        names.each do |name|
+          temp_arr = name.split('/')
+
+          if temp_arr.length != 1
+            array.push(temp_arr.first)
+          else
+            name_prefix = indentation.empty? ? '' : '/'
+            text += "\n" + spacing + variable % [clean_variable_name(name), indentation + name_prefix + name, bundle[:reference]]
+          end
+        end
+
+        [text, array]
+      end
+
+      def separate_variables_from_folders(names:, enum_name:, new_enum_name:, names_new_enum:, names_new:)
+        names.each do |name|
+          temp_arr = name.split('/')
+
+          next if temp_arr.length == 1
+
+          if temp_arr.length > 2
+            names_new_enum.push(temp_arr.drop(1).join('/')) if temp_arr.first == new_enum_name
+            next
+          end
+
+          names_new.push(temp_arr.drop(1).join('/')) if temp_arr[0] == enum_name
+        end
+
+        [names_new, names_new_enum]
+      end
+    end
+  end
+end

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

@@ -10,7 +10,8 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
             <%= 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) %>
             }

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

@@ -0,0 +1,23 @@
+require_relative '../swiftui_template_generator' 
+
+module Redbreast
+  module TemplateGenerator
+    module Color
+      # Used for creating colors in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+          <<~TEMPLATE
+            import SwiftUI
+
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            <%= generate_extension('Color', app_name) %>
+            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Color { Color("%s", bundle: %s) }', bundle: bundle) %>
+            }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,8 @@ module Redbreast
           <<~TEMPLATE
             import UIKit
 
-            //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
             <%= 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) %>
             }

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

@@ -0,0 +1,24 @@
+require_relative '../swiftui_template_generator' 
+
+module Redbreast
+  module TemplateGenerator
+    module Image
+      # Used for creating images in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+
+        def template
+          <<~TEMPLATE
+            import SwiftUI
+
+            // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+            // swiftlint:disable file_length type_body_length line_length superfluous_disable_command
+            <%= generate_extension('Image', app_name) %>
+            <%= generate_file_swift(names: asset_names, variable: 'static var %s: Image { Image("%s", bundle: %s) }', bundle: bundle) %>
+            }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/swiftui_template_generator.rb

@@ -0,0 +1,11 @@
+module Redbreast
+  module TemplateGenerator
+    # Class for creating SwiftUI templates
+    class SwiftUI
+      include ERB::Util
+      def template
+        raise NotImplementedError, 'Abstract Method'
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/tests/colors/swift_colors_tests_template_generator.rb

@@ -12,7 +12,7 @@ module Redbreast
   import XCTest
   @testable import <%= bundle[:testableImport] %>
 
-  //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
   class <%= File.basename(bundle[:outputTestPathColors], ".*") %>: XCTestCase {
 
       func testIfColorsArePresent() {

data/lib/redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator.rb

@@ -0,0 +1,27 @@
+require 'redbreast/template_generators/swiftui_template_generator'
+
+module Redbreast
+  module TemplateGenerator
+    module ColorTest
+      # Used for creating color tests in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+<<~TEMPLATE
+  import SwiftUI
+  import XCTest
+  @testable import <%= bundle[:testableImport] %>
+
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  class <%= File.basename(bundle[:outputTestPathColors], ".*") %>: XCTestCase {
+
+      func testIfColorsArePresent() {
+  <%= create_swift_test_cases(names: asset_names, declaration: '_ = Color.', app_name: app_name) %>
+      }
+  }
+TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/template_generators/tests/images/swift_images_tests_template_generator.rb

@@ -12,7 +12,7 @@ module Redbreast
   import XCTest
   @testable import <%= bundle[:testableImport] %>
 
-  //THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
   class <%= File.basename(bundle[:outputTestPathImages], ".*") %>: XCTestCase {
 
       func testIfImagesArePresent() {

data/lib/redbreast/template_generators/tests/images/swiftui_images_tests_template_generator.rb

@@ -0,0 +1,27 @@
+require 'redbreast/template_generators/swiftui_template_generator'
+
+module Redbreast
+  module TemplateGenerator
+    module ImageTest
+      # Used for creating image tests in swift.
+      class SwiftUI < TemplateGenerator::SwiftUI
+        include ERB::Util
+        def template
+<<~TEMPLATE
+  import SwiftUI
+  import XCTest
+  @testable import <%= bundle[:testableImport] %>
+
+  // THIS FILE IS AUTOGENERATED, DO NOT EDIT BY HAND
+  class <%= File.basename(bundle[:outputTestPathImages], ".*") %>: XCTestCase {
+
+      func testIfImagesArePresent() {
+    <%= create_swift_test_cases(names: asset_names, declaration: '_ = Image.', app_name: app_name) %>
+      }
+  }
+TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.0.3'
+  VERSION = '1.1.2'
 end

data/lib/redbreast.rb

@@ -27,18 +27,24 @@ require 'redbreast/crawlers/color_crawler'
 require 'redbreast/serializers/serializer'
 require 'redbreast/serializers/objc_serializer'
 require 'redbreast/serializers/swift_serializer'
+require 'redbreast/serializers/swiftui_serializer'
 
 # Template generators
 require 'redbreast/template_generators/objc_template_generator'
 require 'redbreast/template_generators/swift_template_generator'
+require 'redbreast/template_generators/swiftui_template_generator'
 require 'redbreast/template_generators/images/objc_images_template_generator'
 require 'redbreast/template_generators/images/swift_images_template_generator'
+require 'redbreast/template_generators/images/swiftui_images_template_generator'
 require 'redbreast/template_generators/colors/objc_colors_template_generator'
 require 'redbreast/template_generators/colors/swift_colors_template_generator'
+require 'redbreast/template_generators/colors/swiftui_colors_template_generator'
 require 'redbreast/template_generators/tests/colors/objc_colors_tests_template_generator'
 require 'redbreast/template_generators/tests/colors/swift_colors_tests_template_generator'
+require 'redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator'
 require 'redbreast/template_generators/tests/images/objc_images_tests_template_generator'
 require 'redbreast/template_generators/tests/images/swift_images_tests_template_generator'
+require 'redbreast/template_generators/tests/images/swiftui_images_tests_template_generator'
 
 # Error Handler
 require 'redbreast/error_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.2
 platform: ruby
 authors:
 - Maroje
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,17 +162,23 @@ files:
 - lib/redbreast/serializers/objc_serializer.rb
 - lib/redbreast/serializers/serializer.rb
 - lib/redbreast/serializers/swift_serializer.rb
+- lib/redbreast/serializers/swiftui_serializer.rb
 - lib/redbreast/template_generators/.DS_Store
 - lib/redbreast/template_generators/colors/objc_colors_template_generator.rb
 - lib/redbreast/template_generators/colors/swift_colors_template_generator.rb
+- lib/redbreast/template_generators/colors/swiftui_colors_template_generator.rb
 - lib/redbreast/template_generators/images/objc_images_template_generator.rb
 - lib/redbreast/template_generators/images/swift_images_template_generator.rb
+- lib/redbreast/template_generators/images/swiftui_images_template_generator.rb
 - lib/redbreast/template_generators/objc_template_generator.rb
 - lib/redbreast/template_generators/swift_template_generator.rb
+- lib/redbreast/template_generators/swiftui_template_generator.rb
 - lib/redbreast/template_generators/tests/colors/objc_colors_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/colors/swift_colors_tests_template_generator.rb
+- lib/redbreast/template_generators/tests/colors/swiftui_colors_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/images/objc_images_tests_template_generator.rb
 - lib/redbreast/template_generators/tests/images/swift_images_tests_template_generator.rb
+- lib/redbreast/template_generators/tests/images/swiftui_images_tests_template_generator.rb
 - lib/redbreast/version.rb
 - redbreast.gemspec
 homepage: https://github.com/infinum/redbreast