clienteer 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8441af948319eba21de55ceba77423ce5fc6e74
-  data.tar.gz: c9d5194af632e69a92b918e55f05a984e6f9850e
+  metadata.gz: 909d6a39576f9b6be0b0d3b101c1fd4a4b3a651e
+  data.tar.gz: 02daeaa0c4c2107f00cec10cff1f4b3461505849
 SHA512:
-  metadata.gz: e8f38276a74a226fc4dd2b4892afd6a3c80a9758680ba39536ece93421e1a949537da756f67cb1349bf812a0e8e4fdbfc8b385e9467552451f784669cd289254
-  data.tar.gz: 62cfa6a37779933d3f7cac7231fc7bebdca257915dad90043f57bcc5eef2bf6002e51fb1c93d73408a6d2aba4993956f6664af1ed89fa988daf8bc2e50ce4263
+  metadata.gz: 3fa588c1a9c4ea2ea0a3573ff77e5626b5425977351474d50792b6c61673882cbebb494fbbbd131043df70d41195239cff5f45200b275c6403d309fbbc49a81c
+  data.tar.gz: 2d391670aaf41b5677cb53f173539a4a8d100a11aaf14302b3dede29908f4c44218ab38301b51d8addb6580cbad2bd24fb6d70ccee46bedb7290731121250c51

data/.gitignore

@@ -8,8 +8,8 @@
 /spec/reports/
 /tmp/
 
-data/ideal_protein.json
-
-data/ideal_protein.clean.json
+/data/
 
 *.gem
+
+.env

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem "mindbody-api", git: "https://github.com/wingrunr21/mindbody-api.git"
+gem 'dotenv-rails'

data/lib/clienteer.rb

@@ -2,12 +2,17 @@ require "clienteer/version"
 require "clienteer/ingester"
 require "clienteer/outgester"
 require "clienteer/digester"
+require "clienteer/sanitizer"
 
 require "kiba"
 require "mindbody-api"
+require "json"
 
 require 'clienteer/railtie' if defined?(Rails)
 
+require 'dotenv'
+Dotenv.load
+
 module Clienteer
 
   ::MindBody.configure do |config|
@@ -18,20 +23,22 @@ module Clienteer
   end
 
   def self.call
-    $count = 0
     $skipped_people = []
     job_definition = Kiba.parse do
       source Ingester::Mindbody
+      transform Sanitizer::NilFinder
+      transform Sanitizer::Name
       transform Digester::IdealProteinCrossReference
       transform Digester::AddressCreation
+      transform Sanitizer::Address
       transform Digester::PhaseCreation
       destination Outgester::Maliero
     end
 
     Kiba.run job_definition
 
-    File.open("data/skipped_people", "a+") do |f|
-      f.write $skipped_people.join(",")
+    File.open("data/skipped_people.yaml", "a+") do |f|
+      f.write YAML.dump $skipped_people
     end
 
   end

data/lib/clienteer/digesters/ideal_protein_cross_reference.rb

@@ -1,5 +1,4 @@
-require "json"
-require "pry"
+
 module Clienteer
   module Digester
     class IdealProteinCrossReference
@@ -16,7 +15,11 @@ module Clienteer
 
       def process(row)
         person = find_ideal_protein_client(row)
-        return nil if person.nil?
+        if person.nil?
+          row[:reason] = "ideal protein subscription not found"
+          $skipped_people << row
+          return nil
+        end
         row.tap do |r|
           r["ideal_subscription_id"] = person["ideal_subscription_id"].to_i
           r["phase"] = person["phase"].to_i
@@ -53,7 +56,6 @@ module Clienteer
         # text << "Should I skip this person or not?".magenta.bold
         # print text.join("\n")
         # bool = IO.gets.chomp!.include?("y")
-        $skipped_people << row[:raw].id
         nil
       end
 

data/lib/clienteer/digesters/phase_creation.rb

@@ -6,8 +6,6 @@ module Clienteer
       end
 
       def process(row)
-        $count += 1
-        binding.pry unless $count >= 20
         row["phase"] = Phase.where(number: row["phase"]).first
         row
       end

data/lib/clienteer/ingester.rb

@@ -1,4 +1,5 @@
 require_relative "ingesters/mindbody"
+require_relative "ingesters/yaml_file"
 
 module Clienteer
   module Ingester

data/lib/clienteer/ingesters/mindbody.rb

@@ -2,10 +2,6 @@ require 'ruby-progressbar'
 module Clienteer
   module Ingester
     class Mindbody
-      def initialize
-        $progressbar = ProgressBar.create total: 2059, format: '%a %bᗧ%i %p%% %t', progress_mark: ' ', remainder_mark: '･'
-        @clients = get_clients
-      end
 
       def self.get_clients
         hash = {"Username" => ENV["MINDBODY_USERNAME"], "Password" => ENV["MINDBODY_PASSWORD"], "SiteIDs" => {"int" => ENV["MINDBODY_SITE_IDS"]}}
@@ -13,8 +9,20 @@ module Clienteer
         alpha.result[:clients]
       end
 
+      def self.to_file
+        File.open('data/mindbody.yml', 'w') do |file|
+          file.write(YAML.dump(Mindbody.get_clients))
+        end
+      end
+
+      def initialize
+        $progressbar = ProgressBar.create total: 2059, format: '%a %bᗧ%i %p%% %t', progress_mark: ' ', remainder_mark: '･'
+        @clients = Mindbody.get_clients
+      end
+
       def each
         @clients.each do |c|
+          $progressbar.increment
           object = {raw: c}
           yield object
         end

data/lib/clienteer/ingesters/yaml_file.rb

@@ -0,0 +1,23 @@
+require 'ruby-progressbar'
+module Clienteer
+  module Ingester
+    class YAMLFile
+
+      def self.get_clients
+        YAML.load_file("data/mindbody.yaml")
+      end
+
+      def initialize
+        @clients = YAMLFile.get_clients
+        $progressbar = ProgressBar.create total: @clients.length, format: '%a %bᗧ%i %p%% %t', progress_mark: ' ', remainder_mark: '･'
+      end
+
+      def each
+        @clients.each do |c|
+          $progressbar.increment
+          yield c
+        end
+      end
+    end
+  end
+end

data/lib/clienteer/outgesters/maliero.rb

@@ -6,7 +6,6 @@ module Clienteer
       end
 
       def write(row)
-        $progressbar.increment
         @clients << new_client(row)
       end
 
@@ -33,8 +32,6 @@ module Clienteer
       end
 
       def close
-        $stderr.puts "\n\n\nHELLO\n\n\n\n"
-        binding.pry
         Client.transaction do
           success = @clients.map(&:save)
           unless success.all?

data/lib/clienteer/railtie.rb

@@ -0,0 +1,11 @@
+
+module Clienteer
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      desc "Runs clienteer"
+      task :clienteer => :environment do
+        Clienteer.call
+      end
+    end
+  end
+end

data/lib/clienteer/sanitizer.rb

@@ -1,5 +1,6 @@
 require_relative "sanitizers/nil_finder"
 require_relative "sanitizers/address"
+require_relative "sanitizers/name"
 
 module Clienteer
   module Sanitizer

data/lib/clienteer/sanitizers/address.rb

@@ -4,13 +4,17 @@ module Clienteer
     class Address
 
       def process(row)
-        address = row["address"]
-        return nil unless check_zip_code address
-        clean_state address
-        row
+        if valid_zip_code? row["address"]
+          clean_state row["address"]
+          return row
+        else
+          row[:reason] = "zip code invalid"
+          $skipped_people << row
+          return nil
+        end
       end
 
-      def check_zip_code(address)
+      def valid_zip_code?(address)
         address.zip_code.match /\A\d{5}(-\d{4})?\Z/
       end
 

data/lib/clienteer/sanitizers/name.rb

@@ -5,11 +5,18 @@ module Clienteer
 
       def process(row)
         names = [row[:raw].first_name, row[:raw].last_name]
-        names.any?(&:not_proper?) ? nil : row
+        names = names.compact.split(" ") if names.compact.length == 1
+        if names.all? {|n| proper? n }
+          return row
+        else
+          row[:reason] = "names not valid"
+          $skipped_people << row
+          return nil
+        end
       end
 
-      def not_proper?(name)
-        return true if name.match /\d/
+      def proper?(name)
+        return false if name.match /\d/
       end
     end
   end

data/lib/clienteer/sanitizers/nil_finder.rb

@@ -6,8 +6,13 @@ module Clienteer
       def process(row)
         raw = row[:raw]
         attrs = [row, raw, raw.first_name, raw.last_name, raw.email]
-        return nil if contains_nils? attrs
-        row
+        if contains_nils? attrs
+          row[:reason] = "contains nils"
+          $skipped_people << row
+          return nil
+        else
+          return row
+        end
       end
 
       def contains_nils?(attrs)

data/lib/clienteer/version.rb

@@ -1,3 +1,3 @@
 module Clienteer
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/rakelib/ideal_protein.rake

@@ -1,5 +1,8 @@
 require 'open-uri'
 require 'json'
+
+require 'dotenv/tasks'
+
 module IdealProtein
   class Clean
     EDIT_URL_REGEX = /\/clinic\/(\d+)\/dieter\/(\d+)\/edit/.freeze
@@ -45,7 +48,7 @@ module IdealProtein
       end
 
       def make_request(url: )
-        buffer = open(url, "Cookie" => COOKIES).read
+        buffer = open(url, "Cookie" => LOGIN_COOKIES).read
         JSON.parse(buffer)
       end
 
@@ -56,12 +59,13 @@ module IdealProtein
   end
 end
 
+
 namespace "ideal_protein" do
 
   task :default => :clean
 
   desc "Cleans Ideal Protein client information"
-  task :clean do
+  task :clean => :dotenv do
     json = IdealProtein::Clean.cleaned_data
     Dir.mkdir "data" unless Dir.exists? "data"
     File.open("data/ideal_protein.clean.json", "w+") do |f|
@@ -70,7 +74,7 @@ namespace "ideal_protein" do
   end
 
   desc "Updates Ideal Protein client information"
-  task :update do
+  task :update => :dotenv do
     json = IdealProtein::Update.get_clients
     Dir.mkdir "data" unless Dir.exists? "data"
     File.open("data/ideal_protein.json", "w+") do |f|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clienteer
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Patrick Metcalfe
@@ -133,8 +133,10 @@ files:
 - lib/clienteer/digesters/phase_creation.rb
 - lib/clienteer/ingester.rb
 - lib/clienteer/ingesters/mindbody.rb
+- lib/clienteer/ingesters/yaml_file.rb
 - lib/clienteer/outgester.rb
 - lib/clienteer/outgesters/maliero.rb
+- lib/clienteer/railtie.rb
 - lib/clienteer/sanitizer.rb
 - lib/clienteer/sanitizers/address.rb
 - lib/clienteer/sanitizers/name.rb