wurfl_device 0.1.5 → 0.1.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wurfl_device
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-22 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &224270260 !ruby/object:Gem::Requirement
+  name: hiredis
+  requirement: &264315840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224270260
+  version_requirements: *264315840
 - !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &224269820 !ruby/object:Gem::Requirement
+  name: redis
+  requirement: &264313640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224269820
+  version_requirements: *264313640
 - !ruby/object:Gem::Dependency
-  name: redis
-  requirement: &224269400 !ruby/object:Gem::Requirement
+  name: thor
+  requirement: &264312400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *264312400
+- !ruby/object:Gem::Dependency
+  name: ox
+  requirement: &264311620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224269400
+  version_requirements: *264311620
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &224268980 !ruby/object:Gem::Requirement
+  requirement: &264309700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224268980
+  version_requirements: *264309700
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &224268560 !ruby/object:Gem::Requirement
+  requirement: &264233040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224268560
+  version_requirements: *264233040
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &224268140 !ruby/object:Gem::Requirement
+  requirement: &264232040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *224268140
+  version_requirements: *264232040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &224267640 !ruby/object:Gem::Requirement
+  requirement: &264230720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *224267640
+  version_requirements: *264230720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &224267120 !ruby/object:Gem::Requirement
+  requirement: &264229320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *224267120
+  version_requirements: *264229320
 - !ruby/object:Gem::Dependency
   name: rspec-core
-  requirement: &224266620 !ruby/object:Gem::Requirement
+  requirement: &264227060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *224266620
+  version_requirements: *264227060
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
-  requirement: &224266080 !ruby/object:Gem::Requirement
+  requirement: &263847780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *224266080
+  version_requirements: *263847780
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &224265540 !ruby/object:Gem::Requirement
+  requirement: &263847080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,29 +142,29 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *224265540
+  version_requirements: *263847080
 - !ruby/object:Gem::Dependency
-  name: faker
-  requirement: &224264820 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &263846340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *224264820
+  version_requirements: *263846340
 - !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &224246240 !ruby/object:Gem::Requirement
+  name: fakeredis
+  requirement: &263845620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *224246240
+  version_requirements: *263845620
 description: Ruby client library for mobile handset detection
 email:
 - ahutalla@gmail.com
@@ -174,10 +185,10 @@ files:
 - config.ru
 - config/unicorn.conf.rb
 - lib/wurfl_device.rb
+- lib/wurfl_device/cache.rb
 - lib/wurfl_device/capability.rb
 - lib/wurfl_device/cli.rb
-- lib/wurfl_device/constants.rb
-- lib/wurfl_device/device.rb
+- lib/wurfl_device/settings.rb
 - lib/wurfl_device/ui.rb
 - lib/wurfl_device/user_agent.rb
 - lib/wurfl_device/user_agent_matcher.rb
@@ -185,6 +196,7 @@ files:
 - lib/wurfl_device/web_service.rb
 - lib/wurfl_device/xml_loader.rb
 - spec/cache/device_spec.rb
+- spec/cache/user_agents_spec.rb
 - spec/spec_helper.rb
 - wurfl_device.gemspec
 homepage: http://github.com/aputs/wurfl_device
@@ -205,7 +217,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- redis server
 rubyforge_project: wurfl_device
 rubygems_version: 1.8.10
 signing_key: 
@@ -213,4 +226,5 @@ specification_version: 3
 summary: Ruby client library for mobile handset detection
 test_files:
 - spec/cache/device_spec.rb
+- spec/cache/user_agents_spec.rb
 - spec/spec_helper.rb

data/lib/wurfl_device/constants.rb

@@ -1,43 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'etc'
-
-module WurflDevice
-  class Constants
-    LOCK_TIMEOUT                  = 3
-    LOCK_EXPIRE                   = 10
-    LOCK_SLEEP                    = 0.1
-
-    WEBSERVICE_HOST               = '127.0.0.1'
-    WEBSERVICE_PORT               = 8090
-    WEBSERVICE_ROOT               = File.join(File.expand_path('~'), '.wurfl_device')
-    WEBSERVICE_PID                = 'webservice.pid'
-    WEBSERVICE_LOG                = 'webservice.log'
-    WEBSERVICE_SOCKET             = 'webservice.sock'
-    WEBSERVICE_WORKER             = 4
-
-    DB_INDEX                      = "7".freeze
-    GENERIC                       = 'generic'
-    GENERIC_XHTML                 = 'generic_xhtml'
-    GENERIC_WEB_BROWSER           = 'generic_web_browser'
-    WURFL                         = "wurfl:"
-    WURFL_INFO                    = "wurfl:info"
-    WURFL_DEVICES                 = "wurfl:devices:"
-    WURFL_DEVICES_INDEX           = "wurfl:index:"
-    WURFL_INITIALIZED             = "wurfl:is_initialized"
-    WURFL_INITIALIZING            = "wurfl:is_initializing"
-    WURFL_USER_AGENTS             = "wurfl:user_agents"
-    WURFL_USER_AGENTS_CACHED      = "wurfl:user_agents_cached"
-
-    WORST_MATCH                   = 7
-
-    MOBILE_BROWSERS   =  [
-      'cldc', 'symbian', 'midp', 'j2me', 'mobile', 'wireless', 'palm', 'phone', 'pocket pc', 'pocketpc', 'netfront',
-      'bolt', 'iris', 'brew', 'openwave', 'windows ce', 'wap2.', 'android', 'opera mini', 'opera mobi', 'maemo', 'fennec',
-      'blazer', 'vodafone', 'wp7', 'armv'
-    ]
-
-    ROBOTS            = [ 'bot', 'crawler', 'spider', 'novarra', 'transcoder', 'yahoo! searchmonkey', 'yahoo! slurp', 'feedfetcher-google', 'toolbar', 'mowser' ]
-    DESKTOP_BROWSERS  = [ 'slcc1', '.net clr', 'wow64', 'media center pc', 'funwebproducts', 'macintosh', 'aol 9.', 'america online browser', 'googletoolbar' ]
-
-  end
-end

data/lib/wurfl_device/device.rb

@@ -1,83 +0,0 @@
-require 'yaml'
-require 'redis'
-
-module WurflDevice
-  class Device
-    attr_accessor :capabilities
-
-    def initialize(device_id=nil)
-      raise WurflDevice::CacheError, "wurfl cache is not initialized" unless WurflDevice.is_initialized?
-      if device_id.nil?
-        @capabilities = WurflDevice.get_actual_device(WurflDevice::Constants::GENERIC)
-      else
-        @capabilities = build_device(device_id)
-      end
-      @capabilities['actual_device_root'] ||= ((@capabilities['user_agent'] !~ /^DO_NOT_MATCH/i) ? true : false)
-    end
-
-    def is_valid?
-      return false if @capabilities.nil?
-      return false if @capabilities.id.nil?
-      return false if @capabilities.id.empty?
-      return true
-    end
-
-    def is_generic?
-      is_valid? && @capabilities.id !~ Regexp.new(WurflDevice::Constants::GENERIC, Regexp::IGNORECASE)
-    end
-
-    def build_device(device_id)
-      capabilities = Capability.new
-      device = WurflDevice.get_actual_device_raw(device_id)
-      return nil if device.nil?
-
-      capabilities['fall_back_tree'] ||= Array.new
-
-      if !device['fall_back'].nil? && !device['fall_back'].empty? && device['fall_back'] != 'root'
-        fall_back = build_device(device['fall_back'])
-        unless fall_back.nil?
-          capabilities['fall_back_tree'].unshift(fall_back['id'])
-          fall_back.each_pair do |key, value|
-            if value.kind_of?(Hash)
-              capabilities[key] ||= Capability.new
-              value.each_pair do |k, v|
-                capabilities[key][k] = v
-              end
-            elsif value.is_a?(Array)
-              capabilities[key] ||= Array.new
-              capabilities[key] |= value
-            else
-              capabilities[key] = value
-            end
-          end
-        end
-      end
-
-      device.each_pair do |key, value|
-        if key =~ /^(.+)\:(.+)$/i
-          capabilities[$1] ||= Capability.new
-          capabilities[$1][$2] = WurflDevice.parse_string_value(value)
-        else
-          capabilities[key] = WurflDevice.parse_string_value(value)
-        end
-      end
-
-      capabilities
-    end
-
-    # Magic predicates
-    # slower than going directly to capabilities
-    def method_missing(method, *args, &block)
-      return nil if @capabilities.nil?
-      meth = method.to_s
-      meth.gsub!(/\?/, '')
-      return @capabilities.send(method, args, block) if @capabilities.has_key?(meth)
-      @capabilities.each_pair do |key, value|
-        if value.is_a?(Hash)
-          return value.send(method, args, block) if value.has_key?(meth)
-        end
-      end
-      return nil
-    end
-  end
-end