eotb 0.5.11 → 0.5.12

data/README.rdoc

@@ -4,6 +4,16 @@ Rails plugin which allow you easily track and observe your apps.
 
 == Installation
 
+=== Bundler
+
+For rails3 you just want to add this line to the Gemfile
+
+  gem 'eotb'
+
+and run
+
+  $ bundle install
+
 === RubyGems
 
 Install gem in traditional way
@@ -17,17 +27,7 @@ Install gem from GitHub repository
   $ git clone git://github.com/Quirke/eotb_rails_plugin.git
   $ cd eotb_rails_plugin
   $ rake build
-  $ gem install ./pkg/eotb-0.5.1.gem
-
-=== Bundler
-
-Add this line to Gemfile in your rails application
-
-  gem 'eotb'
-
-And run
-
-  $ bundle install
+  $ gem install ./pkg/eotb-0.5.11.gem
 
 == Getting API Key
 
@@ -40,25 +40,20 @@ As a result you will get API Key of your application.
 
 To configure your rails 3 app just run the generator with your_api_key and optional number of events sent in one package to Beholder:
 
-   rails generate eotb --api-key=your_api_key [--events=number_of_events]
+   rails generate eotb --api-key=your_api_key
 
 === Rails 2
 
 To configure your rails 2 app just run the generator with your_api_key and optional number of events sent in one package to Beholder:
 
-  script/generate eotb --api-key=your_api_key [--events=number_of_events]
+  script/generate eotb --api-key=your_api_key
   
 === Configuration file
 
 If you didn't use rails generator you can manualy create a file <tt>eotb.rb</tt> in directory <tt>config/initializers</tt> in your rails application with content:
 
   require 'Eotb'
-  Eotb.configure("your_api_key", "events", "host", "port") 
-  # default host and port are 127.0.0.1 and 3000
-  # to use it with Beholder:
-    # host = "beta.beholder.ragnarson.com"
-    # port = "80"
-  # events - number of events sent in one package/request to beholder, default 1.
+  Eotb.configure("your_api_key") 
 
 == Using in your apps
 

data/Rakefile

@@ -8,12 +8,11 @@ begin
     gem.summary = "Rails plugin which allow you easily track and observe your apps"
     gem.description = "Rails plugin which allow you easily track and observe your apps"
     gem.email = "bartlomiej.kozal@ragnarson.com"
-    gem.homepage = "http://github.com/placek/eotb_rails_plugin"
+    gem.homepage = "http://github.com/Ragnarson/eotb_rails_plugin"
     gem.authors = ["Ragnarson"]
     gem.add_development_dependency "rspec", ">= 1.3.0"
     gem.add_development_dependency "jeweler", ">= 1.4.0"
     gem.add_dependency "json", ">= 1.4.3"
-    gem.add_dependency "hoptoad_notifier", ">= 2.3.2"
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.12

data/bin/eotb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'pp'
+require 'optparse'
+
+class EotbConfigurator
+  def parse_options
+    @app = Hash.new
+    options = OptionParser.new do |opts|
+      opts.on("init") do
+        @action = :init
+      end
+      opts.on("-a", "--api-key=[ARG]", "Your API Key") do |opt|
+        @app[:apikey] = opt
+      end
+      opts.on("-e", "--events=[ARG]", "Number of events") do |opt|
+        @app[:events] = opt
+      end
+    end
+    options.parse!(ARGV)
+  end
+  
+  def recognize_rails_version
+    @version = %x( rails -v ).split[1]
+  end
+  
+  def ensure_parameter_was_set
+    if !@app[:apikey]
+      puts "Must pass --api-key or create config/initializers/eotb.rb"
+      exit
+    end
+  end
+  
+  def prepare_command
+    if @version >= "3"
+      command = "rails generate eotb --api-key=#{@app[:apikey]}"
+    else
+      command = "script/generate eotb --api-key=#{@app[:apikey]}"
+    end
+    if @app[:events]
+      command = command + " --events=#{@app[:events]}"
+    end
+    command
+  end
+  
+  def configure args
+    @args = args
+    parse_options
+    ensure_parameter_was_set
+    recognize_rails_version
+    command = prepare_command
+    # exec( command )
+    puts "Will execute: "+command
+  end
+end
+
+EotbConfigurator.new.configure ARGV

data/eotb.gemspec

@@ -5,13 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.5.11"
+  s.version = "0.5.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-09-20}
+  s.date = %q{2010-09-27}
+  s.default_executable = %q{eotb}
   s.description = %q{Rails plugin which allow you easily track and observe your apps}
   s.email = %q{bartlomiej.kozal@ragnarson.com}
+  s.executables = ["eotb"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -25,6 +27,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/eotb",
      "eotb.gemspec",
      "generators/eotb/USAGE",
      "generators/eotb/eotb_generator.rb",
@@ -36,14 +39,14 @@ Gem::Specification.new do |s|
      "spec/eotb_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/placek/eotb_rails_plugin}
+  s.homepage = %q{http://github.com/Ragnarson/eotb_rails_plugin}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails plugin which allow you easily track and observe your apps}
   s.test_files = [
-    "spec/eotb_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+     "spec/eotb_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -54,18 +57,15 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
-      s.add_runtime_dependency(%q<hoptoad_notifier>, [">= 2.3.2"])
     else
       s.add_dependency(%q<rspec>, [">= 1.3.0"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_dependency(%q<json>, [">= 1.4.3"])
-      s.add_dependency(%q<hoptoad_notifier>, [">= 2.3.2"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.3.0"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
     s.add_dependency(%q<json>, [">= 1.4.3"])
-    s.add_dependency(%q<hoptoad_notifier>, [">= 2.3.2"])
   end
 end
 

data/generators/eotb/USAGE

@@ -3,7 +3,7 @@ Description:
   
 
 Example:
-    rails generate eotb --api-key=your_api_key [--events=number_of_events]
+    rails generate eotb --api-key=your_api_key
 
     This will create:
         config/initializers/eotb.rb

data/generators/eotb/eotb_generator.rb

@@ -2,13 +2,12 @@ class EotbGenerator < Rails::Generator::Base
  
   def add_options!(opt)
     opt.on('-k', '--api-key=key', String, "Your Beholder API key") {|v| options[:api_key] = v}
-    opt.on('-e', '--events=number_of_event', Integer, "Number of events sent in one package to Beholder") {|v| options[:events] = v}
   end
   
   def manifest
     record do |m|
       ensure_parameter_was_set
-      m.template "initializer.rb", "config/initializers/eotb.rb", :assigns => {:api_key => api_key_exp, :events => events_exp}
+      m.template "initializer.rb", "config/initializers/eotb.rb", :assigns => {:api_key => api_key_exp}
     end
    
   end
@@ -16,14 +15,6 @@ class EotbGenerator < Rails::Generator::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
-  
-  def events_exp
-    s = if options[:events]
-      "#{options[:events]}"
-    else
-      "1"
-    end
-  end
     
   def ensure_parameter_was_set
     if !options[:api_key]

data/generators/eotb/templates/initializer.rb

@@ -1,3 +1,3 @@
 require 'eotb'
 
-Eotb.configure("<%= api_key_exp %>", <%= events_exp %>, "beta.beholder.ragnarson.com", "80")
+Eotb.configure("<%= api_key_exp %>")

data/lib/eotb.rb

@@ -3,46 +3,82 @@ require 'net/http'
 require 'timeout'
 require 'uri'
 require 'json'
+require 'timer'
 
 class Eotb
 
   @@api_key = nil
   METHODS = [:to_actor, :to_subject, :to_json, :to_hash, :inspect]
     
-  def self.configure(api_key, events = 1, host = '127.0.0.1', port = '3000')
+  def self.configure(api_key)
+    @@host = "beta.beholder.ragnarson.com"
+    @@port = '80'
     @@api_key = api_key
-    @@uri = URI.parse('http://' + host + ':' + port + '/events/' + api_key)
+    @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + api_key)
     @@post = Net::HTTP::Post.new(@@uri.path)
     @@events = {}
     @@counter = 1
-    events >= 1 ? @@reset = events : @@reset = 1
+    @@reset = 100
+    
+    Thread.new do
+      Timer.every(600.0) { |elapsed| 
+        unless @@events.empty?
+          @@counter = @@reset  
+          send
+        end
+      }
+    end unless ENV['RAILS_ENV'] == 'test'
   end
 
   def self.api_key
     @@api_key
   end
   
-  def self.register_event(actor, action, subject = {})
+  def self.register_event(*args)
+    case args.size
+      when 1
+        self._json_register_event(*args)
+      when 2,3
+        self._base_register_event(*args)
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.size} for 1,2 or 3)"
+    end
+  end
+  
+  def self._json_register_event(json)
+    json = JSON.parse json
+    args = [json["actor"],json["action"]]
+    args << json["subject"] if json["subject"]
+    self._base_register_event(*args)
+  end
+  
+  def self._base_register_event(actor, action, subject = {})
+    unless ENV['RAILS_ENV'] == 'test'
     action = { "event#{@@counter}[action]" => action.to_s }    
-    event = (hash_format(actor, :actor)).merge(action).merge(hash_format(subject, :subject))
+      event = (hash_format(actor, :actor)).merge(action).merge(hash_format(subject, :subject))
 
-    @@events.merge! event
-    if (@@counter == @@reset)
-      @@post.set_form_data(@@events)
-      @@counter = 1
-      begin
-      Timeout::timeout(2) {
-        Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
-      }
-      rescue => e
-       	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
-	      logger.error "ERROR eotb gem: " + e.to_s
-	    rescue Timeout::Error => e
-       	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
-	      logger.error "ERROR eotb gem: " + e.to_s
+      @@events.merge! event
+      if (@@counter == @@reset)
+        send    
+      else
+        @@counter += 1
       end
-    else
-      @@counter += 1
+    end
+  end
+  
+  def self.send
+    @@post.set_form_data(@@events)
+    @@counter = 1
+    begin
+    Timeout::timeout(2) {
+      Net::HTTP.new(@@uri.host, @@uri.port).start.request(@@post)
+    }
+    rescue => e
+     	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
+      logger.error "ERROR eotb gem: " + e.to_s
+    rescue Timeout::Error => e
+     	logger = Logger.new("log/#{ENV['RAILS_ENV']}.log")
+      logger.error "ERROR eotb gem: " + e.to_s
     end
   end
   

data/lib/generators/eotb/USAGE

@@ -2,7 +2,7 @@ Description:
     Creates eotb initializer in confing/initializers/eotb.rb, setting your app to work with Beholder.
 
 Example:
-    rails generate eotb --api-key=your_api_key [--events=number_of_events]
+    rails generate eotb --api-key=your_api_key
 
     This will create:
         config/initializers/eotb.rb

data/lib/generators/eotb/eotb_generator.rb

@@ -7,7 +7,6 @@ class EotbGenerator < Rails::Generators::Base
   source_root File.expand_path('../../../../generators/eotb/templates', __FILE__)
   
   class_option :api_key, :aliases => "-k", :type => :string, :desc => "Your Beholder API key"
-  class_option :events, :aliases => "-e",:type => :numeric, :desc => "Number of events sent in one package to Beholder", :default => "1"
   
   def generator
     ensure_parameters_was_set
@@ -29,20 +28,17 @@ class EotbGenerator < Rails::Generators::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
-  def events_exp
-    s = if options[:events]
-      "#{options[:events]}"
-    else
-      "1"
-    end
-  end
   
   def generate_initializer
     template 'initializer.rb', 'config/initializers/eotb.rb'
   end
   
   def api_key_configured?
-    File.exists?('config/initializers/eotb.rb')
+    if !options[:api_key]
+      puts "Must pass --api-key='your_api_key'"
+      exit
+    end
+    File.exists?('config/initializers/eotb.rb') && options[:api_key].empty?
   end
   
 end

data/spec/eotb_spec.rb

@@ -2,13 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Eotb do
   
-    it "should log errors" do 
-      logger = mock(Logger)
-      logger.stub(:new) { logger }
-      logger.stub(:error) { @response }
-      Eotb.register_event(:actor, :action, {:username => "John"}).should == @response
-    end
-  
   describe "shoud format objects" do
     before do
       @@counter = 0
@@ -32,7 +25,9 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("0"*40, 1)
+      
+      Eotb.configure("0"*40)
+      @@counter = 100
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
       Net::HTTP.stub(:request) { "200" }
@@ -40,7 +35,6 @@ describe Eotb do
 
     it "should register two arguments" do
       Eotb.register_event("actor", "action").should == @response
-      Eotb.register_event("act2or", "acti2on").should == @response
     end
 
     it "should register three arguments" do
@@ -63,6 +57,10 @@ describe Eotb do
       Eotb.register_event({:type => { :account => "User"}}, :action, {:username => {:first_name => "John"}}).should == @response
     end
 
+    it "should register JSON messages" do
+      Eotb.register_event('{"actor":{"type":{"account":"User"}},"action":"action","subject":{"username":{"first_name":"John"}}}').should == @response
+    end
+
     it "should register arrays" do
       Eotb.register_event([2,3,4], :action, {:username => ["John", "Josh"]}).should == @response
     end
@@ -73,7 +71,8 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("0"*40, 5)
+      Eotb.configure("0"*40)
+      @@counter = 96
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
       Net::HTTP.stub(:request) { "200" }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 5
-  - 11
-  version: 0.5.11
+  - 12
+  version: 0.5.12
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +02:00
-default_executable: 
+date: 2010-09-27 00:00:00 +02:00
+default_executable: eotb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -66,26 +66,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hoptoad_notifier
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
-  type: :runtime
-  version_requirements: *id004
 description: Rails plugin which allow you easily track and observe your apps
 email: bartlomiej.kozal@ragnarson.com
-executables: []
-
+executables: 
+- eotb
 extensions: []
 
 extra_rdoc_files: 
@@ -100,6 +84,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/eotb
 - eotb.gemspec
 - generators/eotb/USAGE
 - generators/eotb/eotb_generator.rb
@@ -111,7 +96,7 @@ files:
 - spec/eotb_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/placek/eotb_rails_plugin
+homepage: http://github.com/Ragnarson/eotb_rails_plugin
 licenses: []
 
 post_install_message: 
@@ -145,5 +130,5 @@ signing_key:
 specification_version: 3
 summary: Rails plugin which allow you easily track and observe your apps
 test_files: 
-- spec/eotb_spec.rb
 - spec/spec_helper.rb
+- spec/eotb_spec.rb