renderit 0.2.0 → 0.2.2

data/README.rdoc

@@ -24,6 +24,6 @@ In order to use those tempates, default view or layout have to be present. You w
 
 In order to use this gem with rails 2.3.*, you just have to put 'config.gem "renderit"' string in config/environment.rb file.
 
-In order to user this gem with rails 3, you have to require 'renderit' gem in Gemfile and create some file (I prefer renderit.rb) in config/initializers folder where 'RenderIt.load_config' line should be present.
+In order to user this gem with rails 3, you have to require 'renderit' gem in Gemfile.
 
 Copyright (c) 2010 Andrey Romanov. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/renderit.rb

@@ -4,8 +4,8 @@ class RenderIt
     'ie' => 'msie (\d+\.\d).*\)(?!\s*opera)', 
     'firefox' => 'gecko.*?firefox\/(\d+\.\d)', 
     'chrome' => 'applewebkit.*?chrome\/(\d+\.\d)', 
-    'safari' => 'applewebkit.*?version\/(\d+.\d)\.\d(?!\s*mobile).*?safari', 
-    'safarimobile' => 'applewebkit.*?version\/(\d+.\d)\.\d\smobile.*?safari', 
+    'safari' => 'applewebkit.*?version\/(\d+.\d)(?![.\d\s]*mobile)',    
+    'safarimobile' => 'applewebkit.*?version\/(\d+.\d)[.\d\s]*mobile.*?safari', 
     'opera' => 'opera.*?version\/(\d+\.\d)' 
   }
   VERSION_MATCH_REGEXP = Regexp.new("([a-z]+)(.*)", "i")
@@ -36,6 +36,7 @@ class RenderIt
         return Browser.new(browser_name, version[1])
       end
     end
+    nil
   end
 
 
@@ -58,7 +59,6 @@ class RenderIt
   def self.load_config
     if File.exist?(File.join(Rails.root, 'config/renderit.yml'))
       renderit_config = YAML::load_file(File.join(Rails.root, 'config/renderit.yml'))
-      
       #Loading browsers config
       browsers_config = renderit_config['browsers']||{}
       browsers_config.merge!(DEFAULT_BROWSERS_CONFIG)
@@ -85,7 +85,7 @@ class RenderIt
 
       write_inheritable_attribute(:templates_config, templates_config)
     end
-
+    true
   end
 
 end
@@ -147,6 +147,13 @@ if RAILS_THREE_REGEXP =~ Rails.version # If rails version is 3
     end
   end
 
+ class MyRailtie < Rails::Railtie
+   initializer "renderit_initialization" do
+     RenderIt.load_config
+   end
+ end
+
+
 
 else # If rails version is 2.3.*
 

data/renderit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{renderit}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrey Romanov"]
-  s.date = %q{2010-08-09}
+  s.date = %q{2010-08-16}
   s.description = %q{Renders different templates depending on browser user_agent.}
   s.email = %q{judo.ras@gmail.com}
   s.extra_rdoc_files = [
@@ -25,8 +25,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/renderit.rb",
      "renderit.gemspec",
-     "test/helper.rb",
-     "test/test_renderit.rb"
+     "spec/config/renderit.yml",
+     "spec/renderit_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/spec_initializer.rb"
   ]
   s.homepage = %q{http://github.com/romanoff/renderit}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -34,8 +36,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Renders different templates depending on browser user_agent.}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_renderit.rb"
+    "spec/spec_helper.rb",
+     "spec/renderit_spec.rb",
+     "spec/spec_initializer.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -43,12 +46,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

data/spec/config/renderit.yml

@@ -0,0 +1,2 @@
+templates:
+  new: chrome>4, firefox>3.5, opera>10.5

data/spec/renderit_spec.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe RenderIt do
+  
+  it "should load config file" do
+    RenderIt.load_config.should == true
+  end  
+
+  it "should parse Chrome browser user_agent" do
+    browser = RenderIt.get_browser("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/533.9 (KHTML, like Gecko) Chrome/6.0.401.1 Safari/533.9")
+    browser.name.should == 'chrome'
+    browser.version.should == '6.0'
+  end
+
+  it "should parse Firefox browser user_agent" do 
+    browser = RenderIt.get_browser("Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.3) Gecko/20100416 Mandriva Linux/1.9.2.3-0.2mdv2010.0 (2010.0) Firefox/3.6.3")
+    browser.name.should == 'firefox'
+    browser.version.should == '3.6'
+  end
+
+  it "should parse IE browser user_agent" do
+    browser = RenderIt.get_browser("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)")
+    browser.name.should == 'ie'
+    browser.version.should == '8.0'
+  end
+
+  it "should parse Opera browser user_agent" do
+    browser = RenderIt.get_browser("Opera/9.80 (Windows NT 5.1; U; ru) Presto/2.5.24 Version/10.53")
+    browser.name.should == 'opera'
+    browser.version.should == '10.5'    
+  end
+
+  it "should parse Safari browser user_agent" do
+    browser = RenderIt.get_browser("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16")
+    browser.name.should == 'safari'
+    browser.version.should == '5.0'    
+  end
+
+  it "should parse SafariMobile browser user_agent" do
+    browser = RenderIt.get_browser("Mozilla/5.0 (iPhone; U; CPU iPhone OS 2_2_1 like Mac OS X; ru-ru) AppleWebKit/525.18.1 (KHTML, like Gecko) Version/3.1.1 Mobile/5H11 Safari/525.20")
+    browser.name.should == 'safarimobile'
+    browser.version.should == '3.1'    
+  end
+
+  it "should parse SafariMobile browser user_agent" do
+    browser = RenderIt.get_browser("UNDEFINED USER_AGENT")
+    browser.should be_nil
+  end
+
+  it "should return 'new' template name" do
+    request = create_request("Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/533.9 (KHTML, like Gecko) Chrome/6.0.401.1 Safari/533.9")
+    RenderIt.get_template_name(request).should == 'new'     
+  end
+
+  it "should return blank template name if browser is old" do
+    request = create_request("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0)")
+    RenderIt.get_template_name(request).should == ''     
+  end
+
+  it "should return blank template name if unknown browser" do
+    request = create_request("UNDEFINED USER_AGENT")
+    RenderIt.get_template_name(request).should == ''     
+  end
+
+end
+
+def create_request(user_agent)
+  request = Object.new
+  request.stub!(:env).and_return({'HTTP_USER_AGENT' => user_agent})
+  return request
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+require 'rspec'
+require 'yaml'
+require 'spec_initializer'
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'renderit'

data/spec/spec_initializer.rb

@@ -0,0 +1,24 @@
+class Rails
+  class Railtie
+  end
+  def self.version
+    '3.0.0.RC'
+  end
+
+  def self.root
+    File.dirname(__FILE__)
+  end
+end
+
+
+def write_inheritable_attribute(key, value)
+  @attributes ||= {}
+  @attributes[key] = value
+end
+
+def read_inheritable_attribute(key)
+  (@attributes||{})[key]
+end
+
+def initializer(*args)
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: renderit
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrey Romanov
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +03:00
+date: 2010-08-16 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -50,8 +50,10 @@ files:
 - VERSION
 - lib/renderit.rb
 - renderit.gemspec
-- test/helper.rb
-- test/test_renderit.rb
+- spec/config/renderit.yml
+- spec/renderit_spec.rb
+- spec/spec_helper.rb
+- spec/spec_initializer.rb
 has_rdoc: true
 homepage: http://github.com/romanoff/renderit
 licenses: []
@@ -87,5 +89,6 @@ signing_key:
 specification_version: 3
 summary: Renders different templates depending on browser user_agent.
 test_files: 
-- test/helper.rb
-- test/test_renderit.rb
+- spec/spec_helper.rb
+- spec/renderit_spec.rb
+- spec/spec_initializer.rb

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'renderit'
-
-class Test::Unit::TestCase
-end

data/test/test_renderit.rb

@@ -1,4 +0,0 @@
-require 'helper'
-
-class TestRenderit < Test::Unit::TestCase
-end