lentil 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97465eeca8fbdaaa274f0202ff41703550717f74
-  data.tar.gz: 1bf43a3507e0ea9be6d0d97873019b3afe1905c2
+  metadata.gz: 910075a2b670d64085b65204d9a906be3a70005d
+  data.tar.gz: d094dc6d8f5634aabf35453bf36bd2f5bf6a33a5
 SHA512:
-  metadata.gz: e3527f957cf817df95f4a50d87177f83ff28a15690ba31b5960360563a6c908e867747b240b30f4fdcb7c2657f7431518e272669a1fd5d5dd5b7fef557caa25a
-  data.tar.gz: 1fcc672f9e3b5b5d323bb75d484a9cb52005ae07f45113baacafb1d55d97c02ebf905c2f12185ef9d5a57b10ce94108136269325b3ab0e2507a424a57120e916
+  metadata.gz: cfdaf546ef32c38d2301909ed60f79d06226473c0bccdc14612058c9f4ed461b2b7d4a68c980d7acc5fb5df8221855b9d5ec48324a11f6264ae47b9f2af3a3d0
+  data.tar.gz: 5629e8500152774c381a4efb5c78a3c0c6821641d7427b0d9803e793819932a02a9295fd7e15effda8fc192284c76e5b4a36bb3c8588d826b0bffd086893e567

data/README.md

@@ -15,7 +15,7 @@ Although we are using this gem in production, **this gem should be considered an
 
 ## Installation
 
-lentil has been tested under Ruby 1.9.3 and 2.1.5. **Ruby 2.2.x is not currently supported.**
+lentil has been tested under Ruby 1.9.3 through 2.2.0.
 
 ### Create a new Rails app with Rails 3.2.x
 
@@ -215,6 +215,10 @@ Edit `config/lentil_config.yml` and set `instagram_client_id` to the client ID a
 bundle exec rake image_services:instagram:fetch_by_tag
 ```
 
+## Heroku
+
+Documentation for deploying lentil to Heroku may be found in the [doc directory](doc/heroku.md).
+
 ## License
 
 See MIT-LICENSE

data/lib/lentil/version.rb

@@ -1,3 +1,3 @@
 module Lentil
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/dummy/config/database.yml

@@ -1,25 +1,32 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-development:
+sqlite: &sqlite
   adapter: sqlite3
-  database: db/development.sqlite3
+  database: db/<%= Rails.env %>.sqlite3
+
+mysql: &mysql
+  adapter: mysql2
+  encoding: utf8
+  username: travis
+  password:
+  database: lentil_<%= Rails.env %>
+
+postgresql: &postgresql
+  adapter: postgresql
+  username: postgres
+  password:
+  database: lentil_<%= Rails.env %>
+  min_messages: ERROR
+
+defaults: &defaults
   pool: 5
   timeout: 5000
+  host: 127.0.0.1
+  <<: *<%= ENV['DB'] || "sqlite" %>
+
+development:
+  <<: *defaults
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults
 
 production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
+  <<: *defaults

data/test/fixtures/lentil/admin_users.yml

@@ -23,11 +23,11 @@
 # model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
-one: 
+one:
   email: admin@example.com
   encrypted_password: $2a$10$Jln3fQjXhb6Tqecn29ZSZei7lHspu22aVlYTDOKEn.dmio4cJGrh.
-  created_at: <%= DateTime.now.strftime('%y-%m-%d %H:%M:%S') %>
-  updated_at: <%= DateTime.now.strftime('%y-%m-%d %H:%M:%S') %>
+  created_at: <%= DateTime.now.strftime('%Y-%m-%d %H:%M:%S') %>
+  updated_at: <%= DateTime.now.strftime('%Y-%m-%d %H:%M:%S') %>
 
 # column: value
 #

data/test/fixtures/lentil/images.yml

@@ -44,6 +44,7 @@ uno:
   wins_count: 5
   losses_count: 5
   win_pct: 50
+  original_datetime: 2013-04-12 15:58:34.000000000 Z
 
 dos:
   description: "Love the new @snohetta_design #HuntLibrary at #NCState @CentCampus  #nofilter"
@@ -54,6 +55,7 @@ dos:
   user: cl
   state: 1
   staff_like: false
+  original_datetime: 2013-04-13 15:58:34.000000000 Z
 
 tres:
   description: "This is a bad image"
@@ -67,6 +69,7 @@ tres:
   wins_count: 5
   losses_count: 5
   win_pct: 50
+  original_datetime: 2013-04-14 15:58:34.000000000 Z
 
 one:
   description: 'six #hunttesting'
@@ -284,17 +287,17 @@ three:
   file_last_checked:
 
 video:
-  description: 'six #hunttesting'
-  created_at: 2013-04-16 16:16:16.273698000 Z
-  updated_at: 2013-04-16 16:16:16.481430000 Z
+  description: 'video #hunttesting'
+  created_at: 2013-04-10 16:16:16.273698000 Z
+  updated_at: 2013-04-10 16:16:16.481430000 Z
   like_votes_count: 0
-  url: http://instagram.com/p/k5LhuktiSC/
+  url: https://instagram.com/p/vYx78PoxRf/
   user: bd
   state: 1
   external_identifier: '853651752801735775_3292244'
   long_url: http://scontent-b.cdninstagram.com/hphotos-xfa1/t51.2885-15/915706_724481087621112_1586087020_n.jpg
-  original_datetime: 2013-04-16 15:58:34.000000000 Z
-  staff_like: true
+  original_datetime: 2013-04-10 15:58:34.000000000 Z
+  staff_like: false
   moderator_id:
   moderated_at:
   second_moderation: false
@@ -317,27 +320,27 @@ video:
       count: 0
       data: []
     filter: Amaro
-    created_time: '1393448079'
-    link: http://instagram.com/p/k5LhuktiSC/
+    created_time: '1415983240'
+    link: https://instagram.com/p/vYx78PoxRf/
     likes:
       count: 0
       data: []
     images:
       low_resolution:
-        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_6.jpg
+        url: https://scontent.cdninstagram.com/hphotos-xfa1/t51.2885-15/s320x320/e15/915706_724481087621112_1586087020_n.jpg
         width: 306
         height: 306
       thumbnail:
-        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_5.jpg
+        url: https://scontent.cdninstagram.com/hphotos-xfa1/t51.2885-15/s150x150/e15/915706_724481087621112_1586087020_n.jpg
         width: 150
         height: 150
       standard_resolution:
-        url: http://distilleryimage8.s3.amazonaws.com/28b09b209f2811e38e831293e346cce0_8.jpg
+        url: https://scontent.cdninstagram.com/hphotos-xfa1/t51.2885-15/e15/915706_724481087621112_1586087020_n.jpg
         width: 612
         height: 612
     caption:
-      created_time: '1393448079'
-      text: ! 'six #hunttesting'
+      created_time: '1415983240'
+      text: ! 'video #hunttesting'
       from:
         username: bddnc
         profile_picture: http://images.ak.instagram.com/profiles/anonymousUser.jpg

data/test/integration/lentil/images_show_test.rb

@@ -7,10 +7,9 @@ class ImagesShowIndexTest < ActionDispatch::IntegrationTest
     visit(lentil.image_path lentil_images(:one))
     assert page.has_selector?('body.lentil-images_show')
   end
-	
+
   test "video should have a video tag" do
     visit(lentil.image_path lentil_images(:video))
     assert page.has_selector?('video')
   end
-
 end

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

@@ -13,7 +13,8 @@ class ImageModalTest < ActionDispatch::IntegrationTest
     visit lentil.images_path
     assert page.has_no_content?('six #hunttesting')
     assert page.has_no_selector?('.fancybox-image')
-    all('.fancybox').first.click
+    # all('.fancybox').first.click
+    find('.fancybox', match: :first).click
     assert page.has_content?('six #hunttesting')
     assert page.has_selector?('.fancybox-image')
   end

data/test/test_helper.rb

@@ -39,6 +39,10 @@ class ActionDispatch::IntegrationTest
   # Stop ActiveRecord from wrapping tests in transactions
   self.use_transactional_fixtures = false
 
+  def setup
+    DatabaseCleaner.start
+  end
+
   def login_admin_user
     user = lentil_admin_users(:one)
     visit admin_root_path
@@ -49,6 +53,7 @@ class ActionDispatch::IntegrationTest
 
   def browser_start
     Capybara.current_driver = :webkit #_with_long_timeout
+    Capybara.default_wait_time = 30
   end
 
   def browser_end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lentil
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jason Casden
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -383,14 +383,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -467,14 +467,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -911,9 +911,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
-  - - "<"
-    - !ruby/object:Gem::Version
-      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -921,7 +918,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: lentil supports the harvesting of images from Instagram.