sinatra-videoman 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY4Mjk4NjI4MDM3MjFiNGI2NzAzMWI2M2JjMTQ2NzIzZGIwYWRiNw==
+    YjE4YTY5MzIxZWE3ZTMyZTg2MDRjZWY2ODAxZjMxNTVjMzBlZmIyMg==
   data.tar.gz: !binary |-
-    MGM3ZDdkNzI0NDI5ZGI2ZDY1NWEwYWFmYzI1ZDJlYjg4OWMzYmRlNg==
+    YWIxNGI0ZmRmZGEzMGNjMTFlZTdiOWRjMzA2ODAxOWIwY2Y5NjFlYw==
 SHA512:
   metadata.gz: !binary |-
-    ODRmYjViN2Q0ZTg4YzY2ZmU0ZGQxMWFkYzk3MzQ2MzVhZWQ4NGYwNDY0Nzhm
-    NjI0NmNlNWZiMmFhMDMyYjU2YWFiYjJlNGYwYTJhODNjMDE5NGFkMjkxNGM0
-    NWM0NjAxOTRiMDZmYTg1N2U0MmQxN2VmMjkxY2QwYjczOGJmMmI=
+    Y2FkMjA3ODc5NDgzZWMyNjE5YWIzMmNlYzNkZTMyZDZiOGM4NTUzZjYyMzI3
+    ZjlhOGFjMjRiMzE3MmU4ODU4M2MwMGNjMWJkNjgzYzRlYzQ5MzhlYzMwMzMy
+    ZDhlZjExZmI3NGIwZjNjMTYwNjFmOTZmMmNmY2MwMjNmMzVlMzg=
   data.tar.gz: !binary |-
-    NzNlZGQ2NzZmOGU1ZmNjMTE5MzkxZDdjNzMxZDE2OTg2YTdmOTE0OTM5YmZj
-    NzEzZDAzZTM4ZjZhNGI5NjZmN2JiYzM5N2RiYTdhYzVjNDcwNGNlOThjNTdi
-    Njg0ZGRlZTA5ODExOThlMTQyM2Q4NzFjMWM4NThjMmRjNDI5MDc=
+    MDcwMmMyNGQ2MWYwZmJkZTRlMDE4ZjNiYzEyMTRjNWNiMzY2NDM5MjYzMTE4
+    ODMwYjRjZWUyOWVjN2JmZDk0NTZhYTkzNDg5YTc1NDI0ZGE3MzAwNGIwNGVh
+    NTk2Njk2YjA4ZjMxMDBmMzhmOGNhNjdlNWI2ZWVhODZkNzI3NTA=

data/lib/sinatra/videoman/locales/bg.yml

@@ -0,0 +1,14 @@
+en:
+  title: Заглавие
+  description: Описание
+  thumbnail: Миниатюра
+  submit: Изпращане
+  upload: Качване
+  video_files: Видео Файлове
+  video: Видео
+  add_field: Добавяна на полета
+  video_tag_unsupported: Браузърът ви не поддържа HTML5 видеа.
+  vide_not_found: Видеото не беше намерено!
+  video_deleted: Видеото изтрито успешно!
+  video_uploaded: Видеото качено успешно!
+  video_edited: Видеото обновено успешно!

data/lib/sinatra/videoman/locales/en.yml

@@ -0,0 +1,14 @@
+en:
+  title: Title
+  description: Description
+  thumbnail: Thumbnail
+  submit: Submit
+  upload: Upload
+  video_files: Video Files
+  video: Video
+  add_field: Add Fields
+  video_tag_unsupported: Your browser does not support video tags.
+  vide_not_found: Could not find the video you are looking for!
+  video_deleted: Successfully deleted video!
+  video_updated: Successfully uploaded video!
+  video_edited: Successfully edited video!

data/lib/sinatra/videoman/middleware.rb

@@ -1,78 +1,100 @@
 module Sinatra
   module Videoman
-    class Middleware < Sinatra::Base
+    module Middleware
       include Manager
 
-      get '/videos/upload/?' do
-        erb :upload
-      end
+      I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
+      I18n.load_path = Dir[File.join(File.dirname(__FILE__)+'/locales', '*.yml')]
+      I18n.backend.load_translations
+      I18n.enforce_available_locales = true
+      I18n.default_locale = Manager.config[:default_locale]
+
+      def self.registered(app)
+        app.register Sinatra::Partial
+        app.set :partial_template_engine, :erb
+
+        app.get '/videos/upload/?' do
+          erb 'videos/upload'.to_sym
+        end
 
-      post '/videos/upload' do
-        video = Video.new(params[:video])
-        params[:video_files].each do |file|
-          file = VideoFile.new(:file => file, :content_type => file[:type])
-          if file.valid?
-            video.video_files << file
-            file.save!
-            Manager.call :after_file_upload, [file]
+        app.post '/videos/upload' do
+          video = Video.new(params[:video])
+          params[:video_files].each do |file|
+            file = VideoFile.new(:file => file, :content_type => file[:type])
+            if file.valid?
+              video.video_files << file
+              file.save!
+              Manager.call :after_file_upload, [file]
+            else
+              Manager.call :after_file_upload_failure, [request, response]
+              flash[:error] = file.errors.messages
+              redirect '/videos/upload'
+            end
+          end
+          if video.valid? && video.video_files.size >= 1
+            video.save!
+            Manager.call :after_video_save, [video, request, response]
+            flash[:notice] = I18n.t 'video_uploaded'
+            redirect Manager.config[:after_video_save_path]
           else
-            Manager.call :after_file_upload_failure, [request, response]
-            flash[:error] = file.errors.messages
+            Manager.call :after_video_save_failure, [request, response]
+            flash[:error] = video.errors.messages
             redirect '/videos/upload'
           end
         end
-        if video.valid? && video.video_files.size >= 1
-          video.save!
-          Manager.call :after_video_save, [video, request, response]
-          flash[:notice] = Manager.config[:after_video_save_msg]
-          redirect Manager.config[:after_video_save_path]
-        else
-          Manager.call :after_video_save_failure, [request, response]
-          flash[:error] = video.errors.messages
-          redirect '/videos/upload'
-        end
-      end
 
-      get '/videos/show/:id/?' do
-        @video = Video.find(params[:id])
-        erb :show
-      end
+        app.get '/videos/watch/:id/?' do
+          @video = Video.find_by(id: params[:id])
+          if @video
+            erb 'videos/watch'.to_sym
+          else
+            I18n.t 'video_not_found'
+          end
+        end
 
-      get '/videos/edit/:id/?' do
-        @video = Video.find(params[:id])
-        erb :edit
-      end
+        app.get '/videos/edit/:id/?' do
+          @video = Video.find_by(id: params[:id])
+          if @video
+            erb 'videos/edit'.to_sym
+          else
+            I18n.t 'video_not_found'
+          end
+        end
 
-      post '/videos/edit/:id' do
-        video = Video.find(params[:id])
-        video.update_atributes(params)
-        if video.valid?
-          video.save
-          Manager.call :after_update, [video, request, response]
-          flash[:notice] = Manager.config[:after_update_msg]
-          redirect Manager.config[:after_update_path]
-        else
-          Manager.call :after_update_failure, [video, request, response]
-          flash[:error] = video.errors.messages
-          redirect Manager.config[:after_update_failure_path]
+        app.post '/videos/edit/:id' do
+          video = Video.find(params[:id])
+          if video.update_attributes(params)
+            video.save
+            Manager.call :after_video_update, [video, request, response]
+            flash[:notice] = I18n.t 'video_edited'
+            redirect Manager.config[:after_video_update_path]
+          else
+            Manager.call :after_video_update_failure, [video, request, response]
+            flash[:error] = video.errors.messages
+            redirect "/videos/edit/#{video.id}"
+          end
         end
-      end
 
-      post '/videos/delete/:id' do
-        video = Video.find(params[:id])
-        Manager.call :before_delete, [video, request, response]
-        if video
-          video.video.remove!
-          video.delete
-          Manager.call :after_delete, [request, response]
-          flash[:notice] = Manager.config[:after_delete_msg]
+        app.post '/videos/delete/:id' do
+          video = Video.find_by(id: params[:id])
+          if video
+            Manager.call :before_video_delete, [video, request, response]
+            video.thumbnail.remove!
+            video.video_files.each  do |file|
+              file.file.remove!
+              file.destroy!
+            end
+            video.destroy!
+            Manager.call :after_video_delete, [request, response]
+            flash[:notice] = I18n.t 'video_deleted'
+          end
+          redirect Manager.config[:after_video_delete_path]
         end
-        redirect Manager.config[:after_delete_path]
-      end
 
-      get '/videos/' do
-        @videos = Video.all
-        erb :index
+        app.get '/videos/?' do
+          @video_links = Video.all
+          erb 'videos/list'.to_sym
+        end
       end
     end
   end

data/lib/sinatra/videoman/models/video.rb

@@ -6,6 +6,9 @@ require 'sinatra/videoman/thumb_uploader.rb'
 
 class Video < ActiveRecord::Base
   include Sinatra::Videoman
+
+  attr_accessible :title, :description, :thumbnail
+
   mount_uploader :thumbnail, ThumbUploader
   has_many :video_files
 

data/lib/sinatra/videoman/rake.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+
+module Sinatra
+  module Videoman
+    module Tasks
+      def self.install_views_task views_dir
+        current_path = File.expand_path(File.dirname(__FILE__))
+        Dir.foreach(current_path + '/views') do |item|
+          next if item == '.' or item == '..'
+          File.open(File.join(current_path, 'views', item), 'r') do |file|
+            if !File.exists?(File.join(views_dir, item))
+              File.open(File.join(views_dir, item), 'w') do |view|
+                while line = file.gets
+                  view.write line
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+load 'sinatra/videoman/tasks.rake'

data/lib/sinatra/videoman/tasks.rake

@@ -0,0 +1,8 @@
+require 'rake'
+
+namespace :video_views do
+  desc 'Copy view files'
+  task :install do
+    Sinatra::Videoman::Tasks.install_views_task ENV["VIEWS_DIR"]
+  end
+end

data/lib/sinatra/videoman/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Videoman
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/sinatra/videoman/views/edit.erb

@@ -0,0 +1,6 @@
+<form method="post" action="/videos/edit/<%= @video.id %>">
+  <p><%= I18n.t 'title' %>: <input type="text" value=<%= @video.title %> name="title" /></p>
+  <p><%= I18n.t 'description' %>: <input type="text" value=<%= @video.description %> name="description" /></p>
+  <p><%= I18n.t 'thumbnail' %>: <input type="file" value=<%= @video.thumbnail.url%> name="thumbnail" /></p>
+  <input type="submit" value=<%= I18n.t 'submit' %> />
+</form>

data/lib/sinatra/videoman/views/list.erb

@@ -0,0 +1 @@
+<%= partial 'videos/video_link'.to_sym, :collection => @video_links%>

data/lib/sinatra/videoman/views/upload.erb

@@ -1,36 +1,37 @@
 <script type='text/javascript'>
   function addFields(){
-    // Container <div> where dynamic content will be placed
-    var container = document.getElementById("video_input_fields");
-    // Append a node with a random text
+    var container = document.getElementById("video_files");
     container.appendChild(document.createTextNode("Video: "));
-    // Create an <input> element, set its type and name attributes
     var input = document.createElement("input");
     input.type = "file";
     input.name = "video_files[]";
     container.appendChild(input);
-    // Append a line break
     container.appendChild(document.createElement("br"));
   }
 </script>
 <%= flash[:error] %>
 <%= flash[:notice] %>
 <form id="video_form" enctype="multipart/form-data" method="post" action="/videos/upload">
-  <fieldset id="video_input_fields">
-    <legend>Video files</legend>
-    <label for="file">Video:</label>
-    <input id="file" type="file" name="video_files[]" required /></br>
+  <fieldset id="video_files">
+    <legend><%= I18n.t 'video_files' %></legend>
+    <%= I18n.t 'video' %>: <input type="file" name="video_files[]" required /></br>
   </fieldset>
-
-  <label for="title">Title:</label>
-  <input id="title" type="text" name="video[title]" placeholder="Video title" required /><br />
-
-  <label for="description">Description:</label>
-  <input id="description" type="text" name="video[description]" placeholder="Video description" required /><br />
-
-  <label for="thumbnail">Thumbnail:</label>
-  <input id="thumbnail" type="file" name="video[thumbnail]" required /><br />
-
-  <input type="submit" value="Upload" />
-  <input type="button" value="Add file" onclick="addFields()" />
+  <table border="0">
+    <tr>
+      <td><label for="title"><%= I18n.t 'title' %>:</label></td>
+      <td><input id="title" type="text" name="video[title]" placeholder="Video title" required /></td>
+    </tr>
+    <tr>
+      <td><label for="description"><%= I18n.t 'description' %>:</label></td>
+      <td><input id="description" type="text" name="video[description]" placeholder="Video description" required /></td>
+    </tr>
+    <tr>
+      <td><label for="thumbnail"><%= I18n.t 'thumbnail' %>:</label></td>
+      <td><input id="thumbnail" type="file" name="video[thumbnail]" required /></td>
+    </tr>
+    <tr>
+      <td><input type="submit" value=<%= I18n.t 'upload' %> /></td>
+      <td><input type="button" value=<%= I18n.t 'add_field' %> onclick="addFields()" /></td>
+    </tr>
+  </table>
 </form>

data/lib/sinatra/videoman/views/video.erb

@@ -0,0 +1,10 @@
+<h3><%= video.title %></h3>
+<video width="640" height="360" controls>
+  <% video.video_files.each do |source| %>
+    <source src=<%= source.file.url %> type=<%= source.content_type %> />
+  <% end %>
+    <%= I18n.t 'video_tag_not_supported' %>
+</video>
+<div id="description">
+  <%= video.description %>
+</div>

data/lib/sinatra/videoman/views/video_link.erb

@@ -0,0 +1,6 @@
+<div>
+  <a href=<%= "videos/watch/#{video_link.id}" %>>
+    <img src=<%= video_link.thumbnail.url %> width="120" height="90" />
+    <%= video_link.title %>
+  </a>
+</div>

data/lib/sinatra/videoman/views/watch.erb

@@ -0,0 +1 @@
+<%= partial 'videos/video'.to_sym, :locals => {:video => @video} %>

data/lib/sinatra/videoman.rb

@@ -1,14 +1,18 @@
 require "sinatra/videoman/version"
-require "rack-flash"
+require "sinatra/flash"
 require "bcrypt"
 require "sinatra/base"
 require "active_record"
 require "carrierwave"
+require "i18n"
+require "i18n/backend/fallbacks"
 
 module Sinatra
   module Videoman
     module Manager
       @@config = {
+        :default_locale => :en,
+
         :video_upload_dir => nil,
         :video_file_extensions => %w(ogv webm mp4),
         :max_video_file_size => 400,
@@ -18,13 +22,8 @@ module Sinatra
         :max_thumb_file_size => 2,
 
         :after_video_save_path => '/',
-        :after_video_save_msg => 'Successfully uploaded video!',
-
-        :after_update_path => '/',
-        :after_update_msg => 'Successfully updated video!',
-
-        :after_delete_path => '/',
-        :after_delete_msg => 'Successfully deleted video!',
+        :after_video_update_path => '/',
+        :after_video_delete_path => '/',
       }
       @@callbacks = {}
 
@@ -70,20 +69,20 @@ module Sinatra
         self.register :after_video_save_failure, &block
       end
 
-      def self.after_update &block
-        self.register :after_update, &block
+      def self.after_video_update &block
+        self.register :after_video_update, &block
       end
 
-      def self.after_update_failure &block
-        self.register :after_update_failure, &block
+      def self.after_video_update_failure &block
+        self.register :after_video_update_failure, &block
       end
 
-      def self.before_delete &block
-        self.register :after_delete, &block
+      def self.before_video_delete &block
+        self.register :before_video_delete, &block
       end
 
-      def self.after_delete &block
-        self.register :after_delete, &block
+      def self.after_video_delete &block
+        self.register :after_video_delete, &block
       end
     end
   end

data/sinatra-videoman.gemspec

@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
 	spec.add_runtime_dependency "sinatra"
+  spec.add_runtime_dependency "sinatra-partial"
 	spec.add_runtime_dependency "activerecord"
 	spec.add_runtime_dependency "protected_attributes"
   spec.add_runtime_dependency "bcrypt-ruby"
   spec.add_runtime_dependency "carrierwave"
+  spec.add_runtime_dependency "i18n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-videoman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dobromir Ivanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-partial
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Sinatra video manager
 email:
 - dobromir0ivanov@gmail.com
@@ -121,16 +149,22 @@ files:
 - README.md
 - Rakefile
 - lib/sinatra/videoman.rb
+- lib/sinatra/videoman/locales/bg.yml
+- lib/sinatra/videoman/locales/en.yml
 - lib/sinatra/videoman/middleware.rb
 - lib/sinatra/videoman/models/video.rb
 - lib/sinatra/videoman/models/video_file.rb
+- lib/sinatra/videoman/rake.rb
+- lib/sinatra/videoman/tasks.rake
 - lib/sinatra/videoman/thumb_uploader.rb
 - lib/sinatra/videoman/version.rb
 - lib/sinatra/videoman/video_uploader.rb
 - lib/sinatra/videoman/views/edit.erb
-- lib/sinatra/videoman/views/index.erb
-- lib/sinatra/videoman/views/show.erb
+- lib/sinatra/videoman/views/list.erb
 - lib/sinatra/videoman/views/upload.erb
+- lib/sinatra/videoman/views/video.erb
+- lib/sinatra/videoman/views/video_link.erb
+- lib/sinatra/videoman/views/watch.erb
 - sinatra-videoman.gemspec
 homepage: ''
 licenses:

data/lib/sinatra/videoman/views/index.erb

@@ -1 +0,0 @@
-<%= partial :show, :collection => @videos %>

data/lib/sinatra/videoman/views/show.erb

@@ -1,10 +0,0 @@
-<h3><%= @video.title %></h3>
-<video width="320" height="240" controls>
-  <% @video.video_files.each do |source| %>
-    <source src=<%= source.file.url %> type=<%= source.content_type %> />
-  <% end %>
-    Your browser does not support the video tag.
-</video>
-<div id="description">
-  <%= @video.description %>
-</div>