viddl 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 754721cccbe03abc4baaaeeb3cc7b4a466ff792b
-  data.tar.gz: 4aaddeaa7ff0dcd5bdedd75e81168671a640e528
+  metadata.gz: c6c38487a2d7d5f254f6a2c578ee593a19869e92
+  data.tar.gz: 7a23f5b3d8a6e3bb71c66c60db05f22dcb142e9b
 SHA512:
-  metadata.gz: d0ac5e272ff2b62a0db0e2de646c85450ad802a1b9248216966f1421a3fdcaa555ca4938c867629bc09756945915f787e59976195147852941bc0823cc1ac5c8
-  data.tar.gz: 81f1c6314ab103b92c6bead41880835dc5eb4afebe9362d09f6881d35cc9fb4122b8b82604745b426364dfe7ec8d410ce14fa1f725d965e696451fa4d143fd8f
+  metadata.gz: c394b34c44d1181ae5595f03ae5c66651154494b6e16c19537955bd412625d7ea46f578c5e0bb33bb4ffbdbae10c82a4737962124ca8ef3e4c3eabf903755b47
+  data.tar.gz: 0b07f0783b4028f740d320d14bc09419415b30727807c347d0dbb8a22602d74666d93c64390921623873a514768d1fc55e09ac5aba68afe42226a6d7ce6af313

data/README.md

@@ -14,7 +14,7 @@ Running Viddl generates video clip files in the current directory
 
 ### Command Line
 
-The command line usage and options are as follows:
+The command line usage and options are as follows
 
 #### Download
 
@@ -32,15 +32,15 @@ This will start the clip at 10 seconds into the original video and run for five
 viddl https://www.youtube.com/watch?v=6g4dkBF5anU -s 10 -d 5
 ```
 
-Alternately, this will start the clip at 15 seconds in the original video and stop at 22 seconds
+Alternatively, this will also start the clip at 10 seconds into the original video and stop at 15 seconds
 
 ```sh
-viddl https://www.youtube.com/watch?v=6g4dkBF5anU -s 15 -e 22
+viddl https://www.youtube.com/watch?v=6g4dkBF5anU -s 10 -e 15
 ```
 
 #### Resize
 
-This will resize to 640 x 480:
+This will resize to 640 x 480
 
 ```sh
 viddl https://www.youtube.com/watch?v=6g4dkBF5anU -w 640 -h 480
@@ -48,7 +48,7 @@ viddl https://www.youtube.com/watch?v=6g4dkBF5anU -w 640 -h 480
 
 #### Crop
 
-This will crop a 40 x 40 pixel box at position 20 x 20:
+This will crop a 40 x 40 pixel box at position 20 x 20
 
 ```sh
 viddl https://www.youtube.com/watch?v=6g4dkBF5anU --cx 20 --cy 20 --cw 40 --ch 40
@@ -56,7 +56,7 @@ viddl https://www.youtube.com/watch?v=6g4dkBF5anU --cx 20 --cy 20 --cw 40 --ch 4
 
 #### Strip Audio
 
-Audio can be left out of the clip:
+This will make the clip silent
 
 ```sh
 viddl https://www.youtube.com/watch?v=6g4dkBF5anU --no-audio
@@ -64,7 +64,7 @@ viddl https://www.youtube.com/watch?v=6g4dkBF5anU --no-audio
 
 #### Combine
 
-Any or all of these options can be used together:
+Any or all of these options can be used together
 
 ```sh
 viddl https://www.youtube.com/watch?v=6g4dkBF5anU -s 15 -e 22 --no-audio --cx 20 --cy 20 --cw 40 --ch 40 -w 640 -h 480
@@ -72,7 +72,7 @@ viddl https://www.youtube.com/watch?v=6g4dkBF5anU -s 15 -e 22 --no-audio --cx 20
 
 ### Ruby
 
-Similar to the command line, Ruby usage and options are as follows:
+Similar to the command line, Ruby usage and options are as follows
 
 ```ruby
 options = {

data/lib/viddl.rb

@@ -1,5 +1,8 @@
 #
-# viddl
+# Viddl
+#
+# Ruby/Command line tool to quickly download, cut, crop and
+# resize video clips
 #
 # (c)2017 Ari Russo
 # Apache 2.0 License
@@ -14,6 +17,6 @@ module Viddl
 
   extend self
 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 
 end

data/lib/viddl/video/instance.rb

@@ -1,3 +1,5 @@
+require "base64"
+
 module Viddl
 
   module Video
@@ -7,6 +9,8 @@ module Viddl
       attr_accessor :download
       attr_reader :id, :source_url
 
+      ID_LENGTH = 10
+
       # @param [String] url The url of the video source
       def initialize(url)
         @source_url = url
@@ -52,7 +56,7 @@ module Viddl
       # The video instance id
       # @return [String]
       def populate_id
-        @id = @source_url.scan(/youtube.com\/watch\?v\=(\S*)&?/).flatten.first
+        @id = Base64.encode64(@source_url).slice(0, ID_LENGTH)
       end
 
     end

data/spec/video/download_spec.rb

@@ -33,8 +33,8 @@ describe Viddl::Video::Download do
       expect(@result).to(include(@source_url))
     end
 
-    it "includes temp file path" do
-      expect(@result).to(include("#{Viddl::Video::Download::TEMPDIR}/#{@video_id}"))
+    it "includes temp dir" do
+      expect(@result).to(include("#{Viddl::Video::Download::TEMPDIR}/"))
     end
 
   end

data/spec/video/instance_spec.rb

@@ -3,11 +3,20 @@ require "helper"
 describe Viddl::Video::Instance do
 
   before(:each) do
-    @video_id = "6g4dkBF5anU"
-    @source_url = "https://youtube.com/watch?v=#{@video_id}"
+    @yt_video_id = "6g4dkBF5anU"
+    @source_url = "https://youtube.com/watch?v=#{@yt_video_id}"
     @video = Viddl::Video::Instance.new(@source_url)
   end
 
+  context "#populate_id" do
+
+    it "populates id" do
+      expect(@video.id).to_not(be_nil)
+      expect(@video.id.length).to(eq(10))
+    end
+
+  end
+
   context "#source_filenames" do
 
     context "with associated download" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: viddl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-04 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: viddl
-rubygems_version: 2.4.6
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Quickly download, cut, crop and resize video clips