get_freaky 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38a677bb3a53fc8e5093a881f947f485151bfb9a
-  data.tar.gz: e975a4f21f7c8ae7d6d5e40464e37f37fbe2ddcf
+  metadata.gz: a8b8b0276b4246dbdd45894b4abb24c817ff989a
+  data.tar.gz: 0055740fab0f9d3be0caec06b4bfe52f1de3230b
 SHA512:
-  metadata.gz: 37146d928120baff63483b3c75ad814e1a0ffe65cb022ed9ea3651bcbdf2cee4b1b059a474a12e88acbf507a7906e75913789575dcc01794b83ae1b1f944239b
-  data.tar.gz: 0d1923a463f2549574666a0082b8a6d50c655838203d220ec3bb40c4b7b93fa1a299e0768a3ed7b88bcd0661af2956573bcd7210afba913cef1f951b4fcf64e5
+  metadata.gz: e182c7b8b7631cf8c05162310e3c3b84b89f4097a4e7f8c4045977b71d6ab812060e2e545ec85f94edad0a0c5467b70ec592d0832d718fcaf758b3d57842e437
+  data.tar.gz: fafae8df8da8c3cace62350abdff49e1ed0e789e08a30a1d77e60f296c47af8025fe2768ebaa818be348b208263cd65ecde760ba52062160bb2a66332fd4c190

data/lib/get_freaky/conference.rb

@@ -10,9 +10,9 @@ class Conference
   end
 
   def self.find(name)
-    response = get("/conferences/#{name}.json")
-    # TODO: I need to figure out a better way of dealing with 404 errors
-    if response["status"] == 404
+    slug = create_slug(name)
+    response = get("/conferences/#{slug}.json")
+    if response.not_found?
       NullConference.new("No conference was found with that name")
     elsif response.success?
       self.new(
@@ -21,8 +21,7 @@ class Conference
         response["events"]
       )
     else
-      # this just raises the net/http response that was raised
-      raise response.response
+      raise response.status
     end
   end
 
@@ -32,7 +31,7 @@ class Conference
   end
 
   def event_list
-    if valid? 
+    if valid?
       events.map { |event| event["short_code"] }
     else
       "There was no conference found by that name."
@@ -42,4 +41,12 @@ class Conference
   def valid?
     true
   end
+
+  def self.create_slug(title)
+    title.
+      downcase.
+      # we cannot use slugify method below, one conference name has `:` char which must exist in url name (slug)
+      gsub(/[ ._]/, "-").
+      gsub(/([|])/) { |match| CGI.escape(match) }
+  end
 end

data/lib/get_freaky/version.rb

@@ -1,4 +1,4 @@
 module GetFreaky
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
   DATE = %q{2015-11-14}
 end

data/lib/get_freaky/video.rb

@@ -41,6 +41,25 @@ class Video
   def download
     puts "downloading #{title}"
     YoutubeDL.download url, { output: "#{title}.mp4" }
+  rescue Cocaine::ExitStatusError => e
+    regex_errors = [
+      /YouTube said\: This video does not exist\./,
+      /YouTube said\: Please sign in to view this video\./,
+      /Incomplete YouTube ID/,
+      /HTTP Error 404\: Not Found/, # for vimeo
+    ]
+
+    case e.message
+    when *regex_errors
+      puts $LAST_MATCH_INFO[0]
+      return
+    when /content too short/
+      puts "#{$LAST_MATCH_INFO[0]} - retry"
+      return download
+    end
+
+    # raise different uncaught exceptions
+    raise e
   end
 
   def event

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: get_freaky
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Stephen Mariano Cabrera
@@ -126,16 +126,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.6.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -211,3 +211,4 @@ signing_key:
 specification_version: 4
 summary: Get Freaky!
 test_files: []
+has_rdoc: