mobylette 3.1 → 3.2

data/README.rdoc

@@ -10,6 +10,9 @@ http://tscolari.github.com/mobylette/mobylette_images/mobylette.jpg
 
 = Mobylette 
 {<img src="https://secure.travis-ci.org/tscolari/mobylette.png" />}[http://travis-ci.org/tscolari/mobylette]
+{<img src="https://gemnasium.com/tscolari/mobylette.png" />}[https://gemnasium.com/tscolari/mobylette]
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/tscolari/mobylette]
+
 
 This gem works by adding the 'mobile' format to your rails application. Whenever a request come from a mobile device, if you have your controller mobile enabled, it shall render the view.mobile.erb instead of the view.html.erb (or haml, or whatever).
 

data/lib/mobylette/resolvers/chained_fallback_resolver.rb

@@ -1,13 +1,15 @@
 module Mobylette
   module Resolvers
     class ChainedFallbackResolver < ::ActionView::FileSystemResolver
+      DEFAULT_PATTERN = "{:path}/:prefix/:action{.:locale,}{.:formats,}{.:handlers,}"
 
       # Initializes the fallback resolver with a default
       # mobile format.
       #
-      def initialize(formats = {})
-        @fallback_formats = formats.reverse_merge!({ mobile: [:mobile] })
-        super('app/views')
+      def initialize(formats = {}, view_paths = ['app/views'])
+        @fallback_formats = formats
+        @paths = view_paths.map { |view_path| File.expand_path(view_path)}
+        super(@paths.first, DEFAULT_PATTERN)
       end
 
       # Updates the fallback resolver replacing the
@@ -29,10 +31,12 @@ module Mobylette
       # it will behave as a normal FileSystemResovler.
       #
       def replace_fallback_formats_chain(formats)
-        @fallback_formats = formats.reverse_merge!({ mobile: [:mobile] })
+        @fallback_formats = formats
       end
 
-      # Public: finds the right template on the filesystem,
+      private
+
+      # Private: finds the right template on the filesystem,
       #         using fallback if needed
       #
       def find_templates(name, prefix, partial, details)
@@ -43,6 +47,23 @@ module Mobylette
         end
         super(name, prefix, partial, details)
       end
+
+      # Helper for building query glob string based on resolver's pattern.
+      def build_query(path, details)
+        query = @pattern.dup
+
+        prefix = path.prefix.empty? ? "" : "#{escape_entry(path.prefix)}\\1"
+        query.gsub!(/\:prefix(\/)?/, prefix)
+
+        partial = escape_entry(path.partial? ? "_#{path.name}" : path.name)
+        query.gsub!(/\:action/, partial)
+
+        details.each do |ext, variants|
+          query.gsub!(/\:#{ext}/, "{#{variants.compact.uniq.join(',')}}")
+        end
+
+        query.gsub!(/\:path/, "#{@paths.compact.uniq.join(',')}")
+      end
     end
   end
 end

data/lib/mobylette/respond_to_mobile_requests.rb

@@ -43,13 +43,11 @@ module Mobylette
       @@mobylette_options[:devices]            = Hash.new
 
       cattr_accessor :mobylette_resolver
-      self.mobylette_resolver = Mobylette::Resolvers::ChainedFallbackResolver.new()
+      self.mobylette_resolver = Mobylette::Resolvers::ChainedFallbackResolver.new({}, self.view_paths)
       self.mobylette_resolver.replace_fallback_formats_chain(@@mobylette_options[:fallback_chains])
       append_view_path self.mobylette_resolver
     end
 
-
-
     module ClassMethods
       # This method enables the controller do handle mobile requests
       #
@@ -120,7 +118,7 @@ module Mobylette
           self.mobylette_resolver.replace_fallback_formats_chain({ mobile: [:mobile, options[:fall_back]] })
         else
           if options[:fallback_chains]
-            self.mobylette_resolver.replace_fallback_formats_chain(options[:fallback_chains])
+            self.mobylette_resolver.replace_fallback_formats_chain((options[:fallback_chains] || {}).reverse_merge({ mobile: [:mobile, :html] }))
           end
         end
       end

data/lib/mobylette/version.rb

@@ -1,3 +1,3 @@
 module Mobylette
-  VERSION = "3.1"
+  VERSION = "3.2"
 end

data/spec/dummy/log/test.log

@@ -1 +1,29 @@
 DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.
+DEPRECATED > Mobylette: Please don't user :fall_back to configure fall backs any more. See the README for :fallback_chains instead.

data/spec/lib/resolvers/chained_fallback_resolver_spec.rb

@@ -5,7 +5,6 @@ module Mobylette
     describe ChainedFallbackResolver do
 
       describe "#find_templates" do
-
         context "single fallback chain" do
           [
             { mobile: [:mobile, :html]},
@@ -17,7 +16,7 @@ module Mobylette
               it "should change details[:formats] to the fallback array" do
                 details = { formats: [fallback_chain.keys.first] }
                 details.stub(:dup).and_return(details)
-                subject.find_templates("", "", "", details)
+                subject.send(:find_templates, "", "", "", details)
                 details[:formats].should == fallback_chain.values.first
               end
 
@@ -34,14 +33,26 @@ module Mobylette
               it "should change details[:formats] to the fallback array" do
                 details = { formats: [format] } 
                 details.stub(:dup).and_return(details)
-                subject.find_templates("", "", "", details)
+                subject.send(:find_templates, "", "", "", details)
                 details[:formats].should == fallback_array
               end
             end
           end
         end
+      end
 
+      describe "#build_query" do
+        it "should merge paths, formats, and handlers" do
+          details = {:locale=>[:en], :formats=>[:html], :handlers=>[:erb, :builder, :coffee]}
+          paths   = ['/app1/home', '/app2/home']
+          path    = ActionView::Resolver::Path.build('index', 'tests', nil)
+          
+          resolver = Mobylette::Resolvers::ChainedFallbackResolver.new({}, paths)
+          query = resolver.send :build_query, path, details
+          query.should == "{/app1/home,/app2/home}/tests/index{.{en},}{.{html},}{.{erb,builder,coffee},}"
+        end
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobylette
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '3.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70350105267040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70350105267040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70350105266040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350105266040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70350105265420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350105265420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &70350105264620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350105264620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Adds the mobile format for rendering views for mobile device.
 email:
 - tscolari@gmail.com
@@ -129,7 +149,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
@@ -158,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 204503549891134721
+      hash: -3729222328630037007
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,10 +186,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 204503549891134721
+      hash: -3729222328630037007
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Mobile request handling for your Rails app.
@@ -229,7 +248,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