mingle 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446a59b13570511c4ea2168783de71d88a5ea227
-  data.tar.gz: db5b3a67481bd0dd6af997b32888f86ec15c9ca1
+  metadata.gz: fcce2c5dda956651978f29315020ec7655ab9ab1
+  data.tar.gz: 57b36c7a7e56f207a4ede2e22be2a941bcc42fce
 SHA512:
-  metadata.gz: 507b2228505f58f9598fb5b1c2c0795fdab177c5edb7b3237ea7a02eff4d6514ee9723b047dd87b7b4d0096d17b545bd347fa98b024e76e0b2ab44f972f8130f
-  data.tar.gz: d77557aedb8f87489bc182da3a8509dc3da192fe84261fb1ec46434777a8d9ed059179861da6922213374e6bf47fcab2393c672a1fe23f0569b7f0da9ee6955b
+  metadata.gz: e7c9c646d2847131d0d1e57d2950c186cc858685c3ae641688e5d2b7e0b136fa47fe8d0d2735259eb00405f619e8b56b00cc94f4bdba07d3e1ec60869458fadc
+  data.tar.gz: 2fb68c67d1b536c57a18a447f0a220362ae5d231a6b831c85f44b7ea32ba002293994de18148858d4c036d6e2746978c78fb4075df7bf8c5500f06ed12552d97

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+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

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

@@ -25,4 +25,12 @@ class Mingle::Facebook::Post < ActiveRecord::Base
   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

data/app/models/mingle/instagram.rb

@@ -4,7 +4,6 @@ module Mingle::Instagram
     "#{Mingle.table_name_prefix}instagram_"
   end
 
-  # Fetch recent photos tagged with 'klhd'
   def self.fetch hashtags = Mingle::Hashtag.all
     hashtags = Array(hashtags)
 
@@ -21,7 +20,8 @@ module Mingle::Instagram
             url: media.images.standard_resolution.url,
             user_handle: media.user.username,
             user_id: media.user.id,
-            user_image_url: media.user.profile_picture
+            user_image_url: media.user.profile_picture,
+            user_name: media.user.full_name
           }
 
           photo.hashtags << hashtag unless photo.hashtags.include? hashtag

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

@@ -8,6 +8,14 @@ class Mingle::Instagram::Photo < ActiveRecord::Base
 
   before_save :ensure_https_urls
 
+  def author
+    user_handle
+  end
+
+  def avatar
+    user_image_url
+  end
+
   private
 
   def ensure_https_urls

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

@@ -10,6 +10,14 @@ class Mingle::Twitter::Tweet < ActiveRecord::Base
 
   before_save :ensure_https_urls
 
+  def author
+    user_handle
+  end
+
+  def avatar
+    user_image_url
+  end
+
   private
 
   def ensure_https_urls

data/db/migrate/20140305093743_add_user_name_to_mingle_instagram_photos.rb

@@ -0,0 +1,5 @@
+class AddUserNameToMingleInstagramPhotos < ActiveRecord::Migration
+  def change
+    add_column :mingle_instagram_photos, :user_name, :string
+  end
+end

data/lib/mingle/version.rb

@@ -1,3 +1,3 @@
 module Mingle
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/tasks/mingle_tasks.rake

@@ -2,6 +2,7 @@ namespace :mingle do
 
   desc "Fetch everything"
   task fetch: ['twitter:fetch', 'facebook:fetch', 'instagram:fetch']
+  task clear: ['twitter:clear', 'facebook:clear', 'instagram:clear']
 
   namespace :twitter do
 
@@ -10,6 +11,11 @@ namespace :mingle do
       Mingle::Twitter.fetch
     end
 
+    desc "Clear tweets from Twitter"
+    task clear: :environment do
+      Mingle::Twitter::Tweet.destroy_all
+    end
+
   end
 
   namespace :facebook do
@@ -19,6 +25,11 @@ namespace :mingle do
       Mingle::Facebook.fetch
     end
 
+    desc "Clear posts from Facebook"
+    task clear: :environment do
+      Mingle::Facebook::Post.destroy_all
+    end
+
   end
 
   namespace :instagram do
@@ -28,6 +39,11 @@ namespace :mingle do
       Mingle::Instagram.fetch
     end
 
+    desc "Clear photos from Instagram"
+    task clear: :environment do
+      Mingle::Instagram::Photo.destroy_all
+    end
+
   end
 
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140224155358) do
+ActiveRecord::Schema.define(version: 20140305094014) do
 
   create_table "mingle_facebook_posts", force: true do |t|
     t.string   "post_id"
@@ -58,6 +58,7 @@ ActiveRecord::Schema.define(version: 20140224155358) do
     t.text     "message"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "user_name"
   end
 
   create_table "mingle_twitter_tweets", force: true do |t|

data/spec/models/mingle/facebook/post_spec.rb

@@ -40,4 +40,16 @@ describe Mingle::Facebook::Post do
       expect(subject.profile_image_url).to be_nil
     end
   end
+
+  describe "#author" do
+    it 'should be the username' do
+      expect(subject.author).to eq subject.user_name
+    end
+  end
+
+  describe "#avatar" do
+    it 'should be the profile image' do
+      expect(subject.avatar).to eq subject.profile_image_url
+    end
+  end
 end

data/spec/models/mingle/instagram/photo_spec.rb

@@ -1,4 +1,15 @@
 require 'spec_helper'
 
 describe Mingle::Instagram::Photo do
+  describe "#author" do
+    it 'should be the user handle' do
+      expect(subject.author).to eq subject.user_handle
+    end
+  end
+
+  describe "#avatar" do
+    it 'should be the user image url' do
+      expect(subject.avatar).to eq subject.user_image_url
+    end
+  end
 end

data/spec/models/mingle/instagram_spec.rb

@@ -30,6 +30,7 @@ describe Mingle::Instagram do
     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_name).to eq 'Eivind Hilling'
 
     photo = photos.last
 
@@ -41,6 +42,7 @@ describe Mingle::Instagram do
     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_name).to eq 'Eivind Hilling'
 
     expect(Mingle::Instagram::Photo.count).to be 2
   end

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

@@ -1,4 +1,15 @@
 require 'spec_helper'
 
 describe Mingle::Twitter::Tweet do
+  describe "#author" do
+    it 'should be the user handle' do
+      expect(subject.author).to eq subject.user_handle
+    end
+  end
+
+  describe "#avatar" do
+    it 'should be the user image url' do
+      expect(subject.avatar).to eq subject.user_image_url
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mingle
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Johannes Gorset
@@ -10,146 +10,146 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.5'
 - !ruby/object:Gem::Dependency
   name: fb_graph
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: instagram
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.9
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Facebook, Twitter and Instagram integration for Ruby on Rails
@@ -191,6 +191,7 @@ files:
 - db/migrate/20140222112741_create_mingle_instagram_photos.rb
 - 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
 - lib/mingle.rb
 - lib/mingle/engine.rb
 - lib/mingle/version.rb
@@ -226,8 +227,6 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -264,17 +263,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Social media integration for Ruby on Rails
@@ -308,8 +307,6 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html