gon 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6490edc958229669a41401931a59c79cbb3826f
-  data.tar.gz: 9e0337987644e7f2bd4c80456a1a69da673ad640
+  metadata.gz: df53612edac96aa34a023ad579922c66556c733f
+  data.tar.gz: d9edd380ed9e0f5f8175b8e0e1512b299f672d59
 SHA512:
-  metadata.gz: ba65303d31b34f7d2b9bad0d775efb210fb0eba67f30e80190639736773e4a773ed072a4276795c3271507b7f08079f99ad8c5f9b0159eb46c496c59eb768a34
-  data.tar.gz: f543c36fea096b81de1c089fa9af7c1f8845eced67410485b9a345569aa9d181c8551e5a24f6c91866e1a16022b240e24cb1a8ced93b089c2840c2920161eeb8
+  metadata.gz: c64f6170b9cd2b31e78cf140de34b9c73b8a2762d5d5f025b7649c2195254552806269b6b4682ec78594c39811ab38355304c09f4007a2fa337cf87b922ddc5d
+  data.tar.gz: 15e23d39beaa852fd98ce17ac020e6e1bbbd80943369b8f49b3804f053e5bc2630226def87972a91fff06f647f03536b62ab1d274a335f24d164a50c11293f94

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 5.2.1
+
+  * fix for jbuilder module. Thanks to @jankovy
+  * merge variable feature (for merge hash-like variables instead of overriding them). Thanks to @jalkoby
+
 ## 5.2.0
 
   * fix issue where include_gon would raise exception if the controller did not assign any gon variables. Thanks to @asalme

data/lib/gon.rb

@@ -54,11 +54,25 @@ class Gon
       current_gon.gon[name] = value
     end
 
-    def push(data = {})
+    def merge_variable(name, value)
+      old_value = all_variables[name]
+      if value.is_a?(Hash) && old_value.is_a?(Hash)
+        value = old_value.deep_merge(value)
+      end
+      set_variable(name, value)
+    end
+
+    def push(data = {}, merge = false)
       raise 'Object must have each_pair method' unless data.respond_to? :each_pair
 
-      data.each_pair do |name, value|
-        set_variable(name.to_s, value)
+      if merge
+        data.each_pair do |name, value|
+          merge_variable(name.to_s, value)
+        end
+      else
+        data.each_pair do |name, value|
+          set_variable(name.to_s, value)
+        end
       end
     end
 

data/lib/gon/jbuilder.rb

@@ -97,27 +97,20 @@ class Gon
       end
 
       def parse_path(path)
-        return path if File.exists?(path)
-
-        splitted = path.split('/')
-        if splitted.size == 2
-          tmp_path = construct_path(splitted[0], splitted[1])
-          return tmp_path if tmp_path
-        elsif splitted.size == 1
-          tmp_path = construct_path(@_controller_name, splitted[0])
-          return tmp_path if tmp_path
-        end
-
-        raise 'Something wrong with partial path in your jbuilder templates'
+        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(part1, part2)
-        tmp_path = "app/views/#{part1}/_#{part2}"
-        tmp_path = path_with_ext(tmp_path)
-        return tmp_path if tmp_path
-        tmp_path = "app/views/#{part1}/#{part2}"
-        tmp_path = path_with_ext(tmp_path)
-        return tmp_path if tmp_path
+      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)

data/lib/gon/version.rb

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

data/spec/gon/basic_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Gon do
 
   before(:each) do
+    Gon.clear
   end
 
   describe '#all_variables' do
@@ -16,7 +17,6 @@ describe Gon do
     end
 
     it 'supports all data types' do
-      Gon.clear
       Gon.int          = 1
       Gon.float        = 1.1
       Gon.string       = 'string'
@@ -27,8 +27,6 @@ describe Gon do
     end
 
     it 'can be filled with dynamic named variables' do
-      Gon.clear
-
       check = {}
       3.times do |i|
         Gon.set_variable("variable#{i}", i)
@@ -39,7 +37,6 @@ describe Gon do
     end
 
     it 'can set and get variable with dynamic name' do
-      Gon.clear
       var_name = "variable#{rand}"
 
       Gon.set_variable(var_name, 1)
@@ -47,25 +44,49 @@ describe Gon do
     end
 
     it 'can be support new push syntax' do
-      Gon.clear
-
       Gon.push({ :int => 1, :string => 'string' })
       expect(Gon.all_variables).to eq({ 'int' => 1, 'string' => 'string' })
     end
 
     it 'push with wrong object' do
       expect {
-        Gon.clear
         Gon.push(String.new('string object'))
       }.to raise_error('Object must have each_pair method')
     end
 
+    describe "#merge_variable" do
+      it 'deep merges the same key' do
+        Gon.merge_variable(:foo, { bar: { tar: 12 }, car: 23 })
+        Gon.merge_variable(:foo, { bar: { dar: 21 }, car: 12 })
+        expect(Gon.get_variable(:foo)).to  eq(bar: { tar: 12, dar: 21 }, car: 12)
+      end
+
+      it 'merges on push with a flag' do
+        Gon.push(foo: { bar: 1 })
+        Gon.push({ foo: { tar: 1 } }, :merge)
+        expect(Gon.get_variable("foo")).to eq(bar: 1, tar: 1)
+      end
+
+      context 'overrides key' do
+        specify "the previous value wasn't hash" do
+          Gon.merge_variable(:foo, 2)
+          Gon.merge_variable(:foo, { a: 1 })
+          expect(Gon.get_variable(:foo)).to eq(a: 1)
+        end
+
+        specify "the new value isn't a hash" do
+          Gon.merge_variable(:foo, { a: 1 })
+          Gon.merge_variable(:foo, 2)
+          expect(Gon.get_variable(:foo)).to eq(2)
+        end
+      end
+    end
+
   end
 
   describe '#include_gon' do
 
     before(:each) do
-      Gon.clear
       Gon::Request.
         instance_variable_set(:@request_id, request.object_id)
       expect(ActionView::Base.
@@ -261,7 +282,6 @@ describe Gon do
   describe '#include_gon_amd' do
 
     before(:each) do
-      Gon.clear
       Gon::Request.
         instance_variable_set(:@request_id, request.object_id)
       @base = ActionView::Base.new
@@ -286,7 +306,7 @@ describe Gon do
     it 'outputs correct js with an integer' do
       Gon.int = 1
 
-      expect(@base.include_gon_amd).to eq( wrap_script( 
+      expect(@base.include_gon_amd).to eq( wrap_script(
                                     'define(\'gon\',[],function(){'+
                                     'var gon={};gon[\'int\']=1;return gon;'+
                                     '});')
@@ -294,7 +314,7 @@ describe Gon do
     end
 
     it 'outputs correct module name when given a namespace' do
-      expect(@base.include_gon_amd(namespace: 'data')).to eq(wrap_script( 
+      expect(@base.include_gon_amd(namespace: 'data')).to eq(wrap_script(
                                     'define(\'data\',[],function(){'+
                                     'var gon={};return gon;'+
                                     '});')
@@ -303,7 +323,6 @@ describe Gon do
   end
 
   it 'returns exception if try to set public method as variable' do
-    Gon.clear
     expect { Gon.all_variables = 123 }.to raise_error
     expect { Gon.rabl = 123 }.to raise_error
   end

data/spec/spec_helper.rb

@@ -1,4 +1,13 @@
 require 'gon'
+
+# We don't require rails for specs, but jbuilder works only in rails.
+# And it checks version of rails. I've decided to configure jbuilder for rails v4
+module Rails
+  module VERSION
+    MAJOR = 4
+  end
+end
+
 require 'jbuilder'
 require 'rabl'
 require 'rabl-rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -233,3 +233,4 @@ test_files:
 - spec/test_data/sample_with_helpers_rabl_rails.rabl
 - spec/test_data/sample_with_locals.json.jbuilder
 - spec/test_data/sample_with_partial.json.jbuilder
+has_rdoc: