liquid-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60effe936f0e73722ccb5017936e8ebd3194225a
-  data.tar.gz: 5184c687fab2ae2966cce49ca46d78576936889e
+  metadata.gz: 54955a6c51334d96d643bbbbd38c1525249fd772
+  data.tar.gz: b950dc24be7dd7bd91cf7694006c8a4de8791cff
 SHA512:
-  metadata.gz: cc4fbd79de3c6d0f6529bc597184553dfb2abdce2a195f48d641f1179ab52c5a7ad8401cb71b2131306409252173e6a573beb4a4bd64f95b90c78e60b0a872a3
-  data.tar.gz: bba6ac533ec927f2619948a5761e7ed3230080133f551774371b0e7aaa9b67d564946831452a0f7b73a70d9bd6280142bf9a2b92212e55061f8db40f5c3ebc4b
+  metadata.gz: 58bf7986347e7bf2785b23765b16f9061b94f3c86f0e29d9d22e3ae049e835de7ed2e1aabbf0e4ec9a796cf622b29a5ad149033eb1e9212943972ed5a53c0aa6
+  data.tar.gz: 2a2ee583078fc85af996b4f58185d790a4fdc3a9dc5ae4dfdda6f8d4c58d9f5f2c5e8d35a0bc86592d977952a0f6beb061c46bcde08d5c779aceb25b2754199b

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Overview
 
-## 0.1.1 - Not released
+## 0.1.2
+
+### New Features
+
+* Use google analytics universal (Chamnap Chhorn)
+
+* Render liquid template as html_safe by default (Dan Kubb)
+
+## 0.1.1
 
 ### New Features
 

data/README.md

@@ -51,6 +51,12 @@ def liquid_filters
 end
 ```
 
+You can render liquid templates from other template engines, eg. `erb`, `haml`, ...
+
+```ruby
+= render 'shared/partial.liquid'
+```
+
 ### Filter
 
 > Filters are simple methods that modify the output of numbers, strings, variables and objects. They are placed within an output tag `{{` `}}` and are separated with a pipe character `|`.

data/lib/liquid-rails/rspec/view_controller_context.rb

@@ -37,7 +37,7 @@ module Liquid
           end
 
           actual = Liquid::Template.parse(template).render!(context)
-          expect(actual.strip).to eq(expected.strip)
+          expect(actual.to_s.strip).to eq(expected.to_s.strip)
         end
       end
     end

data/lib/liquid-rails/tags/google_analytics_tag.rb

@@ -23,15 +23,12 @@ module Liquid
         %{
         <script type="text/javascript">
 
-          var _gaq = _gaq || [];
-          _gaq.push(['_setAccount', '#{@account_id}']);
-          _gaq.push(['_trackPageview']);
-
-          (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-          })();
+          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+          ga('create', '#{@account_id}', 'auto');
+          ga('send', 'pageview');
 
         </script>
         }

data/lib/liquid-rails/template_handler.rb

@@ -25,7 +25,7 @@ module Liquid
 
         liquid = Liquid::Template.parse(template)
         render_method = (::Rails.env.development? || ::Rails.env.test?) ? :render! : :render
-        liquid.send(render_method, assigns, filters: filters, registers: { view: @view, controller: @controller, helper: @helper })
+        liquid.send(render_method, assigns, filters: filters, registers: { view: @view, controller: @controller, helper: @helper }).html_safe
       end
 
       def filters
@@ -41,4 +41,4 @@ module Liquid
       end
     end
   end
-end
+end

data/lib/liquid-rails/version.rb

@@ -1,5 +1,5 @@
 module Liquid
   module Rails
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/dummy/app/controllers/home_controller.rb

@@ -17,9 +17,12 @@ class HomeController < ApplicationController
   def index_with_filter
   end
 
+  def erb_with_html_liquid_partial
+  end
+
   private
 
     def set_book
       @book = { 'name' => 'Liquid on Rails' }
     end
-end
+end

data/spec/dummy/app/views/home/_html_liquid_partial.liquid

@@ -0,0 +1 @@
+<p>Partial Content</p>

data/spec/dummy/app/views/home/erb_with_html_liquid_partial.erb

@@ -0,0 +1 @@
+<%= render 'html_liquid_partial' %>

data/spec/dummy/config/routes.rb

@@ -8,5 +8,7 @@ Rails.application.routes.draw do
   get  '/index_partial',                to: 'home#index_partial'
   get  '/index_partial_with_full_path', to: 'home#index_partial_with_full_path'
 
+  get '/erb_with_html_liquid_partial',  to: 'home#erb_with_html_liquid_partial'
+
   get '/foospace/bar/index_partial',    to: 'foospace/bar#index_partial'
 end

data/spec/lib/liquid-rails/tags/google_analtyics_tag_spec.rb

@@ -12,15 +12,12 @@ module Liquid
         %{
         <script type="text/javascript">
 
-          var _gaq = _gaq || [];
-          _gaq.push(['_setAccount', 'UA-XXXXX-X']);
-          _gaq.push(['_trackPageview']);
-
-          (function() {
-            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-          })();
+          (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+          m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+          })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+          ga('create', 'UA-XXXXX-X', 'auto');
+          ga('send', 'pageview');
 
         </script>
         }

data/spec/lib/liquid-rails/template_handler_spec.rb

@@ -5,7 +5,7 @@ describe 'Request', type: :feature do
     it 'renders with liquid template' do
       visit '/'
 
-      expect(page.body).to eq 'Liquid on Rails'
+      expect(page.body).to eq('Liquid on Rails')
     end
 
     it 'sets content_type as html by default' do
@@ -19,7 +19,7 @@ describe 'Request', type: :feature do
     it 'renders with layout' do
       visit '/index_with_layout'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails")
     end
   end
 
@@ -27,20 +27,20 @@ describe 'Request', type: :feature do
     it 'no full path for the current controller' do
       visit '/index_partial'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial")
     end
 
     it 'full path' do
       visit '/index_partial_with_full_path'
 
-      expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
+      expect(page.body).to eq("Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial")
     end
 
     it 'respects namespace of original template for partials path' do
       visit '/foospace/bar/index_partial'
+
       expect(page.body.strip).to eq("Foospace::BarController\n\nBar Partial")
     end
-
   end
 
   context 'render with filter' do
@@ -56,4 +56,12 @@ describe 'Request', type: :feature do
       expect(page.body).to eq("Application Layout\nLiquid on Rails\nThis is a long section of text")
     end
   end
+
+  context 'render html within an erb template' do
+    it 'does not escape the html' do
+      visit '/erb_with_html_liquid_partial'
+
+      expect(page.body.strip).to eq("Application Layout\n<p>Partial Content</p>")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chamnap Chhorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,7 +123,9 @@ files:
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/foospace/bar/_partial.liquid
 - spec/dummy/app/views/foospace/bar/index_partial.liquid
+- spec/dummy/app/views/home/_html_liquid_partial.liquid
 - spec/dummy/app/views/home/_partial.liquid
+- spec/dummy/app/views/home/erb_with_html_liquid_partial.erb
 - spec/dummy/app/views/home/index.liquid
 - spec/dummy/app/views/home/index_partial.liquid
 - spec/dummy/app/views/home/index_partial_with_full_path.liquid
@@ -216,7 +218,9 @@ test_files:
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/foospace/bar/_partial.liquid
 - spec/dummy/app/views/foospace/bar/index_partial.liquid
+- spec/dummy/app/views/home/_html_liquid_partial.liquid
 - spec/dummy/app/views/home/_partial.liquid
+- spec/dummy/app/views/home/erb_with_html_liquid_partial.erb
 - spec/dummy/app/views/home/index.liquid
 - spec/dummy/app/views/home/index_partial.liquid
 - spec/dummy/app/views/home/index_partial_with_full_path.liquid