rqrcode_png 0.1.0 → 0.1.1

data/README.markdown

@@ -16,6 +16,8 @@ png = qr.to_img												# returns an instance of ChunkyPNG
 png.resize(90, 90).save("really_cool_qr_image.png")
 ```
 
+*NOTE:* For now, the :size of the QR code has to be 5 or less. Working on this.
+
 ### Bundler
 ```ruby
 gem 'rqrcode_png'
@@ -34,7 +36,7 @@ end
 
 ```ruby
 # somewhere
-qr_code_img = RQRCode::QRCode.new('http://www.google.com/').to_img
+qr_code_img = RQRCode::QRCode.new('http://www.google.com/', :size => 4, :level => :h ).to_img
 @product.update_attribute :qr_code, qr_code_img.to_string
 ```
 

data/lib/rqrcode_png/image.rb

@@ -1,10 +1,7 @@
 module RQRCodePNG
 	class Image
-		BORDER				 = 2
-		IMG_SIZE			 = 33
-		TOTAL_IMG_SIZE = IMG_SIZE + BORDER * 2
 		BLACK					 = ::ChunkyPNG::Color::BLACK
-		WHITE					 = ::ChunkyPNG::Color::WHITE
+		WHITE					 = ::ChunkyPNG::Color::WHITE		
 
 		def initialize(qr_code)
 			@sequence = Sequence.new(qr_code)
@@ -17,7 +14,7 @@ module RQRCodePNG
 			png = blank_img()
 
 			@sequence.dark_squares_only do |x, y|
-				png[y + BORDER, x + BORDER] = BLACK
+				png[y + @sequence.border_width(), x + @sequence.border_width()] = BLACK
 			end
 
 			return png
@@ -25,13 +22,22 @@ module RQRCodePNG
 
 		private
 
+		#
+		# Returns the size of the image
+		#
+		def img_size()
+			@img_size ||= @sequence.img_size() + 
+										@sequence.border_width() * 2
+		end
+
 		#
 		# Returns an appropriately sized, blank (white) image
 		#
 		def blank_img
-			::ChunkyPNG::Image.new( TOTAL_IMG_SIZE,
-															TOTAL_IMG_SIZE,
+			::ChunkyPNG::Image.new( img_size(),
+															img_size(),
 															WHITE )
 		end
+
 	end
 end

data/lib/rqrcode_png/sequence.rb

@@ -20,5 +20,18 @@ module RQRCodePNG
 
 		end
 
+		#
+		# returns the image size by looking at how long the first line of the code is
+		#
+		def img_size
+			@img_size ||= @qr_code.to_s.split("\n").first.size()
+		end
+
+		#
+		# Returns the border, 1/10 of the img size
+		def border_width()
+			@border ||= img_size() / 10
+		end
+
 	end
 end

data/lib/rqrcode_png/version.rb

@@ -1,3 +1,3 @@
 module RqrcodePng
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rqrcode_png
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chunky_png
-  requirement: &2156140160 !ruby/object:Gem::Requirement
+  requirement: &2152638900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156140160
+  version_requirements: *2152638900
 - !ruby/object:Gem::Dependency
   name: rqrcode
-  requirement: &2156139740 !ruby/object:Gem::Requirement
+  requirement: &2152638480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156139740
+  version_requirements: *2152638480
 description: Glues rQRCode together with chunky_png
 email:
 - dcarper@dreamagile.com