mobvious 0.1.0.pre → 0.1.0.pre2

data/.gitignore

@@ -2,4 +2,5 @@
 /.yardoc
 /doc
 /Gemfile.lock
+/pkg
 /vendor/ruby

data/lib/mobvious.rb

@@ -18,4 +18,19 @@ module Mobvious
   def self.config
     @config ||= Mobvious::Config.new
   end
+
+  # An accessor for getting an instance of a strategy that is currently in use.
+  # (Must be present in current `Mobvious.config.strategies`.)
+  # @param class_name [String] a class name of the wanted strategy object
+  def self.strategy(class_name)
+    matching_strategies = self.config.strategies.select do
+      |strategy| strategy.class.name.split('::').last == class_name
+    end
+
+    if matching_strategies.size == 1
+      matching_strategies.first
+    else
+      matching_strategies
+    end
+  end
 end

data/lib/mobvious/strategies/cookie.rb

@@ -8,7 +8,7 @@ module Mobvious
     # interface versions performed by user). Also make sure to use this strategy with high
     # priority, (e.g. put it before user-agent based detection) so it does not get overriden.
     #
-    # Use `set_device_type_cookie` method to set the device type and the strategy will then
+    # Use {Cookie#set_device_type} method to set the device type and the strategy will then
     # recognize it on subsequent requests.
     class Cookie
       # Creates a new Cookie strategy instance.
@@ -38,7 +38,7 @@ module Mobvious
 
         # re-set the cookie to renew the expiration date
         if request_cookie && !response_cookie_already_set
-          set_device_type_cookie(response, request_cookie)
+          set_device_type(response, request_cookie)
         end
       end
 
@@ -46,7 +46,7 @@ module Mobvious
       #
       # @param response [Rack::Response]
       # @param device_type [Symbol] A device type symbol (or string).
-      def set_device_type_cookie(response, device_type)
+      def set_device_type(response, device_type)
         response.set_cookie('mobvious.device_type',
                             { value: device_type.to_s, path: '/', expires: Time.now + @cookie_expires })
       end

data/lib/mobvious/strategies/mobileesp.rb

@@ -35,7 +35,7 @@ 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.accept)
+        mobileesp = MobileESP::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.pre"
+  VERSION = "0.1.0.pre2"
 end

data/spec/mobvious/mobvious_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+class MobviousSpec < MiniTest::Spec
+describe Mobvious do
+  describe "having real strategies" do
+    before do
+      require 'mobvious/strategies/cookie'
+      require 'mobvious/strategies/mobileesp'
+      @cookie = Mobvious::Strategies::Cookie.new
+      @cookie2 = Mobvious::Strategies::Cookie.new
+      @mobileesp = Mobvious::Strategies::Mobileesp.new
+      Mobvious.config.strategies = [
+        @cookie,
+        @cookie2,
+        @mobileesp
+      ]
+    end
+
+    it "gets the right strategy by class name" do
+      Mobvious.strategy('Mobileesp').must_equal @mobileesp
+    end
+
+    it "gets an array of strategies if there is more with the same name" do
+      Mobvious.strategy('Cookie')[0].must_equal @cookie
+      Mobvious.strategy('Cookie')[1].must_equal @cookie2
+    end
+  end
+end
+end

data/spec/mobvious/strategies/cookie_spec.rb

@@ -28,7 +28,7 @@ class CookieSpec < MiniTest::Spec
         it "sets the cookie on response" do
           @app.expects(:call).returns([@response.status, @response.headers, @response.body])
             .with do |env|
-              @strategy.set_device_type_cookie(@response, :tablet)
+              @strategy.set_device_type(@response, :tablet)
               true
             end
           @mock_session.request @uri, @env
@@ -66,7 +66,7 @@ class CookieSpec < MiniTest::Spec
         it "sets the response cookie to the new value, not the old one" do
           @app.expects(:call).returns([@response.status, @response.headers, @response.body])
             .with do |env|
-              @strategy.set_device_type_cookie(@response, :mobile)
+              @strategy.set_device_type(@response, :mobile)
               true
             end
           @mock_session.request @uri, @env

data/spec/mobvious/strategies/mobileesp_spec.rb

@@ -8,7 +8,10 @@ module Mobvious::Strategies
       before do
         @strategy = Mobvious::Strategies::Mobileesp.new
         @request = mock 'request'
-        @request.stubs(:accept).returns('text/html')
+        @env = mock 'env'
+
+        @request.stubs(:env).returns(@env)
+        @env.stubs('[]').with('HTTP_ACCEPT').returns('text/html')
       end
 
       it "categorizes iPhone as :mobile" do
@@ -32,7 +35,10 @@ module Mobvious::Strategies
         @strategy = Mobvious::Strategies::Mobileesp.new(
           Mobvious::Strategies::Mobileesp::DEVICE_TYPES_MOBILE_TABLET_DESKTOP)
         @request = mock 'request'
-        @request.stubs(:accept).returns('text/html')
+        @env = mock 'env'
+
+        @request.stubs(:env).returns(@env)
+        @env.stubs('[]').with('HTTP_ACCEPT').returns('text/html')
       end
 
       it "categorizes iPhone as :mobile" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobvious
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12623500 !ruby/object:Gem::Requirement
+  requirement: &6086160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *12623500
+  version_requirements: *6086160
 - !ruby/object:Gem::Dependency
   name: mobileesp
-  requirement: &12623000 !ruby/object:Gem::Requirement
+  requirement: &6085520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12623000
+  version_requirements: *6085520
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12622080 !ruby/object:Gem::Requirement
+  requirement: &6084760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12622080
+  version_requirements: *6084760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12621480 !ruby/object:Gem::Requirement
+  requirement: &6084100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12621480
+  version_requirements: *6084100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &12620840 !ruby/object:Gem::Requirement
+  requirement: &6083480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12620840
+  version_requirements: *6083480
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &12619900 !ruby/object:Gem::Requirement
+  requirement: &6082580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12619900
+  version_requirements: *6082580
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &12619220 !ruby/object:Gem::Requirement
+  requirement: &6081920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12619220
+  version_requirements: *6081920
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &12618320 !ruby/object:Gem::Requirement
+  requirement: &6080900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12618320
+  version_requirements: *6080900
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &12617600 !ruby/object:Gem::Requirement
+  requirement: &6080320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12617600
+  version_requirements: *6080320
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &12616840 !ruby/object:Gem::Requirement
+  requirement: &6079480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12616840
+  version_requirements: *6079480
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &12616080 !ruby/object:Gem::Requirement
+  requirement: &6078780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12616080
+  version_requirements: *6078780
 description: Rack middleware for choosing a version of an interface to render for
   given request
 email:
@@ -154,6 +154,7 @@ files:
 - lib/mobvious/version.rb
 - mobvious.gemspec
 - spec/mobvious/manager_spec.rb
+- spec/mobvious/mobvious_spec.rb
 - spec/mobvious/strategies/cookie_spec.rb
 - spec/mobvious/strategies/mobileesp_spec.rb
 - spec/mobvious/strategies/url_spec.rb
@@ -172,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 816301950663841186
+      hash: -3375320021797169924
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: