ts_schema 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd4c606265d13a68760b14f6a3e439e8b6e4bf0dbf5a82262a98d8ed30702107
-  data.tar.gz: bced11b47a17ed266bb1d04edbc0e9e962370e802455f8b01a5c314a63a5d069
+  metadata.gz: 98fda5d599b1c67632f071da87640ec19167fbc90c0ef50f3090ef1deb19a394
+  data.tar.gz: 43145f323d86ce2acca7cf45687e0ac7b35e38e2fa0b5216f180fd920e7bd08f
 SHA512:
-  metadata.gz: cd921fb8519068436415f72f03307cb9ed4442e5f90e0119063426a0949ebba3ffc019e1803bd30d0c2cc1a975978ca1ee2c4abdd87d97aafae1519d27c1024c
-  data.tar.gz: 2e0e87c7355b7b42baac898aaff6c4e22aa04122ecc75b28f88d50b31be94577e96506c3d011c5ffae87d205429f5352aa2570e3902a3ddd475589e89d6302ec
+  metadata.gz: 20d2257583b6fd2c219ba6740822d7e7b05df7a49e165b9d8dd7d370a326e33cdf21f4c5920afea1fd76ffd428b5f6796ed2d7dfd0e484a7ea6f37e9248298f5
+  data.tar.gz: e7640bf87f7bd2243a1bab5d3b5bc15188f5151f95236357571141ceef72f4ac95ed8e5fc2a79ac3aa90da4256b7d401ceedd48ebb89188650929031177da301

data/lib/tasks/ts_schema_tasks.rake

@@ -1,30 +1,30 @@
 require "rake"
 
 namespace :ts_schema do
-	desc "Generates a schema file in the default javascripts location, or the location specified in the ts_config initializer options"
-	task :generate do
-		TsSchema.output_file
-	end
+  desc "Generates a schema file in the default javascripts location, or the location specified in the ts_config initializer options"
+  task :generate do
+    TsSchema.output_file
+  end
 end
 
 namespace :db do
-	def auto_generate_and_save_file
-		TsSchema.output_file if TsSchema.configuration.auto_generate
-	end
+  def auto_generate_and_save_file
+    TsSchema.output_file if TsSchema.configuration.auto_generate
+  end
 
   task migrate: :environment do
     auto_generate_and_save_file
   end
 
   task rollback: :environment do
-		auto_generate_and_save_file
+    auto_generate_and_save_file
   end
 
   task reset: :environment do
-		auto_generate_and_save_file
+    auto_generate_and_save_file
   end
 
   task setup: :environment do
-		auto_generate_and_save_file
+    auto_generate_and_save_file
   end
 end

data/lib/ts_schema/schema_generator.rb

@@ -5,7 +5,7 @@ module TsSchema
     def initialize
       Rails.application.eager_load!
       @models = ApplicationRecord.send(:subclasses)
-			@models.merge(TsSchema.configuration.additional_models) unless TsSchema.configuration.additional_models.empty?
+			@models.concat(TsSchema.configuration.additional_models) unless TsSchema.configuration.additional_models.empty?
       @types = TsSchema.configuration.types.merge(TsSchema.configuration.custom_types || {})
     end
 
@@ -67,12 +67,12 @@ module TsSchema
         when association.has_one? || association.belongs_to?
           {
             name: "#{association.name}?",
-            ts_type: association.class_name
+            ts_type: association.class_name.constantize.model_name.param_key.camelize
           }
         when association.collection?
           {
             name: "#{association.name}?",
-            ts_type: "#{association.class_name}[]"
+            ts_type: "#{association.class_name.constantize.model_name.param_key.camelize}[]"
           }
         end
       end

data/lib/ts_schema/version.rb

@@ -1,3 +1,3 @@
 module TsSchema
-  VERSION = "0.1.6"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ts_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - Avram Walden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2.3
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.2.3
+        version: 6.0.0
 description: ''
 email:
 - aviemet@gmail.com