lentil 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950c29559c42d35bd5bbb5a5e9807262ef09e864
-  data.tar.gz: a8fada323c1428fead60b192cebd9d0b709dc1fd
+  metadata.gz: 1eedb412866c22824ea3454b1988e1e1ad5d7511
+  data.tar.gz: 7637990fc33cec6f64cad9150cda02b138e6f9ed
 SHA512:
-  metadata.gz: 460e078efac5f732ccf3c8f3ddd87fa1178abcbe4b32939bbdcf17ec99c9cdf2b33fb024ccff166c2bb58c1cdd5fda2b77502bd930419006e554697e3de249a6
-  data.tar.gz: 83a3d1f490f4402eb21b1710c3f17edadc2622dfca9e17a2cd311b8948aa85db2d6897b68d4af401dbf85060e3d6726ca02daf102cca27bbf2d71655d0e64f4e
+  metadata.gz: c565046bd60a22dc4712e0d9c7ad18892fb438ab5771647bfc469c3825558157091d009a638dd6c69e6f0280cfa36ee9d93ae3ae933b19f8a6ea90e88e9f5df2
+  data.tar.gz: a5a6463f9281ea17e9b85dc7f3f78b945171f6bb47a526cdc45228ed5f49bf07a9b0f8ececa91fd0852028a79566b6e7d18b578e8de86aab540b1a59dd18c80d

data/README.md

@@ -3,6 +3,7 @@
 lentil is a Ruby on Rails Engine that supports the harvesting of images from Instagram and provides several browsing views, mechanisms for sharing, tools for users to select their favorite images, an administrative interface for moderating images, and a system for harvesting images and submitting donor agreements in preparation of ingest into external repositories. Built according to the principles of responsive design, lentil is designed for use on mobile devices, tablets, desktops, and larger screens.
 
 [![Build Status](https://travis-ci.org/NCSU-Libraries/lentil.png)](https://travis-ci.org/NCSU-Libraries/lentil)
+[![Gem Version](https://badge.fury.io/rb/lentil.png)](http://badge.fury.io/rb/lentil)
 
 ## History
 

data/app/models/lentil/image.rb

@@ -94,7 +94,7 @@ class Lentil::Image < ActiveRecord::Base
   def service_tags
     begin
       tag_ids = self.taggings.where(:staff_tag => false).pluck(:tag_id)
-      tags = Tag.find(tag_ids).sort_by(&:name)
+      tags = Lentil::Tag.find(tag_ids).sort_by(&:name)
     rescue
       Rails.logger.error "Error retrieving service_tags"
       tags = []
@@ -104,7 +104,7 @@ class Lentil::Image < ActiveRecord::Base
   def staff_tags
     begin
       tag_ids = self.taggings.where(:staff_tag => true).pluck(:tag_id)
-      tags = Tag.find(tag_ids).sort_by(&:name)
+      tags = Lentil::Tag.find(tag_ids).sort_by(&:name)
     rescue
       Rails.logger.error "Error retrieving staff_tags"
       tags = []
@@ -149,16 +149,21 @@ class Lentil::Image < ActiveRecord::Base
     large_url
   end
 
+  def protocol_relative_url
+    # instagr.am returns 301 to instagram.com and invalid SSL certificate
+    url.sub(/^http:/, '').sub(/\/\/instagr\.am/, '//instagram.com')
+  end
+
   def large_url
-    url + 'media/?size=l'
+    protocol_relative_url + 'media/?size=l'
   end
 
   def medium_url
-    url + 'media/?size=m'
+    protocol_relative_url + 'media/?size=m'
   end
 
   def thumbnail_url
-    url + 'media/?size=t'
+    protocol_relative_url + 'media/?size=t'
   end
 
   States = {

data/lib/generators/lentil/install_generator.rb

@@ -15,7 +15,7 @@ module Lentil
 
       desc 'precompile additional assets'
       def precompile_assets
-        insert_into_file "config/application.rb", "    config.assets.precompile += %w( lentil/iframe.js lentil/iframe.css )\n", :after => "# Inserted by lentil\n"
+        insert_into_file "config/application.rb", "    config.assets.precompile += %w( lentil/iframe.js lentil/iframe.css addanimatedimages.js animatedimages/css/style.css )\n", :after => "# Inserted by lentil\n"
       end
 
       desc 'do not enforce available locales'

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/tasks/image_services.rake

@@ -39,7 +39,7 @@ namespace :lentil do
       Lentil::Service.where(:name => args[:image_service]).first.images.where(:file_harvested_date => nil).
         order("file_harvest_failed ASC").limit(num_to_harvest).each do |image|
         begin
-          raise "Desination directory does not exist or is not a directory: #{base_dir}" unless File.directory?(base_dir)
+          raise "Destination directory does not exist or is not a directory: #{base_dir}" unless File.directory?(base_dir)
 
           image_file_path = "#{base_dir}/#{image.service.name}"
 

data/test/fixtures/lentil/taggings.yml

@@ -15,15 +15,24 @@
 one:
   image: uno
   tag: uno
+  staff_tag: false
 
 two:
   image: dos
   tag: dos
+  staff_tag: false
 
 three:
   image: uno
   tag: dos
+  staff_tag: false
 
-number_one: 
+number_one:
   image: one
   tag: hunttesting
+  staff_tag: false
+
+staff_number_one:
+  image: one
+  tag: hunttesting_staff
+  staff_tag: true

data/test/fixtures/lentil/tags.yml

@@ -27,3 +27,6 @@ five:
 
 hunttesting:
   name: "hunttesting"
+
+hunttesting_staff:
+  name: "hunttesting_staff"

data/test/unit/lentil/image_test.rb

@@ -36,11 +36,28 @@ require 'test_helper'
 
 class ImageTest < ActiveSupport::TestCase
 
-  test "Image should have a tag" do
+  test "Image should have tags" do
+    image = lentil_images(:one)
+
+    assert image.tags.size > 0, "Expected at least one tag"
+  end
+
+  test "Image should have a service tag" do
     image = lentil_images(:one)
     tag = lentil_tags(:hunttesting)
+    service_tags = image.service_tags
+
+    assert service_tags.size > 0, "Expected at least one service tag"
+    assert_equal tag.name, service_tags.first.name
+  end
+
+  test "Image should have a staff tag" do
+    image = lentil_images(:one)
+    tag = lentil_tags(:hunttesting_staff)
+    staff_tags = image.staff_tags
 
-    assert_equal tag.name, image.tags.first.name
+    assert staff_tags.size > 0, "Expected at least one staff tag"
+    assert_equal tag.name, staff_tags.first.name
   end
 
   test "Image should have a license" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -984,4 +984,3 @@ test_files:
 - test/vcr_cassettes/instagram_image_harvest.yml
 - test/vcr_cassettes/instagram_image_id.yml
 - test/vcr_cassettes/instagram_oembed.yml
-has_rdoc: