mingle 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60949a367f442c1a324c904715cb48d88576f599
-  data.tar.gz: 17e07f3a27586fd103fb98e379b52d6f40726753
+  metadata.gz: a9065eee4fcbf4cf798b08a052c87c209a8d4518
+  data.tar.gz: e050a6a2d566384473405ed4545a1fd5474caaa2
 SHA512:
-  metadata.gz: 1cb632bf16a925ea6efc6749b8da84d70e27c66ba1b76cb8bce68b92fd018abce8551c5d60673ecb1eef47b1fa80d1bdc350038fd2fd32dd8eb8a92c8d9e2cb8
-  data.tar.gz: ab1d144d20d2949589e8e244668c66ead49c9d90f692d55ba49b848c108fc9dfeca7ca048042565828bdcb12bbb620f79a136270d77f13059caa64f2941229e7
+  metadata.gz: 6d6b77c34319be35a94a15273f6857d6d869c5d50bbb45c609f93e3ff2cbd93cc992746c57e30390867955217a6ec50b25df741344cc37e1239a164e6b5ff2e2
+  data.tar.gz: 80b26d770497904a3ed85ca7ba28060b7f04a42c784f9766c773911c3dd3b3221b49dcdd854d8e8bbcc66c4489dd9cc5f6e0476940ebaa0029411707904cdfb9

data/app/models/mingle/facebook.rb

@@ -8,7 +8,15 @@ module Mingle::Facebook
     end
 
     # Fetch posts since given date/timestamp, last post's creation date or beginning of time
-    def fetch(hashtags = Mingle::Hashtag.all, since = Mingle::Facebook::Post.ordered.last.try(:created_at))
+    def fetch(hashtags = Mingle::Hashtag.all, since = nil)
+      unless since
+        if Post.any?
+          since = Post.ordered.last.created_at
+        else
+          since = Mingle.config.since
+        end
+      end
+
       hashtags = Array(hashtags)
 
       posts = []
@@ -23,6 +31,10 @@ module Mingle::Facebook
 
     # Retrieves posts through given search query
     def posts_through_search hashtag, since
+      warn "DEPRECATION WARNING: Facebook has deprecated searching for posts. It is no " +
+           "longer available for new applications and will cease to work for existing " +
+           "applications in April 2015."
+
       posts = FbGraph::Post.search(hashtag.tag_name_with_hash, since: since.to_i, return_ssl_resources: 1, access_token: config.access_token)
 
       # Facebook search is fairly unpredictable, so ensure the query is actually mentioned

data/app/models/mingle/facebook/post.rb

@@ -1,36 +1,3 @@
 class Mingle::Facebook::Post < ActiveRecord::Base
-  has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable,
-    dependent: :destroy
-
-  has_many :hashtags, through: :hashtaggings
-
-  validates :post_id, :user_id, :user_name, presence: true
-
-  scope :ordered, lambda { order('created_at ASC') }
-
-  # Prevent Rails from assuming :type is STI-related
-  # See: http://stackoverflow.com/questions/7134559/rails-use-type-column-without-sti
-  self.inheritance_column = nil
-
-  # Large pictures are not directly provided through the Graph API
-  # Note: Not a documented Facebook feature and may potentially break in the future
-  def large_picture
-    picture.gsub(/_(?:s|t)\.(jpg|jpeg|png|gif)$/, '_b.\1') if picture.present?
-  end
-
-  def profile_url
-    "https://www.facebook.com/#{user_id}" if user_id.present?
-  end
-
-  def profile_image_url
-    "https://graph.facebook.com/#{user_id}/picture" if user_id.present?
-  end
-
-  def author
-    user_name
-  end
-
-  def avatar
-    profile_image_url
-  end
+  include Mingle::Concerns::Models::Facebook::Post
 end

data/app/models/mingle/instagram.rb

@@ -26,6 +26,8 @@ module Mingle::Instagram
 
           photo.hashtags << hashtag unless photo.hashtags.include? hashtag
 
+          next if ignore? photo
+
           photo.save!
           photo
         end
@@ -33,4 +35,14 @@ module Mingle::Instagram
     end.flatten
   end
 
+  private
+
+  # Determine whether the given photo should be ignored.
+  #
+  # photo - A Photo instance.
+  #
+  # Returns a Boolean.
+  def self.ignore? photo
+    Mingle.config.since && photo.created_at < Mingle.config.since
+  end
 end

data/app/models/mingle/instagram/photo.rb

@@ -1,28 +1,3 @@
 class Mingle::Instagram::Photo < ActiveRecord::Base
-  has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable, dependent: :destroy
-  has_many :hashtags, through: :hashtaggings
-
-  validates :link, :photo_id, :url, :user_handle, :user_image_url, presence: true
-
-  scope :ordered, lambda { order('created_at ASC') }
-
-  before_save :ensure_https_urls
-
-  def author
-    user_handle
-  end
-
-  def avatar
-    user_image_url
-  end
-
-  private
-
-  def ensure_https_urls
-    self.link = link.sub(/http:/, 'https:')
-    self.url = url.sub(/http:/, 'https:')
-    self.user_image_url = user_image_url.sub(%r(http://images\.ak\.instagram\.com),
-                                              'https://distillery.s3.amazonaws.com')
-  end
-
+  include Mingle::Concerns::Models::Instagram::Photo
 end

data/app/models/mingle/twitter.rb

@@ -9,8 +9,11 @@ module Mingle::Twitter
     def fetch hashtags = Mingle::Hashtag.all, since_id = Mingle::Twitter::Tweet.ordered.last.try(:tweet_id)
       hashtags = Array(hashtags)
 
+      options = { since_id: since_id }
+      options[:exclude] = 'retweets' if Mingle.config.twitter_ignore_retweets
+
       hashtags.map do |hashtag|
-        client.search(hashtag.tag_name_with_hash, since_id: since_id).collect do |data|
+        client.search(hashtag.tag_name_with_hash, options).collect do |data|
           tweet = Tweet.find_or_initialize_by tweet_id: data.id.to_s
 
           tweet.attributes = {
@@ -25,9 +28,11 @@ module Mingle::Twitter
 
           tweet.hashtags << hashtag unless tweet.hashtags.include? hashtag
 
+          next if ignore? tweet
+
           tweet.save!
           tweet
-        end
+        end.compact
       end.flatten
     end
 
@@ -43,6 +48,14 @@ module Mingle::Twitter
       end
     end
 
+    # Determine whether the given tweet should be ignored.
+    #
+    # tweet - A Tweet instance.
+    #
+    # Returns a Boolean.
+    def ignore? tweet
+      Mingle.config.since && tweet.created_at < Mingle.config.since
+    end
   end
 
 end

data/app/models/mingle/twitter/tweet.rb

@@ -1,26 +1,3 @@
 class Mingle::Twitter::Tweet < ActiveRecord::Base
-  has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable,
-    dependent: :destroy
-
-  has_many :hashtags, through: :hashtaggings
-
-  validates :text, :tweet_id, :user_handle, :user_image_url, :user_name, presence: true
-
-  scope :ordered, lambda { order('created_at ASC') }
-
-  before_save :ensure_https_urls
-
-  def author
-    user_handle
-  end
-
-  def avatar
-    user_image_url
-  end
-
-  private
-
-  def ensure_https_urls
-    self.user_image_url = user_image_url.sub(/http:/, 'https:')
-  end
+  include Mingle::Concerns::Models::Twitter::Tweet
 end

data/db/migrate/20140403083806_add_url_to_mingle_twitter_tweets.rb

@@ -0,0 +1,5 @@
+class AddUrlToMingleTwitterTweets < ActiveRecord::Migration
+  def change
+    add_column :mingle_twitter_tweets, :url, :string
+  end
+end

data/lib/generators/mingle/install/USAGE

@@ -0,0 +1,9 @@
+Description:
+  Copies over a default configuration file for Mingle into your application's
+  initializer directory.
+
+Example:
+  rails generate mingle:install
+
+  This will create:
+    config/initializers/mingle.rb

data/lib/generators/mingle/install/install_generator.rb

@@ -0,0 +1,7 @@
+class Mingle::InstallGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+
+  def copy_config_file
+    copy_file 'mingle_config.rb', 'config/initializers/mingle.rb'
+  end
+end

data/lib/generators/mingle/install/templates/mingle_config.rb

@@ -0,0 +1,8 @@
+Mingle.configure do |config|
+  config.facebook_access_token       = ENV['FACEBOOK_ACCESS_TOKEN']
+  config.twitter_api_key             = ENV['TWITTER_API_KEY']
+  config.twitter_api_secret          = ENV['TWITTER_API_SECRET']
+  config.twitter_access_token        = ENV['TWITTER_ACCESS_TOKEN']
+  config.twitter_access_token_secret = ENV['TWITTER_ACCESS_TOKEN_SECRET']
+  config.instagram_client_id         = ENV['INSTAGRAM_CLIENT_ID']
+end

data/lib/mingle.rb

@@ -1,5 +1,6 @@
 require 'mingle/engine'
 require 'mingle/configuration'
+require "mingle/concerns"
 
 require 'twitter'
 require 'fb_graph'
@@ -14,5 +15,20 @@ module Mingle
     def config
       @config ||= Mingle::Configuration.new
     end
+
+    # Set temporary configuration options for the duration of the given block.
+    #
+    # options - A Hash describing temporary configuration options.
+    def temporarily options = {}
+      original = @config.dup
+
+      options.each do |key, value|
+        @config.send "#{key}=", value
+      end
+
+      yield
+    ensure
+      @config = original
+    end
   end
 end

data/lib/mingle/concerns.rb

@@ -0,0 +1,3 @@
+module Mingle::Concerns
+  require 'mingle/concerns/models'
+end

data/lib/mingle/concerns/models.rb

@@ -0,0 +1,5 @@
+module Mingle::Concerns::Models
+  require 'mingle/concerns/models/facebook'
+  require 'mingle/concerns/models/instagram'
+  require 'mingle/concerns/models/twitter'
+end

data/lib/mingle/concerns/models/facebook.rb

@@ -0,0 +1,3 @@
+module Mingle::Concerns::Models::Facebook
+  require 'mingle/concerns/models/facebook/post'
+end

data/lib/mingle/concerns/models/facebook/post.rb

@@ -0,0 +1,40 @@
+module Mingle::Concerns::Models::Facebook::Post
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable,
+      dependent: :destroy
+
+    has_many :hashtags, through: :hashtaggings
+
+    validates :post_id, :user_id, :user_name, presence: true
+
+    scope :ordered, lambda { order('created_at ASC') }
+
+    # Prevent Rails from assuming :type is STI-related
+    # See: http://stackoverflow.com/questions/7134559/rails-use-type-column-without-sti
+    self.inheritance_column = nil
+
+    # Large pictures are not directly provided through the Graph API
+    # Note: Not a documented Facebook feature and may potentially break in the future
+    def large_picture
+      picture.gsub(/_(?:s|t)\.(jpg|jpeg|png|gif)$/, '_b.\1') if picture.present?
+    end
+
+    def profile_url
+      "https://www.facebook.com/#{user_id}" if user_id.present?
+    end
+
+    def profile_image_url
+      "https://graph.facebook.com/#{user_id}/picture" if user_id.present?
+    end
+
+    def author
+      user_name
+    end
+
+    def avatar
+      profile_image_url
+    end
+  end
+end

data/lib/mingle/concerns/models/instagram.rb

@@ -0,0 +1,3 @@
+module Mingle::Concerns::Models::Instagram
+  require 'mingle/concerns/models/instagram/photo'
+end

data/lib/mingle/concerns/models/instagram/photo.rb

@@ -0,0 +1,20 @@
+module Mingle::Concerns::Models::Instagram::Photo
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable, dependent: :destroy
+    has_many :hashtags, through: :hashtaggings
+
+    validates :link, :photo_id, :url, :user_handle, :user_image_url, presence: true
+
+    scope :ordered, lambda { order('created_at ASC') }
+
+    def author
+      user_handle
+    end
+
+    def avatar
+      user_image_url
+    end
+  end
+end

data/lib/mingle/concerns/models/twitter.rb

@@ -0,0 +1,3 @@
+module Mingle::Concerns::Models::Twitter
+  require 'mingle/concerns/models/twitter/tweet'
+end

data/lib/mingle/concerns/models/twitter/tweet.rb

@@ -0,0 +1,26 @@
+module Mingle::Concerns::Models::Twitter::Tweet
+  extend ActiveSupport::Concern
+
+  included do
+    has_many :hashtaggings, class_name: 'Mingle::Hashtagging', as: :hashtaggable,
+      dependent: :destroy
+
+    has_many :hashtags, through: :hashtaggings
+
+    validates :text, :tweet_id, :user_handle, :user_image_url, :user_name, presence: true
+
+    scope :ordered, lambda { order('created_at ASC') }
+
+    def author
+      user_handle
+    end
+
+    def avatar
+      user_image_url
+    end
+
+    def url
+      "https://twitter.com/#{user_handle}/status/#{tweet_id}"
+    end
+  end
+end

data/lib/mingle/configuration.rb

@@ -2,15 +2,38 @@ module Mingle
   class Configuration
     configs = [
       :facebook_access_token, :twitter_api_key, :twitter_api_secret,
-      :twitter_access_token, :twitter_access_token_secret, :instagram_client_id
+      :twitter_access_token, :twitter_access_token_secret,
+      :twitter_ignore_retweets, :instagram_client_id, :since
     ]
 
     attr_accessor *configs
 
-    configs.each do |config|
-      define_method config do
-        instance_variable_get("@#{config}") || ENV[config.upcase.to_s]
-      end
+    def initialize
+      @twitter_ignore_retweets = false
+    end
+
+    def facebook_access_token
+      @facebook_access_token || ENV['FACEBOOK_ACCESS_TOKEN']
+    end
+
+    def twitter_api_key
+      @twitter_api_key || ENV['TWITTER_API_KEY']
+    end
+
+    def twitter_api_secret
+      @twitter_api_secret || ENV['TWITTER_API_SECRET']
+    end
+
+    def twitter_access_token
+      @twitter_access_token || ENV['TWITTER_ACCESS_TOKEN']
+    end
+
+    def twitter_access_token_secret
+      @twitter_access_token_secret || ENV['TWITTER_ACCESS_TOKEN_SECRET']
+    end
+
+    def instagram_client_id
+      @instagram_client_id || ENV['INSTAGRAM_CLIENT_ID']
     end
   end
 end

data/lib/mingle/engine.rb

@@ -7,6 +7,10 @@ module Mingle
   class Engine < ::Rails::Engine
     isolate_namespace Mingle
 
+    initializer 'mingle.factories', after: 'factory_girl.set_factory_paths' do
+      FactoryGirl.definition_file_paths << File.expand_path('../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+    end
+
     config.eager_load_paths.delete_if do |path|
       Pathname.new(path).split.last.to_s == 'jobs' && !defined? Sidekiq
     end

data/lib/mingle/version.rb

@@ -1,3 +1,3 @@
 module Mingle
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end