mingle 0.3.1 → 0.4.0

data/spec/lib/mingle/configuration_spec.rb

@@ -1,16 +1,31 @@
 require 'spec_helper'
 
 describe Mingle::Configuration do
-  {
+  around do |example|
+    Mingle.temporarily &example
+  end
+
+  after :all do
+    ENVIRONMENT_ENABLED_CONFIGURATIONS.each { |key, value| ENV[key.to_s.upcase] = nil }
+  end
+
+  ENVIRONMENT_ENABLED_CONFIGURATIONS = {
     facebook_access_token: 'FACEBOOK_ACCESS_TOKEN',
     twitter_api_key: 'TWITTER_API_KEY',
     twitter_api_secret: 'TWITTER_API_SECRET',
     twitter_access_token: 'TWITTER_ACCESS_TOKEN',
     twitter_access_token_secret: 'TWITTER_ACCESS_TOKEN_SECRET',
-    instagram_client_id: 'INSTAGRAM_CLIENT_ID'
-  }.each do |key, value|
-    before { ENV[value] = 'some-environment-secret' }
+    instagram_client_id: 'INSTAGRAM_CLIENT_ID',
+  }
+
+  NON_ENVIRONMENT_ENABLED_CONFIGURATIONS = {
+    since: 2.days.ago,
+    twitter_ignore_retweets: true
+  }
+
+  CONFIGURATIONS = ENVIRONMENT_ENABLED_CONFIGURATIONS.merge NON_ENVIRONMENT_ENABLED_CONFIGURATIONS
 
+  CONFIGURATIONS.each do |key, value|
     it "responds to #{key}=" do
       expect(subject).to respond_to "#{key}=".to_sym
     end
@@ -21,10 +36,12 @@ describe Mingle::Configuration do
 
     describe '##{key}' do
       context 'when it is not configured through Mingle.configure' do
+        before { ENV[key.to_s.upcase] = 'some-environment-secret' }
+
         it "fetches the configuration from the #{value} environment variable" do
           expect(subject.send(key)).to eq 'some-environment-secret'
         end
-      end
+      end unless key.in? NON_ENVIRONMENT_ENABLED_CONFIGURATIONS
 
       context 'when it has been configured through Mingle' do
         before do
@@ -37,4 +54,10 @@ describe Mingle::Configuration do
       end
     end
   end
+
+  describe "twitter_ignore_retweets" do
+    it "defaults to `false`" do
+      expect(subject.twitter_ignore_retweets).not_to be # it's not
+    end
+  end
 end

data/spec/lib/mingle_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Mingle do
+  describe '.temporarily' do
+    it 'sets temporary configuration options' do
+      expect(Mingle.config.facebook_access_token).to be_nil
+
+      Mingle.temporarily facebook_access_token: 'new access token' do
+        expect(Mingle.config.facebook_access_token).to eq 'new access token'
+      end
+
+      expect(Mingle.config.facebook_access_token).to be_nil
+    end
+  end
+end

data/spec/models/mingle/facebook_spec.rb

@@ -27,6 +27,18 @@ describe Mingle::Facebook do
       Mingle::Facebook.fetch klhd_hashtag
     end
 
+    it 'can fetch posts since the configured time' do
+      offset = 2.days.ago
+
+      Mingle.temporarily since: offset do
+        Mingle::Facebook.should_receive(:posts_through_search).once
+                    .with(klhd_hashtag, offset)
+                    .and_call_original
+
+        Mingle::Facebook.fetch klhd_hashtag
+      end
+    end
+
     it 'accepts multiple hashtags' do
       Mingle::Facebook.should_receive(:posts_through_search).once
                    .with(klhd_hashtag, nil)

data/spec/models/mingle/instagram_spec.rb

@@ -23,25 +23,25 @@ describe Mingle::Instagram do
     photo = photos.first
 
     expect(photo.created_at).to eq Time.at(1369985275)
-    expect(photo.link).to eq 'https://instagram.com/p/Z97x-zEBXL/'
+    expect(photo.link).to eq 'http://instagram.com/p/Z97x-zEBXL/'
     expect(photo.photo_id).to eq '467792855743600075_272366028'
     expect(photo.message).to eq 'foo'
-    expect(photo.url).to eq 'https://distilleryimage7.s3.amazonaws.com/9c90802cc9c311e2868a22000a9f18a6_7.jpg'
+    expect(photo.url).to eq 'http://distilleryimage7.s3.amazonaws.com/9c90802cc9c311e2868a22000a9f18a6_7.jpg'
     expect(photo.user_handle).to eq 'eivindhilling'
     expect(photo.user_id).to eq '272366028'
-    expect(photo.user_image_url).to eq 'https://distillery.s3.amazonaws.com/profiles/profile_272366028_75sq_1365676035.jpg'
+    expect(photo.user_image_url).to eq 'http://images.ak.instagram.com/profiles/profile_272366028_75sq_1365676035.jpg'
     expect(photo.user_name).to eq 'Eivind Hilling'
 
     photo = photos.last
 
     expect(photo.created_at).to eq Time.at(1366202692)
-    expect(photo.link).to eq 'https://instagram.com/p/YNNE4ckBfI/'
+    expect(photo.link).to eq 'http://instagram.com/p/YNNE4ckBfI/'
     expect(photo.photo_id).to eq '436062249016104904_272366028'
     expect(photo.message).to eq nil
-    expect(photo.url).to eq 'https://distilleryimage4.s3.amazonaws.com/995b39c6a75c11e2918122000a9f4d8a_7.jpg'
+    expect(photo.url).to eq 'http://distilleryimage4.s3.amazonaws.com/995b39c6a75c11e2918122000a9f4d8a_7.jpg'
     expect(photo.user_handle).to eq 'eivindhilling'
     expect(photo.user_id).to eq '272366028'
-    expect(photo.user_image_url).to eq 'https://distillery.s3.amazonaws.com/profiles/profile_272366028_75sq_1365676035.jpg'
+    expect(photo.user_image_url).to eq 'http://images.ak.instagram.com/profiles/profile_272366028_75sq_1365676035.jpg'
     expect(photo.user_name).to eq 'Eivind Hilling'
 
     expect(Mingle::Instagram::Photo.count).to be 2
@@ -57,4 +57,13 @@ describe Mingle::Instagram do
     expect(photo.hashtags).to eq [ hashtag ]
   end
 
+  it 'will ignore photos that are too old' do
+    stub_request(:get, /api\.instagram\.com\/v1\/tags\/klhd\/media\/recent\.json/).to_return body: fixture('mingle/instagram/photos.json')
+
+    Mingle.temporarily since: Time.now do
+      photos = Mingle::Instagram.fetch hashtag
+
+      expect(photos.count).to eq 0
+    end
+  end
 end

data/spec/models/mingle/twitter/tweet_spec.rb

@@ -12,4 +12,12 @@ describe Mingle::Twitter::Tweet do
       expect(subject.avatar).to eq subject.user_image_url
     end
   end
+
+  describe "#url" do
+    it 'should be the tweet url' do
+      subject.stub(:user_handle).and_return 'sindre'
+      subject.stub(:tweet_id).and_return '1337'
+      expect(subject.url).to eq "https://twitter.com/sindre/status/1337"
+    end
+  end
 end

data/spec/models/mingle/twitter_spec.rb

@@ -11,6 +11,7 @@ describe Mingle::Twitter do
       config.twitter_api_secret = '...'
       config.twitter_access_token = '...'
       config.twitter_access_token_secret = '...'
+      config.twitter_ignore_retweets = false
     end
   end
 
@@ -32,6 +33,14 @@ describe Mingle::Twitter do
     Mingle::Twitter.fetch hashtag, 12391
   end
 
+  it 'can fetch tweets and ignore retweets' do
+    Mingle.config.twitter_ignore_retweets = true
+    Twitter::REST::Client.any_instance.should_receive(:search).with("#klhd", exclude: 'retweets', since_id: nil)
+      .and_return double(collect: [])
+
+    Mingle::Twitter.fetch hashtag
+  end
+
   it 'will create model instances for fetched tweets' do
     stub_request(:get, /api.twitter.com\/1\.1\/search\/tweets\.json/).to_return body: fixture('mingle/twitter/tweets.json')
 
@@ -43,7 +52,7 @@ describe Mingle::Twitter do
     expect(tweet.text).to match /^Klar for dagens plikter! Ha en fin lørdag/
     expect(tweet.user_id).to eq '280615050'
     expect(tweet.user_handle).to eq 'anitairenLFC'
-    expect(tweet.user_image_url).to eq 'https://si0.twimg.com/profile_images/3521212093/20a837ff967f5f1685f00506df7550e5_normal.jpeg'
+    expect(tweet.user_image_url).to eq 'http://si0.twimg.com/profile_images/3521212093/20a837ff967f5f1685f00506df7550e5_normal.jpeg'
     expect(tweet.user_name).to eq 'Anita Iren Vassli'
 
     tweet = tweets.last
@@ -52,7 +61,7 @@ describe Mingle::Twitter do
     expect(tweet.text).to match /^Av erfaring er det en ting som er sikkert/
     expect(tweet.user_id).to eq '87887606'
     expect(tweet.user_handle).to eq 'Hbjorg'
-    expect(tweet.user_image_url).to eq 'https://si0.twimg.com/profile_images/1364414120/Profil_twitter_normal.jpg'
+    expect(tweet.user_image_url).to eq 'http://si0.twimg.com/profile_images/1364414120/Profil_twitter_normal.jpg'
     expect(tweet.user_name).to eq 'Hans Fredrik'
 
     expect(Mingle::Twitter::Tweet.count).to be 2
@@ -68,4 +77,13 @@ describe Mingle::Twitter do
     expect(tweet.hashtags).to eq [ hashtag ]
   end
 
+  it 'will ignore tweets that are too old' do
+    stub_request(:get, /api.twitter.com\/1\.1\/search\/tweets\.json/).to_return body: fixture('mingle/twitter/tweets.json')
+
+    Mingle.temporarily(since: Time.now) do
+      tweets = Mingle::Twitter.fetch hashtag
+
+      expect(tweets.count).to eq 0
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingle
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Johannes Gorset
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -161,12 +161,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - Rakefile
-- app/assets/javascripts/mingle/application.js
-- app/assets/stylesheets/mingle/application.css
-- app/controllers/mingle/application_controller.rb
-- app/helpers/mingle/application_helper.rb
 - app/jobs/mingle/facebook/fetch.rb
 - app/jobs/mingle/instagram/fetch.rb
 - app/jobs/mingle/twitter/fetch.rb
@@ -180,7 +175,6 @@ files:
 - app/models/mingle/instagram/photo.rb
 - app/models/mingle/twitter.rb
 - app/models/mingle/twitter/tweet.rb
-- app/views/layouts/mingle/application.html.erb
 - config/initializers/facebook.rb
 - config/initializers/instagram.rb
 - config/routes.rb
@@ -192,7 +186,19 @@ files:
 - db/migrate/20140222125715_create_mingle_feed_items.rb
 - db/migrate/20140224155358_drop_mingle_feed_items.rb
 - db/migrate/20140305093743_add_user_name_to_mingle_instagram_photos.rb
+- db/migrate/20140403083806_add_url_to_mingle_twitter_tweets.rb
+- lib/generators/mingle/install/USAGE
+- lib/generators/mingle/install/install_generator.rb
+- lib/generators/mingle/install/templates/mingle_config.rb
 - lib/mingle.rb
+- lib/mingle/concerns.rb
+- lib/mingle/concerns/models.rb
+- lib/mingle/concerns/models/facebook.rb
+- lib/mingle/concerns/models/facebook/post.rb
+- lib/mingle/concerns/models/instagram.rb
+- lib/mingle/concerns/models/instagram/photo.rb
+- lib/mingle/concerns/models/twitter.rb
+- lib/mingle/concerns/models/twitter/tweet.rb
 - lib/mingle/configuration.rb
 - lib/mingle/engine.rb
 - lib/mingle/version.rb
@@ -225,8 +231,10 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -244,6 +252,7 @@ files:
 - spec/jobs/mingle/instagram/fetch_spec.rb
 - spec/jobs/mingle/twitter/fetch_spec.rb
 - spec/lib/mingle/configuration_spec.rb
+- spec/lib/mingle_spec.rb
 - spec/models/mingle/facebook/post_spec.rb
 - spec/models/mingle/facebook_spec.rb
 - spec/models/mingle/hashtag_spec.rb
@@ -279,60 +288,63 @@ signing_key:
 specification_version: 4
 summary: Social media integration for Ruby on Rails
 test_files:
-- spec/factories/mingle/instagram/photos.rb
-- spec/factories/mingle/hashtags.rb
-- spec/factories/mingle/hashtaggings.rb
-- spec/factories/mingle/twitter/tweets.rb
-- spec/factories/mingle/facebook/posts.rb
-- spec/spec_helper.rb
-- spec/lib/mingle/configuration_spec.rb
-- spec/support/fixture.rb
-- spec/dummy/README.rdoc
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/404.html
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
 - spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/boot.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/db/test.sqlite3
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
-- spec/dummy/bin/rails
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rake
+- spec/dummy/db/test.sqlite3
+- spec/dummy/log/test.log
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/jobs/mingle/instagram/fetch_spec.rb
-- spec/jobs/mingle/twitter/fetch_spec.rb
-- spec/jobs/mingle/facebook/fetch_spec.rb
+- spec/dummy/README.rdoc
+- spec/factories/mingle/facebook/posts.rb
+- spec/factories/mingle/hashtaggings.rb
+- spec/factories/mingle/hashtags.rb
+- spec/factories/mingle/instagram/photos.rb
+- spec/factories/mingle/twitter/tweets.rb
+- spec/fixtures/mingle/facebook/page_posts.json
+- spec/fixtures/mingle/facebook/search_posts.json
 - spec/fixtures/mingle/instagram/photos.json
 - spec/fixtures/mingle/twitter/tweets.json
-- spec/fixtures/mingle/facebook/search_posts.json
-- spec/fixtures/mingle/facebook/page_posts.json
-- spec/models/mingle/instagram/photo_spec.rb
+- spec/jobs/mingle/facebook/fetch_spec.rb
+- spec/jobs/mingle/instagram/fetch_spec.rb
+- spec/jobs/mingle/twitter/fetch_spec.rb
+- spec/lib/mingle/configuration_spec.rb
+- spec/lib/mingle_spec.rb
+- spec/models/mingle/facebook/post_spec.rb
 - spec/models/mingle/facebook_spec.rb
 - spec/models/mingle/hashtag_spec.rb
+- spec/models/mingle/hashtagging_spec.rb
+- spec/models/mingle/instagram/photo_spec.rb
 - spec/models/mingle/instagram_spec.rb
-- spec/models/mingle/twitter_spec.rb
 - spec/models/mingle/twitter/tweet_spec.rb
-- spec/models/mingle/hashtagging_spec.rb
-- spec/models/mingle/facebook/post_spec.rb
+- spec/models/mingle/twitter_spec.rb
+- spec/spec_helper.rb
+- spec/support/fixture.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2014 Hyper AS.
-
-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/app/assets/javascripts/mingle/application.js

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree .