rqrcode_core 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6532b18a40855c6c4424b2fb6a9d54edae0377499d85338e2f387547919329b
-  data.tar.gz: 87019adc3b63c4e97ca659224011497b91e6d09f60767a24c3ae4d67ed5d21cf
+  metadata.gz: fa65c1043ff732d79a7c945ebec22c3e58ec30824a10ea66ae2a83666cae0b54
+  data.tar.gz: cd413ba0b0c37980b57d017cc5910dde35cee7c09bf99d6d77ef5d4d74daf287
 SHA512:
-  metadata.gz: 5dacb728f9f5817ee1568871ba9c554433442739be2f4a4e9857bfbb1cfecdd536fe977d869be9d397a7ec9b9dfb0676dbd97e9aa39d6f9fcc3384bf6a0a594e
-  data.tar.gz: cb51d2616d3d7c513155882a1a23bbde9f6c62c2b58bec3b4f20d08b9b7b5d33079dd85bf1203e9dfa650c67b0b35d019eedb2482b1e0f9f36d344004cf968b3
+  metadata.gz: 1e74946cef2ab02b66431dd4e992198392166ae46e837194c2e7f361fcf6a25db37edfdc354ecbc531bbe58d713f6f3a61906c2a365a3b1df79dc03ffcd7296a
+  data.tar.gz: a87de6c5a59cd072c8ec9da9c655b63b519d435cb219ec54a533991eaeece40e4c3778df5f5a566e94f70e8831636454a40476b4e4670f79f3a782f1e3366490

data/Gemfile.lock

@@ -7,7 +7,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     minitest (5.11.3)
-    rake (10.5.0)
+    rake (13.0.1)
 
 PLATFORMS
   ruby
@@ -15,7 +15,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rqrcode_core!
 
 BUNDLED WITH

data/lib/rqrcode_core.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module RQRCodeCore
-  require "rqrcode_core/core_ext"
   require "rqrcode_core/qrcode"
   require "rqrcode_core/version"
 end

data/lib/rqrcode_core/qrcode/qr_bit_buffer.rb

@@ -16,13 +16,13 @@ module RQRCodeCore
 
     def get( index )
       buf_index = (index / 8).floor
-      (( (@buffer[buf_index]).rszf(7 - index % 8)) & 1) == 1
+      (( QRUtil.rszf(@buffer[buf_index], 7 - index % 8)) & 1) == 1
     end
 
 
     def put( num, length )
       ( 0...length ).each do |i|
-        put_bit((((num).rszf(length - i - 1)) & 1) == 1)
+        put_bit(((QRUtil.rszf(num, length - i - 1)) & 1) == 1)
       end
     end
 
@@ -39,7 +39,7 @@ module RQRCodeCore
       end
 
       if bit
-        @buffer[buf_index] |= ((0x80).rszf(@length % 8))
+        @buffer[buf_index] |= (QRUtil.rszf(0x80, @length % 8))
       end
 
       @length += 1

data/lib/rqrcode_core/qrcode/qr_code.rb

@@ -174,7 +174,7 @@ module RQRCodeCore
         raise QRCodeArgumentError, "The passed data is #{string.class}, not String"
       end
 
-      options               = args.extract_options!
+      options               = extract_options!(args)
       level                 = (options[:level] || :h).to_sym
 
       if !QRERRORCORRECTLEVEL.has_key?(level)
@@ -256,7 +256,7 @@ module RQRCodeCore
     #
 
     def to_s( *args )
-      options                = args.extract_options!
+      options                = extract_options!(args)
       dark                   = options[:dark] || options[:true] || 'x'
       light                  = options[:light] || options[:false] || ' '
       quiet_zone_size        = options[:quiet_zone_size] || 0
@@ -461,7 +461,7 @@ module RQRCodeCore
             if @modules[row][ col - c ].nil?
               dark = false
               if byte_index < data.size && !data[byte_index].nil?
-                dark = (( (data[byte_index]).rszf( bit_index ) & 1) == 1 )
+                dark = (( QRUtil.rszf(data[byte_index], bit_index) & 1) == 1 )
               end
               mask = QRUtil.get_mask( mask_pattern, row, col - c )
               dark = !dark if mask
@@ -493,6 +493,10 @@ module RQRCodeCore
       ver + 1
     end
 
+    def extract_options!(arr) #:nodoc:
+      arr.last.is_a?(::Hash) ? arr.pop : {}
+    end
+
     def QRCode.count_max_data_bits(rs_blocks)
       max_data_bytes = rs_blocks.reduce(0) do |sum, rs_block|
         sum + rs_block.data_count

data/lib/rqrcode_core/qrcode/qr_util.rb

@@ -73,6 +73,11 @@ module RQRCodeCore
       (( data << 10 ) | d) ^ G15_MASK
     end
 
+    def QRUtil.rszf( num, count )
+      # zero fill right shift
+      (num >> count) & ((2 ** ((num.size * 8) - count))-1)
+    end
+
     def QRUtil.get_bch_version(data)
       d = data << 12
       while QRUtil.get_bch_digit(d) - QRUtil.get_bch_digit(G18) >= 0
@@ -86,7 +91,7 @@ module RQRCodeCore
 
       while data != 0
         digit = digit + 1
-        data = (data).rszf(1)
+        data = QRUtil.rszf( data, 1 )
       end
 
       digit

data/lib/rqrcode_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RQRCodeCore
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/rqrcode_core.gemspec

@@ -27,6 +27,6 @@ EOF
 
   spec.required_ruby_version = '~> 2.3'
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode_core
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Duncan Robertson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -71,11 +71,6 @@ files:
 - bin/console
 - bin/setup
 - lib/rqrcode_core.rb
-- lib/rqrcode_core/core_ext.rb
-- lib/rqrcode_core/core_ext/array.rb
-- lib/rqrcode_core/core_ext/array/behavior.rb
-- lib/rqrcode_core/core_ext/integer.rb
-- lib/rqrcode_core/core_ext/integer/bitwise.rb
 - lib/rqrcode_core/qrcode.rb
 - lib/rqrcode_core/qrcode/qr_8bit_byte.rb
 - lib/rqrcode_core/qrcode/qr_alphanumeric.rb
@@ -107,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A library to encode QR Codes

data/lib/rqrcode_core/core_ext.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-require 'rqrcode_core/core_ext/array'
-require 'rqrcode_core/core_ext/integer'

data/lib/rqrcode_core/core_ext/array.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rqrcode_core/core_ext/array/behavior'
-
-class Array #:nodoc: all
-  include RQRCodeCore::CoreExtensions::Array::Behavior
-end

data/lib/rqrcode_core/core_ext/array/behavior.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module RQRCodeCore
-  module CoreExtensions #:nodoc: all
-    module Array
-      module Behavior
-        def extract_options!
-          last.is_a?(::Hash) ? pop : {}
-        end unless [].respond_to?(:extract_options!)
-      end
-    end
-  end
-end
-

data/lib/rqrcode_core/core_ext/integer.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rqrcode_core/core_ext/integer/bitwise'
-
-class Integer #:nodoc: all
-  include RQRCodeCore::CoreExtensions::Integer::Bitwise
-end

data/lib/rqrcode_core/core_ext/integer/bitwise.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module RQRCodeCore
-  module CoreExtensions #:nodoc: all
-    module Integer
-      module Bitwise
-        def rszf(count)
-          # zero fill right shift
-          (self >> count) & ((2 ** ((self.size * 8) - count))-1)
-        end
-      end
-    end
-  end
-end
-