gon 5.2.3 → 6.0.0

data/lib/gon/helpers.rb

@@ -3,10 +3,7 @@ class Gon
     def include_gon(options = {})
       if variables_for_request_present?
         Gon::Base.render_data(options)
-      elsif Gon.global.all_variables.present?
-        Gon.clear
-        Gon::Base.render_data(options)
-      elsif options[:init].present?
+      elsif Gon.global.all_variables.present? || options[:init].present?
         Gon.clear
         Gon::Base.render_data(options)
       else
@@ -15,7 +12,7 @@ class Gon
     end
 
     def include_gon_amd(options={})
-      Gon::Base.render_data_amd(options)
+      Gon::Base.render_data(options.merge({amd: true}))
     end
 
     private

data/lib/gon/jbuilder.rb

@@ -4,27 +4,27 @@ class Gon
 
       def handler(args, global = false)
         options = parse_options_from args
-        if global && !options[:template]
-          raise 'You should provide :template when use rabl with global variables'
-        end
-        controller = Gon::Base.get_controller(options)
-        @_controller_name = global ? '' : controller.controller_path
+        valid_options? options, global
 
-        include_helpers
+        controller = Gon::EnvFinder.controller_env(options)
+        controller_name = global ? '' : controller.controller_path
 
-        data = parse_jbuilder \
-          Gon::Base.get_template_path(options, 'jbuilder'),
-          controller,
-          options[:locals]
+        parser = Gon::Jbuilder::Parser.new(
+          template_path: Gon::EnvFinder.template_path(options, 'jbuilder'),
+          controller: controller,
+          controller_name: controller_name,
+          locals: options[:locals]
+        )
+        data = parser.parse!
 
         [data, options]
       end
 
       private
 
-      def include_helpers
-        unless self.class.include? ::ActionView::Helpers
-          self.class.send(:include, ::ActionView::Helpers)
+      def valid_options?(options, global)
+        if global && !options[:template]
+          raise 'You should provide :template when use rabl with global variables'
         end
       end
 
@@ -32,7 +32,7 @@ class Gon
         if old_api? args
           text =  "[DEPRECATION] view_path argument is now optional. "
           text << "If you need to specify it, "
-          text << "please use gon.rabl(:template => 'path')"
+          text << "please use gon.jbuilder(:template => 'path')"
           warn text
 
           args.extract_options!.merge(:template => args[0])
@@ -51,92 +51,6 @@ class Gon
         args.first.is_a? Hash
       end
 
-      def parse_jbuilder(jbuilder_path, controller, locals)
-        controller.instance_variables.each do |name|
-          self.instance_variable_set \
-            name,
-            controller.instance_variable_get(name)
-        end
-        controller._helper_methods.each do |meth|
-          self.class.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
-              def #{meth}(*args, &blk)                               # def current_user(*args, &blk)
-                __controller.send(%(#{meth}), *args, &blk)             #   controller.send(:current_user, *args, &blk)
-              end                                                    # end
-            ruby_eval
-        end
-        locals ||= {}
-        locals['__controller'] = controller
-        locals.each do |name, value|
-          self.class.class_eval do
-            define_method "#{name}" do
-              return value
-            end
-          end
-        end
-        lines = find_partials File.readlines(jbuilder_path)
-        source = lines.join('')
-
-        output = parse_source source, controller
-      end
-
-      def parse_source(source, controller)
-        output = ::JbuilderTemplate.encode(controller) do |json|
-          eval source
-        end
-        JSON.parse(output)
-      end
-
-      def parse_partial(partial_line)
-        path = partial_line.match(/['"]([^'"]*)['"]/)[1]
-        path = parse_path path
-        options_hash = partial_line.match(/,(.*)/)[1]
-
-        set_options_from_hash(options_hash) if options_hash.present?
-
-        find_partials File.readlines(path)
-      end
-
-      def set_options_from_hash(options_hash)
-        options = eval "{#{options_hash}}"
-        options.each do |name, val|
-          self.instance_variable_set("@#{name.to_s}", val)
-          eval "def #{name}; self.instance_variable_get('@' + '#{name.to_s}'); end"
-        end
-      end
-
-      def parse_path(path)
-        return path if File.exists?(path)
-        if (splitted = path.split('/')).blank?
-            raise 'Something wrong with partial path in your jbuilder templates'
-        elsif splitted.size == 1
-            splitted.shift(@_controller_name)
-        end
-        construct_path(splitted)
-      end
-
-      def construct_path(args)
-        last_arg = args.pop
-        tmp_path = 'app/views/' + args.join('/')
-        path = path_with_ext(tmp_path + "/_#{last_arg}")
-        path || path_with_ext(tmp_path + "/#{last_arg}")
-      end
-
-      def path_with_ext(path)
-        return path if File.exists?(path)
-        return "#{path}.jbuilder" if File.exists?("#{path}.jbuilder")
-        return "#{path}.json.jbuilder" if File.exists?("#{path}.json.jbuilder")
-      end
-
-      def find_partials(lines = [])
-        lines.map do |line|
-          if line =~ /partial!/
-            parse_partial line
-          else
-            line
-          end
-        end.flatten
-      end
-
     end
   end
 end

data/lib/gon/jbuilder/parser.rb

@@ -0,0 +1,128 @@
+class Gon
+  module Jbuilder
+    class Parser
+      include ::ActionView::Helpers
+
+      attr_accessor :template_path, :controller, :_controller_name, :locals
+
+      def initialize(parse_params)
+        @template_path    = parse_params[:template_path]
+        @controller       = parse_params[:controller]
+        @_controller_name = parse_params[:controller_name]
+        @locals           = parse_params[:locals] || {}
+      end
+
+      def parse!
+        assign_controller_variables controller
+        eval_controller_helpers controller
+        eval_controller_url_helpers controller
+        locals['__controller'] = controller
+        wrap_locals_in_methods locals
+
+        partials = find_partials(File.readlines(template_path))
+        source = partials.join('')
+
+        parse_source source, controller
+      end
+
+      def assign_controller_variables(controller)
+        controller.instance_variables.each do |name|
+          self.instance_variable_set \
+            name,
+            controller.instance_variable_get(name)
+        end
+      end
+
+      def eval_controller_helpers(controller)
+        controller._helper_methods.each do |meth|
+          self.class.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
+              def #{meth}(*args, &blk)                               # def current_user(*args, &blk)
+                __controller.send(%(#{meth}), *args, &blk)             #   controller.send(:current_user, *args, &blk)
+              end                                                    # end
+            ruby_eval
+        end
+      end
+
+      def eval_controller_url_helpers(controller)
+        if defined?(Rails) && Rails.respond_to?(:application)
+          Rails.application.routes.url_helpers.instance_methods.each do |meth|
+            self.class.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
+              def #{meth}(*args, &blk)                                         # def user_path(*args, &blk)
+                __controller.send(%(#{meth}), *args, &blk)                     #   controller.send(:user_path, *args, &blk)
+              end                                                              # end
+            ruby_eval
+          end
+        end
+      end
+
+      def wrap_locals_in_methods(locals)
+        locals.each do |name, value|
+          self.class.class_eval do
+            define_method "#{name}" do
+              return value
+            end
+          end
+        end
+      end
+
+      def parse_source(source, controller)
+        output = ::JbuilderTemplate.encode(controller) do |json|
+          eval source
+        end
+        JSON.parse(output)
+      end
+
+      def parse_partial(partial_line)
+        path = partial_line.match(/['"]([^'"]*)['"]/)[1]
+        path = parse_path path
+        options_hash = partial_line.match(/,(.*)/)[1]
+
+        set_options_from_hash(options_hash) if options_hash.present?
+
+        find_partials File.readlines(path)
+      end
+
+      def set_options_from_hash(options_hash)
+        options = eval "{#{options_hash}}"
+        options.each do |name, val|
+          self.instance_variable_set("@#{name.to_s}", val)
+          eval "def #{name}; self.instance_variable_get('@' + '#{name.to_s}'); end"
+        end
+      end
+
+      def parse_path(path)
+        return path if File.exists?(path)
+        if (splitted = path.split('/')).blank?
+            raise 'Something wrong with partial path in your jbuilder templates'
+        elsif splitted.size == 1
+            splitted.shift(@_controller_name)
+        end
+        construct_path(splitted)
+      end
+
+      def construct_path(args)
+        last_arg = args.pop
+        tmp_path = 'app/views/' + args.join('/')
+        path = path_with_ext(tmp_path + "/_#{last_arg}")
+        path || path_with_ext(tmp_path + "/#{last_arg}")
+      end
+
+      def path_with_ext(path)
+        return path if File.exists?(path)
+        return "#{path}.jbuilder" if File.exists?("#{path}.jbuilder")
+        return "#{path}.json.jbuilder" if File.exists?("#{path}.json.jbuilder")
+      end
+
+      def find_partials(lines = [])
+        lines.map do |line|
+          if line =~ /partial!/
+            parse_partial line
+          else
+            line
+          end
+        end.flatten
+      end
+
+    end
+  end
+end

data/lib/gon/rabl.rb

@@ -20,8 +20,8 @@ class Gon
         end
 
         data = parse_rabl \
-          Gon::Base.get_template_path(options, 'rabl'),
-          Gon::Base.get_controller(options),
+          Gon::EnvFinder.template_path(options, 'rabl'),
+          Gon::EnvFinder.controller_env(options),
           options[:locals]
 
         [data, options]
@@ -53,7 +53,7 @@ class Gon
         source = File.read(rabl_path)
         original_formats = controller.formats
         controller.formats = [:json]
-        view_context = controller.view_context
+        view_context = controller.send(:view_context)
         locals.each { |k, v| view_context.assigns[k.to_s] = v }
         output = RablRails::Library.instance.get_rendered_template(source, view_context)
         controller.formats = original_formats

data/lib/gon/spec_helpers.rb

@@ -9,7 +9,7 @@ class Gon
             # preload threadlocal & store controller instance
             if controller.is_a? ActionController::Base
               controller.gon
-              Gon.send(:current_gon).env[Gon::Base::ENV_CONTROLLER_KEY] =
+              Gon.send(:current_gon).env[Gon::EnvFinder::ENV_CONTROLLER_KEY] =
                controller
             end
             super

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '5.2.3'
+  VERSION = '6.0.0'
 end

data/lib/gon/watch.rb

@@ -39,7 +39,7 @@ class Gon
       end
 
       def return_variable?(variable)
-        controller = Gon::Base.get_controller
+        controller = Gon::EnvFinder.controller_env
         params = controller.params
         variable = variable.to_s.gsub('=', '')
 
@@ -49,7 +49,7 @@ class Gon
       end
 
       def return_variable(value)
-        controller = Gon::Base.get_controller
+        controller = Gon::EnvFinder.controller_env
         controller.render json: Gon::Escaper.escape_unicode(Gon::JsonDumper.dump value)
       end
 

data/spec/gon/basic_spec.rb

@@ -20,6 +20,7 @@ describe Gon do
       Gon.int          = 1
       Gon.float        = 1.1
       Gon.string       = 'string'
+      Gon.symbol       = :symbol
       Gon.array        = [1, 'string']
       Gon.hash_var     = { :a => 1, :b => '2' }
       Gon.hash_w_array = { :a => [2, 3] }
@@ -89,17 +90,14 @@ describe Gon do
     before(:each) do
       Gon::Request.
         instance_variable_set(:@request_id, request.object_id)
-      expect(ActionView::Base.
-        instance_methods.
-        map(&:to_s).
-        include?('include_gon')).to eq(true)
+      expect(ActionView::Base.instance_methods).to include(:include_gon)
       @base = ActionView::Base.new
       @base.request = request
     end
 
     it 'outputs correct js with an integer' do
       Gon.int = 1
-      expect(@base.include_gon).to eq('<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     'gon.int=1;' +
@@ -109,7 +107,7 @@ describe Gon do
 
     it 'outputs correct js with a string' do
       Gon.str = %q(a'b"c)
-      expect(@base.include_gon).to eq('<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     %q(gon.str="a'b\"c";) +
@@ -120,7 +118,7 @@ describe Gon do
     it 'outputs correct js with a script string' do
       Gon.str = %q(</script><script>alert('!')</script>)
       escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
-      expect(@base.include_gon).to eq('<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     %Q(gon.str="#{escaped_str}";) +
@@ -128,10 +126,20 @@ describe Gon do
                                   '</script>')
     end
 
+    it 'outputs correct js with an integer and type' do
+      Gon.int = 1
+      expect(@base.include_gon(type: true)).to eq('<script type="text/javascript">' +
+                                    "\n//<![CDATA[\n" +
+                                    'window.gon={};' +
+                                    'gon.int=1;' +
+                                    "\n//]]>\n" +
+                                  '</script>')
+    end
+
     it 'outputs correct js with an integer, camel-case and namespace' do
       Gon.int_cased = 1
       expect(@base.include_gon(camel_case: true, namespace: 'camel_cased')).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.camel_cased={};' +
                                     'camel_cased.intCased=1;' +
@@ -143,7 +151,7 @@ describe Gon do
     it 'outputs correct js with camel_depth = :recursive' do
       Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
       expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     'gon.testHash={"testDepthOne":{"testDepthTwo":1}};' +
@@ -155,7 +163,7 @@ describe Gon do
     it 'outputs correct js with camel_depth = 2' do
       Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
       expect(@base.include_gon(camel_case: true, camel_depth: 2)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     'gon.testHash={"testDepthOne":{"test_depth_two":1}};' +
@@ -167,7 +175,7 @@ describe Gon do
     it 'outputs correct js for an array with camel_depth = :recursive' do
       Gon.test_hash = { test_depth_one: [{ test_depth_two: 1 }, { test_depth_two: 2 }] }
       expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     'gon.testHash={"testDepthOne":[{"testDepthTwo":1},{"testDepthTwo":2}]};' +
@@ -221,7 +229,7 @@ describe Gon do
 
     it 'outputs correct js with type text/javascript' do
       expect(@base.include_gon(need_type: true, init: true)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};'\
                                     "\n//]]>\n" +
@@ -231,7 +239,7 @@ describe Gon do
 
     it 'outputs correct js with namespace check' do
       expect(@base.include_gon(namespace_check: true)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon=window.gon||{};'\
                                     "\n//]]>\n" +
@@ -241,7 +249,7 @@ describe Gon do
 
     it 'outputs correct js without namespace check' do
       expect(@base.include_gon(namespace_check: false)).to eq( \
-                                  '<script type="text/javascript">' +
+                                  '<script>' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};'\
                                     "\n//]]>\n" +
@@ -257,7 +265,7 @@ describe Gon do
       end
 
       it "does not raise an exception" do
-        expect { @base.include_gon }.to_not raise_error(Exception)
+        expect { @base.include_gon }.to_not raise_error
       end
 
       it 'outputs correct js' do
@@ -266,7 +274,7 @@ describe Gon do
 
       it 'outputs correct js with init' do
         expect(@base.include_gon(init: true)).to eq( \
-                                    '<script type="text/javascript">' +
+                                    '<script>' +
                                       "\n//<![CDATA[\n" +
                                       'window.gon={};'\
                                       "\n//]]>\n" +
@@ -289,10 +297,7 @@ describe Gon do
     end
 
     it 'is included in ActionView::Base as a helper' do
-      expect(ActionView::Base.
-        instance_methods.
-        map(&:to_s).
-        include?('include_gon_amd')).to eq(true)
+      expect(ActionView::Base.instance_methods).to include(:include_gon_amd)
     end
 
     it 'outputs correct js without variables' do
@@ -323,8 +328,8 @@ describe Gon do
   end
 
   it 'returns exception if try to set public method as variable' do
-    expect { Gon.all_variables = 123 }.to raise_error
-    expect { Gon.rabl = 123 }.to raise_error
+    expect { Gon.all_variables = 123 }.to raise_error(RuntimeError)
+    expect { Gon.rabl = 123 }.to raise_error(RuntimeError)
   end
 
   describe '#check_for_rabl_and_jbuilder' do
@@ -334,15 +339,15 @@ describe Gon do
     it 'should be able to handle ruby 1.8.7 style constants array (strings)' do
       constants_as_strings = Gon.constants.map(&:to_s)
       allow(Gon).to receive(:constants) { constants_as_strings }
-      expect { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
-      expect { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
+      expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
+      expect { Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
 
     it 'should be able to handle ruby 1.9+ style constants array (symbols)' do
       constants_as_symbols = Gon.constants.map(&:to_sym)
       allow(Gon).to receive(:constants) { constants_as_symbols }
-      expect { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
-      expect { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
+      expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
+      expect { Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
   end
 
@@ -350,8 +355,8 @@ describe Gon do
     @request ||= double 'request', :env => {}
   end
 
-  def wrap_script(content, type='text/javascript', cdata=true)
-    script = "<script type=\"#{type}\">"
+  def wrap_script(content, cdata=true)
+    script = "<script>"
     script << "\n//<![CDATA[\n" if cdata
     script << content
     script << "\n//]]>\n" if cdata