nabaztag_hack_kit 0.0.3 → 0.1.0.alpha1

data/{test/bytecode → bytecode/test}/native.mtl

@@ -18,6 +18,16 @@ let test "strcatlist" -> t in
   assert_equalS "313233"  strcatlist "31"::"32"::"33"::nil
 );
 
+let test "rev" -> t in
+(
+  assert_equalL 3::2::1::nil rev 1::2::3::nil nil
+);
+
+let test "rev" -> t in
+(
+  assert_equalS "ABC" "\65\66\67"
+);
+
 // remfromlist same as  listrem!!!
 //let test "remfromlist" -> t in
 //(
@@ -25,4 +35,4 @@ let test "strcatlist" -> t in
 //  Lecho (remfromlist l (listlen l) - 1)
 //  //assert_equalS "0A000"
 //    assert_equalL 48::49::50::nil listrem 48::49::50::nil 49
-//);
+//);

data/{test/bytecode → bytecode/test}/test.mtl

@@ -1,8 +1,8 @@
 proto main 0;;
 
-#include "../../ext/bytecode/lib/util"
-#include "../../bytecode/lib/data_helper"
-#include "../../bytecode/lib/buffer"
+#include "../src/lib/util"
+#include "../lib/data_helper"
+#include "../lib/buffer"
 
 #include "./helper"
 

data/examples/record/Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem "nabaztag_hack_kit"
+gem "ruby-echonest"

data/examples/record/config.ru.example

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
+require './server'
+
+use Rack::Reloader, 0
+
+ECHONEST_CFG = {
+  :key => "",
+}
+
+SOUNDCLOUD_CFG = {
+  :client_id      => "",
+  :client_secret  => "",
+  :username       => "",
+  :password       => "",
+}
+
+run Record::Server.new(ECHONEST_CFG, SOUNDCLOUD_CFG)

data/examples/record/server.rb

@@ -0,0 +1,112 @@
+
+require "nabaztag_hack_kit/server"
+require "soundcloud"
+require "echonest"
+
+class Server < NabaztagHackKit::Server
+
+  REC_FILE = "rec.wav"
+
+  def initialize(echonest_cfg, soundcloud_cfg)
+    super('bytecode.bin')
+    @@echonest   = Echonest(echonest_cfg[:key])
+    @@soundcloud = Soundcloud.new(soundcloud_cfg)
+  end
+
+  def analyse(file_name)
+    @@echonest.track.analysis(file_name)
+  end
+
+  def riff2mp3(file_name)
+    `sox #{file_name} -e signed-integer out.wav && lame --quiet --alt-preset standard out.wav out.mp3`
+    'out.mp3'
+  end
+
+  def norm(a, n = 255)
+    min = a.min
+    max = a.max - min
+    a.map do |i|
+      (n * ((i - min) / max)).to_i
+    end
+  end
+
+  def dance(file_name)
+    an = analyse riff2mp3(file_name)
+
+    puts beats = an.tempo.to_i
+    loud = an.loudness.to_i
+
+    if beats > 0
+      {
+        REC_START => [3],
+        EAR_L => norm(an.segments.first.timbre, 16),
+        EAR_R => norm(an.segments.first.pitches, 16),
+        BMP => [beats],
+        LED_L1 => norm(an.segments.first.timbre, 255),
+        LED_L2 => norm([beats, beats, beats, beats, loud, loud, loud, loud], 255),
+        LED_L3 => norm(norm an.segments.first.pitches, 255),
+      }
+    else
+      {
+        REC_START => [3],
+        EAR_L => [0],
+        EAR_R => [0],
+        BMP => [0],
+        LED_L1 => [0],
+        LED_L2 => [0],
+        LED_L3 => [0]
+      }
+    end
+  end
+
+  def upload(file)
+    @@soundcloud.post('/tracks', :track => {
+      :title        => 'Bunny Boogie',
+      :asset_data   => File.new(file)
+    })
+    {
+      EAR_L  => [16,0,16,0,16,0],
+      LED_L1 => [0],
+      LED_L2 => [0],
+      LED_L3 => [0]
+    }
+  end
+
+  on :start do
+    @@dance = true
+    if @@recording
+      @@recording = false
+    end
+    send_nabaztag({
+      REC_STOP => []
+    })
+  end
+
+  on "button-pressed" do
+    send_nabaztag if @@recording
+      @@recording = false
+      {
+        REC_STOP => [],
+        LED_L1   => [100,0,0,0],
+        LED_L2   => [0,100,0,100],
+        LED_L3   => [0,0,100,0]
+      }
+    else
+      @@recording = true
+      sec = @@dance ? 3 : 0
+      {
+        REC_START => [sec]
+      }
+    end
+  end
+
+  on "recording-finished" do |file_name|
+    @@recording = false
+    send_nabaztag if @@dance
+      dance
+    else
+      upload(file_name)
+    end
+  end
+end
+

data/examples/simple/Gemfile

@@ -0,0 +1,6 @@
+# A sample Gemfile
+source "http://rubygems.org"
+
+gem "foreman"
+gem "heroku"
+

data/examples/simple/Procfile

@@ -0,0 +1,3 @@
+web: bundle exec rackup config.ru -p $PORT
+dev: bundle exec rackup config.ru -p 9292
+tunnel: ssh ssh-21560@warteschlange.de -N -R 9092:localhost:9292

data/{config.ru → examples/simple/config.ru}

@@ -3,4 +3,6 @@
 $LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
 require 'nabaztag_hack_kit/server'
 
-run NabaztagHackKit::Server.new
+use Rack::Reloader, 0
+
+run NabaztagHackKit::Server.new

data/lib/nabaztag_hack_kit/message/api.rb

@@ -25,6 +25,14 @@ module NabaztagHackKit
       EAR_LL = 42
       EAR_LR = 43
 
+      REC_START = 50
+      REC_STOP  = 51
+
+      PLAY_START  = 60
+      PLAY_STOP   = 61
+      PLAY_LOAD   = 62
+      PLAY_STREAM = 63
+
       F = 1
       B = 2
 

data/lib/nabaztag_hack_kit/message/helper.rb

@@ -1,6 +1,9 @@
 module NabaztagHackKit
   module Message
     module Helper
+      extend self
+      include Api
+
       #blink
       def bl(loops = 1, color_on = 0xFF, color_off = 0x00)
         repeat(loops, [color_on, color_off])
@@ -13,7 +16,7 @@ module NabaztagHackKit
       alias_method :sl, :rp #sleep
 
       #knight rider
-      def kr(color = 0xFF, led1 = Api::LED_L1, led2 = Api::LED_L2, led3 = Api::LED_L3)
+      def kr(color = 0xFF, led1 = LED_L1, led2 = LED_L2, led3 = LED_L3)
         {
           led1 => [color,0,0,0],
           led2 => [0,color],
@@ -21,7 +24,7 @@ module NabaztagHackKit
         }
       end
 
-      def fire(color = 0x110000, led1 = Api::LED_L1, led2 = Api::LED_L2, led3 = Api::LED_L3)
+      def fire(color = 0x110000, led1 = LED_L1, led2 = LED_L2, led3 = LED_L3)
         data = Array.new(16) do |i|
           Message.to_3b(i * color)
         end + Array.new(8) do |i|
@@ -35,6 +38,22 @@ module NabaztagHackKit
         }
       end
 
+      def wink(s = 1, e = 4, times = 5)
+        {
+          EAR_L => ([s,e] * times) + [s],
+          EAR_R => [s] + ([s,e] * times)
+        }
+      end
+
+      def circle(times = 15)
+        {
+          LED_0 => [r,0,0,0] * times,
+          LED_1 => [0,r,0,0] * times,
+          LED_4 => [0,0,r,0] * times,
+          LED_3 => [0,0,0,r] * times,
+        }
+      end
+
       def stop
         {
           LED_0 => 0,
@@ -53,6 +72,11 @@ module NabaztagHackKit
           EAR_LR => 0,
         }
       end
+
+      private
+      def r
+        rand(255)
+      end
     end
   end
 end

data/lib/nabaztag_hack_kit/message.rb

@@ -1,5 +1,6 @@
 module NabaztagHackKit
   module Message
+    extend self
 
     def build(*commands)
       commands = if commands.first.is_a?(Hash)
@@ -11,26 +12,31 @@ module NabaztagHackKit
       end
 
       pack full_message commands.map { |cmd, *data|
-        [cmd] + to_3b(data.flatten.size) + data.flatten
+        data = convert_data(data)
+        [cmd] + to_3b(data.size) + data
       }
     end
-    module_function(:build)
 
     def to_3b(int)
       [int >> 16, int >> 8, int].map { |i| i & 0xFF }
     end
-    module_function(:to_3b)
+
+    def convert_data(data)
+      if data.first.is_a?(String)
+        data.first.each_byte.to_a
+      else
+        data.flatten
+      end
+    end
 
     private
     def full_message(*data)
       [0x7F] + data.flatten + [0xFF, 0x0A]
     end
-    module_function(:full_message)
 
     def pack(message)
       message.pack('c*')
     end
-    module_function(:pack)
   end
 
 end

data/lib/nabaztag_hack_kit/public/index.html

@@ -0,0 +1,5 @@
+<h1>Welcome to Nabaztag Hack Kit</h1>
+
+Hurray, your server is successful running! Now point your bunny to this url and you're ready to go!
+
+Check the <a href="https://github.com/rngtng/NabaztagHackKit">Docs</a> how to integrate...

data/lib/nabaztag_hack_kit/server.rb

@@ -7,9 +7,22 @@ module NabaztagHackKit
   class Server < Sinatra::Base
     include Message::Api
 
+    PREFIX = "/api"
+
     def initialize(bytecode_path = nil)
       super
-      @bytecode_path = bytecode_path || File.join('public', 'bytecode.bin')
+      @bytecode_path = bytecode_path || File.expand_path(File.join('../', 'public', 'bytecode.bin'), __FILE__)
+      puts "Serving Bytecode from #{@bytecode_path}"
+    end
+
+    class << self
+      def callbacks
+        @@callbacks ||= {}
+      end
+
+      def on(callback, &block)
+        callbacks[callback] = block
+      end
     end
 
     def send_nabaztag(*data)
@@ -29,22 +42,55 @@ module NabaztagHackKit
       end
     end
 
-    get '/bc.jsp' do
-      # TODO recompile if changed
-      send_file @bytecode_path
+    def callback(action, data, request)
+      if callback = self.class.callbacks[action.to_s]
+        instance_exec data, request, &callback
+      else
+        # puts "no callback found for #{action}"
+        send_nabaztag OK
+      end
     end
 
-    get '/vl/button.jsp' do
-      send_nabaztag EAR_L => [12,0,16,0,16,0,16,0]
+    get "/" do
+      path = File.expand_path(File.join('../', 'public', 'index.html'), __FILE__)
+      puts path
+      File.read(path)
+    end
+
+    get "/bc.jsp" do
+      # TODO recompile if changed
+      send_file @bytecode_path
     end
 
-    post '/vl/log.jsp' do
+    post "#{PREFIX}/log.jsp" do
       @logs = parse_log params[:logs]
       puts "#########################"
       puts @logs.join("\n")
       puts "#########################"
       send_nabaztag OK
     end
-  end
 
+    post "#{PREFIX}/recording-finished.jsp" do
+      file_name = REC_FILE # TODO add timestamp??
+      File.open(file_name, "w+") do |f|
+        f.write request.body.read
+      end
+      callback('recording-finished', file_name, request)
+    end
+
+    get "#{PREFIX}/rfid.jsp" do
+      callback('rfid', params[:id], request)
+    end
+
+    get "#{PREFIX}/button-pressed.jsp" do
+      callback('button-pressed', params[:duration], request)
+    end
+
+    # generic callback
+    %w(get post).each do |method|
+      send(method, "#{PREFIX}/:action.jsp") do
+        callback(params[:action], params, request)
+      end
+    end
+  end
 end

data/lib/nabaztag_hack_kit/version.rb

@@ -1,3 +1,3 @@
 module NabaztagHackKit
-  VERSION = "0.0.3"
+  VERSION = "0.1.0.alpha1"
 end

data/nabaztag_hack_kit.gemspec

@@ -13,8 +13,9 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extensions    = ['ext/mtl/extconf.rb']
+  s.extensions    = ['bytecode/src/mtl/extconf.rb']
+
+  s.bindir        = 'bytecode/bin'
   s.executables   = ['mtl_comp', 'mtl_simu', 'mtl_merge']
 
   s.require_paths = ["lib"]
@@ -23,7 +24,7 @@ Gem::Specification.new do |s|
     s.add_dependency *gem.split(' ')
   end
 
-  ["rake", "rspec"].each do |gem|
+  ["rake", "rspec", "rack-test"].each do |gem|
     s.add_development_dependency *gem.split(' ')
   end
 end

data/spec/integration/server_spec.rb

@@ -0,0 +1,50 @@
+require "spec_helper"
+
+require "nabaztag_hack_kit/server"
+require "rack/test"
+
+shared_examples_for :successful_route do
+  it "returns 200" do
+    get route
+    last_response.should be_ok
+  end
+end
+
+describe NabaztagHackKit::Server do
+  include Rack::Test::Methods
+
+  let(:app) { NabaztagHackKit::Server.new }
+
+  describe "/bc.jsp" do
+    let(:route) { "/bc.jsp" }
+
+    it_behaves_like :successful_route
+  end
+
+  describe "/api/log.jsp" do
+    let(:route) { "/api/log.jsp" }
+
+    it_behaves_like :successful_route
+  end
+
+  describe "/api/rfid.jsp" do
+    let(:route) { "/api/rfid.jsp" }
+
+    it_behaves_like :successful_route
+  end
+
+  describe "/api/recording-finished.jsp" do
+    let(:route) { "/api/recording-finished.jsp" }
+
+    it_behaves_like :successful_route
+  end
+
+  describe "catch all route" do
+    let(:route) { "/api/custom.jsp" }
+
+    it_behaves_like :successful_route
+
+    it "execute callback" do
+    end
+  end
+end

data/{test → spec}/spec_helper.rb

@@ -2,4 +2,4 @@ require 'rspec'
 
 $: << File.expand_path("../../lib", __FILE__)
 
-require "nabaztag_hack_kit"
+require "nabaztag_hack_kit"

data/{test → spec}/unit/message_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../spec_helper", __FILE__)
+require "spec_helper"
 
 require "nabaztag_hack_kit/message"
 
@@ -53,4 +53,4 @@ describe NabaztagHackKit::Message do
       NabaztagHackKit::Message.to_3b(6334239).should == [96, 167, 31]
     end
   end
-end
+end

data/spec/unit/server_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+require "nabaztag_hack_kit/server"
+
+describe NabaztagHackKit::Server do
+  let(:app) { NabaztagHackKit::Server.new }
+
+  describe "#bc.jsp" do
+    def do_action(path)
+      app.call({
+        'REQUEST_METHOD' => 'GET',
+        'PATH_INFO'      => path,
+        'rack.input'     => StringIO.new
+      })
+    end
+
+    it "reads from public/bytecode.bin" do
+      pending
+      app.should_receive(:send_file).with("public/bytecode.bin")
+      do_action '/bc.jsp'
+    end
+
+    context "with custom bin code route" do
+      let(:app) { NabaztagHackKit::Server.new(custom_route) }
+      let(:custom_route) { "bytecode.bin" }
+
+      it "reads from" do
+        pending
+        app.should_receive(:send_file).with(custom_route)
+        do_action '/bc.jsp'
+      end
+    end
+  end
+
+  describe "#on" do
+    it "accepts" do
+      pending
+    end
+  end
+end