yetty 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f45bd672b89d1030a4d3dc6c661c9509feb07d0
-  data.tar.gz: 8e357c6886ad138f1c56cd727ac340d62fcad281
+  metadata.gz: 33e9ad7c97659b85bbfbd10bd7f7a1e2fedd8950
+  data.tar.gz: 3197ddd3065ebd4ae72f4a8cb2873db197e97620
 SHA512:
-  metadata.gz: a98db022addf0ad2ff0ad3fc2864454e9ad365b666620331cd73b665b23358a8aad67855a907fe2c132434392f1992540d0a1a1511fee92158cd3a1ab9cc97b6
-  data.tar.gz: 21bad94340f8d3769204c587cdc4f0678aac9c87160f1b6aed8af17d7cbc24784fcd9f755dc8d6be4b2c9bea6caba2f5605d1ac0d889171112f86266c829bae8
+  metadata.gz: 2f433cb7a4ef52eb74f717e649819c3bf34d2ec5920ca4f182730b63cd35acefadbf4074f46f963ec2250f3c104d053af72fdcf9fb79e38f9164c838262df60a
+  data.tar.gz: 072f2017f1dd174f28aa3e672926dd8a40bd10e95b5b568b154d4bbe4767bd161a83451470f649f054e4c2e6221ef441be8e7ae7406001daa50a21da787d428c

data/CHANGELOG.md

@@ -1,2 +1,6 @@
+## v0.1.2
+* Add updates for to supported embedded iframe
+* Allow site API configuration to be driven via config
+
 ## v0.1.0
 * Initial release

data/lib/yetty/site/app.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'bogo'
 require 'sinatra/base'
 
 module Yetty
@@ -6,18 +7,30 @@ module Yetty
     # Web UI
     class App < Sinatra::Base
 
+      include Bogo::Memoization
+
+      set :protection, :except => :frame_options
+
+      def config
+        memoize(:config, :direct) do
+          path = ENV['YETTY_SITE_CONFIG']
+          unless(path)
+            path = Command::DEFAULT_CONFIGURATION_FILES.detect do |check|
+              full_check = File.expand_path(check)
+              File.exists?(full_check)
+            end
+          end
+          MultiJson.load(File.read(path)).to_smash
+        end
+      end
+
       def bucket
         storage = Miasma.api(
           :type => :storage,
-          :provider => :aws,
-          :credentials => {
-            :aws_access_key_id => ENV['MIASMA_AWS_ACCESS_KEY_ID'],
-            :aws_secret_access_key => ENV['MIASMA_AWS_SECRET_ACCESS_KEY'],
-            :aws_region => ENV['MIASMA_AWS_REGION'],
-            :aws_bucket_region => 'us-west-2'
-          }
+          :provider => config.get(:site, :storage, :provider),
+          :credentials => config.get(:site, :storage, :credentials)
         )
-        bucket = storage.buckets.get('cr-test-00')
+        storage.buckets.get(config.get(:site, :storage, :bucket))
       end
 
       set :public_folder, File.join(File.dirname(__FILE__), 'static')
@@ -45,6 +58,22 @@ module Yetty
         )
       end
 
+      get '/embed/:info' do
+        rec_path = Base64.urlsafe_decode64(params[:info])
+        user, state, name = rec_path.split('/')
+        rec_url = bucket.files.get(rec_path).url
+        haml(
+          :embed,
+          :layout => :embed_layout,
+          :locals => {
+            :user => user,
+            :state => state,
+            :name => name,
+            :url => rec_url
+          }
+        )
+      end
+
       get '/users' do
         file = bucket.files.get('userlist.json')
         users = file ? MultiJson.load(file.body.readpartial).to_smash[:users] : []

data/lib/yetty/site/views/embed.haml

@@ -0,0 +1,20 @@
+#player
+  .header= name
+  #term
+  .progress
+    .progress-bar.progress-info.progress-striped.bar
+  %nav.controls
+    %li.sc-button.action-toggle{'data-action' => 'play'}
+      %span.glyphicon.glyphicon-play
+    %li.speed-container
+      %input.speed{type: 'text', value: '2.5'}
+  %input.cmdline{:hidden => 'hidden'}
+
+:javascript
+  jQuery(function(){
+    window.term = new Terminal(80, 24);
+    window.term.id = 1;
+    term.open(document.getElementById('term'));
+    window.player = new VT.Player(term);
+    window.player.load('#{url}');
+  });

data/lib/yetty/site/views/embed_layout.haml

@@ -0,0 +1,14 @@
+!!! 5
+%html
+  %head
+    %title= "Yetty - [#{@title || '-'}]"
+    %link{:type => 'text/css', :rel => 'stylesheet', :href => '/css/styles.css'}
+    %link{:type => 'text/css', :rel => 'stylesheet', :href => '/css/player.css'}
+    %link{:type => 'text/css', :rel => 'stylesheet', :href => '/css/fd-slider.css'}
+    %script{:type => 'text/javascript', :src => '/js/jquery-2.1.1.min.js'}
+    %script{:type => 'text/javascript', :src => '/js/bootstrap.min.js'}
+    %script{:type => 'text/javascript', :src => '/js/player/fd-slider.min.js'}
+    %script{:type => 'text/javascript', :src => '/js/player/term.js'}
+    %script{:type => 'text/javascript', :src => '/js/player/player.js'}
+  %body.embed{:style => 'background-image: none; background-color: white;'}
+    = yield

data/lib/yetty/version.rb

@@ -1,4 +1,4 @@
 module Yetty
   # Library version
-  VERSION = Gem::Version.new('0.1.0')
+  VERSION = Gem::Version.new('0.1.2')
 end

data/yetty.gemspec

@@ -13,9 +13,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'miasma'
   s.add_dependency 'sinatra'
   s.add_dependency 'haml'
-  s.add_dependency 'slop'
+  s.add_dependency 'slop', '~> 3.0'
   s.add_dependency 'paint'
   s.add_dependency 'shelr'
+  s.add_dependency 'compass'
+  s.add_dependency 'bootstrap-sass'
+  s.add_dependency 'bogo'
   s.executables << 'yetty'
   s.files = Dir['{lib,bin}/**/**/*'] + %w(yetty.gemspec README.md CHANGELOG.md LICENSE)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yetty
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma
@@ -54,6 +54,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: shelr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +95,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shelr
+  name: compass
+  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: bootstrap-sass
+  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: bogo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,6 +182,8 @@ files:
 - lib/yetty/site/static/sounds/nyanlooped.mp3
 - lib/yetty/site/static/sounds/nyanslow.mp3
 - lib/yetty/site/views/about.haml
+- lib/yetty/site/views/embed.haml
+- lib/yetty/site/views/embed_layout.haml
 - lib/yetty/site/views/index.haml
 - lib/yetty/site/views/layout.haml
 - lib/yetty/site/views/recording.haml