bushido 0.0.25 → 0.0.26

data/app/controllers/bushido/data_controller.rb

@@ -3,20 +3,20 @@ module Bushido
     # PUT /bushido/data/
     def index
       @key = params.delete(:key)
-      if ENV["BUSHIDO_KEY"] != @key
+      if ENV["BUSHIDO_APP_KEY"] != @key
         respond_to do |format|
           format.html { render :layout => false, :text => true, :status => :forbidden }
-          format.json { render :status => :unprocessable_entity }
+          format.json { render :status => 401 }
           return
         end
+      end
         
         puts "OMG GOT DATA FROM BUSHIBUS"
         puts params.inspect
-        Bushido::Data.fire(params)
+        Bushido::Data.fire('global', params)
         respond_to do |format|
-          format.json {render :json =>{'acknowledged' => true} :status => 200}
+          format.json {render :json => {'acknowledged' => true}, :status => 200}
         end
-      end
     end
   end
 end

data/lib/bushido/data.rb

@@ -4,20 +4,20 @@ module Bushido
     @@hooks = {}
     
     class << self
-      def fire *hooks, data
+      def fire(data, *hooks)
         unless @@hooks[:global].nil?
-          @@hooks[:global].call('global', data)
+          @@hooks[:global].call(data, 'global')
         end
-        
+
         if hooks.length > 0
           hooks.each do |h|          
             unless @@hooks[h].nil? 
-              @@hooks[h].call(h, data)
+              @@hooks[h].call(data, hook)
             end
           end
         end
       end
-      
+
       def listen *hooks, &block
         if hooks.empty? and block_given?
           @@hooks[:global] = block

data/lib/bushido/envs.rb

@@ -4,20 +4,20 @@ module Bushido
     @@hooks = {}
     
     class << self
-      def fire *hooks
+      def fire(data, *hooks)
         unless @@hooks[:global].nil?
-          @@hooks[:global].call('global')
+          @@hooks[:global].call(data, 'global')
         end
-        
+
         if hooks.length > 0
           hooks.each do |h|          
             unless @@hooks[h].nil? 
-              @@hooks[h].call(h, data)
+              @@hooks[h].call(data, hook)
             end
           end
         end
       end
-      
+
       def listen *hooks, &block
         if hooks.empty? and block_given?
           @@hooks[:global] = block

data/lib/bushido/version.rb

@@ -1,4 +1,4 @@
 module Bushido
   # Current version of the Bushido gem 
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bushido
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 0
-  - 25
-  version: 0.0.25
+  - 26
+  version: 0.0.26
 platform: ruby
 authors: 
 - Sean Grove
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -07:00
+date: 2011-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency