looperman_samples 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e42db4eb33e531f47d71d6a744aff2d38c6d1b98fb68e7b27fb8024bec3e102
-  data.tar.gz: 21ef88b89fcbcabe85636a10bd24bc9769e1fd8e3ca80feda088c4ef1945e5e2
+  metadata.gz: 15c67c7d616b9c5a0d129c5eb55659e5b83eae04e0aed89f62d6bf6f1379c696
+  data.tar.gz: 224ed66eb02c6a081d403d1e5855fd0a2be0f813cac17666489b8560fc27fc73
 SHA512:
-  metadata.gz: b798b0a49a9778094fd0e9285ae752f0c9d8b1b98ec35598a655504c4e2da8ffd2380339f66ad084201b8d1fa025f25450804eb582aed8b5b12f7d9062908188
-  data.tar.gz: eb9a854e85006d826e296454603f20659a6be828c6d8f09e2d58abaf28af52ce984304c7efed1f481d93391513ceebaae603884aa177618eda985abc4586dbb6
+  metadata.gz: 24b77486a35e5eeca85d2f72946803e2e175612ac1ed7698d26a7a13ffecec072ac69bc8479a336c971a782ad76915b7e143b71978bba9e468d5359277961ac5
+  data.tar.gz: 582c5130d0d461ad0f129b507040b8dac4ef828ce580e0930109d9ac4fd18b0f0f8637be4681b46ba0c13d17f4d9cb1008e4b18a4667a37833bb3492e6ceff85

data/Gemfile.lock

@@ -1,16 +1,21 @@
 PATH
   remote: .
   specs:
-    looperman_samples (0.1.6)
+    looperman_samples (0.1.7)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.2)
     mini_portile2 (2.4.0)
     nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.4.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -32,6 +37,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   looperman_samples!
+  pry (~> 0)
   rake (~> 10.0)
   rspec (~> 3.2)
 

data/lib/looperman_samples/cli.rb

@@ -1,29 +1,41 @@
 # our CLI controller
+require 'pry'
+require_relative "../looperman_samples/concerns/cli_methods.rb"
 
 class LoopermanSamples::CLI
 
+  include CliMethods::Findable
+  include CliMethods::Scrapeable
+  include CliMethods::Listable
+
+  #class variable so CLI play function can
+  @@sample_list = []
+
   def call
-    LoopermanSamples::SampleScraper.scrape_samples
+    scrape
     main_menu
     play
     goodbye
   end
 
   def main_menu
+
     puts "There are 25 new samples today. how would you like to browse?"
     puts "1. browse samples by key"
     puts "2. browse samples by tempo"
     puts "3. browse samples by download count"
+
     input = gets.strip
+
     if input == "1"
-      LoopermanSamples::Sample.list_samples_by_key
-      $sample_list = LoopermanSamples::Sample.all.sort {|a, b| a.key <=> b.key}
+      list_by_key #prints list and sets @@sample_list variable
+      @@sample_list = LoopermanSamples::Sample.sort_by_key
     elsif input == "2"
-      LoopermanSamples::Sample.list_samples_by_tempo
-      $sample_list = LoopermanSamples::Sample.all.sort {|a, b| b.bpm.to_i <=> a.bpm.to_i}
+      list_by_tempo #prints list and sets @@sample_list variable
+      @@sample_list = LoopermanSamples::Sample.sort_by_tempo
     elsif input == "3"
-      LoopermanSamples::Sample.list_samples_by_download_count
-      $sample_list = LoopermanSamples::Sample.all.sort {|a, b| b.download_count.to_i <=> a.download_count.to_i}
+      list_by_downloads #prints list and sets @@sample_list variable
+      @@sample_list = LoopermanSamples::Sample.sort_by_download_count
     else
       puts "sorry, not sure what you want"
       main_menu
@@ -36,17 +48,18 @@ class LoopermanSamples::CLI
       loop do
         puts "please enter the number of the sample you'd like to listen to or type exit:"
         input = gets.strip
-        if input.to_i < $sample_list.size + 1 && input.to_i > 0
-          sample = $sample_list[input.to_i - 1]
+        if input.to_i < @@sample_list.size + 1 && input.to_i > 0 #checks that input is greater than zero and less than list size
+          sample = @@sample_list[input.to_i - 1] #takes user input, and sets sample variable using index lookup
           puts "You're listening to #{sample.title} by #{sample.creator.name}"
           puts "would you like to hear more from #{sample.creator.name}? (type yes or no)"
             input = gets.strip
             if input == "yes"
-              more_samples_by_creator(sample)
+              puts "More by #{sample.creator.name}"
+              @@sample_list = find_all_by_creator(sample)
+              list_all_samples_by_creator(@@sample_list)
             elsif input == "no"
               main_menu
             end
-          # puts "Ok!"
         elsif input.to_i > LoopermanSamples::Sample.all.size
           puts "please enter a lower number"
         else
@@ -55,17 +68,6 @@ class LoopermanSamples::CLI
      end
   end
 
-  def more_samples_by_creator(sample)
-    # sets $samples_by_creator to equal a collection of samples by given creator
-    LoopermanSamples::SampleScraper.scrape_more_samples_by_creator(sample.creator)
-    # displays a numbered list of those samples
-    LoopermanSamples::Creator.list_all_samples_by_creator #what is this
-    # sets the sample list to be used in play mode
-    $sample_list = $samples_by_creator
-  end
-
-
-
   def goodbye
     puts "see you tomorrow for more samples!"
   end

data/lib/looperman_samples/concerns/cli_methods.rb

@@ -0,0 +1,36 @@
+module CliMethods
+  
+  module Findable
+    def find_all_by_creator(sample) #returns an array of sample objects
+      LoopermanSamples::SampleScraper.scrape_more_samples_by_creator(sample.creator)
+      sample.creator.samples
+    end
+  end
+
+  module Scrapeable
+    def scrape
+      LoopermanSamples::SampleScraper.scrape_samples
+    end
+  end
+
+  module Listable
+    def list_by_key
+      LoopermanSamples::Sample.list_samples_by_key
+    end
+
+    def list_by_tempo
+      LoopermanSamples::Sample.list_samples_by_tempo
+    end
+
+    def list_by_downloads
+      LoopermanSamples::Sample.list_samples_by_download_count
+    end
+
+    def list_all_samples_by_creator(sample_objects) #puts samples in numbered list
+      sample_objects.each_with_index do |sample, index|
+        puts "#{index + 1}." + " #{sample.title}"
+      end
+    end
+  end
+
+end

data/lib/looperman_samples/creator.rb

@@ -1,42 +1,25 @@
 module LoopermanSamples
-
   class Creator
 
-  attr_accessor :name, :samples
-
-  # creator class - a creator has a name and can have many samples
-  @@creators = []
+    attr_accessor :name, :samples
 
-  def self.all
-    @@creators
-  end
+    @@creators = []
 
-  def initialize(name = nil)
-    @name = name
-    @samples = []
-    @@creators << self
-  end
+    def self.all
+      @@creators
+    end
 
-  # def samples
-  #   Sample.all.select do |sample|
-  #     sample.creator = self
-  #   end
-  # end
+    def initialize(name = nil)
+      @name = name
+      @samples = []
+      @@creators << self
+    end
 
-#adds the sample into the creator's repertoire
-  def add_sample(sample)
-    sample.creator = self unless sample.creator
-    self.samples << sample unless self.samples.include?(sample)
-  end
 
-  def self.list_all_samples_by_creator
-    # binding.pry
-    $samples_by_creator.each_with_index do |sample, index|
-      puts "#{index + 1}." + " #{sample.title}"
+    def add_sample(sample)
+      sample.creator = self unless sample.creator
+      self.samples << sample unless self.samples.include?(sample)
     end
-  end
 
   end
-
-
 end

data/lib/looperman_samples/sample.rb

@@ -3,10 +3,7 @@
 module LoopermanSamples
   class Sample
 
-    # extend Concerns::Findable
-    # responsible for knowing about all of the samples
-
-    attr_accessor :title, :key, :download_count, :url, :creator, :bpm, :genre
+    attr_accessor :title, :key, :download_count, :url, :creator, :bpm
     @@all = []
 
     def self.all
@@ -24,35 +21,35 @@ module LoopermanSamples
       creator.add_sample(self)
     end
 
-    def genre=(genre)
-      @genre = genre
-      creator.add_genre(self)
+    def self.sort_by_key
+      all.sort{|a, b| a.key <=> b.key}
     end
 
     def self.list_samples_by_key
-      #sort the samples by key and return as a numbered list
-      samples_sorted_by_key = LoopermanSamples::Sample.all.sort {|a, b| a.key <=> b.key}
-      samples_sorted_by_key.each_with_index do |item, index|
+      sort_by_key.each_with_index do |item, index|
         puts "#{index + 1}." + " #{item.title} - " + "#{item.key}"
       end
     end
 
+    def self.sort_by_tempo
+      all.sort{|a, b| b.bpm.to_i <=> a.bpm.to_i}
+    end
+
     def self.list_samples_by_tempo
-      #sort the samples by tempo(bpm) and return as a numbered list
-      samples_sorted_by_tempo = LoopermanSamples::Sample.all.sort {|a, b| b.bpm.to_i <=> a.bpm.to_i}
-      samples_sorted_by_tempo.each_with_index do |item, index|
-      puts "#{index + 1}." + " #{item.title}" + "- #{item.bpm}"
+      sort_by_tempo.each_with_index do |item, index|
+        puts "#{index + 1}." + " #{item.title}" + "- #{item.bpm}"
+      end
     end
+
+    def self.sort_by_download_count
+      all.sort{|a, b| b.download_count.to_i <=> a.download_count.to_i}
     end
 
     def self.list_samples_by_download_count
-      #sort the samples by download count and return as a numbered list
-      samples_sorted_by_download_count = LoopermanSamples::Sample.all.sort {|a, b| b.download_count.to_i <=> a.download_count.to_i}
-      samples_sorted_by_download_count.each_with_index do |item, index|
-      puts "#{index + 1}." + " #{item.title}" + " - #{item.download_count} downloads"
-    end
+      sort_by_download_count.each_with_index do |item, index|
+        puts "#{index + 1}." + " #{item.title}" + " - #{item.download_count} downloads"
+      end
     end
 
-
   end
 end

data/lib/looperman_samples/sample_scraper.rb

@@ -3,7 +3,6 @@ module LoopermanSamples
     class SampleScraper
 
         # uses nokogiri's output to instantiate sample and creator objects and assign them attributes, then establishes the sample-creator relationship
-        # there will be 25 samples from the front page of looperman
 
         def self.scrape_samples
           #goes to search for most downloaded in past 24 hours
@@ -31,18 +30,17 @@ module LoopermanSamples
             #inserts the sample into the Sample.all array
                 Sample.all << the_sample
               end
+          #returns all the samples
           Sample.all
         end
 
-        def self.scrape_more_samples_by_creator(sample_creator)
-          $samples_by_creator = []
+        def self.scrape_more_samples_by_creator(sample_creator) #dives into samples of a particular creator
+          sample_creator.samples = []
           doc = Nokogiri::HTML(open("https://www.looperman.com/loops?mid=#{sample_creator.name}"))
           doc.css("div#body-content").css("div div.player-wrapper").each do |sample_bundle|
             the_sample = Sample.new
             the_sample.title = sample_bundle.css(".player-title").text
             the_sample.creator = sample_creator
-            $samples_by_creator << the_sample
-            $samples_by_creator
           end
         end
 

data/lib/looperman_samples/version.rb

@@ -1,3 +1,3 @@
 module LoopermanSamples
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/looperman_samples.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
-  # spec.add_development_dependency "pry", '~> 0'
+  spec.add_development_dependency "pry", '~> 0'
 
   spec.add_dependency "nokogiri"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: looperman_samples
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - "'Harley Rayner'"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +101,7 @@ files:
 - bin/setup
 - lib/looperman_samples.rb
 - lib/looperman_samples/cli.rb
-- lib/looperman_samples/concerns/findable.rb
+- lib/looperman_samples/concerns/cli_methods.rb
 - lib/looperman_samples/creator.rb
 - lib/looperman_samples/sample.rb
 - lib/looperman_samples/sample_scraper.rb

data/lib/looperman_samples/concerns/findable.rb

@@ -1,24 +0,0 @@
-module Concerns
-  module Findable
-    def find_by_name(thing_name)
-      # detect stops on the first thing it finds that matches the condition and returns that value
-      self.all.detect do |thing|
-        thing.name == thing_name
-      end
-    end
-
-    def find_or_create_by_name(thing_name)
-      if self.find_by_name(thing_name) == nil #if the song isn't in there
-          self.create(thing_name)              #make a new song
-      else self.find_by_name(thing_name) != nil #if the song is in there
-        self.find_by_name(thing_name)            # find it and return it
-      end
-    end
-
-    def find_all_by_creator(creator)
-      
-    end
-
-  end
-
-end