bushido 0.0.30 → 0.0.31

data/Gemfile

@@ -21,8 +21,4 @@ platforms :ruby do
   #   gem "mongoid", "2.0.1"
   #   gem "bson_ext", "~> 1.3.0"
   # end
-end
-
-group :development do
-  gem 'ci_reporter'
-end
+end

data/Rakefile

@@ -1,15 +1,12 @@
 require 'rake/testtask'
 require 'bundler'
-require 'ci/reporter/rake/test_unit'
-
 Bundler::GemHelper.install_tasks
 
 task :default => :test
 
 desc "Run bushido tests"
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs += ["lib", "test"]
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
-end
+end

data/app/controllers/bushido/data_controller.rb

@@ -1,9 +1,9 @@
 module Bushido
   class DataController < ApplicationController
-      
+    
     # POST /bushido/data/
     def index
-      @key = params.delete(:key)
+      @key = params.delete("key")
       if ENV["BUSHIDO_APP_KEY"] != @key
         respond_to do |format|
           format.html { render :layout => false, :text => true, :status => :forbidden }
@@ -11,14 +11,23 @@ module Bushido
           return
         end
       end
-        
-        puts "OMG GOT DATA FROM BUSHIBUS"
-        puts params.inspect
-        puts params[:category].inspect
-        Bushido::Data.fire(params, "#{params[:category]}.#{params[:event]}")
-        respond_to do |format|
-          format.json {render :json => {'acknowledged' => true}, :status => 200}
-        end
+      
+      puts "Bushibus Data rec'd"
+      puts params.inspect
+      puts params["category"].inspect
+
+      hook_data             = {}
+      hook_data["category"] = params["category"]
+      hook_data["event"]    = params["event"]
+      hook_data["data"]     = params["data"]
+
+      puts "Firing with: #{hook_data.inspect}"
+
+      Bushido::Data.fire(hook_data, "#{params['category']}.#{params['event']}")
+
+      respond_to do |format|
+        format.json {render :json => {'acknowledged' => true}, :status => 200}
+      end
     end
   end
 end

data/app/controllers/bushido/envs_controller.rb

@@ -2,11 +2,7 @@ module Bushido
   class EnvsController < ApplicationController
     # PUT /bushido/envs/:id
     def update
-      logger.info "Updating ENV vars!"
-      logger.info "params: #{params.inspect}"
-
-      if Bushido::Platform.key != params[:key] or params[:id] == Bushido::Platform.key
-        logger.info "key didn't match! #{Bushido::Platform.key} != #{params[:key]}"
+      if ENV["BUSHIDO_KEY"] != params[:key] or params[:id] == "BUSHIDO_KEY"
         respond_to do |format|
           format.html { render :layout => false, :text => true, :status => :forbidden }
           format.json { render :status => :unprocessable_entity }
@@ -14,20 +10,16 @@ module Bushido
         end
       end
 
-      logger.info "next: #{params[:id]} = #{ENV[params[:id]]}"
-
       ENV[params[:id]] = params[:value]
       @value = ENV[params[:id]]
-
-      logger.info "next: #{params[:id]} = #{ENV[params[:id]]}"
-
+      
       respond_to do |format|
         if @value != ENV[params[:id]]
           format.html{render :layout => false, :text => true, :status => :unprocessable_entity}
           format.json{render :status => :unprocessable_entity}
         else
           puts "Firing update hooks method from controller"
-          Bushido::Envs.fire(params[:id], {params[:id] => ENV[params[:id]]})
+          Bushido::Hooks.fire(params[:id], {params[:id] => ENV[params[:id]]})
           format.html{render :text => true}
           format.json{render :json => {params[:id] => ENV[params[:id]]}}
         end

data/config/routes.rb

@@ -0,0 +1 @@
+

data/lib/bushido/data.rb

@@ -9,41 +9,20 @@ module Bushido
         # register the hooks, and this does that.
       end
 
-      def bushido_data(model, model_data)
-        puts "prepping publish data..."
+      
+      def publish(model, model_data)
+        # POST to /apps/:id/bus
         data = {}
         data[:key] = Bushido::Platform.key
 
-
         data["data"]  = model_data
-        puts data.inspect
         data["data"]["ido_model"] = model
         puts "Publishing Ido model"
         puts data.to_json
         puts Bushido::Platform.publish_url
 
-        return data
-      end
-
-      
-      def publish(model, model_data, verb=:post)
-        puts "in the Data::Publish method"
-        # POST to /apps/:id/bus
-        data = bushido_data(model, model_data)
-
-        puts "got the data"
-        url = Bushido::Platform.publish_url
-        puts "url: #{url} , verb #{verb}"
-        
-        if verb == :delete
-          verb = :put
-          url += "/#{data['data']['ido_id']}"
-        end
-
-        puts "Publishing to: #{url}"
-        
         # TODO: Catch non-200 response code
-        response = JSON.parse(RestClient.send(verb, url, data.to_json, :content_type => :json, :accept => :json))
+        response = JSON.parse(RestClient.post(Bushido::Platform.publish_url, data.to_json, :content_type => :json, :accept => :json))
         if response['ido_id'].nil? or response['ido_version'].nil?
           return false
         end

data/lib/bushido/middleware.rb

@@ -15,8 +15,6 @@ module Bushido
     end
 
     def call(env)
-      @bushido_claimed        = (ENV['BUSHIDO_CLAIMED'].nil? or ENV['BUSHIDO_CLAIMED'].blank?) ? false : true
-
       status, headers, response = @app.call(env)
       
       unless @bushido_app_name.empty?
@@ -31,7 +29,7 @@ module Bushido
               var _bushido_metrics_token = '#{@bushido_metrics_token}';
               (function() {
                 var bushido = document.createElement('script'); bushido.type = 'text/javascript'; bushido.async = true;
-                bushido.src = '#{BUSHIDO_JS_URL}?ts=#{::Bushido::VERSION.gsub('.', '')}';
+                bushido.src = '#{BUSHIDO_JS_URL}?#{::Bushido::VERSION.gsub('.', '')}';
                 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bushido, s);
               })();
             </script>     

data/lib/bushido/models.rb

@@ -4,51 +4,7 @@ module Bushido
       base.extend ClassMethods
     end
 
-    def posh
-      puts "posh"
-    end
-
-    def to_ido
-      data = {}
-      
-      self.class.ido_schema.each do |schema_field|
-        data[schema_field] = self.send(schema_field.to_sym)
-      end
-
-      data
-    end
-
-
-    def ido_destroy
-      unless self.ido_id.nil?
-        puts "Global IdoData, publishing destroy event to Bushido databus"
-
-        data = self.to_ido
-
-        puts "This is the data I *want* to publish: #{data.inspect}"
-
-        begin
-          response = Bushido::Data.publish(self.class.class_variable_get("@@ido_model"), data, :delete)
-        rescue => e
-          puts e.inspect
-          # TODO: Catch specific exceptions and bubble up errors (e.g. 'bushido is down', 'model is malformed', etc.)
-          return false
-        end
-
-        self.ido_version = response["ido_version"]
-        self.ido_id ||= response["ido_id"]
-
-        puts response.inspect
-      else
-        puts "Remote change, not publishing to Bushido databus"
-      end
-
-      return true
-    end
-
-
-
-    def ido_save
+    def bushido_save
       # It's possible we're saving an item just handed to us by Bushido, so we
       # don't want to re-publish it. We can detect it using the version.
       
@@ -58,24 +14,15 @@ module Bushido
       puts "new_record? #{self.new_record?}"
       puts "self.id = #{self.id}"
       puts "ido_id.nil? #{ido_id.nil?}"
-      unless self.new_record?
-        puts "ido_version == self.class.find(self.id).ido_version ? #{ido_version == self.class.find(self.id).ido_version}"
-        puts "#{self.ido_version} == #{self.class.find(self.id).ido_version} ? #{ido_version == self.class.find(self.id).ido_version}"
-      end
+      puts "ido_version == self.class.find(self.id).ido_version ? #{ido_version == self.class.find(self.id).ido_version}" unless self.new_record?
       if self.ido_id.nil? or (not self.new_record? and self.ido_version == self.class.find(self.id).ido_version)
         puts "Local change, publishing to Bushido databus"
 
-        puts "Converting to Ido format..."
-        data = self.to_ido
-
-        puts "Publishing: #{data}"
+        data = self.to_bushido
 
         begin
-          print "About to publish"
-          response = Bushido::Data.publish(self.class.class_variable_get("@@ido_model"), data)
-          puts "done!"
+          response = Bushido::Data.publish(self.class.class_variable_get("@@bushi_model"), data)
         rescue => e
-          puts "ERROR!"
           puts e.inspect
           # TODO: Catch specific exceptions and bubble up errors (e.g. 'bushido is down', 'model is malformed', etc.)
           return false
@@ -93,51 +40,19 @@ module Bushido
     end
 
     module ClassMethods
-      def ido model
-        self.class_variable_set("@@ido_model", model)
+      def bushido model
+        self.class_variable_set("@@bushi_model", model)
 
         [:create, :update, :destroy].each do |event|
           puts "Hooking into #{model}.#{event}..."
 
           Bushido::Data.listen("#{model}.#{event}") do |data, hook|
             puts "#{hook}.) Firing off #{model}.#{event} now with data: #{data}"
-            self.send("on_ido_#{event}".to_sym, self.from_ido(data))
+            self.send("on_bushido_#{event}".to_sym, self.from_bushido(data))
           end
         end
         
-        before_save :ido_save
-        before_destroy :ido_destroy
-      end
-
-      def from_ido(incoming_json)
-        model = self.new
-        puts model.inspect
-        
-        ido_schema.each do |schema_field|
-          puts "Setting#{schema_field}= #{incoming_json[schema_field]}"
-          model.send("#{schema_field}=".to_sym, incoming_json[schema_field])
-        end
-
-        model
-      end
-
-      
-      def on_ido_create(ido_app)
-        ido_app.save
-      end
-
-      def on_ido_update(ido_app)
-        app = self.find_or_create_by_ido_id(ido_app.ido_id)
-        
-        ido_schema.each do |schema_field|
-          app.send("#{schema_field}=".to_sym, ido_app[schema_field])
-        end
-
-        app.save
-      end
-
-      def on_ido_destroy(ido_app)
-        self.find_by_ido_id(ido_app.ido_id).try(:destroy)
+        before_save :bushido_save
       end
     end
   end

data/lib/bushido/version.rb

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

data/lib/bushido.rb

@@ -12,7 +12,6 @@ module Bushido #:nodoc:
   require "bushido/hooks"
   require "bushido/platform"
   require "bushido/utils"
-  require "bushido/hooks"
   require "bushido/command"
   require "bushido/app"
   require "bushido/user"
@@ -23,7 +22,6 @@ module Bushido #:nodoc:
   require "bushido/middleware"
   require "bushido/models"
   require "bushido/schema"
-  require "bushido/ido_schema"
   
   # Default way to setup Bushido. Run rails generate bushido_install to create
   # a fresh initializer with all configuration values.

data/lib/engine.rb

@@ -4,12 +4,15 @@ require 'rails/routes'
 
 module Bushido
   class Engine < Rails::Engine
-
+        
     initializer "bushido.add_middleware" do |app|
-
-      #Only include our middleware if its on our platform
-      app.middleware.use Bushido::Middleware unless ENV['BUSHIDO_APP'].nil?
+      
+      # Only include our middleware if its on our platform
+      unless ENV['BUSHIDO_APP'].nil?
+        app.middleware.use Bushido::Middleware
+      end
+      
     end
-
+    
   end
 end

data/test/executable_test.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+
+class TestExecutable < Test::Unit::TestCase #:nodoc:
+  EXECUTABLE = 
+  def test_complains_with_no_args
+    output = %x{#{File.expand_path('../../bin/bushido', __FILE__)}}
+    assert output =~ /See bushido -h for more detailed instructions/
+  end
+end
+

data/test/routes_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class DefaultRoutingTest < ActionController::TestCase
+  test 'set passed variable' do
+    assert_recognizes({:controller => 'bushido', :action => 'index'}, {:path => 'bushido', :method => :post})
+  end
+  
+  test 'get passed variable' do
+    assert_recognizes({:controller => 'bushido', :action => 'index'}, {:path => 'bushido', :method => :get})
+  end
+
+end

data/test/test_helper.rb

@@ -1,9 +1,8 @@
 ENV["RAILS_ENV"] = "test"
-ENV["BUSHIDO_APP_KEY"] = "bushidoappkey"
 require "rubygems"
 require "bundler"
 Bundler.setup
 
-require "rails_app/config/environment"
+require "dummy/config/environment"
 require "rails/test_help"
 require "rails/generators/test_case"

metadata

@@ -1,71 +1,74 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bushido
-version: !ruby/object:Gem::Version
-  version: 0.0.30
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.31
 platform: ruby
-authors:
+authors: 
 - Sean Grove
 - Kev Zettler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-20 00:00:00.000000000 -07:00
+
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2151803600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2151803600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2151801420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.4.6
   type: :runtime
-  prerelease: false
-  version_requirements: *2151801420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: &2151800220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.1
   type: :runtime
-  prerelease: false
-  version_requirements: *2151800220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: orm_adapter
-  requirement: &2151798860 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.0.3
   type: :runtime
-  prerelease: false
-  version_requirements: *2151798860
+  version_requirements: *id004
 description: A module for integrating the Bushido platform into a rails app
-email:
+email: 
 - support@bushi.do
 - s@bushi.do
-executables:
+executables: 
 - bushido
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Rakefile
@@ -73,6 +76,7 @@ files:
 - app/controllers/bushido/envs_controller.rb
 - bin/bushido
 - bushido.gemspec
+- config/routes.rb
 - lib/bushido.rb
 - lib/bushido/app.rb
 - lib/bushido/command.rb
@@ -80,7 +84,6 @@ files:
 - lib/bushido/envs.rb
 - lib/bushido/event.rb
 - lib/bushido/hooks.rb
-- lib/bushido/ido_schema.rb
 - lib/bushido/middleware.rb
 - lib/bushido/models.rb
 - lib/bushido/orm/active_record.rb
@@ -99,117 +102,39 @@ files:
 - lib/generators/mongoid/bushido_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/bushido.rb
-- lib/rails/#routes.rb#
 - lib/rails/routes.rb
-- test/controllers/envs_controller_test.rb
-- test/rails_app/Rakefile
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/views/application/index.html.erb
-- test/rails_app/app/views/layouts/application.html.erb
-- test/rails_app/config.ru
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/database.yml
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/backtrace_silencers.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/mime_types.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/locales/en.yml
-- test/rails_app/config/routes.rb
-- test/rails_app/db/development.sqlite3
-- test/rails_app/db/test.sqlite3
-- test/rails_app/log/development.log
-- test/rails_app/log/production.log
-- test/rails_app/log/server.log
-- test/rails_app/log/test.log
-- test/rails_app/public/404.html
-- test/rails_app/public/422.html
-- test/rails_app/public/500.html
-- test/rails_app/public/favicon.ico
-- test/rails_app/public/javascripts/application.js
-- test/rails_app/public/javascripts/controls.js
-- test/rails_app/public/javascripts/dragdrop.js
-- test/rails_app/public/javascripts/effects.js
-- test/rails_app/public/javascripts/prototype.js
-- test/rails_app/public/javascripts/rails.js
-- test/rails_app/public/stylesheets/.gitkeep
-- test/rails_app/script/rails
+- test/executable_test.rb
+- test/routes_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: https://github.com/sgrove/bushidogem
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1185013954013927202
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1185013954013927202
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: bushido
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bushido integration
-test_files:
-- test/controllers/envs_controller_test.rb
-- test/rails_app/Rakefile
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/views/application/index.html.erb
-- test/rails_app/app/views/layouts/application.html.erb
-- test/rails_app/config.ru
-- test/rails_app/config/application.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/database.yml
-- test/rails_app/config/environment.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/backtrace_silencers.rb
-- test/rails_app/config/initializers/inflections.rb
-- test/rails_app/config/initializers/mime_types.rb
-- test/rails_app/config/initializers/secret_token.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/locales/en.yml
-- test/rails_app/config/routes.rb
-- test/rails_app/db/development.sqlite3
-- test/rails_app/db/test.sqlite3
-- test/rails_app/log/development.log
-- test/rails_app/log/production.log
-- test/rails_app/log/server.log
-- test/rails_app/log/test.log
-- test/rails_app/public/404.html
-- test/rails_app/public/422.html
-- test/rails_app/public/500.html
-- test/rails_app/public/favicon.ico
-- test/rails_app/public/javascripts/application.js
-- test/rails_app/public/javascripts/controls.js
-- test/rails_app/public/javascripts/dragdrop.js
-- test/rails_app/public/javascripts/effects.js
-- test/rails_app/public/javascripts/prototype.js
-- test/rails_app/public/javascripts/rails.js
-- test/rails_app/public/stylesheets/.gitkeep
-- test/rails_app/script/rails
+test_files: 
+- test/executable_test.rb
+- test/routes_test.rb
 - test/test_helper.rb