nabaztag_hack_kit 0.1.0.alpha3 → 0.1.0.alpha4

data/examples/record/Gemfile

@@ -3,3 +3,8 @@ source "http://rubygems.org"
 
 gem "nabaztag_hack_kit"
 gem "ruby-echonest"
+
+group :development do
+  gem "heroku"
+  gem "foreman"
+end

data/examples/record/server.rb

@@ -6,7 +6,7 @@ require "echonest"
 class Server < NabaztagHackKit::Server
 
   def initialize(echonest_cfg, soundcloud_cfg)
-    super('bytecode.bin')
+    super
     @@echonest   = Echonest(echonest_cfg[:key])
     @@soundcloud = Soundcloud.new(soundcloud_cfg)
   end

data/lib/nabaztag_hack_kit/server.rb

@@ -11,12 +11,15 @@ module NabaztagHackKit
       enable :logging
     end
 
+    # set :public_folder, File.dirname(__FILE__) + '../public'
+
     REC_FILE = "rec.wav"
     PREFIX = "/api/:bunnyid"
 
-    def initialize(bytecode_path = nil)
+    def initialize(opts = {})
       super
-      @bytecode_path = bytecode_path || public_file('bytecode.bin')
+      @base_file     = opts.fetch(:base_file, __FILE__)
+      @bytecode_file = opts.fetch(:bytecode_file, public_file('bytecode.bin'))
     end
 
     class << self
@@ -60,8 +63,12 @@ module NabaztagHackKit
     end
 
     get "/bc.jsp" do
-      logger.info "Serving Bytecode from #{@bytecode_path}"
-      send_file @bytecode_path
+      if File.exists?(@bytecode_file)
+        logger.info "Serving Bytecode from #{@bytecode_file}"
+        send_file @bytecode_file
+      else
+        status 404
+      end
     end
 
     post "#{PREFIX}/log.jsp" do
@@ -90,7 +97,11 @@ module NabaztagHackKit
     end
 
     get "/streams/:file.mp3" do
-      File.read public_file("#{params[:file]}.mp3")
+      if (file = public_file("#{params[:file]}.mp3")) && File.exists?(file)
+        File.read file
+      else
+        status 404
+      end
     end
 
     # generic callback
@@ -108,7 +119,7 @@ module NabaztagHackKit
 
     protected
     def public_file(name)
-      File.expand_path(File.join('..', 'public', name), __FILE__)
+      File.expand_path(File.join('..', 'public', name), @base_file)
     end
   end
 end

data/lib/nabaztag_hack_kit/version.rb

@@ -1,3 +1,3 @@
 module NabaztagHackKit
-  VERSION = "0.1.0.alpha3"
+  VERSION = "0.1.0.alpha4"
 end

data/spec/integration/server_spec.rb

@@ -13,7 +13,7 @@ end
 describe NabaztagHackKit::Server do
   include Rack::Test::Methods
 
-  let(:app) { NabaztagHackKit::Server.new }
+  let(:app) { NabaztagHackKit::Server.new(:bytecode_file => __FILE__) }
 
   describe "/bc.jsp" do
     let(:route) { "/bc.jsp" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nabaztag_hack_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha3
+  version: 0.1.0.alpha4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bytecode/bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000Z
+date: 2012-09-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70172330100880 !ruby/object:Gem::Requirement
+  requirement: &70133294055600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172330100880
+  version_requirements: *70133294055600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70172330100340 !ruby/object:Gem::Requirement
+  requirement: &70133294055060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172330100340
+  version_requirements: *70133294055060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172330099880 !ruby/object:Gem::Requirement
+  requirement: &70133294054600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172330099880
+  version_requirements: *70133294054600
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70172330099420 !ruby/object:Gem::Requirement
+  requirement: &70133294054140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172330099420
+  version_requirements: *70133294054140
 description: Sinatra server api framework to run custom bytecode on Nabaztag v1/v2.
   Sources + Compiler included (linux only)
 email: