mobile-enhancements 0.0.1 → 0.0.2

data/Rakefile

@@ -1 +1,13 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require "rspec/core/rake_task"
+
+desc "Runs all the specs"
+task default: %w(spec)
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end

data/lib/mobile_enhancements/configuration.rb

@@ -47,12 +47,25 @@ module MobileEnhancements
     end
     
     class Options
+      # force format to pass through
+      def format(*args)
+        method_missing("format", *args)
+      end
+
+      def read_attribute(name)
+        (@properties ||= {})[name]
+      end
+      
+      def write_attribute(name, value)
+        (@properties ||= {})[name] = value
+      end
+      
       def method_missing(name, *args, &block)
         case args.size
         when 0
-          (@properties ||= {})[name]
+          read_attribute(name)
         when 1
-          (@properties ||= {})[name] = args.first
+          write_attribute(name, args.first)
         else
           super
         end

data/lib/mobile_enhancements/railtie.rb

@@ -16,6 +16,12 @@ module MobileEnhancements
       if format = MobileEnhancements.configuration.mobile_format
         # register it as an alias to the HTML mime-type
         Mime::Type.register_alias "text/html", format
+        # setup the format calculation
+        ActionController::Base.class_eval do
+          before_filter do |controller|
+            controller.request.format = controller.determine_format
+          end
+        end
       end
     end
 

data/lib/mobile_enhancements/request_helper.rb

@@ -7,10 +7,10 @@ module MobileEnhancements
     def self.delegated_methods
       instance_methods.select do |name|
         name =~ /^(desktop|mobile)\_/
-      end << :determine_layout
+      end + [:determine_layout, :determine_format]
     end
     
-    def_delegators :configuration, :mobile_path_prefix, :mobile_layout, :desktop_layout
+    def_delegators :configuration, :mobile_path_prefix, :mobile_layout, :desktop_layout, :mobile_format
 
     attr_reader :request, :configuration
 
@@ -24,6 +24,11 @@ module MobileEnhancements
       mobile_request? ? mobile_layout : desktop_layout
     end
     
+    # returns what format should be used by the request
+    def determine_format
+      mobile_request? ? mobile_format.to_sym : request.format.to_sym
+    end
+    
     # strips any mobile prefix from the url
     def desktop_url(url = request.url)
       desktop_path(url)

data/lib/mobile_enhancements/version.rb

@@ -1,3 +1,3 @@
 module MobileEnhancements
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/mobile-enhancements.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency "rake"
+  s.add_development_dependency "rails"
   s.add_development_dependency "rb-fsevent"
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "rspec-rails"

data/spec/controllers/test_controller_spec.rb

@@ -0,0 +1,23 @@
+require "spec_helper"
+
+describe TestController do
+  context "via the mobile UI" do
+    describe "GET /#{MobileEnhancements.configuration.mobile_path_prefix}/two" do
+      before { get :two, mobile: MobileEnhancements.configuration.mobile_path_prefix }
+      
+      it "should render 'two, #{MobileEnhancements.configuration.mobile_format}'" do
+        expect(@response.body).to eq "two, #{MobileEnhancements.configuration.mobile_format}"
+      end
+    end
+  end
+  
+  context "via the desktop UI" do
+    describe "GET /two" do
+      before { get :two }
+      
+      it "should render 'two, html'" do
+        expect(@response.body).to eq "two, html"
+      end
+    end
+  end
+end

data/spec/internal/app/controllers/test_controller.rb

@@ -1,7 +1,8 @@
 class TestController < ActionController::Base
   def one
-    render text: __method__
+    render text: [action_name, request.format.to_sym].join(", ")
   end
   alias_method :two, :one
   alias_method :three, :one
+  alias_method :four, :one
 end

data/spec/internal/config/initializers/mobile_enhancements.rb

@@ -4,6 +4,6 @@ MobileEnhancements.configure do
   mobile do
     prefix "m"
     layout "application"
-    mime_type "mob"
+    format "mobile"
   end
 end

data/spec/internal/config/routes.rb

@@ -7,5 +7,6 @@ Rails.application.routes.draw do
   
   mobile_only do
     get "three", to: "test#three"
+    root to: "test#four"
   end
 end

data/spec/mobile_enhancements/configuration_spec.rb

@@ -18,15 +18,23 @@ describe MobileEnhancements::Configuration do
       subject.mobile do
         prefix "m"
         layout "mob"
+        format "mbl"
       end
     end
     
     it "should store the prefix" do
       expect(subject.mobile.prefix).to eq "m"
+      expect(subject.mobile_path_prefix).to eq "m"
     end
     
     it "should store the layout" do
       expect(subject.mobile.layout).to eq "mob"
+      expect(subject.mobile_layout).to eq "mob"
+    end
+    
+    it "should store the format" do
+      expect(subject.mobile.format).to eq "mbl"
+      expect(subject.mobile_format).to eq :mbl
     end
     
     it "should raise method missing for undefined options" do
@@ -43,6 +51,7 @@ describe MobileEnhancements::Configuration do
     
     it "should store the layout" do
       expect(subject.desktop.layout).to eq "desktop"
+      expect(subject.desktop_layout).to eq "desktop"
     end
   end
 end

data/spec/routing/routes_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 describe "standard routing" do
-  it "routes /guides to guides#index" do
+  it "routes /one to test#one" do
     expect(get: "/one").to route_to("test#one")
   end
 end
 
 describe "mobile-optional routing" do
-  it "routes /items to items#index" do
+  it "routes /two to test#two" do
     expect(get: "/two").to route_to({
       controller: "test",
       action: "two",
@@ -15,7 +15,7 @@ describe "mobile-optional routing" do
     })
   end
   
-  it "routes /mobile/items to mobile#index" do
+  it "routes /#{MobileEnhancements.configuration.mobile_path_prefix}/two to test#two" do
     expect(get: "/#{MobileEnhancements.configuration.mobile_path_prefix}/two").to route_to({
       controller: "test",
       action: "two",
@@ -25,15 +25,23 @@ describe "mobile-optional routing" do
 end
 
 describe "mobile-only routing" do
-  it "does not route /pages to pages#index" do
+  it "does not route /three" do
     expect(get: "/three").not_to be_routable
   end
 
-  it "routes /mobile/pages to pages#index" do
+  it "routes /#{MobileEnhancements.configuration.mobile_path_prefix}/three to test#three" do
     expect(get: "/#{MobileEnhancements.configuration.mobile_path_prefix}/three").to route_to({
       controller: "test",
       action: "three",
       mobile: MobileEnhancements.configuration.mobile_path_prefix
     })
   end
+  
+  it "routes /#{MobileEnhancements.configuration.mobile_path_prefix} to test#four" do
+    expect(get: "/#{MobileEnhancements.configuration.mobile_path_prefix}").to route_to({
+      controller: "test",
+      action: "four",
+      mobile: MobileEnhancements.configuration.mobile_path_prefix
+    })
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile-enhancements
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +147,7 @@ files:
 - lib/mobile_enhancements/route_helpers.rb
 - lib/mobile_enhancements/version.rb
 - mobile-enhancements.gemspec
+- spec/controllers/test_controller_spec.rb
 - spec/internal/app/controllers/test_controller.rb
 - spec/internal/config/initializers/mobile_enhancements.rb
 - spec/internal/config/routes.rb
@@ -153,18 +170,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4122015549436335768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4122015549436335768
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -172,6 +183,7 @@ signing_key:
 specification_version: 3
 summary: A few features to aid Rails apps with separate mobile-targeted UIs.
 test_files:
+- spec/controllers/test_controller_spec.rb
 - spec/internal/app/controllers/test_controller.rb
 - spec/internal/config/initializers/mobile_enhancements.rb
 - spec/internal/config/routes.rb