tinderbot 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b1dad2f25741d25506da64708cc3f69d28d0ca
-  data.tar.gz: 0fe61ce02894fd540ef5c1d11d18868beee4ff3a
+  metadata.gz: 7996ea7e4ff30a49b7ad49ab8406297e99f2e69e
+  data.tar.gz: cdcd1fca2d274daf3502bd9158a86c7a6351981d
 SHA512:
-  metadata.gz: 823af092d67c3dcf228d287069b18b46278490dde1db484f205389ba303e007dff2aa373d062638a8f5229075ac97e234bd7567fc6d515c47b75b29f5a9e7396
-  data.tar.gz: ce02442f5e268715b347cbffe7d4399a72a648686048ed89fc0fee78dcb1184ef7177a35d208c8bdeef35055a5be2feb04b50e1fa62a7a343cb5355ff56f771b
+  metadata.gz: c26988c78c633378fd7def83ae8ac253d59ff35766777f04eae3966a12722eb13add88032d461cb3ae39069f55525813bc7f0960e824519c688d08516af08729
+  data.tar.gz: bcdccdc21ecd381ccef1946b60e43e4d5ee3441937fd261c276226bce26b781a5caf508b64fae070d52975f57d2fcfaa7f59827063cdf7068c3c33ed46589f97

data/README.md

@@ -1,7 +1,8 @@
 # Tinderbot
 
-[![Build](https://travis-ci.org/jvenezia/tinderbot.svg?branch=master)](https://travis-ci.org/jvenezia/tinderbot)
 [![Gem Version](https://badge.fury.io/rb/tinderbot.svg)](http://badge.fury.io/rb/tinderbot)
+[![Build](https://travis-ci.org/jvenezia/tinderbot.svg?branch=master)](https://travis-ci.org/jvenezia/tinderbot)
+[![Coverage Status](https://coveralls.io/repos/jvenezia/tinderbot/badge.png)](https://coveralls.io/r/jvenezia/tinderbot)
 
 Tinderbot is a ruby wrapper for the Tinder API.
 
@@ -45,7 +46,7 @@ Once you get your credentials, you can sign in to Tinder.
 facebook_authentication_token = 'your facebook authentication token'
 facebook_user_id = 'your facebook user id'
 
-tinder_client = Tinderbot::Tinder::Client.new
+tinder_client = Tinderbot::Client.new
 tinder_authentication_token = tinder_client.get_authentication_token(facebook_authentication_token, facebook_user_id)
 tinder_client.sign_in tinder_authentication_token
 ```
@@ -61,9 +62,9 @@ user.birth_date #=> #<Date: 2014-05-01>
 user.gender #=> :male (or :female)
 user.photo_urls #=> ['http://photo_1_url.jpg', 'http://photo_2_url.jpg']
 
-user = tinder_client.user(user_id) #=> returns an instance of Tinderbot::Tinder::Models::User
+user = tinder_client.user(user_id) #=> returns an instance of Tinderbot::Model::User
 
-users = tinder_client.recommended_users #=> returns an array of Tinderbot::Tinder::Models::User instances
+users = tinder_client.recommended_users #=> returns an array of Tinderbot::Model::User instances
 
 tinder_client.updates #=> {...} original json from tinder's API
 

data/lib/tinderbot/bot.rb

@@ -0,0 +1,17 @@
+module Tinderbot
+  class Bot
+    attr_accessor :client
+
+    def initialize(client)
+      @client = client
+    end
+
+    def like_recommended_users
+      recommended_users = @client.recommended_users
+      while recommended_users
+        recommended_users.each { |user| @client.like user }
+        recommended_users = @client.recommended_users
+      end
+    end
+  end
+end

data/lib/tinderbot/cli/application.rb

@@ -58,7 +58,7 @@ module Tinderbot
         tinder_client = sign_in
 
         puts 'Starting likes...'
-        tinder_bot = Tinderbot::Tinder::Bot.new tinder_client
+        tinder_bot = Tinderbot::Bot.new tinder_client
         tinder_bot.like_recommended_users
       end
 
@@ -66,7 +66,7 @@ module Tinderbot
 
       def sign_in
         puts 'Connecting to tinder...'
-        tinder_client = Tinderbot::Tinder::Client.new logs_enabled: true
+        tinder_client = Tinderbot::Client.new logs_enabled: true
         store = PStore.new(FACEBOOK_CREDENTIALS_FILE)
         facebook_authentication_token, facebook_user_id = get_last_facebook_credentials(store)
         tinder_authentication_token = get_tinder_authentication_token(store, tinder_client, facebook_authentication_token, facebook_user_id)

data/lib/tinderbot/client.rb

@@ -0,0 +1,98 @@
+module Tinderbot
+  class Client
+    TINDER_API_URL = 'https://api.gotinder.com'
+    CONNECTION_USER_AGENT = 'Tinder/3.0.4 (iPhone; iOS 7.1; Scale/2.00)'
+
+    attr_accessor :connection, :logs_enabled
+
+    def initialize(options = {})
+      @logs_enabled = options[:logs_enabled]
+      build_connection
+    end
+
+    def get_authentication_token(facebook_authentication_token, facebook_user_id)
+      JSON.parse(@connection.post('/auth', {facebook_token: facebook_authentication_token, facebook_id: facebook_user_id}).body)['token']
+    end
+
+    def sign_in(authentication_token)
+      @connection.token_auth(authentication_token)
+      @connection.headers['X-Auth-Token'] = authentication_token
+    end
+
+    def profile
+      Tinderbot::Model::User.build_from_tinder_json JSON.parse(@connection.get('profile').body)
+    end
+
+    def user(user_id)
+      Tinderbot::Model::User.build_from_tinder_json JSON.parse(@connection.get("user/#{user_id}").body)['results']
+    end
+
+    def updates
+      JSON.parse(@connection.post('updates').body)
+    end
+
+    def recommended_users
+      JSON.parse(@connection.post('user/recs').body)['results'].map { |r| Tinderbot::Model::User.build_from_tinder_json r }
+    end
+
+    def like(user_or_user_id)
+      if user_or_user_id.is_a? Tinderbot::Model::User
+        like_from_user_id(user_or_user_id.id)
+        puts "Liked #{user_or_user_id.id} (#{user_or_user_id.name})" if @logs_enabled
+      else
+        like_from_user_id(user_or_user_id)
+        puts "Liked #{user_or_user_id}" if @logs_enabled
+      end
+    end
+
+    def dislike(user_or_user_id)
+      if user_or_user_id.is_a? Tinderbot::Model::User
+        dislike_from_user_id(user_or_user_id.id)
+        puts "Disliked #{user_or_user_id.id} (#{user_or_user_id.name})" if @logs_enabled
+      else
+        dislike_from_user_id(user_or_user_id)
+        puts "Disliked #{user_or_user_id}" if @logs_enabled
+      end
+    end
+
+    def send_message(user_id, message)
+      @connection.post("user/matches/#{user_id}", {message: message})
+      puts "Sent message to #{user_id}" if @logs_enabled
+    end
+
+    def update_location(location)
+      latitude = location.split(',')[0]
+      longitude = location.split(',')[1]
+
+      if latitude && longitude
+        result = JSON.parse(@connection.post('user/ping', {lat: latitude, lon: longitude}).body)
+
+        if result['status'] == 200
+          puts "Location has been updated to #{location}" if @logs_enabled
+        else
+          puts result['error'] if @logs_enabled
+        end
+      else
+        raise Tinderbot::Error, 'Invalid location provided'
+      end
+    end
+
+    protected
+
+    def like_from_user_id(user_id)
+      @connection.get "like/#{user_id}"
+    end
+
+    def dislike_from_user_id(user_id)
+      @connection.get "pass/#{user_id}"
+    end
+
+    def build_connection
+      @connection = Faraday.new(url: TINDER_API_URL) do |faraday|
+        faraday.request :json
+        faraday.adapter Faraday.default_adapter
+      end
+      @connection.headers[:user_agent] = CONNECTION_USER_AGENT
+    end
+  end
+end

data/lib/tinderbot/model/user.rb

@@ -0,0 +1,33 @@
+module Tinderbot
+  module Model
+    class User
+      attr_accessor :original_tinder_json, :id, :name, :bio, :birth_date, :gender, :photo_urls
+
+      def self.build_from_tinder_json(tinder_json)
+        user = self.new
+        user.original_tinder_json = tinder_json
+        user.id = tinder_json['_id']
+        user.name = tinder_json['name']
+        user.bio = tinder_json['bio']
+        user.birth_date = Date.parse tinder_json['birth_date']
+        user.gender = tinder_json['gender'] == 0 ? :male : :female
+        user.photo_urls = tinder_json['photos'].map { |t| t['url'] }
+        user
+      end
+
+      def to_yaml_properties
+        instance_variables - [:@original_tinder_json]
+      end
+
+      def ==(other)
+        other.class == self.class && other.state == self.state
+      end
+
+      protected
+
+      def state
+        self.instance_variables.reject { |item| item == :@original_tinder_json }.map { |variable| self.instance_variable_get variable }
+      end
+    end
+  end
+end

data/lib/tinderbot/version.rb

@@ -1,3 +1,3 @@
 module Tinderbot
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/spec/models/user_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Tinderbot::Tinder::Models::User do
+describe Tinderbot::Model::User do
   describe '#build_from_tinder_json' do
     let(:user_tinder_json) { JSON.parse(open('spec/fixtures/user.json').read)['results'] }
 
-    subject { Tinderbot::Tinder::Models::User.build_from_tinder_json user_tinder_json }
+    subject { Tinderbot::Model::User.build_from_tinder_json user_tinder_json }
 
     it { expect(subject.original_tinder_json).to eq user_tinder_json }
     it { expect(subject.id).to eq user_tinder_json['_id'] }
@@ -25,7 +25,7 @@ describe Tinderbot::Tinder::Models::User do
 
   describe '.to_yaml' do
     let(:user_tinder_json) { JSON.parse(open('spec/fixtures/user.json').read)['results'] }
-    let(:user) { Tinderbot::Tinder::Models::User.build_from_tinder_json user_tinder_json }
+    let(:user) { Tinderbot::Model::User.build_from_tinder_json user_tinder_json }
 
     subject { user.to_yaml }
 

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require 'coveralls'
+Coveralls.wear!
+
 require 'bundler/setup'
 Bundler.setup
 

data/spec/tinder/bot_spec.rb

@@ -1,39 +1,39 @@
 require 'spec_helper'
 
-describe Tinderbot::Tinder::Bot do
-  let(:tinder_client) { Tinderbot::Tinder::Client.new }
-  let(:tinder_bot) { Tinderbot::Tinder::Bot.new(tinder_client) }
+describe Tinderbot::Bot do
+  let(:tinder_client) { Tinderbot::Client.new }
+  let(:tinder_bot) { Tinderbot::Bot.new(tinder_client) }
 
   describe 'client' do
     it { expect(tinder_bot.client).to eq tinder_client }
   end
 
   describe '.like_recommended_people' do
-    let(:recommended_users) { JSON.parse(open('spec/fixtures/recommended_users.json').read)['results'].each { |user| Tinderbot::Tinder::Models::User.build_from_tinder_json user } }
+    let(:recommended_users) { JSON.parse(open('spec/fixtures/recommended_users.json').read)['results'].each { |user| Tinderbot::Model::User.build_from_tinder_json user } }
 
     context 'there is no recommended people' do
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(nil) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(nil) }
 
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).not_to receive(:like_all) }
+      before { expect_any_instance_of(Tinderbot::Client).not_to receive(:like_all) }
 
       it { tinder_bot.like_recommended_users }
     end
 
     context 'there is one set of recommended people' do
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(recommended_users) }
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(nil) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(recommended_users) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(nil) }
 
-      before { recommended_users.each { |user| expect_any_instance_of(Tinderbot::Tinder::Client).not_to receive(:like).with(user).exactly(1).times } }
+      before { recommended_users.each { |user| expect_any_instance_of(Tinderbot::Client).not_to receive(:like).with(user).exactly(1).times } }
 
       it { tinder_bot.like_recommended_users }
     end
 
     context 'there is two sets of recommended people' do
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(recommended_users) }
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(recommended_users) }
-      before { expect_any_instance_of(Tinderbot::Tinder::Client).to receive(:recommended_users).and_return(nil) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(recommended_users) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(recommended_users) }
+      before { expect_any_instance_of(Tinderbot::Client).to receive(:recommended_users).and_return(nil) }
 
-      before { recommended_users.each { |user| expect_any_instance_of(Tinderbot::Tinder::Client).not_to receive(:like).with(user).exactly(2).times } }
+      before { recommended_users.each { |user| expect_any_instance_of(Tinderbot::Client).not_to receive(:like).with(user).exactly(2).times } }
 
       it { tinder_bot.like_recommended_users }
     end

data/spec/tinder/client_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Tinderbot::Tinder::Client do
-  let(:tinder_client) { Tinderbot::Tinder::Client.new }
+describe Tinderbot::Client do
+  let(:tinder_client) { Tinderbot::Client.new }
   let(:connection) { tinder_client.connection }
 
   describe '.connection' do
     it { expect(connection).to be_a(Faraday::Connection) }
-    it { expect("#{connection.url_prefix.scheme}://#{connection.url_prefix.host}").to eq(Tinderbot::Tinder::Client::TINDER_API_URL) }
-    it { expect(connection.headers[:user_agent]).to eq(Tinderbot::Tinder::Client::CONNECTION_USER_AGENT) }
+    it { expect("#{connection.url_prefix.scheme}://#{connection.url_prefix.host}").to eq(Tinderbot::Client::TINDER_API_URL) }
+    it { expect(connection.headers[:user_agent]).to eq(Tinderbot::Client::CONNECTION_USER_AGENT) }
   end
 
   describe '.profile' do
@@ -18,7 +18,7 @@ describe Tinderbot::Tinder::Client do
 
     subject { tinder_client.profile }
 
-    it { should eql? Tinderbot::Tinder::Models::User.build_from_tinder_json(JSON.parse(me_tinder_raw_json)) }
+    it { should eq Tinderbot::Model::User.build_from_tinder_json(JSON.parse(me_tinder_raw_json)) }
   end
 
   describe '.user' do
@@ -30,7 +30,7 @@ describe Tinderbot::Tinder::Client do
 
     subject { tinder_client.user user_id }
 
-    it { should eql? Tinderbot::Tinder::Models::User.build_from_tinder_json(JSON.parse(user_tinder_raw_json)['results']) }
+    it { should eq Tinderbot::Model::User.build_from_tinder_json(JSON.parse(user_tinder_raw_json)['results']) }
   end
 
   describe '.updates' do
@@ -52,7 +52,7 @@ describe Tinderbot::Tinder::Client do
 
     subject { tinder_client.recommended_users }
 
-    it { should eql? JSON.parse(recommended_users_tinder_raw_json)['results'].map { |r| Tinderbot::Tinder::Models::User.build_from_tinder_json r } }
+    it { should eq JSON.parse(recommended_users_tinder_raw_json)['results'].map { |r| Tinderbot::Model::User.build_from_tinder_json r } }
   end
 
   describe '.like' do
@@ -66,7 +66,7 @@ describe Tinderbot::Tinder::Client do
 
     context 'from user model' do
       let(:user_tinder_json) { JSON.parse(open('spec/fixtures/user.json').read)['results'] }
-      let(:user) { Tinderbot::Tinder::Models::User.build_from_tinder_json user_tinder_json }
+      let(:user) { Tinderbot::Model::User.build_from_tinder_json user_tinder_json }
 
       before { expect(connection).to receive(:get).with("like/#{user.id}") }
 
@@ -85,7 +85,7 @@ describe Tinderbot::Tinder::Client do
 
     context 'from user model' do
       let(:user_tinder_json) { JSON.parse(open('spec/fixtures/user.json').read)['results'] }
-      let(:user) { Tinderbot::Tinder::Models::User.build_from_tinder_json user_tinder_json }
+      let(:user) { Tinderbot::Model::User.build_from_tinder_json user_tinder_json }
 
       before { expect(connection).to receive(:get).with("pass/#{user.id}") }
 

data/tinderbot.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
 
   spec.add_dependency 'thor', '~> 0'
   spec.add_dependency 'faraday', '~> 0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tinderbot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jeremy Venezia
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -138,12 +152,12 @@ files:
 - Rakefile
 - bin/tinderbot
 - lib/tinderbot.rb
+- lib/tinderbot/bot.rb
 - lib/tinderbot/cli/application.rb
+- lib/tinderbot/client.rb
 - lib/tinderbot/error.rb
 - lib/tinderbot/facebook.rb
-- lib/tinderbot/tinder/bot.rb
-- lib/tinderbot/tinder/client.rb
-- lib/tinderbot/tinder/models/user.rb
+- lib/tinderbot/model/user.rb
 - lib/tinderbot/version.rb
 - spec/fixtures/profile.json
 - spec/fixtures/recommended_users.json

data/lib/tinderbot/tinder/bot.rb

@@ -1,19 +0,0 @@
-module Tinderbot
-  module Tinder
-    class Bot
-      attr_accessor :client
-
-      def initialize(client)
-        @client = client
-      end
-
-      def like_recommended_users
-        recommended_users = @client.recommended_users
-        while recommended_users
-          recommended_users.each { |user| @client.like user }
-          recommended_users = @client.recommended_users
-        end
-      end
-    end
-  end
-end

data/lib/tinderbot/tinder/client.rb

@@ -1,100 +0,0 @@
-module Tinderbot
-  module Tinder
-    class Client
-      TINDER_API_URL = 'https://api.gotinder.com'
-      CONNECTION_USER_AGENT = 'Tinder/3.0.4 (iPhone; iOS 7.1; Scale/2.00)'
-
-      attr_accessor :connection, :logs_enabled
-
-      def initialize(options = {})
-        @logs_enabled = options[:logs_enabled]
-        build_connection
-      end
-
-      def get_authentication_token(facebook_authentication_token, facebook_user_id)
-        JSON.parse(@connection.post('/auth', {facebook_token: facebook_authentication_token, facebook_id: facebook_user_id}).body)['token']
-      end
-
-      def sign_in(authentication_token)
-        @connection.token_auth(authentication_token)
-        @connection.headers['X-Auth-Token'] = authentication_token
-      end
-
-      def profile
-        Tinderbot::Tinder::Models::User.build_from_tinder_json JSON.parse(@connection.get('profile').body)
-      end
-
-      def user(user_id)
-        Tinderbot::Tinder::Models::User.build_from_tinder_json JSON.parse(@connection.get("user/#{user_id}").body)['results']
-      end
-
-      def updates
-        JSON.parse(@connection.post('updates').body)
-      end
-
-      def recommended_users
-        JSON.parse(@connection.post('user/recs').body)['results'].map { |r| Tinderbot::Tinder::Models::User.build_from_tinder_json r }
-      end
-
-      def like(user_or_user_id)
-        if user_or_user_id.is_a? Tinderbot::Tinder::Models::User
-          like_from_user_id(user_or_user_id.id)
-          puts "Liked #{user_or_user_id.id} (#{user_or_user_id.name})" if @logs_enabled
-        else
-          like_from_user_id(user_or_user_id)
-          puts "Liked #{user_or_user_id}" if @logs_enabled
-        end
-      end
-
-      def dislike(user_or_user_id)
-        if user_or_user_id.is_a? Tinderbot::Tinder::Models::User
-          dislike_from_user_id(user_or_user_id.id)
-          puts "Disliked #{user_or_user_id.id} (#{user_or_user_id.name})" if @logs_enabled
-        else
-          dislike_from_user_id(user_or_user_id)
-          puts "Disliked #{user_or_user_id}" if @logs_enabled
-        end
-      end
-
-      def send_message(user_id, message)
-        @connection.post("user/matches/#{user_id}", {message: message})
-        puts "Sent message to #{user_id}" if @logs_enabled
-      end
-
-      def update_location(location)
-        latitude = location.split(',')[0]
-        longitude = location.split(',')[1]
-
-        if latitude && longitude
-          result = JSON.parse(@connection.post('user/ping', {lat: latitude, lon: longitude}).body)
-
-          if result['status'] == 200
-            puts "Location has been updated to #{location}" if @logs_enabled
-          else
-            puts result['error'] if @logs_enabled
-          end
-        else
-          raise Tinderbot::Error, 'Invalid location provided'
-        end
-      end
-
-      protected
-
-      def like_from_user_id(user_id)
-        @connection.get "like/#{user_id}"
-      end
-
-      def dislike_from_user_id(user_id)
-        @connection.get "pass/#{user_id}"
-      end
-
-      def build_connection
-        @connection = Faraday.new(url: TINDER_API_URL) do |faraday|
-          faraday.request :json
-          faraday.adapter Faraday.default_adapter
-        end
-        @connection.headers[:user_agent] = CONNECTION_USER_AGENT
-      end
-    end
-  end
-end

data/lib/tinderbot/tinder/models/user.rb

@@ -1,25 +0,0 @@
-module Tinderbot
-  module Tinder
-    module Models
-      class User
-        attr_accessor :original_tinder_json, :id, :name, :bio, :birth_date, :gender, :photo_urls
-
-        def self.build_from_tinder_json(tinder_json)
-          user = self.new
-          user.original_tinder_json = tinder_json
-          user.id = tinder_json['_id']
-          user.name = tinder_json['name']
-          user.bio = tinder_json['bio']
-          user.birth_date = Date.parse tinder_json['birth_date']
-          user.gender = tinder_json['gender'] == 0 ? :male : :female
-          user.photo_urls = tinder_json['photos'].map { |t| t['url'] }
-          user
-        end
-
-        def to_yaml_properties
-          instance_variables - [:@original_tinder_json]
-        end
-      end
-    end
-  end
-end