google-qr 0.2.1 → 0.2.2

data/lib/google-qr.rb

@@ -2,15 +2,10 @@ require 'string'
 require 'uri'
 
 class GoogleQR
-  attr_accessor :data,
-                :size,
-                :use_https,
-                :encoding,
-                :error_correction
+  attr_accessor :data, :size, :use_https, :encoding, :error_correction, :margin, :html_options
 
   def initialize(opts={})
     options = {
-      :data => "GoogleQR",
       :size => "100x100",
       :use_https => true
     }.merge!(opts)
@@ -20,10 +15,10 @@ class GoogleQR
 
   def to_s
     if self.data
-      params = ["chl=#{URI.encode(self.data, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}"]
-      params << "chs=#{self.size}" if self.size
+      params = ["chl=#{escape_string(self.data)}"]
+      params << "chs=#{self.size}"
       params << "choe=#{self.encoding}" if self.encoding
-      params << "chld=#{self.error_correction}" if self.error_correction
+      params << error_correction_params if error_correction_param?
       base_url + params.join("&")
     else
       raise "Attribute @data is required for GoogleQR code"
@@ -37,11 +32,45 @@ class GoogleQR
     else
       dimensions = nil
     end
-    "<img src='#{self.to_s}'#{dimensions}/>"
+
+    if self.html_options
+      html_options = ""
+
+      self.html_options.each do |k, v|
+        if k.to_s.length > 0 && v.to_s.length > 0
+          html_options += k.to_s + "='" + v.to_s + "' "
+        end
+      end
+    else
+      html_options = nil
+    end
+
+    "<img src='#{self.to_s}'#{dimensions}#{html_options}/>"
   end
 
   private
   def base_url
     "http#{self.use_https ? 's' : ''}://chart.googleapis.com/chart?cht=qr&"
   end
-end
+  
+  def error_correction_param?
+    self.error_correction || self.margin
+  end
+  
+  def error_correction_params
+    if !self.error_correction && self.margin
+      param = "L|#{self.margin}"
+    elsif self.error_correction && !self.margin
+      param = self.error_correction
+    else
+      param = "#{self.error_correction}|#{self.margin}"
+    end  
+    
+    "chld=#{escape_string(param)}"
+  end
+  
+  def escape_string(string)
+    URI.encode(string, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-qr
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-14 00:00:00.000000000Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Generate URL string for Google QR code and render HTML img string
 email:
 - jhsu@josephhsu.com
-- nrhammond@gmail.com
+- nick@nickhammond.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Wrapper for Google Chart QR code