mobylette 2.2 → 2.3

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 YOURNAME
+Copyright 2011 Tiago Scolari
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -137,9 +137,7 @@ This will force the session_override value in the users session. Values possible
 
 Friendly note: on your tests, call these functions BEFORE you make the request, otherwise they are useless =p
 
-== Contributions and Credits
 
-these pages were very usefull when creating this gem:
-* http://stackoverflow.com/questions/5126085/ruby-on-rails-mobile-application
-* http://www.arctickiwi.com/blog/mobile-enable-your-ruby-on-rails-site-for-small-screens
-* http://metautonomo.us/2011/01/05/mobile-devices-and-rails-maintaining-your-sanity/
+= LICENSE
+
+MIT License. Copyright 2012 Tiago Scolari.

data/Rakefile

@@ -12,6 +12,11 @@ rescue LoadError
   RDoc::Task = Rake::RDocTask
 end
 
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Mobylette'

data/lib/mobylette/fallback_resolver.rb

@@ -46,8 +46,12 @@ module Mobylette
     #         using fallback if needed
     #
     def find_templates(name, prefix, partial, details)
-      details[:formats] = Array.wrap(fallback_list) if details[:formats].first == :mobile
-      super
+      if details[:formats].first == :mobile
+        details = details.dup
+        details[:formats] = Array.wrap(fallback_list) 
+      end
+
+      super(name, prefix, partial, details)
     end
 
     private

data/lib/mobylette/mobile_user_agents.rb

@@ -6,5 +6,5 @@ module Mobylette
     'x320|x240|j2me|sgh|portable|sprint|docomo|kddi|softbank|android|mmp|' +
     'pdxgw|netfront|xiino|vodafone|portalmmm|sagem|mot-|sie-|ipod|up\\.b|' +
     'webos|amoi|novarra|cdm|alcatel|pocket|ipad|iphone|mobileexplorer|' +
-    'mobile|maemo|fennec'
+    'mobile|maemo|fennec|silk'
 end

data/lib/mobylette/version.rb

@@ -1,3 +1,3 @@
 module Mobylette
-  VERSION = "2.2"
+  VERSION = "2.3"
 end

data/spec/dummy/log/test.log

@@ -1,63 +0,0 @@
-  Processing by DefaultFallbackController#index as HTML
-Completed 200 OK in 19ms (Views: 17.9ms)
-  Processing by DefaultFallbackController#index as HTML
-Completed 200 OK in 2ms (Views: 2.2ms)
-  Processing by DefaultFallbackController#test as HTML
-Completed 200 OK in 2ms (Views: 2.0ms)
-  Processing by DefaultFallbackController#test as JS
-Completed 200 OK in 8ms (Views: 7.4ms)
-  Processing by ForceFallbackController#index as HTML
-Completed 200 OK in 4ms (Views: 3.4ms)
-  Processing by ForceFallbackController#index as HTML
-Completed 200 OK in 2ms (Views: 1.8ms)
-  Processing by ForceFallbackController#test as HTML
-Completed 200 OK in 2ms (Views: 1.8ms)
-  Processing by ForceFallbackController#test as HTML
-Completed 200 OK in 1ms (Views: 0.9ms)
-  Processing by ForceFallbackController#test as JS
-Completed 200 OK in 1ms (Views: 0.7ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 4ms (Views: 3.4ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.2ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 2ms (Views: 2.2ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 2ms (Views: 1.5ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.1ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.0ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 2ms (Views: 1.8ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 2ms (Views: 1.3ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.0ms)
-  Processing by HomeController#respond_to_test as HTML
-Completed 200 OK in 2ms (Views: 1.7ms)
-  Processing by HomeController#respond_to_test as HTML
-Completed 200 OK in 2ms (Views: 1.7ms)
-  Processing by HomeController#respond_to_test as MOBILE
-Completed 200 OK in 1ms (Views: 0.9ms)
-  Processing by HomeController#index as JS
-Completed 200 OK in 5ms (Views: 5.2ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.1ms)
-  Processing by HomeController#index as HTML
-Completed 200 OK in 1ms (Views: 1.1ms)
-  Processing by HomeController#index as HTML
-  Parameters: {"skip_mobile"=>"true"}
-Completed 200 OK in 1ms (Views: 1.1ms)
-  Processing by NoFallbackController#index as HTML
-Completed 200 OK in 4ms (Views: 3.7ms)
-  Processing by NoFallbackController#index as HTML
-Completed 200 OK in 3ms (Views: 2.5ms)
-  Processing by NoFallbackController#test as HTML
-Completed 500 Internal Server Error in 1ms
-  Processing by NoFallbackController#test as HTML
-Completed 500 Internal Server Error in 1ms
-  Processing by NoFallbackController#test as HTML
-Completed 500 Internal Server Error in 1ms
-  Processing by SkipXhrRequestController#index as JS
-Completed 200 OK in 6ms (Views: 5.3ms)

data/spec/lib/fallback_resolver_spec.rb

@@ -27,6 +27,7 @@ module Mobylette
         @formats = []
         Array.stub(:wrap).and_return(@formats)
         @details = {:formats => []}
+        @details.stub(:dup).and_return(@details)
       end
 
       context "mobile request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70171537575480 !ruby/object:Gem::Requirement
+  requirement: &70147243123000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70171537575480
+  version_requirements: *70147243123000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70171537574560 !ruby/object:Gem::Requirement
+  requirement: &70147243121340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171537574560
+  version_requirements: *70147243121340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70171537573200 !ruby/object:Gem::Requirement
+  requirement: &70147243119240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70171537573200
+  version_requirements: *70147243119240
 description: Adds the mobile format for rendering views for mobile device.
 email:
 - tscolari@gmail.com
@@ -117,7 +117,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -125,14 +124,6 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da
-- spec/dummy/tmp/cache/assets/CE4/1C0/sprockets%2F18d93e1533d585b2f64ec90b33176ac9
-- spec/dummy/tmp/cache/assets/CED/A70/sprockets%2F621683d8791730a9cc7ce45e17a7e46d
-- spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62
-- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
-- spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
-- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/integration/navigation_spec.rb
 - spec/lib/fallback_resolver_spec.rb
 - spec/lib/respond_to_mobile_requests_spec.rb
@@ -154,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3270955912998944964
+      hash: 1262445420216473146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3270955912998944964
+      hash: 1262445420216473146
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -225,7 +216,6 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -233,14 +223,6 @@ test_files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
-- spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da
-- spec/dummy/tmp/cache/assets/CE4/1C0/sprockets%2F18d93e1533d585b2f64ec90b33176ac9
-- spec/dummy/tmp/cache/assets/CED/A70/sprockets%2F621683d8791730a9cc7ce45e17a7e46d
-- spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62
-- spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
-- spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
-- spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - spec/integration/navigation_spec.rb
 - spec/lib/fallback_resolver_spec.rb
 - spec/lib/respond_to_mobile_requests_spec.rb

data/spec/dummy/log/development.log

@@ -1,116 +0,0 @@
-
-
-Started GET "/" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.html.erb within layouts/application (2.2ms)
-Compiled application.css  (0ms)  (pid 45506)
-Compiled application.js  (0ms)  (pid 45506)
-Completed 200 OK in 25ms (Views: 24.5ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
-Served asset /application.css - 200 OK (5ms)
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:04:55 -0300
-Served asset /application.js - 200 OK (3ms)
-
-
-Started GET "/" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.mobile.erb within layouts/application (0.6ms)
-Compiled application_mobile.css  (0ms)  (pid 45506)
-Compiled application_mobile.js  (0ms)  (pid 45506)
-Completed 200 OK in 30ms (Views: 29.3ms)
-
-
-Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
-Served asset /application_mobile.css - 200 OK (5ms)
-
-
-Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:05:53 -0300
-Served asset /application_mobile.js - 200 OK (2ms)
-
-
-Started GET "/" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.html.erb within layouts/application (2.5ms)
-Completed 200 OK in 34ms (Views: 33.9ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
-Served asset /application.css - 304 Not Modified (0ms)
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:11:35 -0300
-Served asset /application.js - 304 Not Modified (0ms)
-
-
-Started GET "/" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.mobile.erb within layouts/application (0.8ms)
-Completed 200 OK in 8ms (Views: 8.1ms)
-
-
-Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
-Served asset /application_mobile.css - 304 Not Modified (0ms)
-
-
-Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:11:43 -0300
-Served asset /application_mobile.js - 304 Not Modified (0ms)
-
-
-Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.html.erb within layouts/application (0.3ms)
-Completed 200 OK in 26ms (Views: 25.6ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
-Served asset /application.css - 304 Not Modified (0ms)
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:03 -0300
-Served asset /application.js - 304 Not Modified (0ms)
-
-
-Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.html.erb within layouts/application (0.2ms)
-Completed 200 OK in 4ms (Views: 3.7ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
-Served asset /application.css - 304 Not Modified (0ms)
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:05 -0300
-Served asset /application.js - 304 Not Modified (0ms)
-
-
-Started GET "/" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.html.erb within layouts/application (0.2ms)
-Completed 200 OK in 4ms (Views: 3.6ms)
-
-
-Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
-Served asset /application.css - 304 Not Modified (0ms)
-
-
-Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2012-03-25 16:12:12 -0300
-Served asset /application.js - 304 Not Modified (0ms)
-
-
-Started GET "/" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
-  Processing by HomeController#index as HTML
-Rendered home/index.mobile.erb within layouts/application (0.5ms)
-Completed 200 OK in 4ms (Views: 3.7ms)
-
-
-Started GET "/assets/application_mobile.css?body=1" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
-Served asset /application_mobile.css - 200 OK (1ms)
-
-
-Started GET "/assets/application_mobile.js?body=1" for 192.168.0.5 at 2012-03-25 16:12:15 -0300
-Served asset /application_mobile.js - 200 OK (0ms)

data/spec/dummy/tmp/cache/assets/C82/3E0/sprockets%2F48eb4ac616538f8f36870451073315da

@@ -1,14 +0,0 @@
-o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702353.878731:@value{	I"length:EFi�
I"digest;
-F"%769c3433f6bf172ce80327c044c94eb8I"source;
-FI"�
// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//
-
-alert("MOBILE JS");
-;
-FI"
-F"%34fa2587d444e6aea52cea430c668ccd

data/spec/dummy/tmp/cache/assets/CFC/200/sprockets%2F716f89d85d4855706b8a9abec1969c62

@@ -1,16 +0,0 @@
-o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702353.869955:@value{	I"length:EFiaI"digest;
-F"%7b5b4d1463c8ab2cd40517c7d780541aI"source;
-FI"a/*
- * This is the application mobile CSS
- *
- *
- *
- */
-
-
-body {
-  background-color: green;
-}
-;
-FI"
-F"%dcc110379513c5a0ef6f15e1c0fd77c0

data/spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4

@@ -1,16 +0,0 @@
-o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702295.254518:@value{	I"length:EFi`
I"digest;
-F"%da492739dcaff65c608e68791e24b0b5I"source;
-FI"`
/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
-*/
-
-
-
-body {
-  background-color: blue;
-}
-;
-FI"
-F"%4445ed39e85707f3677849c0aa9f18ed

data/spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384

@@ -1,14 +0,0 @@
-o: ActiveSupport::Cache::Entry	:@compressedF:@expires_in0:@created_atf1332702295.262975:@value{	I"length:EFi�
I"digest;
-F"%e9b5a652b2cb6afb7f4abf460034a746I"source;
-FI"�
// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//
-
-alert("HTML JS");
-;
-FI"
-F"%22b0e19566c0b533398b54fe8fbd3f62