building_sync_bindings 0.1.2 → 0.1.3

data/lib/building_sync_rails/version.rb

@@ -1,3 +1,3 @@
 module BuildingSyncRails
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/building_sync_tk/memoization.rb

@@ -25,6 +25,7 @@ module BuildingSyncTk
       def memo_building_sync_for(*args)
         memo_isomorphism_for(BuildingSyncTk::Inflector.instance, *args, xmlattrs: BuildingSyncTk::Factory.instance.xmlattrs)
       end
+      ruby2_keywords(:memo_building_sync_for) if respond_to?(:ruby2_keywords, true) # Ruby 3: forward keyword options through *args (no-op before 2.7)
 
       # Returns the memo-cahe.
       #
@@ -46,5 +47,6 @@ module BuildingSyncTk
     def find_all_with_memo_building_sync_for(*args)
       find_all_with_memo_isomorphism_for(BuildingSyncTk::Inflector.instance, *args, xmlattrs: BuildingSyncTk::Factory.instance.xmlattrs)
     end
+    ruby2_keywords(:find_all_with_memo_building_sync_for) if respond_to?(:ruby2_keywords, true) # Ruby 3: forward keyword options through *args (no-op before 2.7)
   end
 end

data/lib/building_sync_tk/model.rb

@@ -32,6 +32,7 @@ module BuildingSyncTk
       def building_sync_for(*args, &block)
         isomorphism_for(BuildingSyncTk::Factory.instance, BuildingSyncTk::Inflector.instance, *args, &block)
       end
+      ruby2_keywords(:building_sync_for) if respond_to?(:ruby2_keywords, true) # Ruby 3: forward keyword options through *args (no-op before 2.7)
     end
   end
 end

data/lib/tasks/building_sync_rails_tasks.rake

@@ -120,13 +120,26 @@ namespace :building_sync_rails do
     # @note Download the BuildingSync XSD file from the remote network and copy to the local disk.
     download_schema_recursive(uri_xsd_remote, verbose)
 
-    # @note Execute the "xsd2ruby.rb" binary that is installed by the "soap4r" gem.  The Ruby source files are created in the "/" directory.
-    ::Bundler.with_clean_env do
-      `xsd2ruby.rb --xsd #{::File.join("public", uri_xsd_remote.split(::File::SEPARATOR)[-1])} --module_path "BuildingSync" --classdef "BuildingSync" --mapping_registry --mapper --force --quiet`
+    # @note Execute the "xsd2ruby.rb" binary that is installed by the "soap4r" gem. The Ruby source files are created in the repository root.
+    xsd_path = ::File.join("public", uri_xsd_remote.split(::File::SEPARATOR)[-1])
+    generation_succeeded = ::Bundler.with_clean_env do
+      ::Kernel.system(
+        "xsd2ruby.rb",
+        "--xsd", xsd_path,
+        "--module_path", "BuildingSync",
+        "--classdef", "BuildingSync",
+        "--mapping_registry",
+        "--mapper",
+        "--force",
+        "--quiet"
+      )
     end
+    raise "xsd2ruby.rb failed; generated files were not sanitized or moved" unless generation_succeeded
 
     # @note Sanitize the contents of each Ruby source file.
     options_by_local_name.each do |local_name, options|
+      raise "xsd2ruby.rb did not generate #{local_name}" unless ::File.file?(local_name)
+
       s = ::File.open(local_name, "r") do |file|
         array = file.read.split($/)
 
@@ -152,6 +165,8 @@ namespace :building_sync_rails do
     # @note Move the Ruby source files to the "lib/" directory.
     options_by_local_name.keys.each do |local_name|
       ::FileUtils.mv(local_name, ::File.join("lib", local_name)) if ::File.exist?(local_name)
+      raise "Generated file was not moved to lib/#{local_name}" unless ::File.file?(::File.join("lib", local_name))
+      raise "Stale generated file remains at repository root: #{local_name}" if ::File.exist?(local_name)
     end
   end
 end