iphone_helpers 2.0.1 → 2.0.2

data/lib/iphone_helpers/version.rb

@@ -1,3 +1,3 @@
 module IphoneHelpers
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

data/lib/iphone_helpers.rb

@@ -1,6 +1,8 @@
 require 'action_view'
 
 module IphoneHelpers
+  STATUS_BAR_COLORS = %w[black black-translucent]
+
   def iphone(key, options = {})
     tagname, attributes = send(key, options)
 
@@ -11,8 +13,8 @@ module IphoneHelpers
 
   def format_detection(options)
     options[:name] = 'format-detection'
-    options[:content] = "telephone=#{(options[:telephone] && 'yes') || 'no'}"
-    options[:telephone] = nil
+    options[:content] = 'telephone='
+    options[:content] += options.delete(:telephone) ? 'yes' : 'no'
 
     [:meta, options]
   end
@@ -26,8 +28,7 @@ module IphoneHelpers
 
   def icon(options)
     options[:rel] = 'apple-touch-icon'
-    options[:rel] += '-precomposed' if options[:precomposed]
-    options[:precomposed] = nil if options[:precomposed]
+    options[:rel] += '-precomposed' if options.delete(:precomposed)
 
     [:link, options]
   end
@@ -39,23 +40,25 @@ module IphoneHelpers
   end
 
   def status_bar(options)
+    color = options.delete(:color)
     options[:name] = 'apple-mobile-web-app-status-bar-style'
-    options[:content] = (%w[black black-translucent].include?(options[:color]) && options[:color]) || 'default'
-    options[:color] = nil if options[:color]
+    options[:content] = STATUS_BAR_COLORS.include?(color) ? color : 'default'
 
     [:meta, options]
   end
 
   def viewport(options)
+    default_options = {
+      'initial-scale' => 1,'maximum-scale' => 1, 'width' => 'device-width'
+    }
     options = options.map do |key, value|
-      key = key.to_s.gsub('_', '-').to_sym
+      key = key.to_s.gsub('_', '-')
 
       [key, value]
     end
     options = Hash[options]
-    defaults = {:'initial-scale' => 1, :'maximum-scale' => 1, :width => 'device-width'}
-    content = defaults.merge(options).stringify_keys.sort.collect { |k,v| "#{k}=#{v}" }.join(', ')
-    options = {:content => content, :name => 'viewport'}
+    content = default_options.merge(options).sort.collect { |k, v| "#{k}=#{v}" }.join(', ')
+    options = {content: content, name: 'viewport'}
 
     [:meta, options]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iphone_helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70328110504960 !ruby/object:Gem::Requirement
+  requirement: &70344551723560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70328110504960
+  version_requirements: *70344551723560
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70328110504220 !ruby/object:Gem::Requirement
+  requirement: &70344551806640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70328110504220
+  version_requirements: *70344551806640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70328110503260 !ruby/object:Gem::Requirement
+  requirement: &70344551805720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 4.4.0
   type: :development
   prerelease: false
-  version_requirements: *70328110503260
+  version_requirements: *70344551805720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70328110502300 !ruby/object:Gem::Requirement
+  requirement: &70344551804620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 10.0.0
   type: :development
   prerelease: false
-  version_requirements: *70328110502300
+  version_requirements: *70344551804620
 description: iPhone specific HTML tags helper
 email:
 - anton@qvister.se