gon 2.0.4 → 2.0.5

data/README.md

@@ -208,6 +208,15 @@ Use gon with [Jbuilder](https://github.com/rails/jbuilder) as with [Rabl](https:
 
 Jbuilder works now only on Ruby 1.9+, so Gon support for Jbuilder works on 1.9+ only
 
+  0. Add jbuilder to your Gemfile (because of it depends on
+     ActiveSuppurt '~> 3.0.0')
+
+    `Gemfile`
+
+    ``` ruby
+    gem 'jbuilder'
+    ```
+
   1. Create Jbuilder template.
 
     `app/views/posts/index.json.jbuilder`
@@ -227,12 +236,29 @@ Jbuilder works now only on Ruby 1.9+, so Gon support for Jbuilder works on 1.9+
       # some controller logic
     end
     ```
+
 In javascript file for view of this action write call to your variable:
 
+Now you can use partials in jbuilder:
+
+`app/views/posts/index.json.jbuilder`
+
+``` jbuilder
+json.partial! 'app/views/posts/_part.json.jbuilder', :comments => @posts[0].comments
+```
+
+`app/views/posts/_part.json.jbuilder`
+
+``` jbuilder
+json.comments comments.map{ |it| 'comment#' + it.id }
+```
+
 ``` js
 alert(gon.posts)
 alert(gon.posts[0])
 alert(gon.posts[0].post.body)
+alert(gon.comments)
+alert(gon.comments[0])
 ```
 
 P.s. If you didn't put include_gon tag in your html head area - it
@@ -243,13 +269,13 @@ wouldn't work. You can read about this in common usage above.
 Puts this line into `Gemfile` then run `$ bundle`:
 
 ``` ruby
-gem 'gon', '2.0.4'
+gem 'gon', '2.0.5'
 ```
 
 Or if you are old-school Rails 2 developer put this into `config/environment.rb` and run `$ rake gems:install`:
 
 ``` ruby
-config.gem 'gon', :version => '2.0.4'
+config.gem 'gon', :version => '2.0.5'
 ```
 
 Or manually install gon gem: `$ gem install gon`

data/gon.gemspec

@@ -20,9 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency "actionpack", '>= 2.3.0'
   s.add_dependency "rabl"
-  if RUBY_VERSION =~ /9/
-    s.add_dependency "jbuilder"
-  end
   s.add_dependency "json"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "jbuilder"
 end

data/lib/gon.rb

@@ -3,7 +3,7 @@ require 'action_view'
 require 'action_controller'
 require 'gon/helpers'
 require 'gon/rabl'
-if RUBY_VERSION =~ /9/
+if RUBY_VERSION =~ /9/ && defined?(Jbuilder)
   require 'gon/jbuilder'
 end
 
@@ -73,7 +73,11 @@ module Gon
     end
 
     def jbuilder(view_path, options = {})
-      raise NoMethodError.new('You can use Jbuilder support only in 1.9+') if RUBY_VERSION !~ /9/
+      if RUBY_VERSION !~ /9/
+        raise NoMethodError.new('You can use Jbuilder support only in 1.9+') 
+      elsif !defined?(Gon::Jbuilder)
+        raise NoMethodError.new('You should define Jbuilder in your Gemfile') 
+      end
 
       jbuilder_data = Gon::Jbuilder.parse_jbuilder(view_path, options[:controller] || 
                                                   @request_env['action_controller.instance'] || 

data/lib/gon/jbuilder.rb

@@ -1,17 +1,45 @@
-require 'jbuilder'
-
 module Gon
   module Jbuilder
     class << self
+
+      def parse_source(source, controller)
+        output = ::JbuilderTemplate.encode(controller) do |json|
+          eval source
+        end
+        JSON.parse(output)
+      end
+
       def parse_jbuilder(jbuilder_path, controller)
-        source = File.read(jbuilder_path)
         controller.instance_variables.each do |name|
           self.instance_variable_set(name, controller.instance_variable_get(name))
         end
-        output = ::JbuilderTemplate.encode(controller) do |json|
-          eval source
+        lines = find_partials(File.readlines(jbuilder_path))
+        source = lines.join('')
+
+        output = parse_source(source, controller)
+      end
+
+      def parse_partial(partial_line)
+        path = partial_line.match(/['"]([^'"]*)['"]/)[1]
+        options_hash = partial_line.match(/,(.*)/)[1]
+        if options_hash.present?
+          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
-        JSON.parse(output)
+        find_partials(File.readlines(path))
+      end
+
+      def find_partials(lines = [])
+        lines.map do |line|
+          if line =~ /partial!/
+            parse_partial(line)
+          else
+            line
+          end
+        end.flatten
       end
     end
   end

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 module Gon
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end

data/spec/gon/gon_spec.rb

@@ -2,7 +2,8 @@
 require 'gon'
 
 describe Gon, '#all_variables' do 
-  before(:each) do 
+
+  before(:each) do
     Gon.request_env = {}
   end
 
@@ -49,16 +50,45 @@ describe Gon, '#all_variables' do
     Gon.objects.length.should == 2
   end
 
-  it 'render json from jbuilder template' do
-    Gon.clear
-    controller = ActionController::Base.new
-    objects = [1,2]
-    controller.instance_variable_set('@objects', objects)
-    Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
-    Gon.objects.length.should == 2
+  if RUBY_VERSION =~ /1.9/
+    require 'jbuilder'
+    require 'gon/jbuilder'
+
+    it 'render json from jbuilder template' do
+      Gon.clear
+      controller = ActionController::Base.new
+      objects = [1,2]
+      controller.instance_variable_set('@objects', objects)
+      Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
+      Gon.objects.length.should == 2
+    end
+
+    it 'render json from jbuilder template with a partial' do
+      Gon.clear
+      controller = ActionController::Base.new
+      controller.view_paths << 'spec/test_data'
+      objects = [1,2]
+      controller.instance_variable_set('@objects', objects)
+      Gon.jbuilder 'spec/test_data/sample_with_partial.json.jbuilder', :controller => controller
+      Gon.objects.length.should == 2
+    end
+
+    it 'should throw error if you use gon.jbuilder with ruby < 1.9+' do
+      RUBY_VERSION = '1.8.7'
+
+      expect { Gon.jbuilder 'some_path' }.to raise_error(NoMethodError, /1.9/)
+    end
+
+    it 'should raise error if you use gon.jbuilder without requairing jbuilder gem' do
+      RUBY_VERSION = '1.9.2'
+      Gon.send(:remove_const, :Jbuilder)
+
+      expect { Gon.jbuilder 'some_path' }.to raise_error(NoMethodError, /Gemfile/)
+    end
   end
 
   def request
     @request ||= double 'request', :env => {}
   end
+
 end

data/spec/test_data/_sample_partial.json.jbuilder

@@ -0,0 +1 @@
+json.objects objects

data/spec/test_data/sample_with_partial.json.jbuilder

@@ -0,0 +1 @@
+json.partial! 'spec/test_data/_sample_partial.json.jbuilder', :objects => @objects

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000Z
+date: 2011-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2155202500 !ruby/object:Gem::Requirement
+  requirement: &2153437540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155202500
+  version_requirements: *2153437540
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &2155202080 !ruby/object:Gem::Requirement
+  requirement: &2153437120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155202080
+  version_requirements: *2153437120
 - !ruby/object:Gem::Dependency
-  name: jbuilder
-  requirement: &2155201580 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &2153436660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155201580
+  version_requirements: *2153436660
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2155201160 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2153426500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2155201160
+  version_requirements: *2153426500
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2155200740 !ruby/object:Gem::Requirement
+  name: jbuilder
+  requirement: &2153425980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155200740
+  version_requirements: *2153425980
 description: If you need to send some data to your js files and you don't want to
   do this with long way trough views and parsing - use this force!
 email:
@@ -85,8 +85,10 @@ files:
 - lib/gon/rabl.rb
 - lib/gon/version.rb
 - spec/gon/gon_spec.rb
+- spec/test_data/_sample_partial.json.jbuilder
 - spec/test_data/sample.json.jbuilder
 - spec/test_data/sample.rabl
+- spec/test_data/sample_with_partial.json.jbuilder
 homepage: https://github.com/gazay/gon
 licenses: []
 post_install_message: 
@@ -113,5 +115,7 @@ specification_version: 3
 summary: Get your Rails variables in your JS
 test_files:
 - spec/gon/gon_spec.rb
+- spec/test_data/_sample_partial.json.jbuilder
 - spec/test_data/sample.json.jbuilder
 - spec/test_data/sample.rabl
+- spec/test_data/sample_with_partial.json.jbuilder