redbreast 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55140102c283d2812b099b0ec63dc475d12faef4beac0cc12d39cca5b87c2f61
-  data.tar.gz: 70704e2afa3b62adc8693d87cdf47891e255abdaf0b416cc11ae4190acd9d634
+  metadata.gz: '08211f43d2d63e1357a2b75e016ddd0d0998f3399309ffc1164a9604b2376185'
+  data.tar.gz: 3ff926cfb618faa177a063a7347a98e38fe37a248f6115e7a427583d70862d72
 SHA512:
-  metadata.gz: b7945675763fad73af01dcdd6018dbd032d782449f028f0e0d7d289cf028c4b7ce6d4ae5f129a2b47755e14a31b93cbc9bf1f6b6fe33e544558145635d5c6a78
-  data.tar.gz: 51d20e13ab388b0e2bd71a696bda633eed452f4d2be7b6e0179ffd0d6b7f2dffe056e7f0f144c6fdf47272c0168e0b7e95afb369f269c493c8c52531b74546eb
+  metadata.gz: 1c21dd2541a7775af6fe830050e1e4a494908f1e93b96e6eb9f900331de0156a1ca620cb770e6e9010b7fa3247436d7cb196fa53710b52241834a035b33b3f13
+  data.tar.gz: 2ac81fb3c47b9dbb2d285b0efb7259f97268b5756b03b85f39df6f55950e19295f298c158c05f857cf9235b23dd46503cd063afc07c32578f5d5e95ef25b255b

data/.gitignore

@@ -10,3 +10,37 @@
 
 # rspec failure tracking
 .rspec_status
+
+# Created by https://www.toptal.com/developers/gitignore/api/macos
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# End of https://www.toptal.com/developers/gitignore/api/macos

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
+  - 2.7.0
+before_install: gem install bundler -v 2.3.4

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/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

@@ -5,6 +5,7 @@ module Redbreast
     # Used to save swift files
     class Swift < Base
       include Helper::General
+      SPACER = "    "
 
       def save(output_source_path:, template_generator:, generate_colors:)
         directory = File.dirname(output_source_path)
@@ -14,7 +15,7 @@ module Redbreast
         File.write(output_source_path, file)
       end
 
-      def generate_file_swift(names:, spacing: "\t", indentation: '', variable:, bundle:)
+      def generate_file_swift(names:, spacing: SPACER, indentation: '', variable:, bundle:)
         return if names.empty?
 
         text = ''
@@ -22,25 +23,25 @@ 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 = arr.uniq.sort_by(&:downcase)
+
         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
             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 = 'public extension ' + extended_class + " {\n"
 
         return text if app_name.nil? || app_name.empty?
 
-        text + "\tenum " + app_name + " {}\n}\n\nextension " + extended_class + '.' + app_name + " {"
+        text + SPACER + "enum " + app_name + " {}\n}\n\npublic extension " + extended_class + '.' + app_name + " {"
       end
 
       def create_swift_test_cases(names:, declaration:, app_name:)
@@ -64,7 +65,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 += SPACER + SPACER + 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
 
@@ -72,7 +74,7 @@ module Redbreast
       end
 
       def generate_variables(names:, spacing:, indentation:, bundle:, variable:, text:, array:)
-        names.each do |name|
+        names.sort_by(&:downcase).each do |name|
           temp_arr = name.split('/')
 
           if temp_arr.length != 1

data/lib/redbreast/serializers/swiftui_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

data/lib/redbreast/version.rb

@@ -1,3 +1,3 @@
 module Redbreast
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

data/redbreast.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.77'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redbreast
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Maroje
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -130,10 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -143,9 +143,7 @@ files:
 - bin/console
 - bin/setup
 - exe/redbreast
-- lib/.DS_Store
 - lib/redbreast.rb
-- lib/redbreast/.DS_Store
 - lib/redbreast/commands/color_generator.rb
 - lib/redbreast/commands/color_test_generator.rb
 - lib/redbreast/commands/configuration_installer.rb
@@ -163,7 +161,6 @@ files:
 - 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
@@ -201,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: A CLI for safe and strongly typed resources