gon 1.0.0 → 1.1.0

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in evil_vk_ads.gemspec
+# Specify your gem's dependencies in gon.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Gon gem — get your Rails variables in your js
 
-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!
+If you need to send some data to your js files and you don't want to do this with long way through views and parsing - use this force!
 
 ## Usage
 
@@ -20,25 +20,25 @@ In action of your controller you put something like this:
 @your_int = 123
 @your_array = [1,2]
 @your_hash = {'a' => 1, 'b' => 2}
-Gon.your_int = @your_int
-Gon.your_other_int = 345 + Gon.your_int
-Gon.your_array = @your_array
-Gon.your_array << Gon.your_int
-Gon.your_hash = @your_hash
+gon.your_int = @your_int
+gon.your_other_int = 345 + gon.your_int
+gon.your_array = @your_array
+gon.your_array << gon.your_int
+gon.your_hash = @your_hash
 
-Gon.all_variables # > {:your_int => 123, :your_other_int => 468, :your_array => [1, 2, 123], :your_hash => {'a' => 1, 'b' => 2}}
-Gon.your_array # > [1, 2, 123]
+gon.all_variables # > {:your_int => 123, :your_other_int => 468, :your_array => [1, 2, 123], :your_hash => {'a' => 1, 'b' => 2}}
+gon.your_array # > [1, 2, 123]
 
-Gon.clear # Gon.all_variables now is {}
+gon.clear # gon.all_variables now is {}
 ```
 
 In javascript file for view of this action write call to your variable:
 
 ``` js
-alert(Gon.your_int)
-alert(Gon.your_other_int)
-alert(Gon.your_array)
-alert(Gon.your_hash)
+alert(gon.your_int)
+alert(gon.your_other_int)
+alert(gon.your_array)
+alert(gon.your_hash)
 ```
 
 ## Installation
@@ -46,13 +46,13 @@ alert(Gon.your_hash)
 Puts this line into `Gemfile` then run `$ bundle`:
 
 ``` ruby
-gem 'gon', '1.0.0'
+gem 'gon', '1.1.0'
 ```
 
 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 => '1.0.0'
+config.gem 'gon', :version => '1.1.0'
 ```
 
 Or manually install gon gem: `$ gem install gon`

data/gon.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency "actionpack", '>= 2.3.0'
+  s.add_development_dependency "rspec"
 end

data/lib/gon.rb

@@ -1,14 +1,40 @@
 require 'action_view'
 require 'gon/helpers'
-require 'ostruct'
 
-Gon = OpenStruct.new
+module Gon
+  def self.all_variables
+    @request_env[:gon]
+  end
+
+  def self.clear
+    @request_env[:gon] = {}
+  end
 
-class << Gon
-  def all_variables
-    instance_variable_get :@table
+  def self.request_env=(request_env)
+    @request_env = request_env
   end
-  def clear
-    instance_variable_set :@table, {}
+
+  def self.request_env
+    if defined?(@request_env)
+      return @request_env
+    end
+  end
+
+  def self.method_missing(m, *args, &block)
+    @request_env[:gon] ||= {}
+
+    if ( m.to_s =~ /=/ )
+      set_variable(m.to_s.delete('='), args[0])
+    else
+      get_variable(m.to_s)
+    end
+  end
+
+  def self.get_variable(name)
+    @request_env[:gon][name]
+  end
+
+  def self.set_variable(name, value)
+    @request_env[:gon][name] = value
   end
 end

data/lib/gon/helpers.rb

@@ -6,18 +6,33 @@ module Gon
 
     module InstanceMethods
       def include_gon
-        data = Gon.all_variables || {}
+        data = Gon.all_variables
 
-        script = "<script>window.Gon = {};"
+        script = "<script>window.gon = {};"
         data.each do |key, val|
-          script += "Gon." + key.to_s + '=' + val.to_json + ";"
+          script += "gon." + key.to_s + '=' + val.to_json + ";"
         end
         script += "</script>"
         script.html_safe
       end
     end
+  end
+
+  module GonHelpers
+    def self.included base
+      base.send(:include, InstanceMethods)
+    end
 
+    module InstanceMethods
+      def gon
+        if !Gon.request_env || Gon.request_env.object_id != request.env.object_id
+          Gon.request_env = request.env
+        end
+        Gon
+      end
+    end
   end
 end
 
 ActionView::Base.send :include, Gon::Helpers
+ActionController::Base.send :include, Gon::GonHelpers

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 module Gon
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/gon/gon_spec.rb

@@ -2,12 +2,16 @@
 require 'gon'
 
 describe Gon, '#all_variables' do 
+  before(:each) do 
+    Gon.stub(:request).and_return(request)
+  end
+  
   it 'returns all variables in hash' do
     Gon.a = 1
     Gon.b = 2
     Gon.c = Gon.a + Gon.b
     Gon.c.should == 3
-    Gon.all_variables.should == {:a => 1, :b => 2, :c => 3}
+    Gon.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
   end
   
   it 'supports all data types' do
@@ -18,18 +22,20 @@ describe Gon, '#all_variables' do
     Gon.array = [ 1, 'string' ]
     Gon.hash = { :a => 1, :b => '2'}
     Gon.hash_w_array = { :a => [ 2, 3 ] }
-    Gon.klass = OpenStruct.new
-    
+    Gon.klass = Hash
+  end
+  
+  it 'output as js correct' do
+    Gon.clear
+    Gon.int = 1
     ActionView::Base.instance_methods.include?('include_gon').should == true
     base = ActionView::Base.new
     base.include_gon.should == "<script>window.Gon = {};" +
-                                 "Gon.klass={\"table\":{}};" +
-                                 "Gon.string=\"string\";" +
-                                 "Gon.array=[1,\"string\"];" +
-                                 "Gon.float=1.1;" +
                                  "Gon.int=1;" +
-                                 "Gon.hash={\"a\":1,\"b\":\"2\"};" +
-                                 "Gon.hash_w_array={\"a\":[2,3]};" +
                                "</script>"
   end
+  
+  def request
+    @request ||= double 'request', :env => {}
+  end
 end

metadata

@@ -1,33 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gon
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.1.0
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-24 00:00:00 Z
-dependencies: []
-
-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: 
+date: 2011-06-25 00:00:00.000000000 %:z
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &2156682020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156682020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156681540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156681540
+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:
 - alex.gaziev@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -37,38 +51,30 @@ files:
 - lib/gon/helpers.rb
 - lib/gon/version.rb
 - spec/gon/gon_spec.rb
-homepage: ""
+has_rdoc: true
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gon
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Get your Rails variables in your JS
-test_files: 
+test_files:
 - spec/gon/gon_spec.rb