gon 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df53612edac96aa34a023ad579922c66556c733f
-  data.tar.gz: d9edd380ed9e0f5f8175b8e0e1512b299f672d59
+  metadata.gz: fb56c6f655c420fb5f2b19813f08d6ffa9be49eb
+  data.tar.gz: ac393884fd947158ffa948191d261c2f3f3f3739
 SHA512:
-  metadata.gz: c64f6170b9cd2b31e78cf140de34b9c73b8a2762d5d5f025b7649c2195254552806269b6b4682ec78594c39811ab38355304c09f4007a2fa337cf87b922ddc5d
-  data.tar.gz: 15e23d39beaa852fd98ce17ac020e6e1bbbd80943369b8f49b3804f053e5bc2630226def87972a91fff06f647f03536b62ab1d274a335f24d164a50c11293f94
+  metadata.gz: 0e7693c1b853436ebfa220a91a77ab49d34fad3b9deba29fc8f6c3aa1e4bfcfefa1ba6a2472218462bece617d5cd99c06cabab9c67eafa395dd8c7955276074e
+  data.tar.gz: 34c336d1e7851168c7f3284f230f10967bbaa3368b900978547e3965ffe143b5d793085b6503f51f13dd821e713b422b7dab646ea833fc9ceb2791e238c1fb88

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 5.2.2
+
+  * add support for controller helper methods in jbuilder
+
 ## 5.2.1
 
   * fix for jbuilder module. Thanks to @jankovy

data/lib/gon/jbuilder.rb

@@ -57,7 +57,15 @@ class Gon
             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
@@ -97,20 +105,20 @@ class Gon
       end
 
       def parse_path(path)
-        return path if File.exists?(path)                                     
-        if (splitted = path.split('/')).blank?                                
+        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)                                              
+        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('/')        
+        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}")        
+        path || path_with_ext(tmp_path + "/#{last_arg}")
       end
 
       def path_with_ext(path)

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '5.2.1'
+  VERSION = '5.2.2'
 end

data/spec/gon/jbuilder_spec.rb

@@ -32,16 +32,16 @@ describe Gon do
       end
 
       it 'render json from jbuilder template with controller methods' do
-        pending
-        controller.instance_eval {
+        class << controller
           def private_controller_method
-            puts 'gon test helper works'
+            'gon test helper works'
           end
+          helper_method :private_controller_method
           private :private_controller_method
-        }
+        end
 
         Gon.jbuilder 'spec/test_data/sample_with_controller_method.json.jbuilder', :controller => controller
-        expect(Gon.date).to eq('about 6 hours')
+        expect(Gon.data_from_method).to eq('gon test helper works')
       end
 
       it 'render json from jbuilder template with a partial' do

data/spec/gon/rabl_with_rabl_rails_spec.rb

@@ -4,6 +4,7 @@ describe Gon do
 
   before(:all) do
     ensure_rabl_rails_is_loaded
+    RablRails.configuration.cache_templates = false
   end
 
   describe '.rabl with rabl-rails gem' do
@@ -16,7 +17,7 @@ describe Gon do
 
     let(:controller) { ActionController::Base.new }
     let(:objects) { [1, 2] }
-  
+
     context 'render template with deprecation' do
       it 'still works' do
         Gon.rabl 'spec/test_data/sample_rabl_rails.rabl', :controller => controller
@@ -32,7 +33,7 @@ describe Gon do
         )
         expect(Gon.objects.map { |it| it['inspect'] }).to eq(%w(1 2))
       end
-      
+
       it 'works with different locals object' do
         Gon.rabl(
           :template => 'spec/test_data/sample_rabl_rails.rabl',

data/spec/spec_helper.rb

@@ -23,9 +23,11 @@ def ensure_rabl_is_loaded
     load 'rabl.rb'
     load 'rabl/version.rb'
     load 'rabl/helpers.rb'
+    load 'rabl/sources.rb'
     load 'rabl/partials.rb'
-    load 'rabl/engine.rb'
+    load 'rabl/multi_builder.rb'
     load 'rabl/builder.rb'
+    load 'rabl/engine.rb'
     load 'rabl/configuration.rb'
     load 'rabl/renderer.rb'
     load 'rabl/cache_engine.rb'
@@ -36,14 +38,17 @@ end
 def ensure_rabl_rails_is_loaded
   Object.send(:remove_const, :Rabl) if defined? Rabl
   unless defined? RablRails
-    load 'rabl-rails/template.rb'
-    load 'rabl-rails/condition.rb'
+    load 'rabl-rails/renderer.rb'
+    load 'rabl-rails/helpers.rb'
+    load 'rabl-rails/configuration.rb'
+    load 'rabl-rails/nodes/node.rb'
+    load 'rabl-rails/nodes/attribute.rb'
     load 'rabl-rails/compiler.rb'
-    load 'rabl-rails/renderers/base.rb'
+    load 'rabl-rails/renderers/hash.rb'
     load 'rabl-rails/renderers/json.rb'
-    load 'rabl-rails/renderer.rb'
-    load 'rabl-rails/library.rb'
     load 'rabl-rails.rb'
+    load 'rabl-rails/template.rb'
+    load 'rabl-rails/library.rb'
   end
 end
 

data/spec/test_data/sample_with_controller_method.json.jbuilder

@@ -1 +1,2 @@
 json.objects @objects
+json.data_from_method private_controller_method

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack