nabaztag_hack_kit 0.1.0.beta1 → 0.1.0.beta2

data/examples/basic/config.ru

@@ -2,11 +2,9 @@
 
 $LOAD_PATH.unshift ::File.expand_path(::File.dirname(__FILE__) + '/lib')
 require './server'
-require 'nabaztag_hack_kit/redirect'
 
 $stdout.sync = true
 
 use Rack::Reloader, 0
-use NabaztagHackKit::Redirect
 
 run Basic::Server.new

data/lib/nabaztag_hack_kit/mods/playground.rb

@@ -32,9 +32,7 @@ module NabaztagHackKit
 
         app.post "/playground/bunnies/:bunnyid" do #  {"command"=>["40"], "command_values"=>[["1,2,3,4"],[]]}
           if bunny = Bunny.find(params[:bunnyid])
-            bunny.queue_commands(Array(params[:command]).zip(params[:command_values]).map do |command, values|
-              [command, *values.split(",")]
-            end)
+            bunny.queue_commands commands(params[:command], params[:command_values])
             bunny.to_json
           end
         end
@@ -42,9 +40,7 @@ module NabaztagHackKit
         app.post "/playground/bunnies" do #  {"bunny"=>["0019db9c2daf"], "command"=>["40"], "command_values"=>[["1,2,3,4"],[]]}
           Array(params[:bunny]).uniq.each do |bunnyid|
             if bunny = Bunny.find(bunnyid)
-              bunny.queue_commands(Array(params[:command]).zip(params[:command_values]).map do |command, values|
-                [command, *values.split(",")]
-              end)
+              bunny.queue_commands commands(params[:command], params[:command_values])
             end
           end
 
@@ -67,6 +63,22 @@ module NabaztagHackKit
         end
       end
 
+      private
+      def commands(commands, command_values)
+        Array(commands).zip(command_values).map do |command, values|
+          [command] + int_array(values.split(","))
+        end
+      end
+
+      def int_array(array)
+        array.map do |entry|
+          if entry.to_i.to_s == entry
+            entry.to_i
+          else
+            entry
+          end
+        end
+      end
     end
   end
 end

data/lib/nabaztag_hack_kit/version.rb

@@ -1,3 +1,3 @@
 module NabaztagHackKit
-  VERSION = "0.1.0.beta1"
+  VERSION = "0.1.0.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nabaztag_hack_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bytecode/bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -225,7 +225,6 @@ files:
 - lib/nabaztag_hack_kit/public/index.html
 - lib/nabaztag_hack_kit/public/jquery.min.js
 - lib/nabaztag_hack_kit/public/jquery.timeago.js
-- lib/nabaztag_hack_kit/redirect.rb
 - lib/nabaztag_hack_kit/server.rb
 - lib/nabaztag_hack_kit/version.rb
 - nabaztag_hack_kit.gemspec

data/lib/nabaztag_hack_kit/redirect.rb

@@ -1,37 +0,0 @@
-require 'open-uri'
-
-# a rack middleware to redirect(Proxy through) certain request to another service
-#
-# it's the prefered solution for developing, so your bunny still points to live server but any request
-# get forwarded to dev machine
-module NabaztagHackKit
-  class Redirect
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      path  = env['PATH_INFO']
-      query = env['QUERY_STRING']
-      if path =~ /\/redirect/
-        req = Rack::Request.new(env)
-        if (to = req.params["to"]) && !to.empty?
-          @redirect = to
-          render "Redirect turned on to #{@redirect}"
-        else
-          @redirect = nil
-          render "Redirect turned off"
-        end
-      elsif @redirect
-        render open("#{@redirect}#{path}?#{query}")
-      else
-        @app.call(env)
-      end
-    end
-
-    private
-    def render(response)
-      [response.status.first.to_i, {"Content-Type" => response.content_type}, Array(response)]
-    end
-  end
-end