lentil 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f1ba3dca5c251d625e3c36995d80f2a24d4115
-  data.tar.gz: 632b1928bb0b974c7039a25ef2a3c416b997feb6
+  metadata.gz: ecf47629d42a05f5914f948f28629c5dddf4dc05
+  data.tar.gz: 48b6252b34c140ff7cb8acba38e278dd04e4b3a9
 SHA512:
-  metadata.gz: 0842afb191afa661db3a5f0997b3e1c6d406e9a217bf235ab545fc35e508ed09a601f87441931f6b47d6832b641c3660d6276152ccab89a6073ae0871e286651
-  data.tar.gz: 0690cdcb63ca66a1258faebb2cb84849b92aa5577dc0f7faaf6b51ccff8b64f9748db5a1e34d86e38ffeb857d39ae91fdd96efda14052647997165c2285a25a5
+  metadata.gz: f250e5e6eaed99ad29dbbeda37705989a9981754a125563c2701db2bc04ab82686a4299b1fe4b1d9f81f15007b4cd81046319609e616a21d006af5fada71997a
+  data.tar.gz: 5eed5ff3c8f9e2a158dfaba7e5e4a570c7d8fe90c7326a6100e8baa13b24d4a08b187774e57a6910847d13a6fb4a3370e0c88739e02f84ea1dc32ffd81954459

data/README.md

@@ -17,6 +17,8 @@ Although we are using this gem in production, **this gem should be considered an
 
 ## Installation
 
+> lentil is also available through the pre-packaged [Social Media Combine](https://github.com/NCSU-Libraries/Social-Media-Combine) for easier setup alongside Twitter harvesting software.
+
 lentil requires Ruby 2.3.1 or greater.
 
 ### Create a new Rails app with Rails 4.2.x

data/app/assets/javascripts/lentil/addfancybox.js

@@ -48,7 +48,7 @@ function pushimageurl(imageId) {
 // push the url for the displayed image to the browser
 window.history.pushState(null, null, replacementUrl);
 
-Lentil.ga_track(['_trackPageview', replacementUrl]);
+Lentil.ga_track(['pageview', replacementUrl]);
 
 // listen for popstate (back/forward button)
 window.onpopstate = function(){

data/app/assets/javascripts/lentil/event_tracking.js.erb

@@ -13,9 +13,10 @@ $(function () {
 		// In production it tracks the event to Google. It expects an array of everything that
 		// should be sent to Google.
 		ga_track: function(values){
+
 			<% if Rails.env == 'production' %>
-                if (typeof _gaq !== "undefined") {
-                    _gaq.push(values);
+                if (typeof ga !== "undefined") {
+                    window.ga.apply('window', ['send'].concat(values));
                 }
 			<% else %>
 				console.log(values);
@@ -29,33 +30,33 @@ $(function () {
 	// click on image
     $(document.body).on('click', '.images .fancybox', function(){
 		var image_id = $(this).parent().attr('id');
-		Lentil.ga_track(['_trackEvent', 'image', 'click', image_id]);
+		Lentil.ga_track(['event', 'image', 'click', image_id]);
 	});
 
 	// share button
     $(document.body).on('click', '.share', function(){
-		var image_id = $(this).data('imageId');
-		Lentil.ga_track(['_trackEvent', 'image_view', 'share', image_id]);
+		var image_id = $(this).attr('data-image-id');
+		Lentil.ga_track(['event', 'image_view', 'share', image_id]);
 	});
     // facebook
     $(document.body).on('click', '.facebook', function(){
-        var image_id = $(this).data('imageId');
-        Lentil.ga_track(['_trackEvent', 'image_view', 'facebook', image_id]);
+        var image_id = $(this).attr('data-image-id');
+        Lentil.ga_track(['event', 'image_view', 'facebook', image_id]);
     });
     // twitter
     $(document.body).on('click', '.twitter', function(){
-        var image_id = $(this).data('imageId');
-        Lentil.ga_track(['_trackEvent', 'image_view', 'twitter', image_id]);
+        var image_id = $(this).attr('data-image-id');
+        Lentil.ga_track(['event', 'image_view', 'twitter', image_id]);
     });
     // email
     $(document.body).on('click', '.email', function(){
-        var image_id = $(this).data('imageId');
-        Lentil.ga_track(['_trackEvent', 'image_view', 'email', image_id]);
+        var image_id = $(this).attr('data-image-id');
+        Lentil.ga_track(['event', 'image_view', 'email', image_id]);
     });
 
     // like
     $(document.body).on('click', '.like-btn', function(){
-        var image_id = $(this).data('imageId');
+        var image_id = $(this).attr('data-image-id');
         var like_state;
         if ($(this).hasClass('already-clicked')) {
             like_state = 'unlike';
@@ -63,18 +64,18 @@ $(function () {
             like_state = 'like';
         }
 
-        Lentil.ga_track(['_trackEvent', 'image_view', like_state, image_id]);
+        Lentil.ga_track(['event', 'image_view', like_state, image_id]);
     });
 
     // flag
     $(document.body).on('click', '.flag-btn', function(){
-        var image_id = $(this).data('imageId');
-        Lentil.ga_track(['_trackEvent', 'image_view', 'flag', image_id]);
+        var image_id = $(this).attr('data-image-id');
+        Lentil.ga_track(['event', 'image_view', 'flag', image_id]);
     });
 
     // picking a battle image
     $(document.body).on('click', '.battle-form', function(){
         var image_id = $(this).attr('value');
-        Lentil.ga_track(['_trackEvent', 'battle_view', 'pick', image_id]);
+        Lentil.ga_track(['event', 'battle_view', 'pick', image_id]);
     });
 });

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/integration/lentil/javascript/event_tracking_battle_test.rb

@@ -9,9 +9,9 @@ class EventTrackingBattleTest < ActionDispatch::IntegrationTest
       first_image = all('.battle-form').first()
       image_id = first_image['value']
       first_image.click
-      assert_equal("_trackEvent,battle_view,pick,#{image_id}", console_message)
+      assert_equal("event,battle_view,pick,#{image_id}", console_message)
       find('.battle-result-arrow-wrap') # this should wait for the ajax to finish
       browser_end
     end
   end
- end
+ end

data/test/integration/lentil/javascript/event_tracking_test.rb

@@ -13,28 +13,28 @@ class EventTrackingTest < ActionDispatch::IntegrationTest
   test "should trigger an event for clicking on an image" do
   	visit(lentil.images_path)
     find("#image_#{@image.id} a.fancybox").click
-    assert_equal("_trackEvent,image,click,image_#{@image.id}", console_messages[-2])
-    assert_equal("_trackPageview,/lentil/images/#{@image.id}", console_message)
+    assert_equal("event,image,click,image_#{@image.id}", console_messages[-2])
+    assert_equal("pageview,/lentil/images/#{@image.id}", console_message)
   end
 
   test "should trigger an event for clicking on the share button" do
     visit(lentil.image_path(@image))
     find('.share').click
-    assert_equal("_trackEvent,image_view,share,#{@image.id}", console_message)
+    assert_equal("event,image_view,share,#{@image.id}", console_message)
   end
 
   test "should trigger an event for clicking on the facebook share link" do
     visit(lentil.image_path(@image))
     find('.share').click
     find('.facebook').click
-    assert_equal("_trackEvent,image_view,facebook,#{@image.id}", console_message)
+    assert_equal("event,image_view,facebook,#{@image.id}", console_message)
   end
 
   test "should trigger an event for clicking on the twitter share link" do
     visit(lentil.image_path(@image))
     find('.share').click
     find('.twitter').click
-    assert_equal("_trackEvent,image_view,twitter,#{@image.id}", console_message)
+    assert_equal("event,image_view,twitter,#{@image.id}", console_message)
   end
 
   # FIXME: This fails due to the mailto link.
@@ -42,16 +42,16 @@ class EventTrackingTest < ActionDispatch::IntegrationTest
   #   visit(lentil.image_path(@image))
   #   find('.share').click
   #   find('.email').click
-  #   assert_equal("_trackEvent,image_view,email,#{@image.id}", console_message)
+  #   assert_equal("event,image_view,email,#{@image.id}", console_message)
   # end
 
   test "should trigger an event for liking and unliking an image" do
     visit(lentil.image_path(@image))
     find('.like-btn.initial-state', :visible => true).click
-    assert_equal("_trackEvent,image_view,like,#{@image.id}", console_message)
+    assert_equal("event,image_view,like,#{@image.id}", console_message)
     find('.like-btn.already-clicked', :visible => true).click
     find('.like-btn.initial-state', :visible => true)
-    assert_equal("_trackEvent,image_view,unlike,#{@image.id}", console_message)
+    assert_equal("event,image_view,unlike,#{@image.id}", console_message)
   end
 
   # TODO: Not currently implemented
@@ -61,13 +61,13 @@ class EventTrackingTest < ActionDispatch::IntegrationTest
   #   visit lentil.images_path
   #   visit lentil.image_path(@image)
   #   find('.like-btn.already-clicked').click
-  #   assert_equal("_trackEvent,image_view,unlike,#{@image.id}", console_message)
+  #   assert_equal("event,image_view,unlike,#{@image.id}", console_message)
   # end
 
   test "clicking the flag button" do
     visit lentil.image_path(@image)
     find('.flag-btn', :visible => true).click
-    assert_equal("_trackEvent,image_view,flag,#{@image.id}", console_message)
+    assert_equal("event,image_view,flag,#{@image.id}", console_message)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,6 +41,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activeadmin
   requirement: !ruby/object:Gem::Requirement
@@ -509,14 +523,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement