gon-sinatra 0.1.0 → 0.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7e56e3d12d31768fbd700f74991c1c7b53ea0491
+  data.tar.gz: ca60e392e27d7a8e93692624a2c7fad8d67ff847
+SHA512:
+  metadata.gz: f91ae8530d26fe0029006be8b46dcfc0e2b8a1e34516f52c772e3a0af69ebc0214d2cbf1879a00851850b1f984a7000e88d0d94897dfa1b608eb51716752d164
+  data.tar.gz: 51b964523843718864cd4817d78d5558c9ce6d4aa0639529bd35301180ad99ff281f0e83c3ef970f8d52cbdc705b67dd35d9bd7eff16d46bb99ab4434a745804

data/.gitignore

@@ -0,0 +1,2 @@
+.bundle/
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/Gemfile.lock

@@ -1,42 +1,56 @@
 PATH
   remote: .
   specs:
-    gon-sinatra (0.0.5)
-      json
-      rabl
+    gon-sinatra (0.1.0)
       sinatra
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    diff-lcs (1.1.3)
-    json (1.6.4)
-    multi_json (1.0.4)
-    rabl (0.5.3)
+    activesupport (4.1.7)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    diff-lcs (1.2.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    minitest (5.4.2)
+    rabl (0.11.3)
       activesupport (>= 2.3.14)
-      multi_json (~> 1.0.3)
-    rack (1.4.0)
-    rack-protection (1.2.0)
+    rack (1.5.2)
+    rack-protection (1.5.3)
       rack
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sinatra (1.3.2)
-      rack (>= 1.3.6, ~> 1.3)
-      rack-protection (~> 1.2)
-      tilt (>= 1.3.3, ~> 1.3)
-    tilt (1.3.3)
+    rake (10.3.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gon-sinatra!
+  i18n
+  json
+  rabl
+  rake
   rspec

data/README.md

@@ -1,5 +1,6 @@
 # Gon-sinatra gem — get your Sinatra variables in your js
 
+### Build Status ![http://travis-ci.org/gazay/gon-sinatra](https://secure.travis-ci.org/gazay/gon-sinatra.png)
 
 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!
 
@@ -13,12 +14,16 @@ For rails use [gon](https://github.com/gazay/gon).
 
 `my_sinatra_application.rb`
 
+**Note: For classic (non-modular) applications, you still have to explicitely register `Gon::Sinatra`**
+
 ``` ruby
-register Gon::Sinatra
+# For classic applications:
+
+Sinatra::register Gon::Sinatra
 # and if you want to the use Rabl integration
-register Gon::Sinatra::Rabl
+Sinatra::register Gon::Sinatra::Rabl
 
-#or, in a classy app:
+# For modular applications:
 
 class MySinatraApplication < Sinatra::Base #or Padrino::Application
   register Gon::Sinatra
@@ -115,7 +120,7 @@ Profit of using Rabl with gon:
   5. And so on
 
 For using gon with Rabl you need to create new Rabl template and map gon
-to it. 
+to it.
 For example you have model Post with attributes :title and :body.
 You want to get all your posts in your js as an Array.
 That's what you need to do:
@@ -197,6 +202,7 @@ require 'gon-sinatra'
 ## Contributors
 
 * @gazay
+* @skade
 
 Special thanks to @brainopia, @kossnocorp and @ai.
 
@@ -204,7 +210,7 @@ Special thanks to @brainopia, @kossnocorp and @ai.
 
 The MIT License
 
-Copyright (c) 2011 gazay
+Copyright (c) 2014 gazay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/Rakefile

@@ -1,4 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'bundler'
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+
+desc 'Run all tests by default'
+task :default do
+  system("rspec spec")
+end

data/gon-sinatra.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra"
 
   s.add_development_dependency "rabl"
+  s.add_development_dependency "i18n"
   s.add_development_dependency "json"
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
 end

data/lib/gon/sinatra/helpers.rb

@@ -4,24 +4,22 @@ module Gon
   module Sinatra
     module Helpers
       def include_gon(options = {})
-        unless gon.all_variables.empty?
-          data = gon.all_variables
-          namespace = options[:namespace] || 'gon'
-          script = "<script>window." + namespace + " = {};"
-          unless options[:camel_case]
-            data.each do |key, val|
-              script += namespace + "." + key.to_s + '=' + val.to_json + ";"
-            end
-          else
-            data.each do |key, val|
-              script += namespace + "." + key.to_s.camelize(:lower) + '=' + val.to_json + ";"
-            end
+        return '' if gon.all_variables.empty?
+
+        data = gon.all_variables
+        namespace = options[:namespace] || 'gon'
+        script = "<script>window." + namespace + " = {};"
+        unless options[:camel_case]
+          data.each do |key, val|
+            script += namespace + "." + key.to_s + '=' + val.to_json + ";"
           end
-          script += "</script>"
-          script
         else
-          ""
+          data.each do |key, val|
+            script += namespace + "." + key.to_s.camelize(:lower) + '=' + val.to_json + ";"
+          end
         end
+        script += "</script>"
+        script
       end
     end
 
@@ -32,4 +30,4 @@ module Gon
       end
     end
   end
-end
+end

data/lib/gon/sinatra/rabl.rb

@@ -1,14 +1,22 @@
 require 'rabl'
+require 'tilt'
 
 module Gon
   module Sinatra
     module Rabl
       class << self
+        def cache
+          @cache ||= Tilt::Cache.new
+        end
+
         def parse_rabl(rabl_path, controller)
-          source = File.read(rabl_path)
+          source = cache.fetch(rabl_path) do
+            File.read(rabl_path)
+          end
+
           rabl_engine = ::Rabl::Engine.new(source, :format => 'json')
           output = rabl_engine.render(controller, {})
-          ::Rabl.configuration.json_engine.decode(output)
+          ::Rabl.configuration.json_engine.parse(output)
         end
       end
     end

data/lib/gon/sinatra/store.rb

@@ -38,7 +38,9 @@ module Gon
       alias :set :set_variable
 
       def rabl(view_path, options = {})
-        raise Exception.new("You must require rabl and register Gon::Sinatra::Rabl to use rabl") unless defined? Rabl
+        unless defined?(::Rabl)
+          raise Exception.new("You must require rabl and register Gon::Sinatra::Rabl to use rabl")
+        end
 
         unless options[:instance]
           raise ArgumentError.new("You should pass :instance in options: :instance => self")

data/lib/gon/sinatra/version.rb

@@ -1,5 +1,5 @@
 module Gon
   module Sinatra
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/gon/gon_spec.rb

@@ -6,7 +6,7 @@ class App < Sinatra::Base
   register Gon::Sinatra::Rabl
 end
 
-describe Gon::Sinatra, '#all_variables' do 
+describe Gon::Sinatra, '#all_variables' do
   def app
     app = App.new!
     app.env = {}
@@ -15,14 +15,15 @@ describe Gon::Sinatra, '#all_variables' do
 
   before(:each) do
     @gon = Gon::Sinatra::Store.new({})
+    Gon::Sinatra::Rabl.cache.clear
   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}
+    expect(@gon.c).to eq(3)
+    expect(@gon.all_variables).to eq({'a' => 1, 'b' => 2, 'c' => 3})
   end
 
   it 'supports all data types' do
@@ -40,17 +41,16 @@ describe Gon::Sinatra, '#all_variables' do
     instance = app
 
     instance.gon.int = 1
-    instance.methods.map(&:to_s).include?('include_gon').should == true
+    expect(instance.methods.map(&:to_s)).to include('include_gon')
 
-    # TODO: Make it work
-    instance.include_gon.should == "<script>window.gon = {};" +
-                                     "gon.int=1;" +
-                                   "</script>"
+    expect(instance.include_gon).to eq("<script>window.gon = {};" +
+                                         "gon.int=1;" +
+                                       "</script>")
   end
 
   it 'returns exception if try to set public method as variable' do
     @gon.clear
-    lambda { @gon.all_variables = 123 }.should raise_error
+    expect { @gon.all_variables = 123 }.to raise_error
   end
 
   it 'should be threadsafe' do
@@ -59,14 +59,28 @@ describe Gon::Sinatra, '#all_variables' do
 
     instance1.gon.test = "foo"
     instance2.gon.test = "bar"
-    instance1.gon.test.should == "foo"
+    expect(instance1.gon.test).to eq("foo")
   end
 
   it 'render json from rabl template' do
     @gon.clear
     @objects = [1,2]
     @gon.rabl 'spec/test_data/sample.rabl', :instance => self
-    @gon.objects.length.should == 2
+    expect(@gon.objects.length).to eq(2)
+  end
+
+  it 'caches the rabl template' do
+    @gon.clear
+    @objects = [1,2]
+    path = 'spec/test_data/sample.rabl'
+    source = File.read(path)
+    expect(File).to receive(:read).once.and_return(source)
+    @gon.rabl path, :instance => self
+
+    @gon.clear
+    @objects = [1,2,3]
+    @gon.rabl 'spec/test_data/sample.rabl', :instance => self
+    expect(@gon.objects.length).to eq(3)
   end
 
   def request

metadata

@@ -1,60 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: gon-sinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2164262960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164262960
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &2164262520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164262520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2164262060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164262060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164261620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164261620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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:
@@ -63,11 +102,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
-- cache/gon-0.2.2.gem
 - gon-sinatra.gemspec
 - lib/gon-sinatra.rb
 - lib/gon/sinatra/helpers.rb
@@ -78,28 +118,28 @@ files:
 - spec/test_data/sample.rabl
 homepage: https://github.com/gazay/gon-sinatra
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Get your Sinatra variables in your JS
 test_files:
 - spec/gon/gon_spec.rb
 - spec/test_data/sample.rabl
+has_rdoc: