Continue refactoring

Author: gazay

lib/gon.rb

@@ -17,14 +17,6 @@
 module Gon
   class << self
 
-    def all_variables
-      Request.gon
-    end
-
-    def clear
-      Request.clear
-    end
-
     def method_missing(method, *args, &block)
       if ( method.to_s =~ /=$/ )
         if public_method_name? method
@@ -37,6 +29,31 @@ def method_missing(method, *args, &block)
       end
     end
 
+    def all_variables
+      Request.gon
+    end
+
+    def clear
+      Request.clear
+    end
+
+    def rabl(*args)
+      data, options = Gon::Rabl.handler(args)
+
+      store_builder_data 'rabl', data, options
+    end
+
+    def jbuilder(*args)
+      if RUBY_VERSION < '1.9'
+        text = 'You can use Jbuilder support only in 1.9+'
+        raise NoMethodError.new text
+      end
+
+      data, options = Gon::Jbuilder.handler(args)
+
+      store_builder_data 'jbuilder', data, options
+    end
+
     def inspect
       'Gon'
     end
@@ -51,6 +68,18 @@ def set_variable(name, value)
       Request.gon[name] = value
     end
 
+    def store_builder_data(builder, data, options)
+      if options[:as]
+        set_variable(options[:as].to_s, data)
+      elsif data.is_a? Hash
+        data.each do |key, value|
+          set_variable(key, value)
+        end
+      else
+        set_variable(builder, data)
+      end
+    end
+
     def public_method_name?(method)
       public_methods.include?(
         if RUBY_VERSION > '1.9'

lib/gon/base.rb

@@ -6,63 +6,24 @@ def global
         Global
       end
 
-      protected
-
-      def check_method(method, *args, &block)
-
-      end
-
-      private
-
-
-
-      def get_variable(name)
-        raise NotImplementedError
-      end
-
-      def set_variable(name, value)
-        raise NotImplementedError
-      end
-
-      %w(rabl jbuilder).each do |builder_name|
-        define_method builder_name do |*options|
-          if options.first.is_a? String
-            warn "[DEPRECATION] view_path argument is now optional. If you need to specify it please use #{builder}(:template => 'path')"
-            options = options.extract_options!.merge(:template => options[0])
-          else
-            options = (options && options.first.is_a?(Hash)) ? options.first : { }
+      def render_data(options)
+        data = Gon.all_variables
+        namespace = options[:namespace] || 'gon'
+        start = '<script>window.' + namespace + ' = {};'
+        script = ''
+
+        if options[:camel_case]
+          data.each do |key, val|
+            script << "#{namespace}.#{key.to_s.camelize(:lower)}=#{val.to_json};"
           end
-
-          builder_module = get_builder(builder_name)
-
-          data = builder_module.send("parse_#{builder_name}", get_template_path(options, builder_name), get_controller(options))
-
-          if options[:as]
-            set_variable(options[:as].to_s, data)
-          elsif data.is_a? Hash
-            data.each do |key, value|
-              set_variable(key, value)
-            end
-          else
-            set_variable(builder_name, data)
+        else
+          data.each do |key, val|
+            script << "#{namespace}.#{key.to_s}=#{val.to_json};"
           end
         end
-      end
-      alias_method :orig_jbuilder, :jbuilder
 
-      def jbuilder(*options)
-        raise NoMethodError.new('You can use Jbuilder support only in 1.9+') if RUBY_VERSION < '1.9'
-        orig_jbuilder(*options)
-      end
-
-      private
-
-      def get_builder(builder_name)
-        begin
-          "Gon::#{builder_name.classify}".constantize
-        rescue
-          raise NoMethodError.new("You should define #{builder_name.classify} in your Gemfile")
-        end
+        script = start + Gon::Escaper.escape(script) + '</script>'
+        script.html_safe
       end
 
       def get_controller(options)
@@ -75,12 +36,24 @@ def get_controller(options)
 
       def get_template_path(options, extension)
         if options[:template]
-          File.extname(options[:template]) == ".#{extension}" ? options[:template] : "#{options[:template]}.#{extension}"
+          if right_extension?(extension, options[:template])
+            options[:template]
+          else
+            [options[:template], extension].join('.')
+          end
         else
-          "app/views/#{get_controller(options).controller_path}/#{get_controller(options).action_name}.json.#{extension}"
+          controller = get_controller(options).controller_path
+          action = get_controller(options).action_name
+          "app/views/#{controller}/#{action}.json.#{extension}"
         end
       end
 
+      private
+
+      def right_extension?(extension, template_path)
+        File.extname(template_path) == ".#{extension}"
+      end
+
     end
   end
 end

lib/gon/helpers.rb

@@ -8,27 +8,21 @@ def self.included base
     module InstanceMethods
 
       def include_gon(options = {})
-        if Gon.request_env && Gon.all_variables.present? && Gon.request == request.object_id
-          data = Gon.all_variables
-          namespace = options[:namespace] || 'gon'
-          start = '<script>window.' + namespace + ' = {};'
-          script = ''
-          if options[:camel_case]
-            data.each do |key, val|
-              script << namespace + '.' + key.to_s.camelize(:lower) + '=' + val.to_json + ';'
-            end
-          else
-            data.each do |key, val|
-              script << namespace + '.' + key.to_s + '=' + val.to_json + ';'
-            end
-          end
-          script = start + Gon::Escaper.escape(script) + '</script>'
-          script.html_safe
+        if variables_for_request_present?
+          Gon::Base.render_data(options)
         else
           ""
         end
       end
 
+      private
+
+      def variables_for_request_present?
+        Gon::Request.env &&
+        Gon::Request.id == request.object_id &&
+        Gon.all_variables.present?
+      end
+
     end
   end
 
@@ -41,13 +35,20 @@ def self.included base
     module InstanceMethods
 
       def gon
-        if !Gon.request_env || Gon.request != request.object_id
-          Gon.request = request.object_id
-          Gon.request_env = request.env
+        if wrong_gon_request?
+          Gon::Request.id = request.object_id
+          Gon::Request.env = request.env
         end
         Gon
       end
 
+      private
+
+      def wrong_gon_request?
+        Gon::Request.env.blank? ||
+        Gon::Request.id != request.object_id
+      end
+
     end
 
   end

lib/gon/jbuilder.rb

@@ -2,21 +2,58 @@ module Gon
   module Jbuilder
     class << self
 
-      def parse_source(source, controller)
-        output = ::JbuilderTemplate.encode(controller) do |json|
-          eval source
+      def handler(args)
+        options = parse_options_from args
+
+        data = parse_jbuilder \
+          Gon::Base.get_template_path(options,'jbuilder'),
+          Gon::Base.get_controller(options)
+
+        [data, options]
+      end
+
+      private
+
+      def parse_options_from(args)
+        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')"
+          warn text
+
+          args.extract_options!.merge(:template => args[0])
+        elsif new_api? args
+          args.first
+        else
+          {}
         end
-        JSON.parse(output)
+      end
+
+      def old_api?(args)
+        args.first.is_a? String
+      end
+
+      def new_api?(args)
+        args.first.is_a? Hash
       end
 
       def parse_jbuilder(jbuilder_path, controller)
         controller.instance_variables.each do |name|
-          self.instance_variable_set(name, controller.instance_variable_get(name))
+          self.instance_variable_set \
+            name,
+            controller.instance_variable_get(name)
         end
-        lines = find_partials(File.readlines(jbuilder_path))
+        lines = find_partials File.readlines(jbuilder_path)
         source = lines.join('')
 
-        output = parse_source(source, controller)
+        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)
@@ -29,7 +66,7 @@ def parse_partial(partial_line)
             eval "def #{name}; self.instance_variable_get('@' + '#{name.to_s}'); end"
           end
         end
-        find_partials(File.readlines(path))
+        find_partials File.readlines(path)
       end
 
       def find_partials(lines = [])

lib/gon/rabl.rb

@@ -4,13 +4,48 @@ module Gon
   module Rabl
     class << self
 
+      def handler(args)
+        options = parse_options_from args
+
+        data = parse_rabl \
+          Gon::Base.get_template_path(options, 'rabl'),
+          Gon::Base.get_controller(options)
+
+        [data, options]
+      end
+
+      private
+
       def parse_rabl(rabl_path, controller)
         source = File.read(rabl_path)
         rabl_engine = ::Rabl::Engine.new(source, :format => 'json')
         output = rabl_engine.render(controller, {})
         JSON.parse(output)
       end
 
+      def parse_options_from(args)
+        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')"
+          warn text
+
+          args.extract_options!.merge(:template => args[0])
+        elsif new_api? args
+          args.first
+        else
+          {}
+        end
+      end
+
+      def old_api?(args)
+        args.first.is_a? String
+      end
+
+      def new_api?(args)
+        args.first.is_a? Hash
+      end
+
     end
   end
 end

lib/gon/request.rb

@@ -11,11 +11,11 @@ def env=(environment)
         @request_env['gon'] ||= {}
       end
 
-      def request
+      def id
         @request_id if defined? @request_id
       end
 
-      def request=(request_id)
+      def id=(request_id)
         @request_id = request_id
       end