visual-qrcode 0.1.3 → 1.O.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ed1452bc8167ca44fd547c65998487c46f259967c28edc10ea7730f3e968b62
-  data.tar.gz: e6f33b6faf3d491657f13db6218260ab68888d15e046286bac339267451f79f8
+  metadata.gz: e1d5268c5f404484b75afcee3fa4dc74fe7d6f709a9cfc2405608ac37ce6ca5e
+  data.tar.gz: 5a17c764d5369a18de46ac7fa8b22e7b873eca29912a20dbcc76b27352883d71
 SHA512:
-  metadata.gz: 429de2eb4cfa170258b51f814d452df963a32bf54afa6dc2ce8c3ccaf65fc2c8d0da1e490aa9bb2705881cddaf3c511da975610c6f198ae53930793610d6a99a
-  data.tar.gz: d9b1f0e0e9c16592a44a99cb4272adb605189c6902d8e42cf5ef9c4aa0e11ec4c11b209e39fd54ab3b2a4287ca2cf415929e36af742975f3979e5b24cf30f41e
+  metadata.gz: 839b3876084aa3528b23ca0bd31aded4783ac835c1b4bd76adae190a8c34f987a6aa0746a97f9f233d8a9cdeed141c27880f128d583dd8f98d7f1807175cfa18
+  data.tar.gz: 0ccc5234545ed305ca8a23587da3d7a49200d253c526039dbabccd585bf89e5413fa348966bc09cd112077c2f73f4a21461809ab4481aea71ec480056f9c5a47

data/README.md

@@ -4,9 +4,9 @@
 
 Example of some `VisualQrcode` generated by the tests :
 
+![image](/spec/images/ruby_visual_qrcode.png)
 ![image](/spec/images/marianne_visual_qrcode.png)
 ![image](/spec/images/zidane_visual_qrcode.png)
-![image](/spec/images/leaf_visual_qrcode.png)
 
 Basically, each QR Code module is transformed into 9 pixels. The central pixel is the QR Code data, and the 8 other pixels around are used to display the background image.
 
@@ -39,8 +39,9 @@ The basic usage requires a string for the QRCode content and an `image_path` (or
 
 ```ruby
 visual_qr_code = VisualQrcode::Qrcode.new(
-    "Taataaaa Yoyoyooooo ! Qu'est-ce que tu caches sous ton grand chapeauuuuuu !",
-    "spec/images/marianne.png"
+    "This is the sentence that will read in the QR Code",
+    "spec/images/marianne.png",
+    size: 260
 )
 
 # Returns a MiniMagick::Image
@@ -50,39 +51,24 @@ image = visual_qr_code.as_png
 image.write("./marianne_visual_qrcode.png")
 ```
 
-**Default size** : Because we need 9 pixels in each QR Code module, the **minimum size** is **3x the minimum basic QRCode size**  with a high level of error correction. It varies with the amount of content you want to encode in the QR Code.
+> **Default size** : Because we need 9 pixels in each QR Code module, the **minimum size** is **3x the minimum basic QRCode size**  (with a `:high` level of [error correction](https://github.com/whomwah/rqrcode_core/tree/master?tab=readme-ov-file#options)). It varies with the amount of content you want to encode in the QR Code.
+> 
+> If you choose a size too small, you'll get an error informing you of the minimum size necessary for your content.
 
-You can also add a size parameter, in pixels. This size can't be smaller than the **minimum  size**.
 
-```ruby
-visual_qr_code = VisualQrcode::Qrcode.new(
-    "This is a leaf. Yeah. Big surprise, isn't it ?", 
-    "spec/images/leaf.png", 
-    size: 280
-)
-
-visual_qrcode.as_png.write("./leaf_visual_qrcode_280x280.png")
-```
-
-If you choose a size too small, you'll get an error informing you of the minimum size necessary for your content.
+## Design choices
 
-If your content is small and produces a QR Code of small size (big patterns, few modules), you can increase the amount of modules with the `qr_size` parameter. It corresponds to the [size option of RQRCodeCore](https://github.com/whomwah/rqrcode_core/tree/master?tab=readme-ov-file#options)
+### Resize method
 
-```ruby
-visual_qr_code = VisualQrcode::Qrcode.new(
-    "eh", 
-    "spec/images/zidane.png", 
-    qr_size: 10
-)
+The Visual QRCode will be generated at a mutiple of the **minimum size**, and then reduced to the expected size to maintain a good background image quality.
 
-visual_qrcode.as_png.write("./zidane_visual_qrcode_size_10.png")
-```
+> For example, if the minimum size is 140px, and you want a 230px image, it will generate a 280px Visual QRCode and then reduce it to 230px.
 
-## Design choices
+Because of that, it is recommended to provide an image bigger than the expected size, to not be made blurry by the resize. You can't go wrong with an image twice as big as the size of the wanted result.
 
 ### Padding
 
-In order to have a nice visual, a padding is added on the image to keep it inside of the QRCode line patterns on top and on the left. Also it helps to reckognize that the image _is_ a scannable QRCode and not just some random image.
+In order to have a nice visual, a padding is added on the image to keep it inside of the QRCode line patterns on top and on the left. Also it helps to reckognize that the image _is_ a scannable QRCode by keeping some of the well-known patterns of the QR Code in the padding.
 
 **By default, the padding is equal to 7 modules.**
 
@@ -90,26 +76,31 @@ If your image has enough transparency to dodge the QRCode lines, you can remove
 
 ```ruby
 visual_qr_code = VisualQrcode::Qrcode.new(
-    "My leaf don't need no padding, it's a strong and independant leaf",
-    "spec/images/leaf.png", 
-    size: 280, 
+    "https://en.wikipedia.org/wiki/Zinedine_Zidane",
+    "spec/images/zidane.png", 
+    size: 260, 
     padding_modules: 0
 )
 ```
 
 You can also customize the padding if you want more or less modules than the default value.
 
-### Resize method
-
-The Visual QRCode will be generated at a mutiple of the **minimum size**, and then reduced to the expected size to maintain a good background image quality.
-
-> For example, if the minimum size is 140px, and you want a 230px image, it will generate a 280px Visual QRCode and then reduce it to 230px.
-
 ### QRCode minimum Size
 
 The minimum [size of RQRCodeCore](https://github.com/whomwah/rqrcode_core/tree/master?tab=readme-ov-file#options) used is 6 by default, to get enough space for the image to be visible inside the Visual QRCode.
 
-But you can force it to a lower value if you want, with the `qr_size` option.
+You can increase the amount of modules with the `minimum_qr_size` parameter. It corresponds to the [size option of RQRCodeCore](https://github.com/whomwah/rqrcode_core/tree/master?tab=readme-ov-file#options)
+
+```ruby
+visual_qr_code = VisualQrcode::Qrcode.new(
+    "small content", 
+    "spec/images/zidane.png", 
+    size: 260,
+    minimum_qr_size: 15
+)
+```
+
+You can also force it to a lower value if you want. But it will always be incremented until finding a suitable value for your content size.
 
 ## Development
 

data/lib/visual_qrcode/pixels_handler.rb

@@ -14,8 +14,6 @@ module VisualQrcode
         @pixels = pixels
       else
         @image = MiniMagick::Image.open(image_path)
-        raise "Image should be a square" if @image.width != @image.height
-
         set_pixels_from_image
       end
     end
@@ -37,6 +35,7 @@ module VisualQrcode
     def resize(new_size)
       image.resize "#{new_size}x#{new_size}"
       set_pixels_from_image
+      make_square
     end
 
     def add_margin(margin, color: :transparent)
@@ -51,8 +50,42 @@ module VisualQrcode
       @pixels = col_margin + margined_rows + col_margin
     end
 
+    def make_square
+      max_size = [@pixels.length, @pixels.first.length].max
+
+      if @pixels.length < max_size
+        add_transparent_columns_to_size(max_size)
+      elsif @pixels.first.length < max_size
+        add_transparent_rows_to_size(max_size)
+      end
+    end
+
     private
 
+    def add_transparent_columns_to_size(max_size)
+      size_difference = max_size - @pixels.length
+      margin = size_difference / 2
+      rest_of_margin = size_difference % 2
+
+      left_col_margin = [Array.new(max_size, transparent_pixel)] * margin
+      right_col_margin = [Array.new(max_size, transparent_pixel)] * (margin + rest_of_margin)
+
+      @pixels = left_col_margin + @pixels + right_col_margin
+    end
+
+    def add_transparent_rows_to_size(max_size)
+      size_difference = max_size - @pixels.first.length
+      margin = size_difference / 2
+      rest_of_margin = size_difference % 2
+
+      left_row_margin = [transparent_pixel] * margin
+      right_row_margin = [transparent_pixel] * (margin + rest_of_margin)
+
+      @pixels = @pixels.map do |row|
+        left_row_margin + row + right_row_margin
+      end
+    end
+
     def set_pixels_from_image
       @pixels = @image.get_pixels("RGBA")
     end

data/lib/visual_qrcode/qrcode.rb

@@ -15,13 +15,13 @@ module VisualQrcode
 
     attr_reader :content, :basic_qrcode, :pixels_handler, :vqr_pixels
 
-    def initialize(content, image_path, size: nil, padding_modules: nil, qr_size: nil)
+    def initialize(content, image_path, size: nil, padding_modules: nil, minimum_qr_size: nil)
       @content = content
       @size = size
       @padding_modules = padding_modules || DEFAULT_PADDING_MODULES
-      @qr_size = qr_size || 6
+      @minimum_qr_size = minimum_qr_size || 6
 
-      initialize_basic_qr_code_and_qr_size(content)
+      initialize_basic_qr_code_and_minimum_qr_size(content)
       @pixels_handler = VisualQrcode::PixelsHandler.new(image_path: image_path)
       @common_patterns = @basic_qrcode.instance_variable_get(:@common_patterns)
     end
@@ -57,13 +57,13 @@ module VisualQrcode
 
     private
 
-    def initialize_basic_qr_code_and_qr_size(content)
-      @basic_qrcode = RQRCodeCore::QRCode.new(content, level: :h, size: @qr_size)
+    def initialize_basic_qr_code_and_minimum_qr_size(content)
+      @basic_qrcode = RQRCodeCore::QRCode.new(content, level: :h, size: @minimum_qr_size)
     rescue RQRCodeCore::QRCodeRunTimeError => e
       raise e unless e.message =~ /^code length overflow./
 
-      @qr_size += 1
-      initialize_basic_qr_code_and_qr_size(content)
+      @minimum_qr_size += 1
+      initialize_basic_qr_code_and_minimum_qr_size(content)
     end
 
     def default_margin

data/lib/visual_qrcode/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module VisualQrcode
-  VERSION = "0.1.3"
+  VERSION = "1.O.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visual-qrcode
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 1.O.0
 platform: ruby
 authors:
 - Caillou
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-15 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick