divining_rod 0.5.0 → 0.6.0

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+gem "shoulda"
+gem "rack"
+gem "mocha"

data/Gemfile.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    mocha (0.9.12)
+    rack (1.2.2)
+    shoulda (2.11.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mocha
+  rack
+  shoulda

data/LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2009 Mark Percival
+Copyright 2009-2011 Mark Percival
+Portions Copyright 2011 Twitter, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,53 +1,11 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "divining_rod"
-    gem.summary = %Q{A mobile phone web request profiler}
-    gem.description = %Q{A mobile phone web request profiler using definitions that look like rails routes}
-    gem.email = "mark@mpercival.com"
-    gem.homepage = "http://github.com/markpercival/divining_rod"
-    gem.authors = ["Mark Percival"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib' << 'test' << '.'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "divining_rod #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/divining_rod.gemspec

@@ -1,74 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "divining_rod/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{divining_rod}
-  s.version = "0.5.0"
+  s.name        = "divining_rod"
+  s.version     = DiviningRod::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Mark Percival"]
+  s.email       = ["mark@markpercival.us"]
+  s.homepage    = "http://github.com/mdp/divining_rod"
+  s.summary     = %q{An opinionated ruby encryption library}
+  s.description = %q{Supports OpenSSL compatible AES, HMAC, and RSA encryption}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Percival"]
-  s.date = %q{2010-08-30}
-  s.description = %q{A mobile phone web request profiler using definitions that look like rails routes}
-  s.email = %q{mark@mpercival.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.markdown"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "divining_rod.gemspec",
-     "example_config.rb",
-     "lib/divining_rod.rb",
-     "lib/divining_rod/definition.rb",
-     "lib/divining_rod/mapper.rb",
-     "lib/divining_rod/mappings.rb",
-     "lib/divining_rod/matchers.rb",
-     "lib/divining_rod/murge.rb",
-     "lib/divining_rod/profile.rb",
-     "lib/divining_rod/rack.rb",
-     "lib/divining_rod/rack/divining_rack.rb",
-     "lib/divining_rod/utilities.rb",
-     "spec/definition_spec.rb",
-     "spec/example_mapping_spec.rb",
-     "spec/mapper_spec.rb",
-     "spec/mapping_spec.rb",
-     "spec/profile_spec.rb",
-     "spec/rack_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/markpercival/divining_rod}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{A mobile phone web request profiler}
-  s.test_files = [
-    "spec/definition_spec.rb",
-     "spec/example_mapping_spec.rb",
-     "spec/mapper_spec.rb",
-     "spec/mapping_spec.rb",
-     "spec/profile_spec.rb",
-     "spec/rack_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "divining_rod"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
-

data/example_config.rb

@@ -1,17 +1,17 @@
-DiviningRod::Mappings.define do |map|
+DiviningRod::Mappings.define(:format => :html) do |map|
     # Android based phones
     map.ua /Android/, :format => :webkit, :name => 'Android', :tags => [:android, :youtube_capable, :google_gears]
-    
+
     # Apple iPhone OS
     map.ua /Apple.*Mobile.*Safari/, :format => :webkit, :tags => [:apple, :iphone_os, :youtube_capable] do |iphone|
       iphone.ua /iPad/, :tags => :ipad, :name => 'iPad'
       iphone.ua /iPod/, :tags => :ipod, :name => 'iPod Touch'
       iphone.ua /iPhone/, :tags => [:iphone], :name => 'iPhone'
     end
-    
+
     #Blackberry, needs more detail here
     map.ua /BlackBerry/, :tags => :blackberry, :name => 'BlackBerry'
-    
+
     # The desktop browsers, we don't set a format on these to let it pass through
     map.with_options :tags => :desktop do |desktop|
       desktop.ua /Chrome/, :tags => :chrome, :name => 'Chrome'
@@ -22,10 +22,11 @@ DiviningRod::Mappings.define do |map|
         msie.ua /MSIE 6/, :version => 6
         msie.ua /MSIE 7/, :version => 7
         msie.ua /MSIE 8/, :version => 8
+        msie.ua /MSIE 10/, :version => 10, :tags => :html5
       end
     end
-    
+
     # Enable this to forces a default format if unmatched
     # otherwise it will return the request.format
-    # map.default :format => :html 
-end
+    map.default :name => "Unknown"
+end

data/lib/divining_rod.rb

@@ -2,8 +2,7 @@ module DiviningRod; end
 
 require 'divining_rod/profile'
 require 'divining_rod/utilities'
-require 'divining_rod/murge'
+require 'divining_rod/mash'
 require 'divining_rod/definition'
 require 'divining_rod/mappings'
-require 'divining_rod/mapper'
 require 'divining_rod/matchers'

data/lib/divining_rod/definition.rb

@@ -1,13 +1,11 @@
 module DiviningRod
   class Definition
-    include Murge
 
     attr_accessor :prc, :group, :opts, :parent
-    attr_writer :children
 
     def initialize(opts={}, &blk)
       @prc = blk
-      @opts = opts
+      @opts = Mash.new(opts)
     end
 
     def evaluate(request)
@@ -26,28 +24,16 @@ module DiviningRod
     end
 
     def tags
-      opts[:tags] || []
+      @tags ||= opts[:tags] || []
     end
-    
-    def opts
-      if parent
-        @murged_opts ||= murge(parent.opts, @opts)
-      else
-        @opts
-      end
+
+    def children
+      @children ||= []
     end
-    
+
     def format
       opts[:format]
     end
-    
-    def children
-      @children ||= []
-      @children.each do |child|
-        child.parent ||= self
-      end
-      @children
-    end
 
   end
 end

data/lib/divining_rod/mappings.rb

@@ -4,18 +4,67 @@ module DiviningRod
     class << self
 
       attr_accessor :root_definition
-      
+
       def define(opts = {})
-        @root_definition = Definition.new { true }
-        yield Mapper.new(@root_definition, opts)
-        @root_definition.freeze
+        @root_definition = Definition.new(opts) { true }
+        yield Mappings.new(@root_definition)
+        @root_definition
       end
-      
+
       def evaluate(obj)
         @root_definition.evaluate(obj)
       end
-      
+
+    end
+
+    attr_reader :default_opts, :parent
+
+    def initialize(parent, default_opts = {})
+      @parent = parent
+      @default_opts = Mash.new(default_opts)
+    end
+
+    def pattern(type, pattern, opts = {})
+      definition = Matchers.send(type.to_sym, pattern, merged_opts(opts))
+      append_to_parent(definition)
+      if block_given?
+        yield self.class.new(definition)
+      end
+      definition
+    end
+
+    def default(opts = {})
+      definition = Definition.new(merged_opts(opts)) { true }
+      append_to_parent(definition)
+      definition
+    end
+
+    def with_options(opts)
+      yield self.class.new(parent, opts)
+    end
+
+    def method_missing(meth, *args, &blk)
+      # Lets us use map.ua instead of map.pattern :ua
+      if Matchers.respond_to?(meth.to_sym)
+        self.pattern(meth, args[0], args[1,], &blk)
+      else
+        super
+      end
     end
 
+    private
+
+    def merged_opts(opts)
+      opts = parent.opts.merge(opts)
+      opts = default_opts.merge(opts)
+      opts
+    end
+
+    def append_to_parent(definition)
+      parent.children << definition
+      definition
+    end
+
+
   end
 end

data/lib/divining_rod/mash.rb

@@ -0,0 +1,17 @@
+module DiviningRod
+  class Mash < Hash
+
+    def initialize(hsh = {})
+      self.replace(hsh || {})
+    end
+
+    def merge(opts = {})
+      if self[:tags] || opts[:tags]
+        tags = Array(self[:tags]) | Array(opts[:tags])
+        opts[:tags] = tags
+      end
+      super(opts)
+    end
+
+  end
+end

data/lib/divining_rod/matchers.rb

@@ -20,7 +20,7 @@ module DiviningRod
 
       def ua_prof(pattern, opts ={})
         Definition.new(opts) {|request|
-          if pattern.match(request.env['X_WAP_PROFILE'])
+          if pattern.match(request.env['HTTP_X_WAP_PROFILE'])
             true
           end
         }

data/lib/divining_rod/murge.rb

@@ -1,16 +1,17 @@
 module DiviningRod
   module Murge
-    
+
     # This is tacky, but I'm preserving tags in the option hash
     # and only want to have to write this once
     #
     def murge(old_opts, new_opts)
       old_opts = old_opts || {}
+      new_opts = new_opts || {}
       tags = Array(old_opts[:tags]) | Array(new_opts[:tags])
       opts = old_opts.merge(new_opts)
       opts[:tags] = tags
       opts
     end
-    
+
   end
-end
+end

data/lib/divining_rod/profile.rb

@@ -1,10 +1,10 @@
 module DiviningRod
-  class Profile
+  module Profiler
 
     def initialize(request)
-      @request = request.clone #Lets not mess with the real one
+      @request = request
     end
-    
+
     def match
       @match ||= DiviningRod::Mappings.evaluate(@request)
     end
@@ -21,14 +21,18 @@ module DiviningRod
       match != DiviningRod::Mappings.root_definition
     end
 
+    def tagged?(tag)
+      if match
+        Array(match.tags).include?(tag.to_sym)
+      else
+        false
+      end
+    end
+
     def method_missing(meth)
       if meth.to_s.match(/(.+)\?$/)
         tag = $1
-        if match
-          match.tags.include?(tag.to_s) ||  match.tags.include?(tag.to_sym) || match.tags == tag
-        else
-          false
-        end
+        tagged?(tag)
       elsif match.opts.include?(meth.to_sym)
         match.opts[meth]
       else
@@ -37,4 +41,9 @@ module DiviningRod
     end
 
   end
+
+  class Profile
+    include Profiler
+  end
 end
+

data/lib/divining_rod/utilities.rb

@@ -1,6 +1,6 @@
 module DiviningRod
   class Utilities
-    
+
     def self.parse_subdomain(request)
       env = request.env
       if forwarded = env["HTTP_X_FORWARDED_HOST"]
@@ -14,6 +14,6 @@ module DiviningRod
         []
       end
     end
-    
+
   end
-end
+end

data/lib/divining_rod/version.rb

@@ -0,0 +1,3 @@
+module DiviningRod
+  VERSION = "0.6.0"
+end

data/test/test_definition.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class DefinitionTest < Test::Unit::TestCase
+  context DiviningRod::Definition do
+
+    should "work with no children not match" do
+      definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
+        request == 'iphone'
+      }
+      assert_equal definition.evaluate('foo'), nil
+    end
+
+    should "work with no children and match" do
+      definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
+        request == 'iphone'
+      }
+      assert_equal definition, definition.evaluate('iphone')
+    end
+
+    context "with children" do
+
+      should "work with children that match" do
+        definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
+          request.match(/iphone/)
+        }
+        definition.children << DiviningRod::Definition.new(:format => :ipod, :tags => [:small, :lacks_a_camera]) { |request|
+          request.match(/ipod/)
+        }
+        definition.children << DiviningRod::Definition.new(:format => :ipad, :tags => [:big, :lacks_a_camera]) { |request|
+          request.match(/ipad/)
+        }
+        result = definition.evaluate('iphone ipad')
+        assert_equal :ipad, result.format
+        assert result.tags.include?(:big)
+      end
+
+
+    end
+
+  end
+end

data/test/test_example_config.rb

@@ -0,0 +1,71 @@
+require 'test_helper'
+require 'example_config'
+
+def profile_ua(ua)
+  DiviningRod::Profile.new(request_mock(:ua => ua))
+end
+
+
+class ExampleConfigTest < Test::Unit::TestCase
+  context 'the example config' do
+
+    context "recognizing Apple devices" do
+
+      should "recognize an iPad" do
+        profile = profile_ua("Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10")
+        assert profile.ipad?
+      end
+
+      should "recognize an iPod touch 2.2.1" do
+        profile = profile_ua("Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20")
+        assert profile.ipod?
+      end
+
+      should "recognize an iPod touch 3.1.2" do
+        profile = profile_ua("Mozilla/5.0 (iPod; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16")
+        assert profile.ipod?
+      end
+
+      should "recognize an iPhone 3.1.2" do
+        profile = profile_ua("Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16")
+        assert profile.iphone?
+      end
+
+      should "recognize an iPhone 2.1.2" do
+        profile = profile_ua("Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20")
+        assert profile.iphone?
+      end
+
+    end
+
+    context "recognizing Android devices" do
+
+      should "recognize a basic android" do
+        profile = profile_ua("Mozilla/5.0 (Linux; U; Android 1.0; en-us; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2")
+        assert profile.android?
+      end
+
+    end
+
+    context "recognizing desktop browsers" do
+
+      should "recognize Internet Explorer 10" do
+        profile = profile_ua("Mozilla/4.0 (compatible; MSIE 10.0; Windows NT 7.0)")
+        assert profile.desktop?
+        assert_equal profile.version, 10
+        assert profile.html5?
+      end
+
+    end
+
+    context "with root definition options" do
+      should "carry through" do
+        profile = profile_ua("Unknown phone")
+        assert_equal "Unknown", profile.name
+        assert_equal :html, profile.format
+      end
+    end
+
+
+  end
+end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,12 +1,17 @@
 require 'rubygems'
-require 'spec'
 require 'rack'
-require  File.expand_path('../../lib/divining_rod', __FILE__)
+require 'test/unit'
+require 'shoulda'
+require 'mocha'
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'divining_rod'
+
+include Mocha::API
 
 def request_mock(opts)
   opts = {
            :host => 'example.com'
          }.merge(opts)
   env = {'HTTP_USER_AGENT' => opts[:ua], 'SERVER_NAME' => opts[:host], 'X_WAP_PROFILE' => opts[:wap_profile]}
-  mock('RailsRequest', :env => env, :format => opts[:format])
-end
+  stub(:env => env, :format => opts[:format])
+end

data/test/test_mash.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+module DiviningRod
+  class MashTest < Test::Unit::TestCase
+    context 'Mash is like Hash' do
+      should "work that way" do
+        mash = Mash.new({:a_key => "and a value"})
+        and_mash = Mash.new({:my_key => "and my value"})
+        assert_equal ({:a_key => "and a value", :my_key => "and my value"}), mash.merge(and_mash)
+      end
+
+      should "also mash tags" do
+        mash = Mash.new({:tags => :foo})
+        and_mash = Mash.new({:tags => [:bar, :baz]})
+        assert_equal mash.merge(and_mash), {:tags => [:foo, :bar, :baz]}
+      end
+
+      should "accept nil happily" do
+        mash = Mash.new(nil)
+        assert_equal({}, mash)
+      end
+    end
+  end
+end
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: divining_rod
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Mark Percival
@@ -14,91 +10,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 -07:00
+date: 2011-04-25 00:00:00 +00:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: A mobile phone web request profiler using definitions that look like rails routes
-email: mark@mpercival.com
+dependencies: []
+
+description: Supports OpenSSL compatible AES, HMAC, and RSA encryption
+email: 
+- mark@markpercival.us
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - .document
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - divining_rod.gemspec
 - example_config.rb
 - lib/divining_rod.rb
 - lib/divining_rod/definition.rb
-- lib/divining_rod/mapper.rb
 - lib/divining_rod/mappings.rb
+- lib/divining_rod/mash.rb
 - lib/divining_rod/matchers.rb
 - lib/divining_rod/murge.rb
 - lib/divining_rod/profile.rb
 - lib/divining_rod/rack.rb
 - lib/divining_rod/rack/divining_rack.rb
 - lib/divining_rod/utilities.rb
-- spec/definition_spec.rb
-- spec/example_mapping_spec.rb
-- spec/mapper_spec.rb
-- spec/mapping_spec.rb
-- spec/profile_spec.rb
-- spec/rack_spec.rb
-- spec/spec_helper.rb
+- lib/divining_rod/version.rb
+- test/test_definition.rb
+- test/test_example_config.rb
+- test/test_helper.rb
+- test/test_mash.rb
 has_rdoc: true
-homepage: http://github.com/markpercival/divining_rod
+homepage: http://github.com/mdp/divining_rod
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: divining_rod
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A mobile phone web request profiler
-test_files: 
-- spec/definition_spec.rb
-- spec/example_mapping_spec.rb
-- spec/mapper_spec.rb
-- spec/mapping_spec.rb
-- spec/profile_spec.rb
-- spec/rack_spec.rb
-- spec/spec_helper.rb
+summary: An opinionated ruby encryption library
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.5.0

data/lib/divining_rod/mapper.rb

@@ -1,55 +0,0 @@
-module DiviningRod
-  class Mapper
-    include Murge
-    
-    def initialize(parent, default_opts = {})
-      @parent = parent
-      @default_opts = default_opts
-    end
-
-    def pattern(type, pattern, opts = {})
-      opts = murge(default_options, opts)
-      definition = Matchers.send(type.to_sym, pattern, opts)
-      append_to_parent(definition)
-      if block_given?
-        yield self.class.new(definition)
-      end
-      definition
-    end
-    
-    def with_options(opts)
-      yield self.class.new(@parent, opts)
-    end
-
-    def default(opts = {})
-      definition = Definition.new(opts) { true }
-      append_to_parent(definition)
-      definition
-    end
-
-    def method_missing(meth, *args, &blk)
-      # Lets us use map.ua instead of map.pattern :ua
-      if Matchers.respond_to?(meth.to_sym)
-        self.pattern(meth, args[0], args[1,], &blk)
-      else
-        super
-      end
-    end
-
-    private
-    
-      def default_options
-        @default_opts || {}
-      end
-
-      def append_to_parent(definition)
-        if @parent
-          @parent.children << definition
-        end
-        definition
-      end
-
-  end
-
-
-end

data/spec/definition_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-describe DiviningRod::Definition do
-  
-  it "should work with no children not match" do
-    definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
-      request == 'iphone'
-    }
-    definition.evaluate('foo').should be_nil
-  end
-  
-  it "should work with no children and match" do
-    definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
-      request == 'iphone'
-    }
-    definition.evaluate('iphone').should eql(definition)
-  end
-  
-  describe "with children" do
-    
-    it "should work with children that match" do
-      definition = DiviningRod::Definition.new(:format => :iphone, :tags => [:overpriced, :easy_to_break]) { |request|
-        request.match(/iphone/)
-      }
-      definition.children << DiviningRod::Definition.new(:format => :ipod, :tags => [:big, :lacks_a_camera]) { |request|
-        request.match(/ipod/)
-      }
-      definition.children << DiviningRod::Definition.new(:format => :ipad, :tags => [:big, :lacks_a_camera]) { |request|
-        request.match(/ipad/)
-      }
-      result = definition.evaluate('iphone ipad')
-      result.should_not eql(definition)
-      result.format.should eql(:ipad)
-      result.tags.should include(:overpriced)
-    end
-    
-    
-  end
-  
-end

data/spec/example_mapping_spec.rb

@@ -1,60 +0,0 @@
-require 'spec/spec_helper'
-require 'example_config'
-
-def profile_ua(ua)
-  DiviningRod::Profile.new(request_mock(:ua => ua))
-end
-  
-
-describe 'the example config' do
-
-  describe "recognizing Apple devices" do
-
-    it "should recognize an iPad" do
-      profile = profile_ua("Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10")
-      profile.ipad?.should be_true
-    end
-    
-    it "should recognize an iPod touch 2.2.1" do
-      profile = profile_ua("Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20")
-      profile.ipod?.should be_true
-    end
-    
-    it "should recognize an iPod touch 3.1.2" do
-      profile = profile_ua("Mozilla/5.0 (iPod; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16")
-      profile.ipod?.should be_true
-    end
-    
-    it "should recognize an iPhone 3.1.2" do
-      profile = profile_ua("Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16")
-      profile.iphone?.should be_true
-    end
-    
-    it "should recognize an iPhone 2.1.2" do
-      profile = profile_ua("Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20")
-      profile.iphone?.should be_true
-    end
-    
-  end
-  
-  describe "recognizing Android devices" do
-    
-    it "should recognize a basic android" do
-      profile = profile_ua("Mozilla/5.0 (Linux; U; Android 1.0; en-us; dream) AppleWebKit/525.10+ (KHTML, like Gecko) Version/3.0.4 Mobile Safari/523.12.2")
-      profile.android?.should be_true
-    end
-    
-  end
-  
-  describe "recognizing desktop browsers" do
-    
-    it "should recognize Internet Explorer 7" do
-      profile = profile_ua("Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 6.0)")
-      profile.desktop?.should be_true
-      profile.version.should eql(7)
-    end
-    
-  end
-
-
-end

data/spec/mapper_spec.rb

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe DiviningRod::Mapper do
-  
-  before :each do
-    @root_definition = DiviningRod::Definition.new { true }
-    mapper = DiviningRod::Mapper.new(@root_definition, {:tags => [:fuck], :foo => true})
-    mapper.ua /Safari/, :tags => [:baz] do |map|
-      map.with_options :tags => :awsome do |awesome|
-        awesome.ua /Apple/, :tags => [:foo]
-      end
-    end
-  end
-  
-  it "should map a definition" do
-    request = request_mock(:ua => 'Apple Mobile Safari', :format => :html)
-    result = @root_definition.evaluate(request)
-    result.tags.should include(:fuck)
-  end
-  
-end

data/spec/mapping_spec.rb

@@ -1,78 +0,0 @@
-require 'spec_helper'
-
-describe DiviningRod::Mappings do
-
-  before :each do
-    DiviningRod::Mappings.define(:tags => :mobile) do |map|
-      map.ua /Apple/, :format => :webkit, :tags => [:apple] do |apple|
-
-        # iPod, iPhone, and iPad
-        apple.with_options :tags => [:youtube, :geolocate, :iphone] do |advanced|
-          advanced.ua /iPad/, :tags => :ipad do |ipad|
-            ipad.ua /OS\s4/, :tags => :version4
-            ipad.ua /OS\s3/, :tags => :version3 do |v3|
-              v3.ua /Unicorns/, :tags => :omg_unicorns do |unicorns|
-                unicorns.ua /eat kittens/, :tags => [:omg_they_eat_kittens]
-              end
-            end
-            ipad.ua /OS\s2/, :tags => :version2
-          end
-          advanced.ua /iPod/, :tags => [:ipod, :ipod_touch]
-        end
-
-        # Also an apple but actualy a newton
-        apple.ua /Newton/, :tags => [:apple] do |newton|
-          newton.ua /OS 8/, :tags => :os8
-        end
-      end
-    end
-  end
-
-  it "should match a top level user agent" do
-    request = request_mock(:ua => 'Apple Mobile Safari', :format => :html)
-    result = DiviningRod::Mappings.root_definition.evaluate(request)
-    result.should_not be_nil
-    result.tags.should include(:apple)
-    result.tags.should_not include(:ipad)
-    result.tags.should include(:mobile)
-  end
-
-  it "should match a child definition" do
-    ipad_request = request_mock(:ua => 'Apple iPad', :format => :html)
-    result = DiviningRod::Mappings.evaluate(ipad_request)
-    result.tags.should include(:ipad)
-  end
-
-  it "should match a sub child definition" do
-    ipad_request = request_mock(:ua => 'Apple iPad - now powered by Unicorns - OS 3.3', :format => :html)
-    result = DiviningRod::Mappings.evaluate(ipad_request)
-    result.tags.should include(:ipad)
-    result.tags.should include(:omg_unicorns)
-    result.tags.should include(:version3)
-  end
-
-  it "should match a really really deep child definition" do
-    ipad_request = request_mock(:ua => 'Apple iPad - now powered by Unicorns who eat kittens - OS 3.3', :format => :html)
-    result = DiviningRod::Mappings.evaluate(ipad_request)
-    result.tags.should include(:ipad, :youtube)
-    result.tags.should include(:omg_unicorns)
-    result.tags.should include(:omg_they_eat_kittens)
-    result.tags.should include(:version3)
-  end
-
-  it "should match a in order defined" do
-    ipad_request = request_mock(:ua => 'Apple iPad - now powered by Unicorns who eat kittens - OS 2', :format => :html)
-    result = DiviningRod::Mappings.evaluate(ipad_request)
-    result.tags.should include(:ipad, :youtube)
-    result.tags.should_not include(:omg_they_eat_kittens, :omg_unicorns)
-    result.tags.should include(:version2)
-  end
-
-  it "should match a in order defined" do
-    ipad_request = request_mock(:ua => 'Apple Newton - OS 8', :format => :html)
-    result = DiviningRod::Mappings.evaluate(ipad_request)
-    result.tags.should_not include(:omg_they_eat_kittens, :omg_unicorns)
-    result.tags.should include(:os8)
-  end
-
-end

data/spec/profile_spec.rb

@@ -1,118 +0,0 @@
-require 'spec_helper'
-
-describe DiviningRod do
-
-  before :each do
-    @request = request_mock(:ua => 'My iPhone which is actually an iPad')
-    
-    DiviningRod::Mappings.define do |map|
-      map.ua /iPhone/, :format => :webkit, :tags => [:iphone, :youtube, :geolocate] do |iphone|
-        iphone.ua /iPad/, :tags => [:ipad]
-      end
-    end
-  end
-
-  it "should recognize an iPhone" do
-    profile = DiviningRod::Profile.new(@request)
-    profile.format.should eql(:webkit)
-  end
-
-  it "should know if it belongs to a category tag" do
-    profile = DiviningRod::Profile.new(@request)
-    profile.ipad?.should be_true
-  end
-
-  it "should know if it does not belongs to a category" do
-    profile = DiviningRod::Profile.new(@request)
-    profile.wap?.should be_false
-  end
-  
-  describe "without a default route" do
-    
-    before :each do
-      @request = request_mock(:ua => 'My Foo Fone', :format => :html)
-      
-      DiviningRod::Mappings.define do |map|
-        map.ua /iPhone/, :format => :webkit, :tags => [:iphone, :youtube, :geolocate]
-      end
-    end
-
-    it "should use the default group for unknown phones" do
-      profile = DiviningRod::Profile.new(@request)
-      profile.wap?.should be_false
-      profile.format.should eql(:html)
-    end
-
-  end
-  
-
-  describe "with a default route" do
-    
-    before :each do
-      @request = request_mock(:ua => 'My Foo Fone')
-      
-      DiviningRod::Mappings.define do |map|
-        map.ua /iPhone/, :format => :webkit, :tags => [:iphone, :youtube, :geolocate]
-        map.default :format => :html
-      end
-    end
-
-    it "should use the default group for unknown phones" do
-      profile = DiviningRod::Profile.new(@request)
-      profile.wap?.should be_false
-      profile.format.should eql(:html)
-    end
-
-  end
-
-  describe "without a default definition" do
-
-    before :each do
-      @request = request_mock(:ua => 'Foo Fone', :format => :html)
-      
-      DiviningRod::Mappings.define do |map|
-        map.ua /iPhone/, :format => :webkit, :tags => [:iphone, :youtube, :geolocate]
-      end
-    end
-
-    it "should not find a match" do
-      DiviningRod::Profile.new(@request).recognized?.should be_false
-    end
-
-  end
-  
-  describe "matching a subdomain" do
-
-    before :each do
-      @request = request_mock(:ua => 'Foo Fone', :host => 'wap.example.com')
-      
-      DiviningRod::Mappings.define do |map|
-        map.subdomain /wap/, :format => :wap, :tags => [:shitty]
-      end
-    end
-
-    it "should not find a match" do
-      DiviningRod::Profile.new(@request).recognized?.should be_true
-      profile = DiviningRod::Profile.new(@request)
-      profile.wap?
-    end
-
-  end
-  
-  describe "matching the weird requests(no user_agent passed)" do
-
-    before :each do
-      @request = request_mock(:ua => nil, :subdomains => [])
-      
-      DiviningRod::Mappings.define do |map|
-        map.ua /iPhone/, :format => :wap, :tags => [:shitty]
-      end
-    end
-
-    it "should not find a match" do
-      DiviningRod::Profile.new(@request).recognized?.should be_false
-    end
-
-  end
-
-end

data/spec/rack_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require "divining_rod/rack"
-require "rack/test"
-
-describe DiviningRod do
-  include Rack::Test::Methods
-
-  def app
-    DiviningRod::Rack.new(app = lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['foo']] })
-  end
-
-  before :each do
-    DiviningRod::Mappings.define do |map|
-      map.ua /iPhone/, :format => :webkit, :tags => [:iphone, :youtube, :geolocate] do |iphone|
-        iphone.ua /iPad/, :tags => [:ipad]
-      end
-    end
-  end
-
-  it "should profile an incoming request" do
-    header 'User-Agent', "iPhone Safari"
-    get "/"
-    last_request.env['divining_rod.profile'].should be_an_instance_of(DiviningRod::Profile)
-    last_request.env['divining_rod.profile'].iphone?.should be_true
-  end
-
-end