qr-bills 1.0.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e85a0928abfb125572539a4fbf99b331c789e2c21fd425b9c94736cb4fe8d8
-  data.tar.gz: 59788940942a55e4f30cf13a17c9ae8a20aeab4a925633bb8967cf2cc8c59fc2
+  metadata.gz: 7fc173cb15d0093e2298fa873dcc9320b1485c093cee48f4ac6f8266bb0ea45a
+  data.tar.gz: acc76affa6b192d19dbc0b749440afe706af181127a2ae5337a161f13c889551
 SHA512:
-  metadata.gz: f9549f75f73c43ec82593358bb088454ce462eef5aa6ad71b2b83f95d432918dd30733abe0818435fe077797b1b9a01c7c9a5f2712bfd47a59596800789ae49b
-  data.tar.gz: 522b9bc62b6f80de240080390ca7a62a1ea116731bc2046d0339706c08b90f5a1be257bf31f5414bcb8a53529ada4cd410a3d7edf7195f958a22608551b2442e
+  metadata.gz: bd9cf2223b15f2e4a3d93e548d10e60f05dbf8d7862c9e635f51f24b6d10740b72c5016609521bd865411c7bb26085fb351ece7f3abeb6b996a90c7b6787bcda
+  data.tar.gz: daadbf86fc459a426fded5b081529941d9fe895ccdcd988eae21dca7dba14f913fe5b8b794fc16955a70fff4aa7a508c152168caa20a71485d2cac0325d199c2

data/lib/qr-bills/qr-generator.rb

@@ -19,8 +19,6 @@ module QRGenerator
   end
 
   def self.build_qrcode_png(bill_params, qrcode_path)
-    warn('DEPRECATION WARNING: The qrcode_png format and qrcode_filepath parameter are deprecated and will be removed from qr-bills 1.1 (use png or svg instead)')
-
     final_qr = build_png(bill_params)
     final_qr.save(qrcode_path)
     final_qr
@@ -127,8 +125,8 @@ module QRGenerator
     payload += "#{bill_params[:creditor][:iban].delete(' ')}\r\n"
     payload += "#{bill_params[:creditor][:address][:type]}\r\n"
     payload += "#{bill_params[:creditor][:address][:name]}\r\n"
-    payload += "#{bill_params[:creditor][:address][:line1]}\r\n"
-    payload += "#{bill_params[:creditor][:address][:line2]}\r\n"
+    payload += "#{bill_params[:creditor][:address][:street_name]}\r\n"
+    payload += "#{bill_params[:creditor][:address][:building_number]}\r\n"
     payload += "#{bill_params[:creditor][:address][:postal_code]}\r\n"
     payload += "#{bill_params[:creditor][:address][:town]}\r\n"
     payload += "#{bill_params[:creditor][:address][:country]}\r\n"
@@ -143,8 +141,8 @@ module QRGenerator
     payload += "#{bill_params[:currency]}\r\n"
     payload += "#{bill_params[:debtor][:address][:type]}\r\n"
     payload += "#{bill_params[:debtor][:address][:name]}\r\n"
-    payload += "#{bill_params[:debtor][:address][:line1]}\r\n"
-    payload += "#{bill_params[:debtor][:address][:line2]}\r\n"
+    payload += "#{bill_params[:debtor][:address][:street_name]}\r\n"
+    payload += "#{bill_params[:debtor][:address][:building_number]}\r\n"
     payload += "#{bill_params[:debtor][:address][:postal_code]}\r\n"
     payload += "#{bill_params[:debtor][:address][:town]}\r\n"
     payload += "#{bill_params[:debtor][:address][:country]}\r\n"
@@ -154,5 +152,8 @@ module QRGenerator
     payload += "EPD\r\n"
     payload += "#{bill_params[:bill_information_coded]}\r\n"
     payload += "#{bill_params[:alternative_scheme_parameters]}\r\n"
+
+    payload.delete_suffix!("\r\n") while payload.end_with?("\r\n")
+    payload
   end
 end

data/lib/qr-bills/qr-html-layout.rb

@@ -248,9 +248,13 @@ module QRHTMLLayout
   def self.render_address(address)
     case address[:type]
     when 'S'
-      format("%s<br>\n%s %s<br>\n%s %s<br>\n", address[:name], address[:line1], address[:line2], address[:postal_code], address[:town])
+      if address[:street_name].empty?
+        format("%s<br>\n%s %s<br>\n", address[:name], address[:postal_code], address[:town])
+      else 
+        format("%s<br>\n%s %s<br>\n%s %s<br>\n", address[:name], address[:street_name], address[:building_number], address[:postal_code], address[:town])
+      end
     when 'K'
-      format("%s<br>\n%s<br>\n%s<br>\n", address[:name], address[:line1], address[:line2])
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: please move to type-S addresses, K-type is not supported anymore with and after v2.0.0 - params line1 and line2 doesn't exist anymore and are now street_name / building_number"
     end
   end
 end

data/lib/qr-bills/qr-params.rb

@@ -30,8 +30,8 @@ module QRParams
           address: {
             type: "S",
             name: "",
-            line1: "",
-            line2: "",
+            street_name: "",
+            building_number: "",
             postal_code: "",
             town: "",
             country: "",
@@ -42,8 +42,8 @@ module QRParams
           address: {
             type: "S",
             name: "",
-            line1: "",
-            line2: "",
+            street_name: "",
+            building_number: "",
             postal_code: "",
             town: "",
             country: "",
@@ -80,7 +80,7 @@ module QRParams
     if params.dig(:bill_params, :currency) == "" || params.dig(:bill_params, :currency) == nil
       raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: currency cannot be blank"
     end
-
+ 
     true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qr-bills
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 2.0.0
 platform: ruby
 authors:
 - Damiano Radice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-30 00:00:00.000000000 Z
+date: 2026-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n