custom_rqrcode 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea62843afa1136c33b482736004244e7f79de76e
-  data.tar.gz: fb159070123aecb6640b9799427da317bdc83c33
+  metadata.gz: f42fb6ae55847d291deb52c0d21363724dceb4d4
+  data.tar.gz: 6a788af594a1fb7cc04c91272be9652166f02961
 SHA512:
-  metadata.gz: 5b17d23753bc4c532758f2143521e19933b122dc9ef90da9b526cd11e4dfbdc6fda052bacd3930ad85666266779cb2b5bc5530fbc250da64bef05b2b5ad28780
-  data.tar.gz: 450aa6e408409ce91e1a4214e4ea750a93f392d64eb6195631217977885a56ae17a5a86fe2475b70102eec1a8175ab4fd12d95bd7c6bb230784fa460b1ef36ed
+  metadata.gz: 8fdc7be3d1065f282f551b0940ee869847030cc11e52860e69634de2d2c2bf3e4f5642d649390d34265c2929b4f6e23b386a1b7005946f3a82e1c95faaba35c6
+  data.tar.gz: 79f7d303b3ae1b5a5c6c24b7eb3432a7ca5d43ce78017f559be56d81cae19e856fc08d73d885abaa799a9bf187ed34576cf485ec2f3a755bb60726911994b0cf

data/README.md

@@ -19,9 +19,7 @@ You will also want to add the **mini_magick** gem to your application's `Gemfile
 ## How to use
 
 In your controller actions, you could return a QR code that links to the current page like this:
-
 ```ruby
-First usage:
 bg_image = Rails.root.join("app").to_s + ActionController::Base.helpers.asset_path("images/bg_image.png")
 respond_to do |format|
   format.html
@@ -31,7 +29,10 @@ respond_to do |format|
   format.jpeg { render :qrcode => request.url }
 end
 
-Second usage:
+```
+
+In your controller actions, you could generate multiple QR codes on the background
+```ruby
 bg_image = Rails.root.join("app").to_s + ActionController::Base.helpers.asset_path("images/bg_image.png")
 cqrcode = RQRCode::CQRCode.new
 options = {
@@ -39,6 +40,8 @@ options = {
 	:bg   => bg_image
 }
 cqrcode.generateQRcode(options, :png)
+cqrcode.generateQRcode(options, :jpeg)
+cqrcode.generateQRcode(options, :gif)
 
 ```
   

data/lib/custom_rqrcode.rb

@@ -15,42 +15,8 @@ module RQRCode
 		format         = self.request.format.symbol
 		cqrcode        = RQRCode::CQRCode.new
 		options[:info] = string
-		cqrcode.generateQRcode(options, format)
-=begin
-		size   = options[:size]  || RQRCode.minimum_qr_size_from_string(string)
-		level  = options[:level] || :h
+		data           = cqrcode.generateQRcode(options, format)
 
-		bg       = options[:bg] || false
-		bsize    = options[:bsize] || false
-		geometry = options[:geometry] || "+00+00"
-		gravity  = options[:gravity] || "north"
-		fsize    = options[:fsize] || false
-		fsave    = options[:fsave] || false
-
-		qrcode = RQRCode::QRCode.new(string, :size => size, :level => level)
-		svg    = RQRCode::Renderers::SVG::render(qrcode, options)
-
-		data   = \
-		if format && format == :svg
-		svg
-		else
-			image = MiniMagick::Image.read(svg) { |i| i.format "svg" }
-			image.format format
-
-			if bg
-				bg_image = MiniMagick::Image.open bg
-				bg_image.resize bsize if bsize
-				image    =  bg_image.composite(image) do |c|
-					c.gravity gravity
-					c.geometry geometry
-				end
-			end
-		image.resize fsize if fsize
-		image.write fsave if fsave
-
-		image.to_blob
-		end
-=end
 		self.response_body = render_to_string(:text => data, :template => nil)
 	end
 
@@ -83,7 +49,7 @@ module RQRCode
 
 			data   = \
 			if format && format == :svg
-			svg
+				svg
 			else
 				image = MiniMagick::Image.read(svg) { |i| i.format "svg" }
 				image.format format
@@ -96,11 +62,12 @@ module RQRCode
 						c.geometry geometry
 					end
 				end
-			image.resize fsize if fsize
-			image.write fsave if fsave
+				image.resize fsize if fsize
+				image.write fsave if fsave
 
-			image.to_blob
+				image.to_blob
 			end
+			return data
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: custom_rqrcode
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Johnson Chang