stylegen 0.3.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4808a4d66b66694ce4df774bc4fc3cc4048e5eb28849bc9d6e89c191a2c9f32
-  data.tar.gz: 639451c4ee1913d543c1b10cd3ed6dc7bf8f70b5711ac490ca1644d28b88bd88
+  metadata.gz: 31f78139e4e4008bf37ab9d48bc8e00309b7a04d98be8e0a2d66a281afde0780
+  data.tar.gz: e08e613e70ef4ca0f96989051db35496783caf8c4de3245fb78600d6a72cd15a
 SHA512:
-  metadata.gz: 3ac5a414042b33bef240224d8390d79e92466b777a98bd9ffa0dcd20fe63b4b3353823d26dcc129655bd3d534b1eca2b7c9950b2b6e1764b5d7e30e8e1381ac2
-  data.tar.gz: 8d2e762fef43e854ca222e9fba107fb8df885d2ae4b2d0ab44eed03c6f7e0c5f61138df701954fd479b4dcbe2f1698b18ae4a140423a625bab83ccff95b0eec5
+  metadata.gz: aa6e4794fb3fa16e907aa5fe272fce946b225de69565ca92dee659dd2ddaae63e6ae141c320366bb05ff8dade91ae5b3acd1cb8ca5f0641ab44cfa909971a4bc
+  data.tar.gz: d0b5c306bb2edc0e1c017ba35df7dfb6445d02fe66b12cc7560999461c7ce4a2549378a47b371466b49771cb7300fb360a50ca6345f62e48c23137d1a58644d2

data/.deepsource.toml

@@ -0,0 +1,5 @@
+version = 1
+
+[[analyzers]]
+name = "ruby"
+enabled = true

data/.github/workflows/ci.yml

@@ -1,14 +1,14 @@
 name: CI
-
 on:
   push:
-    branches: "*"
+    branches:
+      - master
   pull_request:
-    branches: "*"
+    branches:
+      - master
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -17,9 +17,10 @@ jobs:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.rubocop.yml

@@ -6,17 +6,6 @@ AllCops:
   TargetRubyVersion: 2.5
   NewCops: enable
 
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Metrics/ClassLength:
-  Enabled: true
-  Max: 150
-
-Naming/MethodParameterName:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -25,9 +14,3 @@ Metrics/AbcSize:
 
 Style/Documentation:
   Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Minitest/AssertInDelta:
-  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## v0.5.0
+### Changed
+- Switched generated code from `struct` to `class`.
+- SwiftUI: Use `Color(uiColor:)` initializer when running on iOS 15+.
+
+## v0.4.0
+### Added
+- Added support for color descriptions.
+
 ## v0.3.1
 ### Changed
 - Increased precision of HEX color conversion to avoid truncation. 

data/Gemfile

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stylegen (0.3.1)
+    stylegen (0.5.0)
       dry-inflector (~> 0.2.0)
       gli (~> 2.1)
       json_schemer (~> 0.2.0)
@@ -13,9 +13,9 @@ GEM
     dry-inflector (0.2.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
-    gli (2.20.1)
+    gli (2.21.0)
     hana (1.3.7)
-    json_schemer (0.2.18)
+    json_schemer (0.2.24)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)

data/README.md

@@ -68,6 +68,7 @@ colors:
       alpha: 0.6
 
   primary_background:
+    description: The color for the main background of your interface.
     light: "#FFFFFF"
     dark:
       # Value for base (non-elevated) level

data/Rakefile

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rake/testtask"
-require "rubocop/rake_task"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rubocop/rake_task'
 
 Rake::TestTask.new
 RuboCop::RakeTask.new

data/bin/stylegen

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "stylegen/cli"
+require 'stylegen/cli'
 
 exit Stylegen::CLI::App.run(ARGV)

data/lib/stylegen/cli/app.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require "yaml"
-require "gli"
+require 'yaml'
+require 'gli'
 
-require "stylegen/validator"
-require "stylegen/generator"
+require 'stylegen/validator'
+require 'stylegen/generator'
 
 module Stylegen
   module CLI
     class App
       extend GLI::App
 
-      program_desc "CLI tool for managing colors in iOS apps"
+      program_desc 'CLI tool for managing colors in iOS apps'
 
       version Stylegen::VERSION
 
@@ -19,30 +19,30 @@ module Stylegen
 
       # Commands
 
-      desc "Generates a sample theme.yaml file in the current directory"
+      desc 'Generates a sample theme.yaml file in the current directory'
       command :init do |c|
         c.action do
-          exit_now!("'theme.yaml' already exists!") if File.exist?("theme.yaml")
+          exit_now!("'theme.yaml' already exists!") if File.exist?('theme.yaml')
 
-          template = File.read(File.join(__dir__, "template.yaml"))
-          File.write("theme.yaml", template)
+          template = File.read(File.join(__dir__, 'template.yaml'))
+          File.write('theme.yaml', template)
 
           puts "Generated 'theme.yaml'."
         end
       end
 
-      desc "Generates the Swift colors file"
+      desc 'Generates the Swift colors file'
       command :build do |c|
         c.action do
-          exit_now!("'theme.yaml' not found. Create one with 'stylegen init'.") unless File.exist?("theme.yaml")
+          exit_now!("'theme.yaml' not found. Create one with 'stylegen init'.") unless File.exist?('theme.yaml')
 
-          data = File.open("theme.yaml") { |file| YAML.safe_load(file) }
+          data = File.open('theme.yaml') { |file| YAML.safe_load(file) }
 
           validator = Validator.new
 
           unless validator.valid?(data)
             message = []
-            message << "theme.yaml contains one or more errors:"
+            message << 'theme.yaml contains one or more errors:'
 
             validator.validate(data).each do |e|
               message << "  #{e}"

data/lib/stylegen/cli/template.yaml

@@ -37,6 +37,8 @@ colors:
       alpha: 0.6
 
   primary_background:
+    # Use `description` to document your colors (optional).
+    description: The color for the main background of your interface.
     light: "#FFFFFF"
     dark:
       # Value for base (non-elevated) level

data/lib/stylegen/cli.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require "stylegen/cli/app"
+require 'stylegen/cli/app'

data/lib/stylegen/colors/base_elevated_color.rb

@@ -2,12 +2,15 @@
 
 module Stylegen
   class BaseElevatedColor
+    attr_reader :description
+
     def initialize(base, elevated)
-      @base, @elevated = base, elevated
+      @base = base
+      @elevated = elevated
     end
 
     def to_s(struct_name, indent = 0)
-      indent_prefix = " " * indent
+      indent_prefix = ' ' * indent
 
       result = []
       result << "#{struct_name}("

data/lib/stylegen/colors/color.rb

@@ -4,8 +4,13 @@ module Stylegen
   class Color
     attr_reader :red, :green, :blue, :alpha
 
-    def initialize(r, g, b, a)
-      @red, @green, @blue, @alpha = r, g, b, a
+    MAX_PRECISION = 16
+
+    def initialize(red, green, blue, alpha)
+      @red = red
+      @green = green
+      @blue = blue
+      @alpha = alpha
     end
 
     def self.from_hex(hex, alpha = nil)
@@ -21,9 +26,12 @@ module Stylegen
         raise ArgumentError, "Invalid color syntax: #{hex}"
       end
 
-      max_precision = 16
-
-      Color.new(r.round(max_precision), g.round(max_precision), b.round(max_precision), alpha || 1.0)
+      Color.new(
+        r.round(MAX_PRECISION),
+        g.round(MAX_PRECISION),
+        b.round(MAX_PRECISION),
+        alpha || 1.0
+      )
     end
 
     def grayscale?
@@ -34,7 +42,7 @@ module Stylegen
       if grayscale?
         "#{struct_name}(white: #{@red}, alpha: #{@alpha})"
       else
-        indent_prefix = " " * indent
+        indent_prefix = ' ' * indent
 
         result = []
         result << "#{struct_name}("

data/lib/stylegen/colors/light_dark_color.rb

@@ -3,11 +3,12 @@
 module Stylegen
   class LightDarkColor
     def initialize(light, dark)
-      @light, @dark = light, dark
+      @light = light
+      @dark = dark
     end
 
     def to_s(struct_name, indent = 0)
-      indent_prefix = " " * indent
+      indent_prefix = ' ' * indent
 
       result = []
       result << "#{struct_name}("

data/lib/stylegen/colors.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require "stylegen/colors/color"
-require "stylegen/colors/light_dark_color"
-require "stylegen/colors/base_elevated_color"
+require 'stylegen/colors/color'
+require 'stylegen/colors/light_dark_color'
+require 'stylegen/colors/base_elevated_color'

data/lib/stylegen/data.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require "dry/inflector"
-require "stylegen/version"
-require "stylegen/colors"
+require 'dry/inflector'
+require 'stylegen/version'
+require 'stylegen/colors'
 
 module Stylegen
   class Data
@@ -14,12 +14,31 @@ module Stylegen
       @inflector ||= Dry::Inflector.new
     end
 
+    def file_header
+      header = @data['header'] || <<~HEADER
+        //
+        //  {{STYLEGEN_FILENAME}}
+        //
+        //  Autogenerated by stylegen ({{STYLEGEN_VERSION}})
+        //  DO NOT EDIT
+        //
+      HEADER
+
+      replacements = {
+        'STYLEGEN_FILENAME' => basename,
+        'STYLEGEN_VERSION' => version,
+        'STYLEGEN_YEAR' => Date.today.year
+      }
+
+      header.strip.gsub(/{{(\w+)}}/) { replacements[Regexp.last_match(1)] || '' }
+    end
+
     def version
       Stylegen::VERSION
     end
 
     def system_name
-      @data["system_name"] || "Theme"
+      @data['system_name'] || 'Theme'
     end
 
     def util_method_name
@@ -27,28 +46,36 @@ module Stylegen
     end
 
     def output_path
-      @data["output_path"]
+      @data['output_path']
     end
 
     def swiftui?
-      @data["swiftui"] || false
+      @data['swiftui'] || false
     end
 
     def basename
-      File.basename(@data["output_path"])
+      File.basename(@data['output_path'])
     end
 
     def access_level
-      @data["access_level"] || "internal"
+      @data['access_level'] || 'internal'
+    end
+
+    def effective_access_level
+      access_level == 'internal' ? '' : "#{access_level} "
     end
 
     def struct_name
       "#{system_name}Color"
     end
 
-    def colors
-      @colors ||= @data["colors"].map do |key, value|
-        [inflector.camelize_lower(key), generate_color(value)]
+    def color_entries
+      @color_entries ||= @data['colors'].map do |key, value|
+        {
+          property: inflector.camelize_lower(key),
+          description: value['description'],
+          color: generate_color(value)
+        }
       end
     end
 
@@ -57,17 +84,17 @@ module Stylegen
     def generate_color(data)
       if data.is_a?(String)
         Color.from_hex(data)
-      elsif data.key?("color")
-        Color.from_hex(data["color"], data["alpha"])
-      elsif data.key?("light")
+      elsif data.key?('color')
+        Color.from_hex(data['color'], data['alpha'])
+      elsif data.key?('light')
         LightDarkColor.new(
-          generate_color(data["light"]),
-          generate_color(data["dark"])
+          generate_color(data['light']),
+          generate_color(data['dark'])
         )
-      elsif data.key?("base")
+      elsif data.key?('base')
         BaseElevatedColor.new(
-          generate_color(data["base"]),
-          generate_color(data["elevated"])
+          generate_color(data['base']),
+          generate_color(data['elevated'])
         )
       end
     end

data/lib/stylegen/generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "stylegen/data"
-require "stylegen/template"
+require 'stylegen/data'
+require 'stylegen/template'
 
 module Stylegen
   class Generator
@@ -10,16 +10,15 @@ module Stylegen
     end
 
     def generate
-      template_content = File.read(File.join(__dir__, "resources/template.swift.erb"))
-      template = Template.new(template_content, @data)
+      template = Template.new(@data)
 
-      file = File.open(@data.output_path, "w")
+      file = File.open(@data.output_path, 'w')
       file << template.render
       file.close
     end
 
     def stats
-      @stats ||= { output_path: @data.output_path, color_count: @data.colors.count }
+      @stats ||= { output_path: @data.output_path, color_count: @data.color_entries.count }
     end
   end
 end

data/lib/stylegen/resources/schema.json

@@ -26,6 +26,9 @@
     "Color": {
       "type": "object",
       "properties": {
+        "description": {
+          "type": "string"
+        },
         "color": {
           "$ref": "#/definitions/HexColor"
         },
@@ -41,6 +44,9 @@
     "BaseElevatedColor": {
       "type": "object",
       "properties": {
+        "description": {
+          "type": "string"
+        },
         "base": {
           "$ref": "#/definitions/AbstractColor"
         },
@@ -54,6 +60,9 @@
     "LightDarkColor": {
       "type": "object",
       "properties": {
+        "description": {
+          "type": "string"
+        },
         "light": {
           "$ref": "#/definitions/AbstractColor"
         },
@@ -107,4 +116,4 @@
     "output_path",
     "colors"
   ]
-}
+}

data/lib/stylegen/template.rb

@@ -1,16 +1,166 @@
 # frozen_string_literal: true
 
-require "erb"
-
 module Stylegen
+  # rubocop:disable Metrics/ClassLength
   class Template
-    def initialize(content, data)
-      @content = content
+    attr_reader :data
+
+    def initialize(data)
       @data = data
     end
 
     def render
-      ERB.new(@content, nil, "-").result(binding)
+      result = []
+      result << render_header
+      result << render_imports
+      result << render_struct
+      result << render_colors
+      result << render_utils
+      result.join("\n")
+    end
+
+    private
+
+    def render_header
+      @data.file_header << "\n"
+    end
+
+    def render_imports
+      result = []
+      result << 'import UIKit'
+      result << 'import SwiftUI' if data.swiftui?
+      result << ''
+      result.join("\n")
+    end
+
+    def render_struct
+      <<~HEREDOC.lstrip
+        #{data.effective_access_level} final class #{data.struct_name} {
+
+            let rawValue: UIColor
+
+            private init(_ rawValue: UIColor) {
+                self.rawValue = rawValue
+            }
+
+            private convenience init(white: CGFloat, alpha: CGFloat) {
+                self.init(
+                    UIColor(white: white, alpha: alpha)
+                )
+            }
+
+            private convenience init(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) {
+                self.init(
+                    UIColor(red: red, green: green, blue: blue, alpha: alpha)
+                )
+            }
+
+            private convenience init(light: #{data.struct_name}, dark: #{data.struct_name}) {
+                if #available(iOS 13.0, *) {
+                    self.init(
+                        UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
+                            switch traits.userInterfaceStyle {
+                            case .dark:
+                                return dark.rawValue
+                            default:
+                                return light.rawValue
+                            }
+                        })
+                    )
+                } else {
+                    self.init(light.rawValue)
+                }
+            }
+
+            private convenience init(base: #{data.struct_name}, elevated: #{data.struct_name}) {
+                if #available(iOS 13.0, *) {
+                    self.init(
+                        UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
+                            switch traits.userInterfaceLevel {
+                            case .elevated:
+                                return elevated.rawValue
+                            default:
+                                return base.rawValue
+                            }
+                        })
+                    )
+                } else {
+                    self.init(base.rawValue)
+                }
+            }
+
+        }
+      HEREDOC
+    end
+
+    def render_colors
+      result = []
+      result << '// MARK: Colors'
+      result << ''
+      result << "#{data.effective_access_level} extension #{data.struct_name} {".lstrip
+      result << ''
+
+      data.color_entries.each do |entry|
+        unless entry[:description].nil?
+          entry[:description].strip.lines.each do |line|
+            result << "    /// #{line.strip}"
+          end
+        end
+
+        result << "    static let #{entry[:property]} = #{entry[:color].to_s(data.struct_name, 4)}\n"
+      end
+
+      result << '}'
+      result << ''
+      result.join("\n")
+    end
+
+    def render_utils
+      result = []
+      result << '// MARK: Utils'
+      result << ''
+
+      if data.swiftui?
+        result << <<~HEREDOC.lstrip
+          #{data.effective_access_level} extension Color {
+
+              @inline(__always)
+              static func #{data.util_method_name}(_ color: #{data.struct_name}) -> Color {
+                  if #available(iOS 15.0, *) {
+                      return Color(uiColor: color.rawValue)
+                  } else {
+                      return Color(color.rawValue)
+                  }
+              }
+
+          }
+        HEREDOC
+      end
+
+      result << <<~HEREDOC.lstrip
+        #{data.effective_access_level} extension UIColor {
+
+            @inline(__always)
+            static func #{data.util_method_name}(_ color: #{data.struct_name}) -> UIColor {
+                return color.rawValue
+            }
+
+        }
+      HEREDOC
+
+      result << <<~HEREDOC.lstrip
+        #{data.effective_access_level} extension CGColor {
+
+            @inline(__always)
+            static func #{data.util_method_name}(_ color: #{data.struct_name}) -> CGColor {
+                return color.rawValue.cgColor
+            }
+
+        }
+      HEREDOC
+
+      result.join("\n")
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/stylegen/validator.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "json_schemer"
+require 'json_schemer'
 
 module Stylegen
   class Validator
@@ -12,7 +12,7 @@ module Stylegen
       errors = []
 
       schema.validate(config).each do |v|
-        errors << JSONSchemer::Errors.pretty(v) unless v["type"] == "schema"
+        errors << JSONSchemer::Errors.pretty(v) unless v['type'] == 'schema'
       end
 
       errors
@@ -21,7 +21,7 @@ module Stylegen
     private
 
     def schema
-      @schema ||= JSONSchemer.schema(File.read(File.join(__dir__, "resources/schema.json")))
+      @schema ||= JSONSchemer.schema(File.read(File.join(__dir__, 'resources/schema.json')))
     end
   end
 end

data/lib/stylegen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stylegen
-  VERSION = "0.3.1"
+  VERSION = '0.5.0'
 end

data/lib/stylegen.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "stylegen/version"
-require "stylegen/colors"
-require "stylegen/generator"
-require "stylegen/data"
-require "stylegen/validator"
+require 'stylegen/version'
+require 'stylegen/colors'
+require 'stylegen/generator'
+require 'stylegen/data'
+require 'stylegen/validator'

data/stylegen.gemspec

@@ -1,31 +1,31 @@
 # frozen_string_literal: true
 
-require "./lib/stylegen/version"
+require './lib/stylegen/version'
 
 Gem::Specification.new do |s|
-  s.name = "stylegen"
+  s.name = 'stylegen'
   s.version = Stylegen::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Ramon Torres"]
-  s.email = ["raymondjavaxx@gmail.com"]
-  s.homepage = "https://github.com/raymondjavaxx/stylegen"
-  s.description = s.summary = "Tool for generating styling code for iOS apps"
+  s.authors = ['Ramon Torres']
+  s.email = ['raymondjavaxx@gmail.com']
+  s.homepage = 'https://github.com/raymondjavaxx/stylegen'
+  s.description = s.summary = 'Tool for generating styling code for iOS apps'
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
-  s.require_paths = ["lib"]
-  s.license = "MIT"
+  s.require_paths = ['lib']
+  s.license = 'MIT'
 
-  s.add_runtime_dependency "dry-inflector", "~> 0.2.0"
-  s.add_runtime_dependency "gli", "~> 2.1"
-  s.add_runtime_dependency "json_schemer", "~> 0.2.0"
+  s.add_runtime_dependency 'dry-inflector', '~> 0.2.0'
+  s.add_runtime_dependency 'gli', '~> 2.1'
+  s.add_runtime_dependency 'json_schemer', '~> 0.2.0'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "minitest", "~> 5.14"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rubocop"
-  s.add_development_dependency "rubocop-minitest"
-  s.add_development_dependency "rubocop-rake"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'minitest', '~> 5.14'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-minitest'
+  s.add_development_dependency 'rubocop-rake'
 
-  s.required_ruby_version = ">= 2.5.0"
+  s.required_ruby_version = '>= 2.5.0'
 end

data/test/helper.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-gem "minitest"
+gem 'minitest'
 
-require "minitest/pride"
-require "minitest/autorun"
+require 'minitest/pride'
+require 'minitest/autorun'
 
-require_relative "../lib/stylegen"
+require_relative '../lib/stylegen'

data/test/test_base_elevated_color.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "helper"
+require_relative 'helper'
 
 class TestBaseElevatedColor < MiniTest::Test
   def test_to_string
     color = Stylegen::BaseElevatedColor.new(
-      Stylegen::Color.from_hex("#000000"),
-      Stylegen::Color.from_hex("#333333")
+      Stylegen::Color.from_hex('#000000'),
+      Stylegen::Color.from_hex('#333333')
     )
 
     # Default indentation
@@ -18,7 +18,7 @@ class TestBaseElevatedColor < MiniTest::Test
       )
     CODE
 
-    assert_equal expected, color.to_s("ThemeColor")
+    assert_equal expected, color.to_s('ThemeColor')
 
     # Additional indentation
 
@@ -29,6 +29,6 @@ class TestBaseElevatedColor < MiniTest::Test
           )
     CODE
 
-    assert_equal expected, color.to_s("ThemeColor", 4)
+    assert_equal expected, color.to_s('ThemeColor', 4)
   end
 end

data/test/test_color.rb

@@ -1,40 +1,40 @@
 # frozen_string_literal: true
 
-require_relative "helper"
+require_relative 'helper'
 
 class TestColor < MiniTest::Test
   def test_parsing
-    color = Stylegen::Color.from_hex("#FF8000")
-    assert_equal 1.0, color.red
-    assert_equal 0.5019607843137255, color.green
-    assert_equal 0.0, color.blue
-    assert_equal 1.0, color.alpha
+    color = Stylegen::Color.from_hex('#FF8000')
+    assert_in_delta(1.0, color.red)
+    assert_in_delta(0.5019607843137255, color.green)
+    assert_in_delta(0.0, color.blue)
+    assert_in_delta(1.0, color.alpha)
 
     # Optional pound sign
-    color = Stylegen::Color.from_hex("FF8000")
-    assert_equal 1.0, color.red
-    assert_equal 0.5019607843137255, color.green
-    assert_equal 0.0, color.blue
-    assert_equal 1.0, color.alpha
+    color = Stylegen::Color.from_hex('FF8000')
+    assert_in_delta(1.0, color.red)
+    assert_in_delta(0.5019607843137255, color.green)
+    assert_in_delta(0.0, color.blue)
+    assert_in_delta(1.0, color.alpha)
 
     # Specify alpha
-    color = Stylegen::Color.from_hex("#FF8000", 0.5)
-    assert_equal 0.5, color.alpha
+    color = Stylegen::Color.from_hex('#FF8000', 0.5)
+    assert_in_delta(0.5, color.alpha)
   end
 
   def test_parsing_shorthand_syntax
-    color = Stylegen::Color.from_hex("#FC0")
-    assert_equal 1.0, color.red
-    assert_equal 0.8000000000000002, color.green
-    assert_equal 0.0, color.blue
-    assert_equal 1.0, color.alpha
+    color = Stylegen::Color.from_hex('#FC0')
+    assert_in_delta(1.0, color.red)
+    assert_in_delta(0.8000000000000002, color.green)
+    assert_in_delta(0.0, color.blue)
+    assert_in_delta(1.0, color.alpha)
 
     # Optional pound sign
-    color = Stylegen::Color.from_hex("FC0")
-    assert_equal 1.0, color.red
-    assert_equal 0.8000000000000002, color.green
-    assert_equal 0.0, color.blue
-    assert_equal 1.0, color.alpha
+    color = Stylegen::Color.from_hex('FC0')
+    assert_in_delta(1.0, color.red)
+    assert_in_delta(0.8000000000000002, color.green)
+    assert_in_delta(0.0, color.blue)
+    assert_in_delta(1.0, color.alpha)
   end
 
   def test_grayscale
@@ -46,7 +46,7 @@ class TestColor < MiniTest::Test
   end
 
   def test_to_string
-    color = Stylegen::Color.from_hex("#00FF00")
+    color = Stylegen::Color.from_hex('#00FF00')
 
     expected = <<~CODE.strip
       ThemeColor(
@@ -57,11 +57,11 @@ class TestColor < MiniTest::Test
       )
     CODE
 
-    assert_equal expected, color.to_s("ThemeColor")
+    assert_equal expected, color.to_s('ThemeColor')
 
     # Grayscale
-    color = Stylegen::Color.from_hex("#FFFFFF")
-    expected = "ThemeColor(white: 1.0, alpha: 1.0)"
-    assert_equal expected, color.to_s("ThemeColor")
+    color = Stylegen::Color.from_hex('#FFFFFF')
+    expected = 'ThemeColor(white: 1.0, alpha: 1.0)'
+    assert_equal expected, color.to_s('ThemeColor')
   end
 end

data/test/test_light_dark_color.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative "helper"
+require_relative 'helper'
 
 class TestLightDarkColor < MiniTest::Test
   def test_to_string
     color = Stylegen::LightDarkColor.new(
-      Stylegen::Color.from_hex("#FFFFFF"),
-      Stylegen::Color.from_hex("#333333")
+      Stylegen::Color.from_hex('#FFFFFF'),
+      Stylegen::Color.from_hex('#333333')
     )
 
     # Default indentation
@@ -18,7 +18,7 @@ class TestLightDarkColor < MiniTest::Test
       )
     CODE
 
-    assert_equal expected, color.to_s("ThemeColor")
+    assert_equal expected, color.to_s('ThemeColor')
 
     # Additional indentation
 
@@ -29,6 +29,6 @@ class TestLightDarkColor < MiniTest::Test
           )
     CODE
 
-    assert_equal expected, color.to_s("ThemeColor", 4)
+    assert_equal expected, color.to_s('ThemeColor', 4)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stylegen
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Ramon Torres
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-22 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -144,6 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".deepsource.toml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
@@ -165,7 +166,6 @@ files:
 - lib/stylegen/data.rb
 - lib/stylegen/generator.rb
 - lib/stylegen/resources/schema.json
-- lib/stylegen/resources/template.swift.erb
 - lib/stylegen/template.rb
 - lib/stylegen/validator.rb
 - lib/stylegen/version.rb
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Tool for generating styling code for iOS apps

data/lib/stylegen/resources/template.swift.erb

@@ -1,97 +0,0 @@
-//
-//  <%= @data.basename %>
-//
-//  Autogenerated by stylegen (<%= @data.version %>)
-//  DO NOT EDIT
-//
-
-import UIKit
-<% if @data.swiftui? -%>
-import SwiftUI
-<% end -%>
-
-<%= @data.access_level %> struct <%= @data.struct_name %> {
-
-    let uiColor: UIColor
-
-    fileprivate init(white: CGFloat, alpha: CGFloat) {
-        self.uiColor = UIColor(white: white, alpha: alpha)
-    }
-
-    fileprivate init(red: CGFloat, green: CGFloat, blue: CGFloat, alpha: CGFloat) {
-        self.uiColor = UIColor(red: red, green: green, blue: blue, alpha: alpha)
-    }
-
-    fileprivate init(_ color: UIColor) {
-        self.uiColor = color
-    }
-
-    fileprivate init(light: <%= @data.struct_name %>, dark: <%= @data.struct_name %>) {
-        if #available(iOS 13.0, *) {
-            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
-                switch traits.userInterfaceStyle {
-                case .dark:
-                    return dark.uiColor
-                default:
-                    return light.uiColor
-                }
-            })
-        } else {
-            self.uiColor = light.uiColor
-        }
-    }
-
-    fileprivate init(base: <%= @data.struct_name %>, elevated: <%= @data.struct_name %>) {
-        if #available(iOS 13.0, *) {
-            self.uiColor = UIColor(dynamicProvider: { (traits: UITraitCollection) -> UIColor in
-                switch traits.userInterfaceLevel {
-                case .elevated:
-                    return elevated.uiColor
-                default:
-                    return base.uiColor
-                }
-            })
-        } else {
-            self.uiColor = base.uiColor
-        }
-    }
-
-}
-
-// MARK: Colors
-
-<%= @data.access_level %> extension <%= @data.struct_name %> {
-<% @data.colors.each do |member, color| %>
-    static let <%= member %> = <%= color.to_s(@data.struct_name, 4) %>
-<% end %>
-}
-
-// MARK: - Extensions
-<% if @data.swiftui? %>
-<%= @data.access_level %> extension Color {
-
-    @inline(__always)
-    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> Color {
-        return Color(color.uiColor)
-    }
-
-}
-<% end -%>
-
-<%= @data.access_level %> extension UIColor {
-
-    @inline(__always)
-    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> UIColor {
-        return color.uiColor
-    }
-
-}
-
-<%= @data.access_level %> extension CGColor {
-
-    @inline(__always)
-    static func <%= @data.util_method_name %>(_ color: <%= @data.struct_name %>) -> CGColor {
-        return color.uiColor.cgColor
-    }
-
-}