tinder_client 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f4ad83b15d2db91d476b1a6f0394c98bf7b2d68fbbc8283baad68ce745c454e
-  data.tar.gz: f8971a6dea4c42121a5156bc2284fc4e6a94a41f45aa8e98843f8cdd1b26d11d
+  metadata.gz: 167cc4ebb326169d8ae16da13a2152c868a988cbdad04d2cf1624aa8755f716f
+  data.tar.gz: a791451985f07ef5e3bf6f1fc1eb253a1cb9aacd6dc1f3dd7791b18f50086f74
 SHA512:
-  metadata.gz: 80fafc81e80807001dc8ce11d9cb8cd650732cac861b66a1db4c6e06d082ddf29acd38e07011353724f4b1b14285b6f0a9bf6d421034580158f292c174976442
-  data.tar.gz: 44393d3dfd9d19254963015fa3a225b51f3debbcea2f9ae88e7739e4cd9b2efa5ecc1b3919d69ae40547b0cdc7d3783dce20a7078b864a8aa8dfc75ef5e75ba2
+  metadata.gz: bf42e0127c461cd11918f1c06dc9051a4558d3e463cedbdd7ed76ba321f3d9bfe9faf6883402b97b5273db2d1f28c5de4b913c5ee4a5f46357fa6a77f8039b4a
+  data.tar.gz: 01faabdf01872223930df55161b474e5daf0b58464bcdcb9d1b133a0ae8e9c0c8063b5c528d5813dcc891f04d9e7dae84d8bfb83f062d27f298e116896dc19c6

data/Gemfile

@@ -1,16 +1,25 @@
 source "https://rubygems.org"
+
 gem 'bundler', '~> 1.17.2'
 
+gem 'simplecov'
 gem 'codecov'
 
 gem 'faraday', '~> 0.15.0'
-gem 'hashdiff', ['>= 1.0.0.beta1'] # fix for webmock
 gem 'rspec', '~> 3.8'
-gem 'webmock', '3.6.0'
 
-gem 'dry-initializer', git: 'https://github.com/dry-rb/dry-initializer.git', ref: 'dd7b590'
 gem 'dry-struct', git: 'https://github.com/dry-rb/dry-struct.git', ref: 'fe507e6'
 gem 'dry-types', git: 'https://github.com/dry-rb/dry-types.git', ref: '3d54d08'
 
+# web Mocks/stubs
+gem 'vcr'
+gem 'webmock', '3.6.0'
+gem 'hashdiff', ['>= 1.0.0.beta1'] # fix for webmock
+gem 'multi_json'
+
+# Dev stuff
+gem 'ruby-debug-ide'
+gem 'debase'
+
 # Specify your gem's dependencies in tinder.gemspec
 gemspec

data/README.md

@@ -65,7 +65,7 @@ That means, call the services with your API token to return a struct:
     attribute :id, Types.string
     attribute? :crop_info do
       attribute? :user do
-        attribute :width_pct, Types.float
+        attribute :width_pct, Dry::Types['coercible.float']
         attribute :x_offset_pct, Types.float
         attribute :height_pct, Types.float
         attribute :y_offset_pct, Types.float

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "tinder"
+require "tinder_client"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/tasks/tinder.rake

@@ -2,7 +2,7 @@
 
 require 'bundler/setup'
 require 'rake'
-require "tinder"
+require "tinder_client"
 
 # ### Environment Variables
 # `phone_number` - the phone number to login with

data/lib/tinder/client.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "tinder"
+require "tinder_client"
 require "faraday"
 
 module Tinder

data/lib/tinder/get_recommendations.rb

@@ -20,25 +20,24 @@ module Tinder
 
       results.map { |user_data| Recommendation.new(user_data) }
     end
+
+    alias_method :recommendations, :get_recommendations
+  end
+
+  class PhotoMetadata < Dry::Struct
+    attribute :width_pct, Dry::Types['coercible.integer']
+    attribute :x_offset_pct, Dry::Types['coercible.integer']
+    attribute :height_pct, Dry::Types['coercible.integer']
+    attribute :y_offset_pct, Dry::Types['coercible.integer']
   end
 
   class Photo < Dry::Struct
     attribute :id, Types.string
     attribute? :crop_info do
-      attribute? :user do
-        attribute :width_pct, Types.float
-        attribute :x_offset_pct, Types.float
-        attribute :height_pct, Types.float
-        attribute :y_offset_pct, Types.float
-      end
-      attribute? :algo do
-        attribute :width_pct, Types.float
-        attribute :x_offset_pct, Types.float
-        attribute :height_pct, Types.float
-        attribute :y_offset_pct, Types.float
-      end
-      attribute :processed_by_bullseye, Types.bool
-      attribute :user_customized, Types.bool
+      attribute? :user, PhotoMetadata
+      attribute? :algo, PhotoMetadata
+      attribute? :processed_by_bullseye, Types.bool
+      attribute? :user_customized, Types.bool
       attribute? :url, Types.string
       attribute? :processedFiles, Types.array
       attribute? :fileName, Types.string
@@ -51,14 +50,14 @@ module Tinder
     attribute :bio, Types.string
     attribute :birth_date, Types.string
     attribute :name, Types.string
-    attribute :photos, Types.array.of(Photo)
-    attribute :gender, Types.integer
-    attribute :jobs, Types.array
-    attribute :schools, Types.array do
-      attribute :name, Types.string
+    attribute? :photos, Types.array.of(Photo)
+    attribute? :gender, Types.integer
+    attribute? :jobs, Types.array
+    attribute? :schools, Types.array do
+      attribute? :name, Types.string
     end
     attribute? :city do
-      attribute :name, Types.string
+      attribute? :name, Types.string
     end
     attribute? :is_traveling, Types.bool
     attribute? :hide_age, Types.bool
@@ -69,18 +68,18 @@ module Tinder
   class Recommendation < Dry::Struct
     attribute :type, Types.string
     attribute :user, User
-    attribute :facebook do
-      attribute :common_connections, Types.array
-      attribute :connection_count, Types.integer
-      attribute :common_interests, Types.array
+    attribute? :facebook do
+      attribute? :common_connections, Types.array
+      attribute? :connection_count, Types.integer
+      attribute? :common_interests, Types.array
     end
-    attribute :spotify, Types.hash
-    attribute :distance_mi, Types.integer
-    attribute :content_hash, Types.string
-    attribute :s_number, Types.integer
-    attribute :teasers, Types.array do
-      attribute :type, Types.string
-      attribute :string, Types.string
+    attribute? :spotify, Types.hash
+    attribute? :distance_mi, Types.integer
+    attribute? :content_hash, Types.string
+    attribute? :s_number, Types.integer
+    attribute? :teasers, Types.array do
+      attribute? :type, Types.string
+      attribute? :string, Types.string
     end
   end
 end

data/lib/tinder/get_updates.rb

@@ -11,73 +11,76 @@ module Tinder
       # The next one only occurs without Tinder Plus subscription
       fail 'No Results Left' if response.dig('error', 'message') == 'There is no one around you'
 
-      updates = Updates.new(response)
+      updates = Updates.new(response['data'])
     end
+
+    alias_method :updates, :get_updates
   end
 
   class Message < Dry::Struct
-    attribute :_id, Types.string
-    attribute :match_id, Types.string
-    attribute :sent_date, Types.string
-    attribute :message, Types.string
-    attribute :to, Types.string
-    attribute :from, Types.string
-    attribute :created_date, Types.string
-    attribute :timestamp, Types.send('coercible.string')
+    attribute? :_id, Types.string
+    attribute? :match_id, Types.string
+    attribute? :sent_date, Types.string
+    attribute? :message, Types.string
+    attribute? :to, Types.string
+    attribute? :from, Types.string
+    attribute? :created_date, Types.string
+    attribute? :timestamp, Types.send('coercible.string')
   end
 
   class LikedMessage < Dry::Struct
-    attribute :message_id, Types.string
-    attribute :updated_at, Types.string
-    attribute :liker_id, Types.string
-    attribute :match_id, Types.string
-    attribute :is_liked, Types.bool
+    attribute? :message_id, Types.string
+    attribute? :updated_at, Types.string
+    attribute? :liker_id, Types.string
+    attribute? :match_id, Types.string
+    attribute? :is_liked, Types.bool
   end
 
   class Person < Dry::Struct
+    attribute? :_id, Types.string
     attribute? :bio, Types.string
-    attribute :birth_date, Types.string
-    attribute :gender, Types.integer
-    attribute :name, Types.string
-    attribute :ping_time, Types.string
-    attribute :photos, Types.array
+    attribute? :birth_date, Types.string
+    attribute? :gender, Types.integer
+    attribute? :name, Types.string
+    attribute? :ping_time, Types.string
+    attribute? :photos, Types.array
   end
 
   class Match < Dry::Struct
-    attribute :_id, Types.string
-    attribute :closed, Types.bool
-    attribute :common_friend_count, Types.integer
-    attribute :common_like_count, Types.integer
-    attribute :created_date, Types.string
-    attribute :dead, Types.bool
-    attribute :following, Types.bool
-    attribute :following_moments, Types.bool
-    attribute :id, Types.string
-    attribute :is_boost_match, Types.bool
-    attribute :is_fast_match, Types.bool
-    attribute :is_super_like, Types.bool
-    attribute :last_activity_date, Types.string
-    attribute :message_count, Types.integer
-    attribute :messages, Types.array.of(Message)
-    attribute :muted, Types.bool
-    attribute :participants, Types.array
-    attribute :pending, Types.bool
-    attribute :person, Person
-    attribute :readreceipt, Types.hash
-    attribute :seen, Types.hash
+    attribute? :_id, Types.string
+    attribute? :closed, Types.bool
+    attribute? :common_friend_count, Types.integer
+    attribute? :common_like_count, Types.integer
+    attribute? :created_date, Types.string
+    attribute? :dead, Types.bool
+    attribute? :following, Types.bool
+    attribute? :following_moments, Types.bool
+    attribute? :id, Types.string
+    attribute? :is_boost_match, Types.bool
+    attribute? :is_fast_match, Types.bool
+    attribute? :is_super_like, Types.bool
+    attribute? :last_activity_date, Types.string
+    attribute? :message_count, Types.integer
+    attribute? :messages, Types.array.of(Message)
+    attribute? :muted, Types.bool
+    attribute? :participants, Types.array
+    attribute? :pending, Types.bool
+    attribute? :person, Person
+    attribute? :readreceipt, Types.hash
+    attribute? :seen, Types.hash
   end
 
   class Updates < Dry::Struct
-    attribute :blocks, Types.array.of(Types.string)
-    attribute :deleted_lists, Types.array
-    attribute :goingout, Types.array
-    attribute :harassing_messages, Types.array
-    attribute :inbox, Types.array.of(Message)
-    attribute :poll_interval, Types.hash
-    attribute :liked_messages, Types.array.of(LikedMessage)
-    attribute :lists, Types.array
-    attribute :matches, Types.array.of(Match)
-    attribute :squads, Types.array
+    attribute? :blocks, Types.array.of(Types.string)
+    attribute? :deleted_lists, Types.array
+    attribute? :goingout, Types.array
+    attribute? :harassing_messages, Types.array
+    attribute? :inbox, Types.array.of(Message)
+    attribute? :poll_interval, Types.hash
+    attribute? :liked_messages, Types.array.of(LikedMessage)
+    attribute? :lists, Types.array
+    attribute? :matches, Types.array.of(Match)
+    attribute? :squads, Types.array
   end
 end
 

data/lib/tinder/profile.rb

@@ -22,87 +22,86 @@ module Tinder
 
   class ActiveProfile < Dry::Struct
 
-    attribute :account do
-      attribute :is_email_verified, Dry::Types['bool']
-      attribute :account_email, Dry::Types['string']
-      attribute :account_phone_number, Dry::Types['string']
+    attribute? :account do
+      attribute? :is_email_verified, Types.bool
+      attribute? :account_email, Types.string
+      attribute? :account_phone_number, Types.string
     end
-    attribute :boost do
-      attribute :duration, Dry::Types['integer']
-      attribute :allotment, Dry::Types['integer']
-      attribute :allotment_used, Dry::Types['integer']
-      attribute :allotment_remaining, Dry::Types['integer']
-      attribute :internal_remaining, Dry::Types['integer']
-      attribute :purchased_remaining, Dry::Types['integer']
-      attribute :remaining, Dry::Types['integer']
-      attribute :super_boost_purchased_remaining, Dry::Types['integer']
-      attribute :super_boost_remaining, Dry::Types['integer']
-      attribute :boost_refresh_amount, Dry::Types['integer']
-      attribute :boost_refresh_interval, Dry::Types['integer']
-      attribute :boost_refresh_interval_unit, Dry::Types['string']
+    attribute? :boost do
+      attribute? :duration, Types.integer
+      attribute? :allotment, Types.integer
+      attribute? :allotment_used, Types.integer
+      attribute? :allotment_remaining, Types.integer
+      attribute? :internal_remaining, Types.integer
+      attribute? :purchased_remaining, Types.integer
+      attribute? :remaining, Types.integer
+      attribute? :super_boost_purchased_remaining, Types.integer
+      attribute? :boost_refresh_amount, Types.integer
+      attribute? :boost_refresh_interval, Types.integer
+      attribute? :boost_refresh_interval_unit, Types.string
     end
-    attribute :email_settings do
-      attribute :email, Dry::Types['string']
-      attribute :email_settings do
-        attribute :promotions, Dry::Types['bool']
-        attribute :messages, Dry::Types['bool']
-        attribute :new_matches, Dry::Types['bool']
+    attribute? :email_settings do
+      attribute? :email, Types.string
+      attribute? :email_settings do
+        attribute? :promotions, Types.bool
+        attribute? :messages, Types.bool
+        attribute? :new_matches, Types.bool
       end
     end
-    attribute :instagram do
-      attribute :username, Dry::Types['string']
-      attribute :profile_picture, Dry::Types['string']
-      attribute :media_count, Dry::Types['integer']
-      attribute :last_fetch_time, Dry::Types['string']
-      attribute :completed_initial_fetch, Dry::Types['bool']
-      attribute :photos, Dry::Types['array']
-      attribute :should_reauthenticate, Dry::Types['bool']
+    attribute? :instagram do
+      attribute? :username, Types.string
+      attribute? :profile_picture, Types.string
+      attribute? :media_count, Types.integer
+      attribute? :last_fetch_time, Types.string
+      attribute? :completed_initial_fetch, Types.bool
+      attribute? :photos, Types.array
+      attribute? :should_reauthenticate, Types.bool
     end
-    attribute :likes do
-      attribute :likes_remaining, Dry::Types['integer']
+    attribute? :likes do
+      attribute? :likes_remaining, Types.integer
     end
-    attribute :notifications, Dry::Types['array']
-    attribute :plus_control do
-      attribute :discoverable_party, Dry::Types['string']
-      attribute :hide_ads, Dry::Types['bool']
-      attribute :hide_age, Dry::Types['bool']
-      attribute :hide_distance, Dry::Types['bool']
-      attribute :blend, Dry::Types['string']
+    attribute? :notifications, Types.array
+    attribute? :plus_control do
+      attribute? :discoverable_party, Types.string
+      attribute? :hide_ads, Types.bool
+      attribute? :hide_age, Types.bool
+      attribute? :hide_distance, Types.bool
+      attribute? :blend, Types.string
     end
-    attribute :products, Dry::Types['hash']
-    attribute :purchase, Dry::Types['hash']
-    attribute :spotify, Dry::Types['hash']
-    attribute :super_likes do
-      attribute :remaining, Dry::Types['integer']
-      attribute :alc_remaining, Dry::Types['integer']
-      attribute :new_alc_remaining, Dry::Types['integer']
-      attribute :allotment, Dry::Types['integer']
-      attribute :superlike_refresh_amount, Dry::Types['integer']
-      attribute :superlike_refresh_interval, Dry::Types['integer']
-      attribute :superlike_refresh_interval_unit, Dry::Types['string']
-      attribute :resets_at, Dry::Types['string']
+    attribute? :products, Types.hash
+    attribute? :purchase, Types.hash
+    attribute? :spotify, Types.hash
+    attribute? :super_likes do
+      attribute? :remaining, Types.integer
+      attribute? :alc_remaining, Types.integer
+      attribute? :new_alc_remaining, Types.integer
+      attribute? :allotment, Types.integer
+      attribute? :superlike_refresh_amount, Types.integer
+      attribute? :superlike_refresh_interval, Types.integer
+      attribute? :superlike_refresh_interval_unit, Types.string
+      attribute? :resets_at, Types.string.optional
     end
-    attribute :tinder_u do
-      attribute :status, Dry::Types['string']
+    attribute? :tinder_u do
+      attribute? :status, Types.string
     end
-    attribute :travel do
-      attribute :is_traveling, Dry::Types['bool']
+    attribute? :travel do
+      attribute? :is_traveling, Types.bool
     end
-    attribute :tutorials, Dry::Types['array']
-    attribute :user do
-      attribute :_id, Dry::Types['string']
-      attribute :age_filter_max, Dry::Types['integer']
-      attribute :age_filter_min, Dry::Types['integer']
-      attribute :bio, Dry::Types['string']
-      attribute :birth_date, Dry::Types['string']
-      attribute :create_date, Dry::Types['string']
-      attribute :crm_id, Dry::Types['string']
-      attribute :discoverable, Dry::Types['bool']
-      attribute :distance_filter, Dry::Types['integer']
-      attribute :gender, Dry::Types['integer']
-      attribute :gender_filter, Dry::Types['integer']
-      attribute :name, Dry::Types['string']
-      attribute :photos, Dry::Types['array']
+    attribute? :tutorials, Types.array
+    attribute? :user do
+      attribute? :_id, Types.string
+      attribute? :age_filter_max, Types.integer
+      attribute? :age_filter_min, Types.integer
+      attribute? :bio, Types.string
+      attribute? :birth_date, Types.string
+      attribute? :create_date, Types.string
+      attribute? :crm_id, Types.string
+      attribute? :discoverable, Types.bool
+      attribute? :distance_filter, Types.integer
+      attribute? :gender, Types.integer
+      attribute? :gender_filter, Types.integer
+      attribute? :name, Types.string
+      attribute? :photos, Types.array
     end
   end
 

data/lib/tinder/version.rb

@@ -1,3 +1,3 @@
 module Tinder
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/tinder_client.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "bundler"
-  spec.add_dependency "dry-initializer"
   spec.add_dependency "dry-struct"
   spec.add_dependency "dry-types"
   spec.add_dependency "faraday"
@@ -35,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake"
   spec.add_dependency "rspec"
   spec.add_dependency "webmock"
+  spec.add_dependency "vcr"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tinder_client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Patrick Clery
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-26 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: hashdiff
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashdiff
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -158,7 +158,6 @@ files:
 - bin/setup
 - lib/dry_helper.rb
 - lib/tasks/tinder.rake
-- lib/tinder.rb
 - lib/tinder/account_settings.rb
 - lib/tinder/client.rb
 - lib/tinder/get_recommendations.rb
@@ -167,6 +166,7 @@ files:
 - lib/tinder/pass.rb
 - lib/tinder/profile.rb
 - lib/tinder/version.rb
+- lib/tinder_client.rb
 - tinder_client.gemspec
 homepage: https://github.com/patrickclery/tinder_client
 licenses: