wurfl_device 0.1.5 → 0.1.6

data/lib/wurfl_device/version.rb

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

data/lib/wurfl_device/web_service.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'yaml'
 require 'wurfl_device'
 require 'sinatra/base'
@@ -5,57 +6,22 @@ require 'sinatra/base'
 module WurflDevice
   class WebService < Sinatra::Base
     get '/' do
-      user_agent = request.env['HTTP_USER_AGENT'] || '-'
-      device = WurflDevice.get_device_from_ua(user_agent)
-      return device.capabilities.to_yaml unless device.nil?
-      {}.to_yaml
-    end
-
-    get '/:capa' do
-      user_agent = request.env['HTTP_USER_AGENT'] || '-'
-      device = WurflDevice.get_device_from_ua(user_agent)
-      return device.send(params[:capa]).to_yaml unless device.nil?
-      {}.to_yaml
-    end
-
-    get '/device/:id' do
-      device = WurflDevice.get_device_from_id(params[:id])
-      capabilities = {}
-      capabilities = device.capabilities unless device.nil?
+      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
     end
 
-    get '/device/:id/:capa' do
-      device = WurflDevice.get_device_from_id(params[:id])
-      capability = {}
-      capability = device.send(params[:capa]) unless device.nil?
+    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
     end
 
-    get '/actual_device/:id' do
-      capabilities = WurflDevice.get_actual_device(params[:id])
+    get '/device/:id' do
+      capabilities = WurflDevice.capabilities_from_id(params[:id])
       capabilities.to_yaml
     end
-
-    get '/actual_device/:id/:capa' do
-      capabilities = WurflDevice.get_actual_device(params[:id])
-      get_capa(params[:capa], capabilities).to_yaml
-    end
-
-  protected
-    def get_capa(capa, capabilities)
-      capability = nil
-      if capabilities.has_key?(capa)
-        capability = capabilities.send(capa)
-      else
-        capabilities.each_pair do |key, value|
-          if value.is_a?(Hash)
-            capability = value.send(capa)
-            break
-          end
-        end
-      end
-      return capability
-    end
   end
 end

data/lib/wurfl_device/xml_loader.rb

@@ -1,49 +1,56 @@
-require 'etc'
-require 'nokogiri'
+# encoding: utf-8
+require 'ox'
 
 module WurflDevice
   class XmlLoader
     def self.load_xml_file(wurfl_file, &blk)
-      devices = Hash.new
-
-      xml = Nokogiri::XML File.open(wurfl_file)
-
-      version = xml.xpath('//version/ver')[0].children.to_s rescue nil
-      last_updated = DateTime.parse(xml.xpath('//version/last_updated')[0].children.to_s) rescue nil
-
-      xml.xpath('//devices/*').each do |element|
-        wurfl_id = 'generic'
-        user_agent = 'generic'
-        fall_back = nil
-        if element.attributes["id"].to_s != "generic"
-          wurfl_id = element.attributes["id"].to_s
-          user_agent = element.attributes["user_agent"].to_s
-          user_agent = 'generic' if user_agent.empty?
-          fall_back = element.attributes["fall_back"].to_s
-        end
+      begin
+        file_contents = File.open(wurfl_file).read.force_encoding('UTF-8')
+      rescue => e
+        raise XMLFileError, e.message
+      end
 
-        device = Hash.new
-        device['id'] = wurfl_id
-        device['user_agent'] = user_agent
-        device['fall_back'] = fall_back
+      # TODO apparently Ox doesn't support UCS/Unicode chars???
+      file_contents.gsub!(/\&\#x.+\;/, '')
+
+      # parse xml using Ox
+      doc = Ox.parse(file_contents)
+      doc.nodes.map do |elem1|
+        next unless elem1.value =~ /wurfl/i
+        elem1.nodes.map do |elem2|
+          # version info
+          version_info = Hash.new
+          if elem2.value == 'version'
+            elem2.nodes.map do |e|
+              if e.value == 'ver'
+                version_info[:version] = e.nodes[0].to_s
+              end
+            end
+            yield version_info if block_given?
+          end
 
-        element.xpath('.//*').each do |group|
-          group_id = group.attributes["id"].to_s
-          next if group_id.empty?
-          group_capa = Hash.new
-          group.xpath('.//*').each do |capability|
-            name = capability.attributes["name"].to_s
-            next if name.empty?
-            group_capa[name] = WurflDevice.parse_string_value(capability.attributes["value"].to_s)
+          # devices list
+          if elem2.value == 'devices'
+            elem2.nodes.map do |device|
+              next unless device.value =~ /device/i
+              capabilities = Hash.new
+              capabilities['id'] = device.attributes[:id] || ''
+              capabilities['user_agent'] = device.attributes[:user_agent] || ''
+              capabilities['fall_back'] = device.attributes[:fall_back] || ''
+
+              device.nodes.map do |group|
+                next unless group.value =~ /group/i
+                group.nodes.map do |capability|
+                  capabilities[group.attributes[:id]] ||= Hash.new
+                  next unless capability.value =~ /capability/i
+                  capabilities[group.attributes[:id]][capability.attributes[:name]] = capability.attributes[:value]
+                end
+              end
+              yield capabilities if block_given?
+            end
           end
-          device[group_id] = group_capa
         end
-
-        devices[wurfl_id] = device
-        yield device if block_given?
       end
-
-      [devices, version, last_updated]
     end
   end
 end

data/lib/wurfl_device.rb

@@ -1,15 +1,24 @@
-require 'etc'
-require 'redis'
-
+# encoding: utf-8
 require 'wurfl_device/version'
 
+class Object
+  def to_actual_value
+    return self unless self.kind_of?(String)
+    return false if self =~ /^false/i
+    return true if self =~ /^true/i
+    return self.to_i if (self == self.to_i.to_s)
+    return self.to_f if (self == self.to_f.to_s)
+    self
+  end
+end
+
 module WurflDevice
-  autoload :Capability,         'wurfl_device/capability'
-  autoload :Constants,          'wurfl_device/constants'
-  autoload :Device,             'wurfl_device/device'
-  autoload :Handset,            'wurfl_device/handset'
   autoload :UI,                 'wurfl_device/ui'
   autoload :CLI,                'wurfl_device/cli'
+  autoload :Capability,         'wurfl_device/capability'
+  autoload :Cache,              'wurfl_device/cache'
+  autoload :Handset,            'wurfl_device/handset'
+  autoload :Settings,           'wurfl_device/settings'
   autoload :UserAgent,          'wurfl_device/user_agent'
   autoload :UserAgentMatcher,   'wurfl_device/user_agent_matcher'
   autoload :XmlLoader,          'wurfl_device/xml_loader'
@@ -21,249 +30,45 @@ module WurflDevice
   end
 
   class CacheError    < WurflDeviceError; status_code(10); end
+  class XMLFileError  < WurflDeviceError; status_code(11); end
 
   class << self
-    attr_writer :ui, :db
+    attr_writer :ui
 
     def ui
       @ui ||= UI.new
     end
 
-    def db
-      @db ||= Redis.new(:db => Constants::DB_INDEX)
-    end
-
-    def tmp_dir
-      tmp_loc = File.join(Etc.systmpdir, 'wurfl_device')
-      FileUtils.mkdir_p(tmp_loc)
-      return tmp_loc
-    end
-
-    def get_actual_device(device_id)
-      capabilities = Capability.new
-      actual_device = get_actual_device_raw(device_id)
-      return nil if actual_device.nil?
-      actual_device.each_pair do |key, value|
-        if key =~ /^(.+)\:(.+)$/i
-          capabilities[$1] ||= Capability.new
-          capabilities[$1][$2] = parse_string_value(value)
-        else
-          capabilities[key] = parse_string_value(value)
-        end
-      end
+    def capabilities_from_id(device_id)
+      capabilities = Cache.build_capabilities(device_id)
       capabilities
     end
 
-    def get_device_from_id(device_id)
-      device = Device.new(device_id)
-      return device if device.is_valid?
-      return nil
-    end
-
-    def get_device_from_ua(user_agent)
-      matcher = UserAgentMatcher.new.match(user_agent)
-      return matcher.device
-    end
-
-    def get_device_from_ua_cache(user_agent, bypass_main_cache=false)
-      unless bypass_main_cache
-        cached_device = db.hget(Constants::WURFL_USER_AGENTS_CACHED, user_agent)
-        return Marshal::load(cached_device) unless cached_device.nil?
-      end
-      cached_device = db.hget(Constants::WURFL_USER_AGENTS, user_agent)
-      return Marshal::load(cached_device) unless cached_device.nil?
-      return nil
-    end
-
-    def save_device_in_ua_cache(user_agent, device)
-      db.hset(Constants::WURFL_USER_AGENTS_CACHED, user_agent, Marshal::dump(device))
-    end
-
-    def get_info
-      db.hgetall(Constants::WURFL_INFO)
-    end
-
-    # cache related
-    def clear_user_agent_cache
-      db.del(Constants::WURFL_USER_AGENTS_CACHED)
-    end
-
-    def clear_cache
-      db.keys("#{Constants::WURFL}*").each { |k| db.del k }
-    end
-
-    def clear_devices
-      db.keys("#{Constants::WURFL_DEVICES}*").each { |k| db.del k }
-      db.del(Constants::WURFL_INITIALIZED)
-      db.del(Constants::WURFL_INFO)
-    end
-
-    def get_user_agents
-      db.hkeys(Constants::WURFL_USER_AGENTS)
-    end
-
-    def get_user_agents_in_cache
-      db.hkeys(Constants::WURFL_USER_AGENTS_CACHED)
-    end
-
-    def get_user_agents_in_index(matcher)
-      db.hkeys("#{Constants::WURFL_DEVICES_INDEX}#{matcher}")
-    end
-
-    def get_actual_device_raw(device_id)
-      db.hgetall("#{Constants::WURFL_DEVICES}#{device_id}")
-    end
-
-    def get_devices
-      db.keys("#{Constants::WURFL_DEVICES}*")
-    end
-
-    def get_indexes
-      db.keys("#{Constants::WURFL_DEVICES_INDEX}*")
-    end
-
-    def rebuild_user_agent_cache
-      # update the cache's
-      db.del(Constants::WURFL_USER_AGENTS)
-      get_indexes.each { |k| db.del(k) }
-
-      get_devices.each do |device_id|
-        device_id.gsub!(Constants::WURFL_DEVICES, '')
-        actual_device = get_actual_device(device_id)
-        next if actual_device.nil?
-        user_agent = actual_device.user_agent
-        next if user_agent.nil? || user_agent.empty?
-        device = Device.new(device_id)
-        next unless device.is_valid?
-        db.hset(Constants::WURFL_USER_AGENTS, user_agent, Marshal::dump(device))
-
-        next if user_agent =~ /^DO_NOT_MATCH/i
-        matcher = UserAgentMatcher.new.get_index(user_agent)
-        db.hset("#{Constants::WURFL_DEVICES_INDEX}#{matcher}", user_agent, device_id)
-      end
-
-      get_user_agents_in_cache.each do |user_agent|
-        db.hdel(Constants::WURFL_USER_AGENTS_CACHED, user_agent)
-        UserAgentMatcher.new.match(user_agent)
-      end
-    end
-
-    def is_initialized?
-      status = parse_string_value(db.get(Constants::WURFL_INITIALIZED))
-      return false if status.nil?
-      return false unless status.is_a?(TrueClass)
-      true
-    end
-
-    def initialize_cache
-      # make sure only process can initialize at a time
-      # don't initialize if there is another initializing
-      lock_the_cache_for_initializing do
-        db.set(Constants::WURFL_INITIALIZED, false)
-
-        # download & parse the wurfl xml
-        xml_list = Array.new
-        xml_list << download_wurfl_xml_file
-        xml_list << download_wurfl_web_patch_xml_file
-
-        xml_list.each do |xml_file|
-          (devices, version, last_updated) = XmlLoader.load_xml_file(xml_file) do |capabilities|
-            device_id = capabilities.delete('id')
-            next if device_id.nil? || device_id.empty?
-            db.del("#{Constants::WURFL_DEVICES}#{device_id}")
-            user_agent = capabilities.delete('user_agent')
-            fall_back = capabilities.delete('fall_back')
-
-            device_id.strip! unless device_id.nil?
-            user_agent.strip! unless user_agent.nil?
-            fall_back.strip! unless fall_back.nil?
-
-            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "id", device_id)
-            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "user_agent", user_agent)
-            db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "fall_back", fall_back)
-
-            capabilities.each_pair do |key, value|
-              if value.is_a?(Hash)
-                value.each_pair do |k, v|
-                  db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}:#{k.to_s}", v)
-                end
-              else
-                db.hset("#{Constants::WURFL_DEVICES}#{device_id}", "#{key.to_s}", value)
-              end
-            end
-          end
-
-          next if version.nil?
-          db.set(Constants::WURFL_INITIALIZED, true)
-          db.hset(Constants::WURFL_INFO, "version", version)
-          db.hset(Constants::WURFL_INFO, "last_updated", Time.now)
-        end
-      end
-    end
-
-    def parse_string_value(value)
-      return value unless value.is_a?(String)
-      # convert to utf-8 (wurfl.xml encoding format)
-      value.force_encoding('UTF-8')
-      return false if value =~ /^false/i
-      return true if value =~ /^true/i
-      return value.to_i if (value == value.to_i.to_s)
-      return value.to_f if (value == value.to_f.to_s)
-      value
-    end
-  protected
-    def download_wurfl_xml_file
-      wurfl_xml_source = "http://sourceforge.net/projects/wurfl/files/WURFL/2.2/wurfl-2.2.xml.gz"
-      FileUtils.mkdir_p(WurflDevice.tmp_dir)
-      FileUtils.cd(WurflDevice.tmp_dir)
-      `wget --timeout=60 -qN -- #{wurfl_xml_source} > /dev/null`
-      raise "Failed to download wurfl-latest.xml.gz" unless $? == 0
-
-      wurfl_xml_filename = File.basename(wurfl_xml_source)
-      `gunzip -qc #{wurfl_xml_filename} > wurfl.xml`
-      raise 'Failed to unzip wurfl-latest.xml.gz' unless $? == 0
-
-      wurfl_xml_file_extracted = File.join(WurflDevice.tmp_dir, 'wurfl.xml')
-      raise "wurfl.xml does not exists!" unless File.exists?(wurfl_xml_file_extracted)
-
-      wurfl_xml_file_extracted
-    end
-
-    def download_wurfl_web_patch_xml_file
-      wurfl_web_patch_xml_source = 'http://sourceforge.net/projects/wurfl/files/WURFL/2.2/web_browsers_patch.xml'
-      `wget --timeout=60 -qN -- #{wurfl_web_patch_xml_source} > /dev/null`
-      raise "Failed to download wurfl-latest.xml.gz" unless $? == 0
-
-      wurfl_web_patch_xml = File.join(WurflDevice.tmp_dir, 'web_browsers_patch.xml')
-      raise "web_browsers_patch.xml does not exists!" unless File.exists?(wurfl_web_patch_xml)
-
-      wurfl_web_patch_xml
-    end
-
-    def lock_the_cache_for_initializing
-      start_at = Time.now
-      success = false
-      while Time.now - start_at < Constants::LOCK_TIMEOUT
-        success = true and break if try_lock
-        sleep Constants::LOCK_SLEEP
+    def capability_from_user_agent(capability, user_agent)
+      capability_group = nil
+
+      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?
       end
-      if block_given? and success
-        yield
-        unlock
-      end
-    end
 
-    def try_lock
-      now = Time.now.to_f
-      @expires_at = now + Constants::LOCK_EXPIRE
-      return true if db.setnx(Constants::WURFL_INITIALIZING, @expires_at)
-      return false if db.get(Constants::WURFL_INITIALIZING).to_f > now
-      return true if db.getset(Constants::WURFL_INITIALIZING, @expires_at).to_f <= now
-      return false
+      capabilities = capabilities_from_user_agent(user_agent)
+      return capabilities[capability] if capability_group.nil?
+      return capabilities[capability_group][capability]
     end
 
-    def unlock(force=false)
-      db.del(Constants::WURFL_INITIALIZING) if db.get(Constants::WURFL_INITIALIZING).to_f == @expires_at or force
+    def capabilities_from_user_agent(user_agent)
+      matcher = UserAgentMatcher.new
+      matcher.match(user_agent)
+      matcher.capabilities
     end
   end
 end

data/spec/cache/device_spec.rb

@@ -1,37 +1,13 @@
 require 'spec_helper'
-require 'yaml'
 
 describe WurflDevice do
-  describe :devices do
-    it "cache should be available" do
-      WurflDevice.is_initialized?.should == true
-    end
-
-    it "generic device should exists" do
-      device = WurflDevice.get_actual_device(WurflDevice::Constants::GENERIC)
-      device.id.should == WurflDevice::Constants::GENERIC
-    end
-
-    it "check for user agent matcher" do
-      {
-        'nokia_x3_02_ver1' => 'NokiaX3-02/5.0 (05.60) Profile/MIDP-2.1 Configuration/CLDC-1.1',
-        'nokia_n90_ver1_sub2052414' => 'NokiaN90-1/3.0541.5.2 Series60/2.8 Profile/MIDP-2.0 Configuration/CLDC-1.1',
-
-        #'opwv_v6_generic' => 'SAMSUNG-B5712C/1.0 RTK-E/1.0 DF/1.0 Release/08.17.2007 Browser/Openwave6.2.3.3.c.1.101 Profile/MIDP-2.0 Configuration/CLDC-1.1/*MzU3ODEwMDIwNzc5ODgx UP.Browser/6.',
-        'samsung_a707_ver1_subshpvppr5' => 'SAMSUNG-SGH-A707/1.0 SHP/VPP/R5 NetFront/3.3 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
-        'samsung_u700_ver1_subua' => 'SAMSUNG-SGH-U700/1.0 SHP/VPP/R5 NetFront/3.4 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
-        #'generic' => 'SAMSUNG-SCH-M710/(null)ID4 (compatible; MSIE 6.0; Windows CE; PPC) Opera 9.5',
-
-        'sonyericsson_k700i_ver1subr2ay' => 'SonyEricssonK700i/R2AC SEMC-Browser/4.0.2 Profile/MIDP-2.0 Configuration/CLDC-1.1',
-        'sonyericsson_k550i_ver1_subr1jd' => 'SonyEricssonK550i/R1JD Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1',
-
-        'blackberry8520_ver1_subos5' => 'BlackBerry8520/5.0.0.592 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/603',
+  it "devices should be many" do
+    WurflDevice::Cache::Devices.entries.count.should > 0
+  end
 
-        'generic' => "'M', 'Y' 'P', 'H', 'O', 'N', 'E' Browser/WAP2.0 Profile/MIDP-2.0 Configuration/CLDC-1.1",
-      }.each_pair do |device_id, user_agent|
-        device = WurflDevice.get_device_from_ua(user_agent)
-        device.id.should == device_id
-      end
-    end
+  it "generic device should exists" do
+    capabilities = WurflDevice.capabilities_from_id(WurflDevice::Settings::GENERIC)
+    capabilities.id.nil?.should == false
+    capabilities.id.should == WurflDevice::Settings::GENERIC
   end
 end

data/spec/cache/user_agents_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'yaml'
+
+describe WurflDevice do
+  it "check for user agent matcher" do
+    {
+      'nokia_x3_02_ver1' => 'NokiaX3-02/5.0 (05.60) Profile/MIDP-2.1 Configuration/CLDC-1.1',
+      'nokia_n90_ver1_sub2052314' => 'NokiaN90-1/3.0541.5.2 Series60/2.8 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+
+      'opwv_v6_generic' => 'SAMSUNG-B5712C/1.0 RTK-E/1.0 DF/1.0 Release/08.17.2007 Browser/Openwave6.2.3.3.c.1.101 Profile/MIDP-2.0 Configuration/CLDC-1.1/*MzU3ODEwMDIwNzc5ODgx UP.Browser/6.',
+      'samsung_a707_ver1_subshpvppr5' => 'SAMSUNG-SGH-A707/1.0 SHP/VPP/R5 NetFront/3.3 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
+      'samsung_u700_ver1_subua' => 'SAMSUNG-SGH-U700/1.0 SHP/VPP/R5 NetFront/3.4 SMM-MMS/1.2.0 profile/MIDP-2.0 configuration/CLDC-1.1',
+      'generic' => 'SAMSUNG-SCH-M710/(null)ID4 (compatible; MSIE 6.0; Windows CE; PPC) Opera 9.5',
+
+      'sonyericsson_k700i_ver1subr2ay' => 'SonyEricssonK700i/R2AC SEMC-Browser/4.0.2 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+      'sonyericsson_k550i_ver1_subr1jd' => 'SonyEricssonK550i/R1JD Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1',
+
+      'blackberry8520_ver1_subos5' => 'BlackBerry8520/5.0.0.592 Profile/MIDP-2.1 Configuration/CLDC-1.1 VendorID/603',
+
+      'generic' => "'M', 'Y' 'P', 'H', 'O', 'N', 'E' Browser/WAP2.0 Profile/MIDP-2.0 Configuration/CLDC-1.1",
+    }.each_pair do |device_id, user_agent|
+      device = WurflDevice.capabilities_from_user_agent(user_agent)
+      device.id.nil?.should == false
+      device.id.should == device_id
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ else
   require 'rubygems'
 end
 
-require 'faker'
 require 'rspec/core'
 
 $LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
@@ -17,4 +16,10 @@ RSpec.configure do |config|
   config.color_enabled = true
 end
 
+use_fake_redis = ENV['NO_FAKE_REDIS'].nil? ? true : false
+
+require 'fakeredis' if use_fake_redis
 require 'wurfl_device'
+
+xml_file ||= WurflDevice::Settings.default_wurfl_xml_file
+WurflDevice::Cache::initialize_cache(xml_file) unless WurflDevice::Cache.initialized?

data/wurfl_device.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'wurfl_device'
 
-  s.add_dependency 'thor'
-  s.add_dependency 'nokogiri'
+  s.add_dependency 'hiredis'
   s.add_dependency 'redis'
+  s.add_dependency 'thor'
+  s.add_dependency 'ox'
   s.add_dependency 'text'
   s.add_dependency 'sinatra'
   s.add_dependency 'unicorn'
@@ -28,8 +29,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-core', '~> 2.0'
   s.add_development_dependency 'rspec-expectations', '~> 2.0'
   s.add_development_dependency 'rr', '~> 1.0'
-  s.add_development_dependency 'faker', '~> 0.9'
   s.add_development_dependency 'simplecov', '~> 0.5.3'
+  s.add_development_dependency 'fakeredis', '~> 0.2.2'
+
+  s.requirements    << 'redis server'
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")