solara 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee9572ad8162826e8ebd8ed6b9f5e6a0ba5c2ef23ecec56ed610206becc3e80f
-  data.tar.gz: d0cfbf2ba68d160fdf531f3148e216662063d2a9182c341ea22e1266e283bcf5
+  metadata.gz: 5f359a3ba4f7f58b06a5c26efa077d45900f5d98952c8ffb85ed80407b5060b5
+  data.tar.gz: 1f9bf9dc53e840e154f7c8ad3474f04cf4423bbd0ee97f201aa751e1a03423d0
 SHA512:
-  metadata.gz: 7e2e2c181701aa9af6099694beedc3f68e926446e8a1d67b4841e66b5ecf1da8fad76c9b479a52738f0bf7a48551328b7058c0bbafcc1574a68b9b388b37035a
-  data.tar.gz: e3e2d47d57ed66593435bb6294013c99711177bfadb4ae25ea74d2ebb1d511abc0eb98dd7fa9f4579106cf7ec26cf76393294b7d4fd9b6c89aa0c679343ef8e3
+  metadata.gz: bbf72d63463d30bd732fc79bb254c66aeba2f65773bb488ac697688656b462860c3e1b9b0ac4a0d506ccc7d249dad2cf4130b2e0f7da06d8d1862765f8cf81dc
+  data.tar.gz: 36ddb1dcdbcf3c3c0540ea5c78461083bc5fc98751a94e864cd81278ead26919006b80bd037d2a57d5d9be557a0b7916a829e04420366abb99db7ba6fb4ad905

data/solara/lib/core/scripts/brand_configurations_manager.rb

@@ -40,11 +40,13 @@ class TemplateManager
     end
 
     def templates
-      result = parse_configurations
-      collect_json_templates.each do |template|
-        result << template unless result.any? { |r| r['filename'] == template['filename'] }
+      result = parse_configurations.compact
+      user_defined_items = collect_user_defined_json.compact
+      user_defined_items.each do |user_defined_item|
+        next if result.any? { |r| r[:filename] == user_defined_item[:filename] }
+        result << user_defined_item
       end
-      result.compact
+      result
     rescue StandardError => e
       Solara.logger.error("Failed to generate templates: #{e.message}")
       []
@@ -71,7 +73,7 @@ class TemplateManager
       []
     end
 
-    def collect_json_templates
+    def collect_user_defined_json
       directories = [
         FilePath.brand_global_json_dir,
         FilePath.brand_json_dir(@brand_key)

data/solara/lib/core/scripts/gitignore_manager.rb

@@ -32,7 +32,6 @@ class GitignoreManager
     end
 
     def add_item(item)
-        puts item
         existing_items = read_gitignore
 
         if existing_items.include?(item)

data/solara/lib/core/scripts/json_manifest_processor.rb

@@ -63,7 +63,8 @@ class JsonManifestProcessor
       file_name = File.basename(file_path)
       # Skip files that were already processed via manifest
       next if manifest_files.include?(file_name)
-      next if file_name == 'json_manifest.json'
+      ignored = %w[flutter_json_manifest.json android_json_manifest.json ios_json_manifest.json global_json_manifest.json]
+      next if ignored.any? { |item| item == file_name }
 
       class_name = derive_class_name(file_name)
       process_json_file(file_path, class_name, {}, false)

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Malek Kamel