eotb 0.5.16 → 0.5.18

data/README.rdoc

@@ -91,6 +91,10 @@ Register hashes and nested hashes
 You can register any type of objects
 
   Eotb.register_event(Object.new, :fed, {:pet => Dog.new})
+  
+== Using Query API
+
+eotb version >= 0.5.17 supports new feature which let's you incorporate reports in your application. For more info please vist: http://beta.beholder.ragnarson.com/doc/how_to_use_query_api
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.5.16
+0.5.18

data/bin/eotb

@@ -26,7 +26,7 @@ class EotbConfigurator
   
   def ensure_parameter_was_set
     if !@app[:apikey]
-      puts "Must pass --api-key or create config/initializers/eotb.rb"
+      puts "Must pass --api-key or file config/initializers/eotb.rb already exists"
       exit
     end
   end

data/eotb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{eotb}
-  s.version = "0.5.16"
+  s.version = "0.5.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ragnarson"]
-  s.date = %q{2010-10-31}
+  s.date = %q{2010-11-23}
   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}
@@ -33,10 +33,12 @@ Gem::Specification.new do |s|
      "generators/eotb/eotb_generator.rb",
      "generators/eotb/templates/initializer.rb",
      "lib/eotb.rb",
+     "lib/eotb/report.rb",
      "lib/generators/eotb/USAGE",
      "lib/generators/eotb/eotb_generator.rb",
      "lib/timer.rb",
      "spec/eotb_spec.rb",
+     "spec/report_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/Ragnarson/eotb_rails_plugin}
@@ -46,7 +48,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Rails plugin which allow you easily track and observe your apps}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/eotb_spec.rb"
+     "spec/eotb_spec.rb",
+     "spec/report_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/generators/eotb/eotb_generator.rb

@@ -2,14 +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('-l', '--login=login', String, "Your Beholder app login") {|v| options[:email] = v}
-    opt.on('-d', '--password=password', String, "Your Beholder app password") {|v| options[:password] = 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, :login => login_exp, :password => password_exp}
+      m.template "initializer.rb", "config/initializers/eotb.rb", :assigns => {:api_key => api_key_exp }
     end
    
   end
@@ -17,24 +15,11 @@ class EotbGenerator < Rails::Generator::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
-  def login_exp
-    "#{options[:login]}"
-  end
-  def password_exp
-    "#{options[:password]}"
-  end
-    
+
   def ensure_parameter_was_set
     if !options[:api_key]
       puts "Must pass --api-key='your_api_key' or -k 'your_api_key'"
       exit
-    elsif !options[:login]
-      puts "Must pass --login='app_login' or -l 'app_login'"
-      exit
-    elsif !options[:password]
-      puts "Must pass --password='app_password' or -d 'app_password'"
-      exit
-    end
   end
 
 end

data/generators/eotb/templates/initializer.rb

@@ -1,3 +1,4 @@
 require 'eotb'
+require 'eotb/report'
 
-Eotb.configure("<%= api_key_exp %>", "<%= login_exp %>", "<%= password_exp %>")
+Eotb.configure("<%= api_key_exp %>")

data/lib/eotb.rb

@@ -10,28 +10,36 @@ class Eotb
   @@api_key = nil
   METHODS = [:to_actor, :to_subject, :to_json, :to_hash, :inspect]
     
-  def self.configure(*params) #(api_key, email, password)
+  def self.configure(*params) 
     @@host = "beta.beholder.ragnarson.com"
     @@port = '80'
     @@api_key = params[0] if params.size > 0
     @@reset = 100
-    if params.size == 1  # DEPRECATED - remove on Eotb 0.5.17
-      puts 'DEPRECATION WARNING'
-      puts 'Eotb.configure(api_key) -- method will be removed in eotb 0.5.17'
+    if params.size == 1  
+      
       @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + @@api_key)
       @@post = Net::HTTP::Post.new(@@uri.path)
-    elsif params.size == 4 # DEPRECATED - remove on Eotb 0.5.17
-      puts 'DEPRECATION WARNING'
-      puts 'Eotb.configure(api_key, events, host, port) -- method will be removed in eotb 0.5.17'
+      
+    elsif params.size == 4 # DEPRECATED - remove on Eotb 0.5.19
+      
       @@host = params[2]
       @@port = params[3]
       params[1].to_i >= 1 ? @@reset = params[1].to_i : @@reset = 1
       @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + @@api_key)
       @@post = Net::HTTP::Post.new(@@uri.path)
-    elsif params.size == 3 
+      puts 'DEPRECATION WARNING'
+      puts 'Eotb.configure(api_key, events, host, port) -- method will be removed in eotb 0.5.19'
+      
+    elsif params.size == 3 # DEPRECATED - remove on Eotb 0.5.19
+      
       @@uri = URI.parse('http://' + @@host + ':' + @@port + '/events/' + @@api_key)
       @@post = Net::HTTP::Post.new(@@uri.path)
+      @@login = params[1]
+      @@pass = params[2]
       @@post.basic_auth params[1], params[2]
+      puts 'DEPRECATION WARNING'
+      puts 'Eotb.configure(api_key) -- method will be removed in eotb 0.5.19'
+      
     else
       raise ArgumentError, 'Wrong number of arguments. Check Eotb.configure parameters!'
     end
@@ -52,6 +60,12 @@ class Eotb
   def self.api_key
     @@api_key
   end
+  def self.host_port
+    [@@host, @@port]
+  end
+  def self.login_password
+    [@@login, @@pass]
+  end
   def self.events
     @@events
   end

data/lib/eotb/report.rb

@@ -0,0 +1,89 @@
+require 'ostruct'
+class Eotb::Report 
+  
+  def self.find(query)
+    configure 'find'
+    hash = {}
+    query.each_pair { |k, v|
+      hash.merge!(hash_format(v, k)) 
+    }
+    @@post.set_form_data(hash)
+    array = JSON.parse send
+    array.map { |a| OpenStruct.new(a) }.sort {|x ,y| y.created_on <=> x.created_on}
+  end
+  
+  def self.latest
+    configure 'latest'
+    array = JSON.parse(send)
+    array.map { |a| OpenStruct.new(a) }
+  end
+  
+  def self.latest_daily
+    configure 'latest_daily'
+    array = JSON.parse(send)
+    array.map { |a| OpenStruct.new(a) }
+  end
+  
+  def self.latest_weekly
+    configure 'latest_weekly'
+    array = JSON.parse(send)
+    array.map { |a| OpenStruct.new(a) }
+  end
+  
+private
+
+  def self.configure(option)
+    @@uri = URI.parse('http://' + Eotb.host_port[0] + ':' + Eotb.host_port[1] + '/gem/' + Eotb.api_key + '/' + option )
+    @@post = Net::HTTP::Post.new(@@uri.path)
+  end
+  
+  def self.send()
+    res = {}
+    begin
+    Timeout::timeout(2) {
+      res = 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  
+    res.body
+  end
+  
+  METHODS = [:to_json, :to_hash, :inspect]
+  def self.value_format(value)
+    value.send METHODS.find { |m| m if value.respond_to? m }
+  end
+  
+  def self.hash_flatten(hash)
+    hash.inject({}) do |h, (k, v)|
+      if v.is_a?(Hash)
+        hash_flatten(v).each do |sk, sv|
+          h[[k] + sk] = sv
+        end
+      else
+        k = k ? [k] : []
+        h[k] = v
+      end
+      h
+    end
+  end
+
+  def self.hash_format(hash, type)
+    if hash.is_a?(Hash)
+      h = hash_flatten(hash).map do |k, v|
+        key = k.map{ |e| "[#{e}]" }.join
+        "\"find[#{type}]#{key}\" => #{value_format(v)}"
+        
+      end.join(', ')
+    else
+      h = "\"find[#{type}]\" => #{value_format(hash)}"
+    end
+    eval "{#{h.to_s}}"
+  end
+  
+ 
+end

data/lib/generators/eotb/eotb_generator.rb

@@ -7,8 +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 :login, :aliases => "-l", :type => :string, :desc => "Your Beholder app login"
-  class_option :password, :aliases => "-d", :type => :string, :desc => "Your Beholder app password"
   
   def generator
     ensure_parameters_was_set
@@ -30,13 +28,7 @@ class EotbGenerator < Rails::Generators::Base
   def api_key_exp
     "#{options[:api_key]}"
   end
-  def login_exp
-    "#{options[:login]}"
-  end
-  def password_exp
-    "#{options[:password]}"
-  end
-  
+
   def generate_initializer
     template 'initializer.rb', 'config/initializers/eotb.rb'
   end
@@ -45,14 +37,8 @@ class EotbGenerator < Rails::Generators::Base
     if !options[:api_key]
       puts "Must pass --api-key='your_api_key' or -k 'your_api_key'"
       exit
-    elsif !options[:email]
-      puts "Must pass --email='app_email' or -l 'app_email'"
-      exit
-    elsif !options[:password]
-      puts "Must pass --password='app_password' or -d 'app_password'"
-      exit
     end
-    File.exists?('config/initializers/eotb.rb') && options[:api_key].empty? && options[:login].empty? && options[:password].empty?
+    File.exists?('config/initializers/eotb.rb') && options[:api_key].empty?
   end
   
 end

data/spec/eotb_spec.rb

@@ -2,7 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Eotb do
   
-  describe "shoud format objects" do
+#  describe "version" do
+#    it "configure with 3 parameters should return deprecation warning" do
+#      text = <<-EOF
+#      DEPRECATION WARNING
+#      Eotb.configure(api_key, events, host, port) -- method will be removed in eotb 0.5.17
+#      EOF
+#      Eotb.configure("test_api_key", 'login', 'passwords').should == text
+#    end
+#  
+#  end
+  
+  describe "should format objects" do
     before do
       @@counter = 0
     end
@@ -25,7 +36,7 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("test_api_key", 'email', 'passwords')
+      Eotb.configure("test_api_key")
       @@counter = 100
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
@@ -70,7 +81,7 @@ describe Eotb do
     
     before(:each) do
       @response = "200"
-      Eotb.configure("0"*40, 'email', 'passwords')
+      Eotb.configure("0"*40)
       @@counter = 96
       Net::HTTP.stub(:new) { Net::HTTP } 
       Net::HTTP.stub(:start) { Net::HTTP } 
@@ -82,7 +93,6 @@ describe Eotb do
       Eotb.register_event("actor", "action", {:username => "John"}).should == @response
     end
 
-    
   end
   
 end

data/spec/report_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Eotb::Report do
+  
+  describe "shoud format objects" do
+    before(:each) do
+      @response = "200"
+      Eotb.configure("test_api_key")
+      @@counter = 100
+      Net::HTTP.stub(:new) { Net::HTTP } 
+      Net::HTTP.stub(:start) { Net::HTTP } 
+      Net::HTTP.stub(:request) { "200" }
+      Eotb::Report.stub(:send) { [] }
+      JSON.stub(:parse) { [{:name => "Example"}] }
+    end
+    
+    it "should format with correct type " do
+      Eotb::Report.hash_format('2010-10-05', :created_on).should == {"find[created_on]" => "2010-10-05"}
+    end
+    
+    it "find should return OpenStruct objects in an  array" do
+      Eotb::Report.find({:name => "Example name"}).should == [OpenStruct.new({:name => "Example"})]
+    end
+    
+    it "latest should return OpenStruct objects in an array" do
+      Eotb::Report.latest.should == [OpenStruct.new({:name => "Example"})]
+    end
+    
+    it "latest_daily should return OpenStruct objects in an array" do
+      Eotb::Report.latest_daily.should == [OpenStruct.new({:name => "Example"})]
+    end
+    
+    it "latest_weekly should return OpenStruct objects in an array" do
+      Eotb::Report.latest_weekly.should == [OpenStruct.new({:name => "Example"})]
+    end
+    
+  end
+  
+end  

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
+require 'activeresource'
 require 'eotb'
+require 'eotb/report'
 require 'spec'
 require 'spec/autorun'
 Spec::Runner.configure do |config|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: eotb
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 47
   prerelease: false
   segments: 
   - 0
   - 5
-  - 16
-  version: 0.5.16
+  - 18
+  version: 0.5.18
 platform: ruby
 authors: 
 - Ragnarson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: eotb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,10 +90,12 @@ files:
 - generators/eotb/eotb_generator.rb
 - generators/eotb/templates/initializer.rb
 - lib/eotb.rb
+- lib/eotb/report.rb
 - lib/generators/eotb/USAGE
 - lib/generators/eotb/eotb_generator.rb
 - lib/timer.rb
 - spec/eotb_spec.rb
+- spec/report_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/Ragnarson/eotb_rails_plugin
@@ -132,3 +134,4 @@ summary: Rails plugin which allow you easily track and observe your apps
 test_files: 
 - spec/spec_helper.rb
 - spec/eotb_spec.rb
+- spec/report_spec.rb