gon 4.0.0 → 4.0.1

data/.gitignore

@@ -2,4 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
-
+.rvmrc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 4.0.1
+
+  * Removed BlankSlate requirement *Peter Schröder*
+  * Gon#set_variable and Gon#get_variable moved to public scope
+  * Added option :locals to gon.rabl functionality
+
 ## 4.0.0
 
   * Added gon.watch functionality (thanks to @brainopia and @kossnocorp)

data/lib/gon.rb

@@ -1,6 +1,3 @@
-if defined?(Jbuilder)
-  gem 'blankslate'
-end
 require 'action_view'
 require 'action_controller'
 require 'gon/base'
@@ -39,6 +36,14 @@ class Gon
       end
     end
 
+    def get_variable(name)
+      Request.gon[name]
+    end
+
+    def set_variable(name, value)
+      Request.gon[name] = value
+    end
+
     def all_variables
       Request.gon
     end
@@ -71,14 +76,6 @@ class Gon
 
     private
 
-    def get_variable(name)
-      Request.gon[name]
-    end
-
-    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)

data/lib/gon/rabl.rb

@@ -15,17 +15,21 @@ class Gon
 
         data = parse_rabl \
           Gon::Base.get_template_path(options, 'rabl'),
-          Gon::Base.get_controller(options)
+          Gon::Base.get_controller(options),
+          options[:locals]
 
         [data, options]
       end
 
       private
 
-      def parse_rabl(rabl_path, controller)
+      def parse_rabl(rabl_path, controller, locals)
+        locals ||= {}
         source = File.read(rabl_path)
         rabl_engine = ::Rabl::Engine.new(source, :format => 'json')
-        output = rabl_engine.render(controller, {})
+
+        output = rabl_engine.render(controller, locals)
+
         JSON.parse(output)
       end
 

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

data/lib/gon/watch.rb

@@ -109,7 +109,7 @@ class Gon
       def return_variable(value)
         controller = Gon::Base.get_controller
 
-        controller.render :text => value.to_json
+        controller.render :json => value
       end
 
     end

data/spec/gon/basic_spec.rb

@@ -27,6 +27,26 @@ describe Gon do
       Gon.klass         = Hash
     end
 
+    it 'can be filled with dynamic named variables' do
+      Gon.clear
+
+      check = {}
+      3.times do |i|
+        Gon.set_variable("variable#{i}", i)
+        check["variable#{i}"] = i
+      end
+
+      Gon.all_variables.should == check
+    end
+
+    it 'can set and get variable with dynamic name' do
+      Gon.clear
+      var_name = "variable#{rand}"
+
+      Gon.set_variable var_name, 1
+      Gon.get_variable(var_name).should == 1
+    end
+
   end
 
   describe '#include_gon' do

data/spec/gon/rabl_spec.rb

@@ -27,6 +27,25 @@ describe Gon do
       end
     end
 
+    context 'option locals' do
+      it 'works without locals object properly' do
+        Gon.rabl(
+          :template =>'spec/test_data/sample.rabl',
+          :controller => controller
+        )
+        Gon.objects.map { |it| it['object']['inspect'] }.should == ['1', '2']
+      end
+
+      it 'works with different locals object' do
+        Gon.rabl(
+          :template =>'spec/test_data/sample.rabl',
+          :controller => controller,
+          :locals => { :objects => [3, 4] }
+        )
+        Gon.objects.map { |it| it['object']['inspect'] }.should == ['3', '4']
+      end
+    end
+
     it 'works if rabl is included' do
       Gon.rabl :template =>'spec/test_data/sample.rabl', :controller => controller
       Gon.objects.length.should == 2

data/spec/gon/watch_spec.rb

@@ -54,7 +54,7 @@ describe Gon::Watch do
     controller.params = params
     Gon::Request.env['action_controller.instance'] = controller
 
-    controller.should_receive('render').with(:text => '1')
+    controller.should_receive('render').with(:json => 1)
 
     Gon.watch.a = 1
   end

data/spec/test_data/sample.rabl

@@ -1,2 +1,2 @@
 collection @objects => 'objects'
-attributes :id
+attributes :inspect

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack