ts_schema 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c5b7352bbc0b12a6d1925a6a3a3bbbd5cd07cdf0cc2357bd8ffa78ae2a914ff
-  data.tar.gz: a64da9cdc3cf78a889bd5a627b7da1a0db7069ca2810656d4fc6c9b100d46005
+  metadata.gz: a5093baca17f4486d16008b5e3eb15dde18d5064b902a45c0d05defe5948f0ee
+  data.tar.gz: 14d0f1352c9c716af3040814447c8aac81a3cdb66b04870fe698c5f9fa1c98f9
 SHA512:
-  metadata.gz: d1fe180689d19ea43a0b1359bc1995dfe49432507c139b9253d89cd880810838b0c59b5e40b2fdc291fdf34921283f7e776dda5b24b0d5aa2ab1c6bc6a8544ed
-  data.tar.gz: 17c2297757977a80b4f311f5348f0892ebf7c645fc58d50324d75fd7cfd582b3a2e9ce22af26ae55e25c0f17a20695664a9f216736e923ecfd0aaa0d3860ff8f
+  metadata.gz: b8425b8aefc7433b1360b6fb703ae9d0664513d6f6396e347f2b4c1e7d2345daf2a5047779c576cd070187c34fe87edd0da8aba6947dee644951c01e89fe2fbf
+  data.tar.gz: 146ce2d710732da6f36cad8d4c9a9ff4d9fb95f186247c937441719951539517d8705184b8b151f42446a413b20f0b19f2dde0e79476b29d96c69aa62271aadc

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,9 @@ module TsSchema
     def initialize
       Rails.application.eager_load!
       @models = ApplicationRecord.send(:subclasses)
-			@models.concat(TsSchema.configuration.additional_models) unless TsSchema.configuration.additional_models.empty?
+			unless TsSchema.configuration.additional_models.empty?
+				@models.concat(TsSchema.configuration.additional_models.map {|m| m.to_s.constantize })
+			end
       @types = TsSchema.configuration.types.merge(TsSchema.configuration.custom_types || {})
     end
 
@@ -67,12 +69,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.7"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ts_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.10
 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
   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