bushido 0.0.29 → 0.0.30

data/Gemfile

@@ -3,3 +3,26 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in bushido.gemspec
 gemspec
+
+
+gem "rails", "~> 3.0.7"
+gem "sqlite3-ruby"
+
+group :test do
+  # gem "webrat", "0.7.2", :require => false
+  #   gem "mocha", :require => false
+end
+
+platforms :ruby do
+  #gem "sqlite3-ruby"
+
+  # group :mongoid do
+  #   gem "mongo", "~> 1.3.0"
+  #   gem "mongoid", "2.0.1"
+  #   gem "bson_ext", "~> 1.3.0"
+  # end
+end
+
+group :development do
+  gem 'ci_reporter'
+end

data/Rakefile

@@ -1,9 +1,15 @@
 require 'rake/testtask'
 require 'bundler'
+require 'ci/reporter/rake/test_unit'
+
 Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new do |t|
-  t.libs += ["lib", "test"]
-  t.test_files = FileList['test/test*.rb']
+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.verbose = true
 end

data/app/controllers/bushido/data_controller.rb

@@ -1,6 +1,7 @@
 module Bushido
   class DataController < ApplicationController
-    # PUT /bushido/data/
+      
+    # POST /bushido/data/
     def index
       @key = params.delete(:key)
       if ENV["BUSHIDO_APP_KEY"] != @key
@@ -13,7 +14,8 @@ module Bushido
         
         puts "OMG GOT DATA FROM BUSHIBUS"
         puts params.inspect
-        Bushido::Data.fire('global', params)
+        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

data/app/controllers/bushido/envs_controller.rb

@@ -2,7 +2,11 @@ module Bushido
   class EnvsController < ApplicationController
     # PUT /bushido/envs/:id
     def update
-      if ENV["BUSHIDO_KEY"] != params[:key] or params[:id] == "BUSHIDO_KEY"
+      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]}"
         respond_to do |format|
           format.html { render :layout => false, :text => true, :status => :forbidden }
           format.json { render :status => :unprocessable_entity }
@@ -10,16 +14,20 @@ 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::Hooks.fire(params[:id], {params[:id] => ENV[params[:id]]})
+          Bushido::Envs.fire(params[:id], {params[:id] => ENV[params[:id]]})
           format.html{render :text => true}
           format.json{render :json => {params[:id] => ENV[params[:id]]}}
         end

data/bushido.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rest-client", ">=1.6.1"
   s.add_dependency "json",        ">=1.4.6"
   s.add_dependency "highline",    ">=1.6.1"
+  s.add_dependency "orm_adapter", "~> 0.0.3"
 
   s.rubyforge_project = "bushido"
 

data/lib/bushido/data.rb

@@ -1,40 +1,55 @@
 module Bushido
   class Data #:nodoc:
     
-    @@hooks = {}
-    
-    class << self
-      def fire(data, *hooks)
-        unless @@hooks[:global].nil?
-          @@hooks[:global].call(data, 'global')
-        end
+    extend Hooks
 
-        if hooks.length > 0
-          hooks.each do |h|          
-            unless @@hooks[h].nil? 
-              @@hooks[h].call(data, hook)
-            end
-          end
-        end
+    class << self
+      def attach(*models)
+        # Total no-op, we just need to load the classes in order to
+        # register the hooks, and this does that.
       end
 
-      def listen *hooks, &block
-        if hooks.empty? and block_given?
-          @@hooks[:global] = block
-        elsif !hooks.nil? and block_given?
-          hooks.each do |h|
-            @@hooks[h] = block
-          end
-        end
+      def bushido_data(model, model_data)
+        puts "prepping publish data..."
+        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)
-        puts "bushido publishing model"
-        puts Bushido::Platform.host
-        RestClient.post(Bushido::Platform.host, model.to_json, :content_type => :json, :accept => :json)
+      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))
+        if response['ido_id'].nil? or response['ido_version'].nil?
+          return false
+        end
+
+        return response
       end
-      
     end
-    
   end
-end
+end

data/lib/bushido/envs.rb

@@ -1,34 +1,6 @@
 module Bushido
   class Envs #:nodoc:
-    
-    @@hooks = {}
-    
-    class << self
-      def fire(data, *hooks)
-        unless @@hooks[:global].nil?
-          @@hooks[:global].call(data, 'global')
-        end
-
-        if hooks.length > 0
-          hooks.each do |h|          
-            unless @@hooks[h].nil? 
-              @@hooks[h].call(data, hook)
-            end
-          end
-        end
-      end
-
-      def listen *hooks, &block
-        if hooks.empty? and block_given?
-          @@hooks[:global] = block
-        elsif !hooks.nil? and block_given?
-          hooks.each do |h|
-            @@hooks[h] = block
-          end
-        end
-      end
-      
-    end
-    
+    extend Hooks 
   end
-end
+end
+

data/lib/bushido/hooks.rb

@@ -0,0 +1,38 @@
+module Hooks
+
+  @@hooks = {}
+  
+  def fire(data, *events)
+    puts "Hooks: #{@@hooks.inspect}"
+
+    puts "Events: #{events.inspect}"
+    puts "\twith data: #{data.inspect}"
+    unless @@hooks[:global].nil?
+      @@hooks[:global].call(data, 'global')
+    end
+    
+    if events.length > 0
+      events.each do |event|
+        print "Checking for event: #{event} in hooks..."
+        if @@hooks[event].nil?
+          puts "not found, ignoring."
+        else
+          puts "found, firing!"
+          @@hooks[event].call(data, event)
+        end
+      end
+    end
+  end
+  
+  def listen *events, &block
+    puts "Listening for #{events.inspect}"
+
+    if events.empty? and block_given?
+      @@hooks[:global] = block
+    elsif !events.nil? and block_given?
+      events.each do |event|
+        @@hooks[event] = block
+      end
+    end
+  end
+end

data/lib/bushido/ido_schema.rb

@@ -0,0 +1,17 @@
+# This is probably a bad idea. Feel free to kill this file if you're unsure.
+module Bushido
+  module IdoSchema
+    class << self
+      def schema_for(ido_model)
+        # GET to /ido/schemas/:ido_model
+        # TODO: Catch non-200 response code
+        response = JSON.parse(RestClient.get("#{Bushido::Platform.host}/ido/schemas/#{ido_model}/#{ENV['BUSHIDO_PROJECT_SHA']}", :content_type => :json, :accept => :json))
+        if response['ido_schema'].nil?
+          return false
+        end
+
+        return response['ido_schema']
+      end
+    end
+  end
+end

data/lib/bushido/middleware.rb

@@ -1,10 +1,9 @@
-require 'rack/utils'
+#require 'rack/utils'
 
 module Bushido
   class Middleware
 
-    # BUSHIDO_JS_URL = 'http://localhost:4567/javascripts/bushido.js'
-    BUSHIDO_JS_URL = 'http://bushi.do/api/bushido.js'
+    BUSHIDO_JS_URL = "#{Bushido::Platform.host}/api/bushido.js"
 
     include Rack::Utils
 
@@ -12,10 +11,12 @@ module Bushido
       @app = app
       @bushido_app_name       = ENV['BUSHIDO_APP']
       @bushido_metrics_token  = ENV['BUSHIDO_METRICS_TOKEN']
-      @bushido_claimed        = ENV['BUSHIDO_CLAIMED'].nil? ? false : true
+      @bushido_claimed        = (ENV['BUSHIDO_CLAIMED'].nil? or ENV['BUSHIDO_CLAIMED'].blank?) ? false : true
     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?
@@ -30,7 +31,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}?#{::Bushido::VERSION.gsub('.', '')}';
+                bushido.src = '#{BUSHIDO_JS_URL}?ts=#{::Bushido::VERSION.gsub('.', '')}';
                 var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(bushido, s);
               })();
             </script>     

data/lib/bushido/models.rb

@@ -0,0 +1,144 @@
+module Bushido
+  module Models
+    def self.included(base)
+      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
+      # 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.
+      
+      puts "what"
+      # bushido_id.nil? This is new, it's from us (otherwise bushido would have given it an id), we should publish it.
+      # bushido_version == self.find(self.id).bushido_version The version hasn't changed, our data has, we should publish it
+      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
+      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}"
+
+        begin
+          print "About to publish"
+          response = Bushido::Data.publish(self.class.class_variable_get("@@ido_model"), data)
+          puts "done!"
+        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
+        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
+
+    module ClassMethods
+      def ido model
+        self.class_variable_set("@@ido_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))
+          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)
+      end
+    end
+  end
+end

data/lib/bushido/orm/active_record.rb

@@ -0,0 +1,44 @@
+require 'orm_adapter/adapters/active_record'
+
+module Bushido
+  module Orm
+    # This module contains some helpers and handle schema (migrations):
+    #
+    #   create_table :accounts do |t|
+    #     t.database_authenticatable
+    #     t.confirmable
+    #     t.recoverable
+    #     t.rememberable
+    #     t.trackable
+    #     t.lockable
+    #     t.timestamps
+    #   end
+    #
+    # However this method does not add indexes. If you need them, here is the declaration:
+    #
+    #   add_index "accounts", ["email"],                :name => "email",                :unique => true
+    #   add_index "accounts", ["confirmation_token"],   :name => "confirmation_token",   :unique => true
+    #   add_index "accounts", ["reset_password_token"], :name => "reset_password_token", :unique => true
+    #
+    module ActiveRecord
+      module Schema
+        include Bushido::Schema
+
+        # Tell how to apply schema methods.
+        def apply_bushido_schema(name, type, options={})
+          column name, type.to_s.downcase.to_sym, options
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  class Base
+    include Bushido::Models
+  end
+end
+
+ActiveRecord::ConnectionAdapters::Table.send :include, Bushido::Orm::ActiveRecord::Schema
+ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Bushido::Orm::ActiveRecord::Schema
+

data/lib/bushido/orm/mongoid.rb

@@ -0,0 +1,31 @@
+require 'orm_adapter/adapters/mongoid'
+
+module Bushido
+  module Orm
+    module Mongoid
+      module Hook
+        def bushido_modules_hook!
+          extend Schema
+          yield
+          return unless Devise.apply_schema
+          devise_modules.each { |m| send(m) if respond_to?(m, true) }
+        end
+      end
+
+      module Schema
+        include Bushido::Schema
+
+        # Tell how to apply schema methods
+        def apply_bushido_schema(name, type, options={})
+          type = Time if type == DateTime
+          field name, { :type => type }.merge!(options)
+        end
+      end
+    end
+  end
+end
+
+Mongoid::Document::ClassMethods.class_eval do
+  include Bushido::Models
+  include Bushido::Orm::Mongoid::Hook
+end

data/lib/bushido/platform.rb

@@ -9,7 +9,10 @@ module Bushido
       def key
         ENV['BUSHIDO_APP_KEY']
       end
-
+      
+      def publish_url
+        "#{host}/apps/#{name}/bus"
+      end
 
       def host
         port = ENV['BUSHIDO_PORT'] ? ":#{ENV['BUSHIDO_PORT']}" : ""

data/lib/bushido/schema.rb

@@ -0,0 +1,42 @@
+module Bushido
+  # Holds devise schema information. To use it, just include its methods
+  # and overwrite the apply_schema method.
+  module Schema
+
+    # Creates reset_password_token and reset_password_sent_at.
+    #
+    # == Options
+    # * :reset_within - When true, adds a column that reset passwords within some date
+    def recoverable(options={})
+      use_within = options.fetch(:reset_within, Devise.reset_password_within.present?)
+      apply_devise_schema :reset_password_token, String
+      apply_devise_schema :reset_password_sent_at, DateTime if use_within
+    end
+
+    # Creates remember_token and remember_created_at.
+    #
+    # == Options
+    # * :use_salt - When true, does not create a remember_token and use password_salt instead.
+    def rememberable(options={})
+      use_salt = options.fetch(:use_salt, Devise.use_salt_as_remember_token)
+      apply_devise_schema :remember_token,      String unless use_salt
+      apply_devise_schema :remember_created_at, DateTime
+    end
+
+    # Creates sign_in_count, current_sign_in_at, last_sign_in_at,
+    # current_sign_in_ip, last_sign_in_ip.
+    def trackable
+      apply_devise_schema :sign_in_count,      Integer, :default => 0
+      apply_devise_schema :current_sign_in_at, DateTime
+      apply_devise_schema :last_sign_in_at,    DateTime
+      apply_devise_schema :current_sign_in_ip, String
+      apply_devise_schema :last_sign_in_ip,    String
+    end
+
+
+    # Overwrite with specific modification to create your own schema.
+    def apply_devise_schema(name, type, options={})
+      raise NotImplementedError
+    end
+  end
+end

data/lib/bushido/version.rb

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

data/lib/bushido.rb

@@ -1,12 +1,18 @@
 module Bushido #:nodoc:
   require 'optparse'
-  require 'rest-client'
+  require 'rest_client'
   require 'json'
   require 'highline/import'
-  
+  require 'orm_adapter'
+    
   require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+  
+  require "action_dispatch"
+  require "rails/routes"
+  require "bushido/hooks"
   require "bushido/platform"
   require "bushido/utils"
+  require "bushido/hooks"
   require "bushido/command"
   require "bushido/app"
   require "bushido/user"
@@ -15,4 +21,13 @@ module Bushido #:nodoc:
   require "bushido/envs"
   require "bushido/data"
   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.
+  def self.setup
+    yield self
+  end
 end

data/lib/engine.rb

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