wurfl_device 0.1.7 → 0.1.8

data/lib/wurfl_device/user_agent_matcher.rb

@@ -122,7 +122,7 @@ module WurflDevice
       when user_agent.contains('NetFront/3.5')
         'DO_NOT_MATCH_NETFRONT_3_5'
       # Contains Mozilla/, but not at the beginning of the UA
-      when user_agent.starts_with('Mozilla/') || user_agent.contains('Mozilla/')
+      when !user_agent.starts_with('Mozilla/') && user_agent.contains('Mozilla/')
         'DO_NOT_MATCH_MOZILLA'
       # Obigo
       when user_agent.contains(['ObigoInternetBrowser/Q03C', 'AU-MIC/2', 'AU-MIC-', 'AU-OBIGO', 'Obigo/Q03', 'Obigo/Q04', 'ObigoInternetBrowser/2', 'Teleca Q03B1'])

data/lib/wurfl_device/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module WurflDevice
-  VERSION = "0.1.7".freeze
+  VERSION = "0.1.8".freeze
 end

data/lib/wurfl_device/web_service.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'yaml'
+require 'json'
 require 'wurfl_device'
 require 'sinatra/base'
 
@@ -9,19 +10,22 @@ module WurflDevice
       user_agent = request.env['HTTP_USER_AGENT']
       user_agent = WurflDevice::Settings::GENERIC if user_agent.nil? || user_agent.empty?
       capabilities = WurflDevice.capabilities_from_user_agent(user_agent)
-      capabilities.to_yaml
+      return capabilities.to_json if params.key?('json')
+      return capabilities.to_yaml
     end
 
     get '/capability/:id' do
       user_agent = request.env['HTTP_USER_AGENT']
       user_agent = WurflDevice::Settings::GENERIC if user_agent.nil? || user_agent.empty?
       capability = WurflDevice.capability_from_user_agent(params[:id], user_agent)
-      capability.to_yaml
+      return capabilities.to_json if params.key?('json')
+      return capabilities.to_yaml
     end
 
     get '/device/:id' do
       capabilities = WurflDevice.capabilities_from_id(params[:id])
-      capabilities.to_yaml
+      return capabilities.to_json if params.key?('json')
+      return capabilities.to_yaml
     end
   end
 end

data/lib/wurfl_device.rb

@@ -45,24 +45,18 @@ module WurflDevice
     end
 
     def capability_from_user_agent(capability, user_agent)
-      capability_group = nil
-
+      capability_key = capability
       if Settings::CAPABILITY_GROUPS.include?(capability)
         group_keys = Array.new
         Settings::CAPABILITY_TO_GROUP.select { |k, v| v == capability }.each_pair { |k, v| group_keys << "#{v}:#{k}" }
         group_vals = Cache.storage.hmget(Cache::UserAgents.build_cache_id(user_agent), *group_keys)
         return Cache.parse_actual_capabilities(Hash[*group_keys.zip(group_vals).flatten])[capability] if (group_vals.select { |v| v.nil? }.empty?)
-      else
-        capability_mapped = capability
-        capability_group = Settings::CAPABILITY_TO_GROUP[capability]
-        capability_mapped = "#{capability_group}:#{capability}" unless capability_group.nil?
-        actual_capability = WurflDevice::Cache::UserAgents.get(user_agent, capability_mapped)
-        return actual_capability.to_actual_value unless actual_capability.nil?
+      elsif Settings::CAPABILITY_TO_GROUP.key?(capability)
+        capability_key = "#{Settings::CAPABILITY_TO_GROUP[capability]}:#{capability}"
       end
-
-      capabilities = capabilities_from_user_agent(user_agent)
-      return capabilities[capability] if capability_group.nil?
-      return capabilities[capability_group][capability]
+      actual_capability = WurflDevice::Cache::UserAgents.get(user_agent, capability_key)
+      return actual_capability.to_actual_value unless actual_capability.nil?
+      return nil
     end
 
     def capabilities_from_user_agent(user_agent)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000 Z
+date: 2011-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &162053300 !ruby/object:Gem::Requirement
+  requirement: &37987500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *162053300
+  version_requirements: *37987500
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &162051200 !ruby/object:Gem::Requirement
+  requirement: &37986900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *162051200
+  version_requirements: *37986900
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &162049980 !ruby/object:Gem::Requirement
+  requirement: &37986320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *162049980
+  version_requirements: *37986320
 - !ruby/object:Gem::Dependency
   name: ox
-  requirement: &162049020 !ruby/object:Gem::Requirement
+  requirement: &37877880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *162049020
+  version_requirements: *37877880
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &162047840 !ruby/object:Gem::Requirement
+  requirement: &37877280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *162047840
+  version_requirements: *37877280
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &161970640 !ruby/object:Gem::Requirement
+  requirement: &37876680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *161970640
+  version_requirements: *37876680
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &161969520 !ruby/object:Gem::Requirement
+  requirement: &37876060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *161969520
+  version_requirements: *37876060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &161968120 !ruby/object:Gem::Requirement
+  requirement: &37875160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *161968120
+  version_requirements: *37875160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &161967040 !ruby/object:Gem::Requirement
+  requirement: &37872380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *161967040
+  version_requirements: *37872380
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &161964400 !ruby/object:Gem::Requirement
+  requirement: &37871840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *161964400
+  version_requirements: *37871840
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &161585020 !ruby/object:Gem::Requirement
+  requirement: &37871260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *161585020
+  version_requirements: *37871260
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &161584320 !ruby/object:Gem::Requirement
+  requirement: &37870380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *161584320
+  version_requirements: *37870380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &161583640 !ruby/object:Gem::Requirement
+  requirement: &38294780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *161583640
+  version_requirements: *38294780
 - !ruby/object:Gem::Dependency
   name: fakeredis
-  requirement: &161582900 !ruby/object:Gem::Requirement
+  requirement: &38293500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,7 +164,7 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *161582900
+  version_requirements: *38293500
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com