mobvious 0.1.0 → 0.1.1

data/Gemfile

@@ -7,6 +7,5 @@ gemspec
 
 # temporarily switched for this fork, because the current version of guard-minitest has broken notifications
 gem 'guard-minitest', git: 'git://github.com/aspiers/guard-minitest', ref: '4b660261d35'
-gem 'mobileesp', git: 'git://github.com/jistr/mobileesp'
 gem 'mocha', require: false
 gem 'turn', require: false

data/Rakefile

@@ -1 +1,10 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.pattern = "spec/**/*_spec.rb"
+end
+

data/lib/mobvious.rb

@@ -13,6 +13,13 @@ require "mobvious/manager"
 #
 # See {Mobvious::Strategies} for predefined strategies or roll out your own.
 module Mobvious
+  # A configuration method, evaluates the block in the context of the Mobvious.config object.
+  def self.configure &block
+    raise "Configure method needs to be passed a block." unless block_given?
+
+    config.instance_eval &block
+  end
+
   # An accessor for the global Mobvious configuration object.
   # See {Config} for configuration options.
   def self.config

data/lib/mobvious/strategies/cookie.rb

@@ -13,18 +13,27 @@ module Mobvious
     class Cookie
       # Creates a new Cookie strategy instance.
       #
+      # @param allowed_device_types [Array<Symbol>]
+      #   A whitelist of all device types that can be returned by this strategy. This is
+      #   a security measure against modifying the cookies on client side.
       # @param cookie_expires [Integer]
       #   Amount of seconds to hold device type cookie. Defaults to one year (365*24*60*60).
-      def initialize(cookie_expires = (365*24*60*60))
+      def initialize(allowed_device_types, cookie_expires = (365*24*60*60))
         @cookie_expires = cookie_expires
+
+        # device types must be compared with the cookie as strings to prevent attacks
+        # against .to_sym that could lead to memory leaks
+        @allowed_device_types = allowed_device_types.map {|device_type| device_type.to_s }
       end
 
-      # Gets device type using a pre-set cookie. Returns nil if the cookie is not set.
+      # Gets device type using a pre-set cookie. Returns nil if the cookie is not set or its
+      # value is not listed among `allowed_device_types` (the list can be defined in {#initialize}).
       #
       # @param request [Rack::Request]
       # @return [Symbol] device type or nil
       def get_device_type(request)
-        request.cookies['mobvious.device_type'].to_sym if request.cookies['mobvious.device_type']
+        cookie_value = request.cookies['mobvious.device_type']
+        cookie_value.to_sym if @allowed_device_types.include? cookie_value
       end
 
       # Automatically sets the device type cookie again to prolong its expiration date.

data/lib/mobvious/strategies/mobileesp.rb

@@ -1,4 +1,4 @@
-require 'mobileesp'
+require 'mobileesp_converted'
 
 module Mobvious
   module Strategies
@@ -35,7 +35,8 @@ module Mobvious
       # @param request [Rack::Request]
       # @return [Symbol] device type or nil
       def get_device_type(request)
-        mobileesp = MobileESP::UserAgentInfo.new(request.user_agent, request.env['HTTP_ACCEPT'])
+        return nil if request.user_agent.nil? || request.env['HTTP_ACCEPT'].nil?
+        mobileesp = MobileESPConverted::UserAgentInfo.new(request.user_agent, request.env['HTTP_ACCEPT'])
         @detection_procedure.call(mobileesp)
       end
     end

data/lib/mobvious/version.rb

@@ -1,3 +1,3 @@
 module Mobvious
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/mobvious.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "rack", ">= 1.2.0"
-  s.add_runtime_dependency "mobileesp"
+  s.add_runtime_dependency "mobileesp_converted", '~> 0.2.0'
 
 
   # == DEVELOPMENT DEPENDENCIES ==

data/spec/mobvious/manager_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../spec_helper'
 
 module Mobvious
   class ManagerSpec < MiniTest::Spec

data/spec/mobvious/mobvious_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../spec_helper'
 
 class MobviousSpec < MiniTest::Spec
 describe Mobvious do
@@ -6,8 +6,8 @@ describe Mobvious do
     before do
       require 'mobvious/strategies/cookie'
       require 'mobvious/strategies/mobileesp'
-      @cookie = Mobvious::Strategies::Cookie.new
-      @cookie2 = Mobvious::Strategies::Cookie.new
+      @cookie = Mobvious::Strategies::Cookie.new [:mobile, :desktop]
+      @cookie2 = Mobvious::Strategies::Cookie.new [:mobile, :desktop]
       @mobileesp = Mobvious::Strategies::Mobileesp.new
       Mobvious.config.strategies = [
         @cookie,
@@ -16,6 +16,12 @@ describe Mobvious do
       ]
     end
 
+    it "yields itself in configure block" do
+      Mobvious.configure do
+        strategies.must_equal Mobvious.config.strategies
+      end
+    end
+
     it "gets the right strategy by class name" do
       Mobvious.strategy('Mobileesp').must_equal @mobileesp
     end

data/spec/mobvious/strategies/cookie_spec.rb

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'mobvious/strategies/cookie'
 
 module Mobvious::Strategies
 class CookieSpec < MiniTest::Spec
   describe Cookie do
     before do
-      @strategy = Cookie.new
+      @strategy = Cookie.new [:desktop, :tablet, :mobile]
       @app = mock 'app'
       @uri = URI("http://foo.com/")
 
@@ -44,6 +44,16 @@ class CookieSpec < MiniTest::Spec
         @request.cookies['mobvious.device_type'] = 'tablet'
       end
 
+      it "returns nil if cookie has invalid value" do
+        @request.cookies['mobvious.device_type'] = 'memory_leak_attack'
+        @app.expects(:call).returns([@response.status, @response.headers, @response.body])
+          .with do |env|
+            @strategy.get_device_type(@request).must_equal nil
+            true
+          end
+        mock_response = @mock_session.request @uri, @env
+      end
+
       it "gets device type from cookie" do
         @app.expects(:call).returns([@response.status, @response.headers, @response.body])
           .with do |env|

data/spec/mobvious/strategies/mobileesp_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'mobvious/strategies/mobileesp'
 
 module Mobvious::Strategies
@@ -20,7 +20,7 @@ module Mobvious::Strategies
       end
 
       it "categorizes Android tablet as :desktop" do
-        @request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; U; Android 3.0; xx-xx; Xoom Build/HRI39) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2")
+        @request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13")
         @strategy.get_device_type(@request).must_equal :desktop
       end
 
@@ -47,7 +47,7 @@ module Mobvious::Strategies
       end
 
       it "categorizes Android tablet as :tablet" do
-        @request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; U; Android 3.0; xx-xx; Xoom Build/HRI39) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2")
+        @request.stubs(:user_agent).returns("Mozilla/5.0 (Linux; U; Android 3.0; en-us; Xoom Build/HRI39) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13")
         @strategy.get_device_type(@request).must_equal :tablet
       end
 

data/spec/mobvious/strategies/url_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require_relative '../../spec_helper'
 require 'mobvious/strategies/url'
 
 module Mobvious::Strategies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobvious
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12832380 !ruby/object:Gem::Requirement
+  requirement: &13559960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12832380
+  version_requirements: *13559960
 - !ruby/object:Gem::Dependency
-  name: mobileesp
-  requirement: &12831840 !ruby/object:Gem::Requirement
+  name: mobileesp_converted
+  requirement: &13559160 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12831840
+  version_requirements: *13559160
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12830900 !ruby/object:Gem::Requirement
+  requirement: &13558600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12830900
+  version_requirements: *13558600
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12830320 !ruby/object:Gem::Requirement
+  requirement: &13557860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12830320
+  version_requirements: *13557860
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &12829740 !ruby/object:Gem::Requirement
+  requirement: &13556780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12829740
+  version_requirements: *13556780
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12828900 !ruby/object:Gem::Requirement
+  requirement: &13555880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12828900
+  version_requirements: *13555880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12828080 !ruby/object:Gem::Requirement
+  requirement: &13555380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12828080
+  version_requirements: *13555380
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &12827000 !ruby/object:Gem::Requirement
+  requirement: &13554440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12827000
+  version_requirements: *13554440
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &12826340 !ruby/object:Gem::Requirement
+  requirement: &13642280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12826340
+  version_requirements: *13642280
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &12825660 !ruby/object:Gem::Requirement
+  requirement: &13641840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12825660
+  version_requirements: *13641840
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &12824960 !ruby/object:Gem::Requirement
+  requirement: &13641400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12824960
+  version_requirements: *13641400
 description: Rack middleware for choosing a version of an interface to render for
   given request
 email:
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -335408179176031834
+      hash: 2708548775781943004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -335408179176031834
+      hash: 2708548775781943004
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11