mobile_rails 0.0.3 → 0.0.5

data/lib/mobile_rails/controller_additions.rb

@@ -22,6 +22,7 @@ module MobileRails
     end
     module ClassMethods
       def has_mobile_rails
+        self.send(:include, MobileRails::ControllerAdditions::InstanceMethods)
         before_filter :set_mobile_request
 
         helper_method :mobile?
@@ -31,7 +32,7 @@ module MobileRails
   end
 end
 
-
-ActionController::Base.send(:extend, MobileRails::ControllerAdditions::ClassMethods)
-ActionController::Base.send(:include, MobileRails::ControllerAdditions::InstanceMethods)
+if defined? ActionController
+  ActionController::Base.send(:extend, MobileRails::ControllerAdditions::ClassMethods)
+end
 

data/lib/mobile_rails/version.rb

@@ -1,3 +1,3 @@
 module MobileRails
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/mobile_rails/controller_additions_spec.rb

@@ -0,0 +1,76 @@
+require "spec_helper"
+
+describe MobileRails::ControllerAdditions::InstanceMethods do
+  let(:controller_class) { Class.new }
+  let(:controller) { controller_class.new }
+  let(:session) { Hash.new }
+  let(:request) { Object.new }
+
+  before(:each) do
+    controller_class.send(:include, MobileRails::ControllerAdditions::InstanceMethods)
+    controller.stub(:session) { session }
+    controller.stub(:request) { request }
+  end
+
+  describe ".set_mobile_request" do
+    it "should not mobile request if having a web version session" do
+      request.stub(:user_agent).and_return("iphone")
+      session[:mobile_session] = 0
+      controller.request.should_not_receive(:format=).with(:mobile)
+      controller.set_mobile_request
+      session[:mobile_session].should == 0
+    end
+
+    it "should set mobile request as default for a mobile devise" do
+      request.stub(:user_agent).and_return("iphone")
+      controller.request.should_receive(:format=).with(:mobile)
+      controller.set_mobile_request
+      session[:mobile_session].should == 1
+    end
+
+    it "should not set mobile request for a non mobile devise" do
+      request.stub(:user_agent).and_return("mozilla")
+      controller.request.should_not_receive(:format=).with(:mobile)
+      controller.set_mobile_request
+    end
+  end
+
+  describe ".mobile_session?" do
+    it "should return true if session is set to mobile" do
+      session[:mobile_session] = 1
+      controller.mobile_session?.should be_true
+    end
+    it "should return false if session is not set to mobile" do
+      session[:mobile_session] = 0
+      controller.mobile_session?.should be_false
+    end
+  end
+
+  describe "mobile?" do
+    it "should return true for mobile devise" do
+      request.stub(:user_agent).and_return("iphone")
+      controller.mobile?.should be_true
+    end
+    it "should return false for non mobile devise" do
+      request.stub(:user_agent).and_return("iphone")
+      controller.mobile?.should be_true
+    end
+  end
+
+  describe MobileRails::ControllerAdditions::ClassMethods do
+    let(:controller_class) { Class.new }
+    let(:controller) { controller_class.new }
+
+    describe "#has_mobile_rails" do
+      it "should set up controller" do
+        controller_class.send(:extend, MobileRails::ControllerAdditions::ClassMethods)
+        controller_class.should_receive(:before_filter).with(:set_mobile_request)
+        controller_class.should_receive(:helper_method).with :mobile?
+        controller_class.should_receive(:layout).with(:mobile_layout)
+        controller_class.should_receive(:include).with(MobileRails::ControllerAdditions::InstanceMethods)
+        controller_class.has_mobile_rails
+      end
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1 +1,2 @@
-require 'mobile_rails'
+require 'rubygems'
+require 'mobile_rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobile_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209047366720 !ruby/object:Gem::Requirement
+  requirement: &70100599701060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70209047366720
+  version_requirements: *70100599701060
 description: Gem for easy creation of mobile enabled rails app.
 email:
 - zyinghai@gmail.com
@@ -42,6 +42,7 @@ files:
 - lib/mobile_rails/controller_additions.rb
 - lib/mobile_rails/version.rb
 - mobile_rails.gemspec
+- spec/mobile_rails/controller_additions_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/hisea/mobile_rails
 licenses: []
@@ -68,4 +69,5 @@ signing_key:
 specification_version: 3
 summary: Gem for easy creation of mobile enabled rails app.
 test_files:
+- spec/mobile_rails/controller_additions_spec.rb
 - spec/spec_helper.rb