From 379e9d99b51c904898c1cdefb65ceb724061c6fc Mon Sep 17 00:00:00 2001 From: DamirSvrtan Date: Tue, 5 Nov 2013 14:04:33 +0100 Subject: [PATCH] Made jquery.cookie as a dependency --- .gitignore | 1 + cookies_eu.gemspec | 3 +- lib/cookies_eu.rb | 2 + vendor/assets/javascripts/jquery.cookie.js | 95 ---------------------- 4 files changed, 5 insertions(+), 96 deletions(-) delete mode 100644 vendor/assets/javascripts/jquery.cookie.js diff --git a/.gitignore b/.gitignore index 205057d..5f8d310 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ spec/reports test/tmp test/version_tmp tmp +*.gem diff --git a/cookies_eu.gemspec b/cookies_eu.gemspec index 951f4ff..4e2845d 100644 --- a/cookies_eu.gemspec +++ b/cookies_eu.gemspec @@ -18,7 +18,8 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_development_dependency "jquery-rails" + spec.add_dependency "jquery-rails" + spec.add_dependency "jquery-cookie-rails" spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" end diff --git a/lib/cookies_eu.rb b/lib/cookies_eu.rb index 5daab35..dccd6d4 100644 --- a/lib/cookies_eu.rb +++ b/lib/cookies_eu.rb @@ -1,5 +1,7 @@ require "cookies_eu/version" require "cookies_eu/engine" +require 'jquery-rails' +require 'jquery-cookie-rails' module CookiesEu end diff --git a/vendor/assets/javascripts/jquery.cookie.js b/vendor/assets/javascripts/jquery.cookie.js deleted file mode 100644 index c4f99af..0000000 --- a/vendor/assets/javascripts/jquery.cookie.js +++ /dev/null @@ -1,95 +0,0 @@ -/*! - * jQuery Cookie Plugin v1.3.1 - * https://github.com/carhartl/jquery-cookie - * - * Copyright 2013 Klaus Hartl - * Released under the MIT license - */ -(function (factory) { - if (typeof define === 'function' && define.amd) { - // AMD. Register as anonymous module. - define(['jquery'], factory); - } else { - // Browser globals. - factory(jQuery); - } -}(function ($) { - - var pluses = /\+/g; - - function raw(s) { - return s; - } - - function decoded(s) { - return decodeURIComponent(s.replace(pluses, ' ')); - } - - function converted(s) { - if (s.indexOf('"') === 0) { - // This is a quoted cookie as according to RFC2068, unescape - s = s.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\'); - } - try { - return config.json ? JSON.parse(s) : s; - } catch(er) {} - } - - var config = $.cookie = function (key, value, options) { - - // write - if (value !== undefined) { - options = $.extend({}, config.defaults, options); - - if (typeof options.expires === 'number') { - var days = options.expires, t = options.expires = new Date(); - t.setDate(t.getDate() + days); - } - - value = config.json ? JSON.stringify(value) : String(value); - - return (document.cookie = [ - config.raw ? key : encodeURIComponent(key), - '=', - config.raw ? value : encodeURIComponent(value), - options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE - options.path ? '; path=' + options.path : '', - options.domain ? '; domain=' + options.domain : '', - options.secure ? '; secure' : '' - ].join('')); - } - - // read - var decode = config.raw ? raw : decoded; - var cookies = document.cookie.split('; '); - var result = key ? undefined : {}; - for (var i = 0, l = cookies.length; i < l; i++) { - var parts = cookies[i].split('='); - var name = decode(parts.shift()); - var cookie = decode(parts.join('=')); - - if (key && key === name) { - result = converted(cookie); - break; - } - - if (!key) { - result[name] = converted(cookie); - } - } - - return result; - }; - - config.defaults = {}; - - $.removeCookie = function (key, options) { - if ($.cookie(key) !== undefined) { - // Must not alter options, thus extending a fresh object... - $.cookie(key, '', $.extend({}, options, { expires: -1 })); - return true; - } - return false; - }; - -}));