Some new specs

Author: gazay

lib/gon.rb

@@ -1,5 +1,5 @@
 
-if RUBY_VERSION =~ /9/ && defined?(Jbuilder)
+if RUBY_VERSION > '1.9' && defined?(Jbuilder)
   gem 'blankslate'
 end
 require 'action_view'
@@ -9,7 +9,7 @@
 if defined?(Rabl)
   require 'gon/rabl'
 end
-if RUBY_VERSION =~ /9/ && defined?(Jbuilder)
+if RUBY_VERSION > '1.9' && defined?(Jbuilder)
   require 'gon/jbuilder'
 end
 
@@ -45,7 +45,7 @@ def request=(request_id)
 
     def method_missing(m, *args, &block)
       if ( m.to_s =~ /=$/ )
-        if public_methods.include?(RUBY_VERSION =~ /1.9/ ? m.to_s[0..-2].to_sym : m.to_s[0..-2])
+        if public_methods.include?(RUBY_VERSION > '1.9' ? m.to_s[0..-2].to_sym : m.to_s[0..-2])
           raise "You can't use Gon public methods for storing data"
         end
         set_variable(m.to_s.delete('='), args[0])
@@ -91,7 +91,7 @@ def set_variable(name, value)
     alias_method :orig_jbuilder, :jbuilder
 
     def jbuilder(*options)
-      raise NoMethodError.new('You can use Jbuilder support only in 1.9+') if RUBY_VERSION !~ /9/
+      raise NoMethodError.new('You can use Jbuilder support only in 1.9+') if RUBY_VERSION < '1.9'
       orig_jbuilder(*options)
     end
 

spec/gon/gon_spec.rb

@@ -1,29 +1,33 @@
 # gon_spec_rb
 require 'gon'
 
-describe Gon, '#all_variables' do
+describe Gon do
 
   before(:each) do
     Gon.request_env = {}
   end
 
-  it 'returns all variables in hash' do
-    Gon.a = 1
-    Gon.b = 2
-    Gon.c = Gon.a + Gon.b
-    Gon.c.should == 3
-    Gon.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
-  end
+  describe '#all_variables' do
+
+    it 'returns all variables in hash' do
+      Gon.a = 1
+      Gon.b = 2
+      Gon.c = Gon.a + Gon.b
+      Gon.c.should == 3
+      Gon.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
+    end
+
+    it 'supports all data types' do
+      Gon.clear
+      Gon.int = 1
+      Gon.float = 1.1
+      Gon.string = 'string'
+      Gon.array = [ 1, 'string' ]
+      Gon.hash_var = { :a => 1, :b => '2'}
+      Gon.hash_w_array = { :a => [ 2, 3 ] }
+      Gon.klass = Hash
+    end
 
-  it 'supports all data types' do
-    Gon.clear
-    Gon.int = 1
-    Gon.float = 1.1
-    Gon.string = 'string'
-    Gon.array = [ 1, 'string' ]
-    Gon.hash_var = { :a => 1, :b => '2'}
-    Gon.hash_w_array = { :a => [ 2, 3 ] }
-    Gon.klass = Hash
   end
 
   describe '#include_gon' do
@@ -66,6 +70,7 @@
   end
 
   describe '.rabl' do
+
     require 'rabl'
     require 'gon/rabl'
 
@@ -74,8 +79,8 @@
       controller.instance_variable_set('@objects', objects)
     end
 
-    let(:controller) { ActionController::Base.new}
-    let(:objects) { [1,2]}
+    let(:controller) { ActionController::Base.new }
+    let(:objects) { [1,2] }
 
     context 'render template with deprecation' do
       it 'still works' do
@@ -96,78 +101,119 @@
       load 'gon/rabl.rb'
     end
 
-  end
-
-  describe '.get_template_path' do
+    context '.get_template_path' do
+      context 'template is specified' do
 
-    context 'template is specified' do
-      it 'add the extension if not included in the template name' do
-        Gon.send(:get_template_path, { :template => 'spec/test_data/sample'}, 'rabl').should eql('spec/test_data/sample.rabl')
-      end
+        it 'add the extension if not included in the template name' do
+          Gon.send(:get_template_path, { :template => 'spec/test_data/sample'}, 'rabl').should eql('spec/test_data/sample.rabl')
+        end
 
-      it 'return the specified template' do
-        Gon.send(:get_template_path, { :template => 'spec/test_data/sample.rabl'}, 'rabl').should eql('spec/test_data/sample.rabl')
-      end
-    end
+        it 'return the specified template' do
+          Gon.send(:get_template_path, { :template => 'spec/test_data/sample.rabl'}, 'rabl').should eql('spec/test_data/sample.rabl')
+        end
 
-    context 'template is not specified' do
-      before do
-        Gon.clear
-        controller.instance_variable_set('@objects', objects)
-        controller.action_name = 'show'
       end
 
-      let(:controller) { ActionController::Base.new}
-      let(:objects) { [1,2]}
+      context 'template is not specified' do
 
-      context 'the action doesn as a template at a different format' do
-        it 'return the same template as the action with rabl extension' do
-          Gon.send(:get_template_path, {:controller => controller}, 'rabl').should eql('app/views/action_controller/base/show.json.rabl')
+        before do
+          Gon.clear
+          controller.instance_variable_set('@objects', objects)
+          controller.action_name = 'show'
         end
-      end
-      context 'the action as a template at a different format' do
-        it 'return the same template as the action with rabl extension' do
-          Gon.send(:get_template_path, {:controller => controller}, 'rabl').should eql('app/views/action_controller/base/show.json.rabl')
+
+        let(:controller) { ActionController::Base.new }
+        let(:objects) { [1,2] }
+
+        context 'the action doesn as a template at a different format' do
+          it 'return the same template as the action with rabl extension' do
+            Gon.send(:get_template_path, {:controller => controller}, 'rabl').should eql('app/views/action_controller/base/show.json.rabl')
+          end
         end
+
       end
     end
+
   end
 
-  if RUBY_VERSION =~ /1.9/
+  if RUBY_VERSION > '1.9'
     require 'jbuilder'
     require 'gon/jbuilder'
 
-    it 'render json from jbuilder template' do
-      Gon.clear
-      controller = ActionController::Base.new
-      objects = [1,2]
-      controller.instance_variable_set('@objects', objects)
-      Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
-      Gon.objects.length.should == 2
-    end
+    describe '.jbuilder' do
+      context 'render jbuilder templates' do
 
-    it 'render json from jbuilder template with a partial' do
-      Gon.clear
-      controller = ActionController::Base.new
-      controller.view_paths << 'spec/test_data'
-      objects = [1,2]
-      controller.instance_variable_set('@objects', objects)
-      Gon.jbuilder 'spec/test_data/sample_with_partial.json.jbuilder', :controller => controller
-      Gon.objects.length.should == 2
-    end
+        before do
+          Gon.clear
+          controller.instance_variable_set('@objects', objects)
+        end
+
+        let(:controller) { ActionController::Base.new }
+        let(:objects) { [1,2] }
+
+        it 'render json from jbuilder template' do
+          Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
+          Gon.objects.length.should == 2
+        end
+
+        it 'render json from jbuilder template with a partial' do
+          controller.view_paths << 'spec/test_data'
+          Gon.jbuilder 'spec/test_data/sample_with_partial.json.jbuilder', :controller => controller
+          Gon.objects.length.should == 2
+        end
 
-    it 'should throw error if you use gon.jbuilder with ruby < 1.9+' do
-      RUBY_VERSION = '1.8.7'
+      end
+
+      it 'should throw error if you use gon.jbuilder with ruby < 1.9+' do
+        RUBY_VERSION = '1.8.7'
+
+        expect { Gon.jbuilder 'some_path'}.to raise_error(NoMethodError, /1.9/)
+      end
+
+      it 'should raise error if you use gon.jbuilder without requiring jbuilder gem' do
+        RUBY_VERSION = '1.9.2'
+        Gon.send(:remove_const, :Jbuilder)
+
+        expect { Gon.jbuilder 'some_path' }.to raise_error(NoMethodError, /Gemfile/)
+        load 'jbuilder.rb'
+        load 'gon/jbuilder.rb'
+      end
 
-      expect { Gon.jbuilder 'some_path'}.to raise_error(NoMethodError, /1.9/)
     end
 
-    it 'should raise error if you use gon.jbuilder without requiring jbuilder gem' do
-      RUBY_VERSION = '1.9.2'
-      Gon.send(:remove_const, :Jbuilder)
+    describe '.get_template_path' do
+      context 'template is specified' do
 
-      expect { Gon.jbuilder 'some_path' }.to raise_error(NoMethodError, /Gemfile/)
+        it 'add the extension if not included in the template name' do
+          Gon.send(:get_template_path, { :template => 'spec/test_data/sample'}, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
+        end
+
+        it 'return the specified template' do
+          Gon.send(:get_template_path, { :template => 'spec/test_data/sample.jbuilder'}, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
+        end
+
+      end
+
+      context 'template is not specified' do
+
+        before do
+          Gon.clear
+          controller.instance_variable_set('@objects', objects)
+          controller.action_name = 'show'
+        end
+
+        let(:controller) { ActionController::Base.new }
+        let(:objects) { [1,2] }
+
+        context 'the action doesn as a template at a different format' do
+          it 'return the same template as the action with rabl extension' do
+            Gon.send(:get_template_path, {:controller => controller}, 'jbuilder').should eql('app/views/action_controller/base/show.json.jbuilder')
+          end
+        end
+
+      end
     end
+
   end
 
   def request