liquid-google-analytics 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c273aa60e52b1088e7b169a0303d266a0f7d3f
-  data.tar.gz: 477623cbe78725cb3c9270a36a349950643fdf59
+  metadata.gz: 64ca365e7fd75238fbf47bed6e2ea4433497a3bc
+  data.tar.gz: ddce2d7e49b77b1acb6197de0f1f33d805e93b70
 SHA512:
-  metadata.gz: aa7ad8424e9ffc9144b5e7a9745059799cc9faba2a927d41a98247731c2936b78fb333d2aa0b19bdd176416a7b42b1aa10c4f367b5cc326f42d22b1dd7e1d685
-  data.tar.gz: 662152dbf0b1058fb57fa5a74727b2ceb1593c8a49a7ba3d1ef5c8f7c17bef8a81095d4eed16cc577456526499dee651514a6be1439c4b184c8d971d9005b7f4
+  metadata.gz: e5e498809aaa1955e730316fef4b695e91797cb0a78bee7a61c5c23738b48ab71d890c3cb6ceabcd102f953e2230e6eccb1f122cf4f66496e617e2ff38eb579d
+  data.tar.gz: 55ac4295ca2790824d3b9b18ada967274202c7ac589936b65642077d94a4ba7165567f6138d1854534934afcdfd33423858dcce23234280ab02c921984ec3be0

data/LICENSE.md

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Rohan Sakhale
-
-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:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2016 Rohan Sakhale
+
+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:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,46 +1,60 @@
-# Liquid Google Analytics Tag
-
-This plugin helps generate Google Analytics code snippet easily as a Liquid Tag call
-
-### Installation
-
-This plugin is available as a [RubyGem](https://rubygems.org/gems/liquid-google-analytics/)
-
-Add this line to your application's Gemfile:
-
-```
-gem 'liquid-google-analytics'
-```
-
-And then execute the `bundle install` command to install the gem.
-
-Alternatively, you can also manually install the gem using the following command:
-
-```
-$ gem install liquid-google-analytics
-```
-
-For Jekyll Users, after the plugin has been installed successfully, add the following lines to your _config.yml in order to tell Jekyll to use the plugin:
-
-```yaml
-gems:
-  - liquid-google-analytics
-```
-
-### Usage
-
-You need to use `google_analytics` as liquid tag and pass the Tracking Code as parameter shown below
-
-```
-{{ google_analytics UA-12345 }}
-```
-
-### Contribute
-
-Fork this repository, make your changes and then issue a pull request. If you find bugs or have new ideas that you do not want to implement yourself, file a bug report.
-
-### Copyright
-
-Copyright (c) 2015 Rohan Sakhale
-
-License: MIT
+# Liquid Google Analytics Tag [![build status](https://gitlab.com/SaiAshirwadInformatia/LiquidGoogleAnalytics/badges/master/build.svg)](https://gitlab.com/SaiAshirwadInformatia/LiquidGoogleAnalytics/commits/master) [![Gem Version](https://badge.fury.io/rb/liquid-google-analytics.svg)](https://badge.fury.io/rb/liquid-google-analytics) [![coverage report](https://gitlab.com/SaiAshirwadInformatia/LiquidGoogleAnalytics/badges/master/coverage.svg)](https://gitlab.com/SaiAshirwadInformatia/LiquidGoogleAnalytics/commits/master)
+
+This plugin helps generate Google Analytics code snippet easily with the help of Liquid Tag or Liquid Variable Filter
+
+### Installation
+
+This plugin is available as a [RubyGem](https://rubygems.org/gems/liquid-google-analytics/)
+
+Add this line to your application's Gemfile:
+
+```
+gem 'liquid-google-analytics'
+```
+
+And then execute the `bundle install` command to install the gem.
+
+Alternatively, you can also manually install the gem using the following command:
+
+```
+$ gem install liquid-google-analytics
+```
+
+For Jekyll Users, after the plugin has been installed successfully, add the following lines to your _config.yml in order to tell Jekyll to use the plugin:
+
+```yaml
+gems:
+  - liquid-google-analytics
+```
+
+### Usage
+
+You need to use `google_analytics` as liquid tag and pass the Tracking Code as parameter shown below
+
+```
+{% google_analytics UA-12345 %}
+```
+
+### Alternate
+
+Optionally now you can also maintain Google Analytics code in config and use filter for variable as below
+
+```yaml
+ga_code: UA-12345
+```
+
+```
+{{ site.ga_code | google_analytics }}
+```
+
+### Contribute
+
+Fork this repository, create your branch, make changes and then issue a pull request.
+
+If you find bugs or have new ideas that you do not want to implement yourself, file a bug report.
+
+### Copyright
+
+Copyright (c) 2016 Rohan Sakhale
+
+License: [MIT](LICENSE.md)

data/lib/liquid-google-analytics.rb

@@ -1,5 +1,6 @@
-# Generate script code for Google Analytics with Liquid Tag
-require 'liquid'
-require 'liquid/google_analytics'
-
-Liquid::Template.register_tag 'google_analytics', Liquid::GoogleAnalytics
+# Generate script code for Google Analytics with Liquid Tag
+require 'liquid'
+require 'liquid/google_analytics'
+
+Liquid::Template.register_tag 'google_analytics', Liquid::GoogleAnalyticsTag
+Liquid::Template.register_filter(GoogleAnalyticsFilterModule)

data/lib/liquid/google_analytics.rb

@@ -1,30 +1,50 @@
-
-module Liquid
-	class GoogleAnalytics < Liquid::Tag
-		TEMPLATE = <<-EOF
-<script>
-  (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','https://www.google-analytics.com/analytics.js','ga');
-
-  ga('create', '%s', 'auto');
-  ga('send', 'pageview');
-
-</script>
-		EOF
-
-		def initialize(tag_name, tracking_code, tokens)
-		    super
-		    @tracking_code = tracking_code.to_s.strip
-		 end
-
-		def render(context)
-			code = ""
-			if @tracking_code
-				code = format(TEMPLATE, @tracking_code)
-			end
-			code
-		end
-	end
+module LiquidGoogleAnalytics
+	TEMPLATE = <<-EOF
+<script>
+  (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','https://www.google-analytics.com/analytics.js','ga');
+
+  ga('create', '%s', 'auto');
+  ga('send', 'pageview');
+
+</script>
+		EOF
+end
+module GoogleAnalyticsFilterModule
+
+	def google_analytics(input)
+		code = ""
+		code = format(LiquidGoogleAnalytics::TEMPLATE, input)
+		code
+	end
+end
+
+module Liquid
+
+	class GoogleAnalyticsTag < Liquid::Tag
+
+		def initialize(tag_name, markup, options)
+		    super
+		    tracking_parsed_code = Liquid::Template.parse(markup.to_s.strip).render
+		    unless tracking_parsed_code
+		    	tracking_parsed_code = markup.to_s.strip
+		    end
+		    @tracking_code = tracking_parsed_code
+		 end
+
+		def render(context)
+			code = ""
+			if context['code']
+				@tracking_code = context['code']
+			elsif context['tracking_code']
+				@tracking_code = context['tracking_code']
+			end
+			if @tracking_code
+				code = format(LiquidGoogleAnalytics::TEMPLATE, @tracking_code)
+			end
+			code
+		end
+	end
 end

data/lib/liquid/plugin_version.rb

@@ -1,6 +1,6 @@
-
-module Liquid
-	class GoogleAnalytics
-		VERSION = "1.0.2".freeze
-	end
+
+module Liquid
+	class GoogleAnalytics
+		VERSION = "1.1.0".freeze
+	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid-google-analytics
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Rohan Sakhale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-18 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.9.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 description: Generate Google Analytics Script code with simple Liquid Tag
 email: rohansakhale@gmail.com
 executables: []
@@ -98,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate Google Analytics Script code with simple Liquid Tag