internet-sampler 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94e768283bc9ac747d870d79bebb09b9d1ba5ac0
-  data.tar.gz: bf182b6b82aae4291bae03db5cf795f3d8d3b761
+  metadata.gz: 057d9cfc69ff0e8c56471323e9393c591970f618
+  data.tar.gz: 86018e23643b20116d7b4d76de0a86578bace964
 SHA512:
-  metadata.gz: 9764c40abb1661392b8184eb201d53e2b8968ea85e6125ceb30be6d7f8fce39532a4f85d94a9d94c469273c4f0d718493bac1988ac8313831c3a52ad0d4bb9c0
-  data.tar.gz: 9821603d3c7f38df52d208501d9d398e6b38f7f3cfefb8db568b07b6c47af020f281b5ad44b23338b833db790674dc483b5264c21d9271b7c0ca397c3a0a75e3
+  metadata.gz: d751c23dbb1e8f2c5255af0f1e0480cb0c1bfba4f2536a83a5cdf87b24be238d85ac2d12efebf6ad1e18fed57182ba571259806c83467160376589edf310fbbb
+  data.tar.gz: 8721e77cd6203226eb546e14d82b7f06360e237a27e339a71ed8b487b94b143f79eed517bf864727b19a446ff78981a04fa1d4b36e996efa8accee262aef5888

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 
 /dump.rdb
+
+/*.gem

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    internet-sampler (0.1.0)
+    internet-sampler (0.2.1)
       redis
-      sinatra (~> 1.4.6)
-      sinatra-contrib (~> 1.4.6)
+      sinatra (~> 1.4)
+      sinatra-contrib (~> 1.4)
       sinatra-websocket
-      slim (~> 3.0.6)
+      slim (~> 3.0)
 
 GEM
   remote: https://rubygems.org/

data/app/public/main.css

@@ -1,9 +1,13 @@
 body {
   font-family: sans-serif;
-  background-color: #efefef;
+  background-color: #D9D8D5;
   margin: 0 1.5em;
 }
 
+h1 {
+  font-weight: 700;
+}
+
 #number {
   position: fixed;
   z-index: -1;
@@ -27,7 +31,6 @@ body {
 
 .play-container {
   display: block;
-  padding-top: 1em;
 }
 
 .play {
@@ -38,6 +41,7 @@ body {
   vertical-align: top;
 
   margin-right: 14px;
+  margin-bottom: 14px;
   padding: 14px;
 
   text-align: center;
@@ -47,23 +51,22 @@ body {
   font-weight: bold;
   font-size: 20px;
 
-  border: 2px solid #555;
-  border-radius: 10px;
-  background-color: #ccc;
+  border-radius: 4px;
+  background-color: #8A8B91;
+
+  box-shadow: 0 0 9px #777;
 
   transition: all .1s ease 0s;
 }
 
 .play:hover {
-  border: 2px solid #333;
   background-color: #999;
 }
 
 .play:active {
   color: #fff;
-  border: 2px solid #111;
   background-color: #777;
-  transform: scale(0.95, 0.95);
+  box-shadow: 0 0 7px #C63851, 0 0 3px #333 inset;
 }
 
 .play audio {
@@ -77,22 +80,76 @@ body {
   font-size: 3em;
 }
 
+.checkbox-wrapper {
+  margin-top: 3.5em;
+}
+
+.checkbox {
+  display: inline-block;
+}
+
+.checkbox input[type="checkbox"] {
+  display: none;
+}
+
+.checkbox label {
+  display: inline-block;
+  cursor: pointer;
+  font-size: .8em;
+  padding: .3em .7em;
+  border: 1px solid #888;
+  border-radius: 3px;
+  box-shadow: 0 0 3px #888 inset;
+  background-color: #ccc;
+  color: #666;
+
+  transition: all .1s ease 0s;
+}
+
+.checkbox label:hover {
+  opacity: .8;
+}
+
+.checkbox label:active {
+  transform: translateY(1px);
+}
+
+.checkbox input[type="checkbox"]:checked ~ label {
+  background-color: #E1A6A2;
+  box-shadow: 0 0 2px 1px #EF5F55 inset;
+  border-color: #A5554F;
+  color: #000;
+}
+
+.checkbox + .checkbox {
+  margin-left: .5em;
+}
+
 #msgs {
   display: block;
   border: 1px solid #777;
+  margin-top: 1em;
   padding: .3em;
-  margin-top: 5em;
   font-family: monospace;
   font-size: 10px;
   max-height: 10em;
   overflow: scroll;
 }
 
-@media only screen and (max-device-width: 736px) {
+@media only screen and (max-width: 550px) {
   .play {
     width: 90%;
+    height: 140px;
     margin: 14px auto;
   }
+
+  .checkbox {
+    display: block;
+  }
+  .checkbox + .checkbox {
+    margin-top: .3em;
+    margin-left: 0;
+  }
 }
 
 .widgets .widget {

data/app/public/main.js

@@ -4,15 +4,15 @@ window.onload = (function(){
     el.innerHTML = msg + '<br>' + el.innerHTML;
   };
 
-  var ws       = new WebSocket(ws_url);
+  var ws = new WebSocket(ws_url);
 
   var play = function(slug, count) {
     if (document.getElementById('checkbox-play-on-device').checked) {
-      var target = $(".play[data-track=" + slug + "] audio")[0];
+      var $target = $(".play[data-track=" + slug + "] audio")[0];
       if (document.getElementById('checkbox-rewind-on-play').checked) {
-        target.currentTime = 0;
+        $target.currentTime = 0;
       }
-      target.play();
+      $target.play();
       if (typeof(window.navigator.vibrate) === "function") { window.navigator.vibrate(70); }
     }
 
@@ -46,7 +46,7 @@ window.onload = (function(){
     }
   };
 
-  var evname = ('ontouchstart' in document) ? 'touchstart' : 'click';
+  var evname = ('ontouchstart' in document) ? 'touchstart' : 'mousedown';
   $('.play').on(evname, function(f){
     var tg = f.currentTarget.getAttribute('data-track');
     ws.send(
@@ -56,6 +56,5 @@ window.onload = (function(){
       })
     );
     show('Sent: ' + tg);
-    play(tg, null);
   });
 });

data/app/views/index.slim

@@ -11,13 +11,7 @@ html
     script src="/main.js"
   body
     h1 Internet Sampler
-    #number = "*"
-    .checkbox.clickable
-      input type='checkbox' name='play-on-device' id='checkbox-play-on-device' checked="checked"
-      label for='checkbox-play-on-device' Play sound on this device
-    .checkbox.clickable
-      input type='checkbox' name='rewind-on-play' id='checkbox-rewind-on-play' checked="checked"
-      label for='checkbox-rewind-on-play' Rewind on play
+    #number *
 
     .play-container
       - @tracks.each do |track|
@@ -25,7 +19,17 @@ html
           .tag = track[:slug]
           audio src="#{track[:path]}" preload="auto" controls="none"
           .count = (track[:count] || 0)
+
+    .checkbox-wrapper
+      .checkbox.clickable
+        input type='checkbox' name='play-on-device' id='checkbox-play-on-device' checked="checked"
+        label for='checkbox-play-on-device' Play sound on this device
+      .checkbox.clickable
+        input type='checkbox' name='rewind-on-play' id='checkbox-rewind-on-play' checked="checked"
+        label for='checkbox-rewind-on-play' Rewind on play
+
     #msgs
+
     footer
       p
         .widgets

data/config.ru

@@ -9,5 +9,7 @@ InternetSampler::Application.run_with_sampler_options!(
       { slug: 'Frontliner', path: '/mp3/frontliner-fsharp-kick.mp3' },
     ]
   },
-  { port: 9292, bind: 'localhost' }
+  {}
 )
+
+# run InternetSampler::Application

data/lib/internet-sampler/cli.rb

@@ -8,6 +8,7 @@ module InternetSampler
       sinatra_options = {
         port: 9292,
         bind: 'localhost',
+        environment: :development,
       }
       sampler_options = {
         tracks: []
@@ -17,6 +18,11 @@ module InternetSampler
 
       opt.on('-p port', '--port port', 'port to listen (default is 9292)') { |i| sinatra_options[:port] = i.to_i }
       opt.on('-b host', '--bind host', 'host to bind (default is localhost)') { |i| sinatra_options[:bind] = i }
+      opt.on('-e env', '--environment env', 'environment to run (production, test or development; default is development)') { |i|
+        if %w{development test production}.include? i
+          sinatra_options[:environment] = i.to_sym
+        end
+      }
       opt.on('-t slug:url', '--track slug:url', 'sample sound to serve (note that `url\' is not path to file but URL to serve)') { |i|
         if track = i.match(/^([^:]*):(.*)$/)
           sampler_options[:tracks] << {

data/lib/internet-sampler/version.rb

@@ -1,3 +1,3 @@
 module InternetSampler
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: internet-sampler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - polamjag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra