finexclub 0.1.1 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.1

data/bin/finexclub_updater

@@ -7,45 +7,94 @@ require "cgi"
 require File.dirname(__FILE__) + "/../lib/finexclub"
 require "optparse"
 
-class GenFactory
-  def self.get(gen)
-    case gen
-    when 'alpha'
-      AlphaGen.new
-    when 'zeta'
-      ZetaGen.new
+module Generator
+  class << self
+    def get(gen)
+      class_name = gen.to_s.gsub(/^(.)/) { $1.upcase }
+      const_get(class_name).new
+    end
+
+    def all
+      constants.map { |e| e.downcase }
+    end
+
+    def rand_price(n = nil)
+      n ||= 10000
+      rand(n)/n.to_f
+    end
+
+    def rand_index
+      rand(100) 
     end
   end
-end
 
-class AlphaGen
-  def name
-    'alpha'
+
+  class Alpha
+    def name
+      'alpha'
+    end
+
+    def generate(options = {})
+      Finexclub::Chart::SYMBOLS.inject([]) do |data, symbol| 
+        data << ["alpha[][symbol]", symbol.upcase]
+        data << ["alpha[][index]", Generator.rand_index]
+        data << ["alpha[][direction]", rand > 0.5? 1 : 0]
+      end
+    end
   end
 
-  def generate(options = {})
-    Finexclub::Chart::SYMBOLS.inject([]) do |data, symbol| 
-      data << ["alpha[][symbol]", symbol.upcase]
-      data << ["alpha[][index]", rand(100)]
-      data << ["alpha[][direction]", rand > 0.5? 1 : 0]
+  class Zeta
+    def name
+      'zeta'
+    end
+
+    def generate(options = {})
+      symbol = options[:symbol] || raise("--symbol option is missing")
+      data = []
+      data << ["zeta[][symbol]", symbol.upcase]
+      data << ["zeta[][up_support]", Generator.rand_price]
+      data << ["zeta[][up_resist]", Generator.rand_price]
+      data << ["zeta[][down_support]", Generator.rand_price]
+      data << ["zeta[][down_resist]", Generator.rand_price]
+      data << ["zeta[][screenshot_filename]", "#{symbol.upcase}_ZETA.gif"]
     end
   end
-end
 
-class ZetaGen
-  def name
-    'zeta'
+  class Prognosis
+    def name
+      'prognosis'
+    end
+
+    def generate(options = {})
+      symbol = options[:symbol] || raise("--symbol option is missing")
+      actions = %w(buy sell hold_sell hold_buy stop)
+      data = []
+      data << ["prognosis[][symbol]", symbol.upcase]
+      data << ["prognosis[][action]", actions[rand(actions.size)]]
+      data << ["prognosis[][take_profit]", Generator.rand_price]
+      data << ["prognosis[][profit]", Generator.rand_index]
+      data << ["prognosis[][screenshot_filename]", "PROGNOSIS.png"]
+    end
   end
 
-  def generate(options = {})
-    symbol = options[:symbol] || raise("ZetaGen :symbol option is missing")
-    data = []
-    data << ["zeta[][symbol]", symbol.upcase]
-    data << ["zeta[][up_support]", rand(10)]
-    data << ["zeta[][up_resist]", rand(10)]
-    data << ["zeta[][down_support]", rand(10)]
-    data << ["zeta[][down_resist]", rand(10)]
-    data << ["zeta[][screenshot_filename]", "#{symbol.upcase}_ZETA.gif"]
+  class Octopus
+    def name
+      'octopus'
+    end
+
+    def generate(options = {})
+      symbol = options[:symbol] || raise("--symbol option is missing")
+      actions = %w(buy sell hold_sell hold_buy stop)
+      data = []
+      data << ["octopus[][symbol]", symbol.upcase]
+      data << ["octopus[][action]", actions[rand(actions.size)]]
+      data << ["octopus[][take_profit]", Generator.rand_price]
+      data << ["octopus[][profit]", rand(100)]
+      data << ["octopus[][stop_loss]", Generator.rand_price]
+      data << ["octopus[][loss]", rand(100)]
+      data << ["octopus[][index]", Generator.rand_index]
+      data << ["octopus[][screenshot_filename]", "OCTOPUS.png"]
+    end
   end
 end
 
@@ -73,11 +122,13 @@ class FakeUpdater
   end
 end
 
+STRATEGIES = %w(trends finexclub)
+
 options = {}
 options[:host] = 'localhost'
 options[:port] = 9292
 opts = OptionParser.new do |opts|
-  opts.banner = "Usage: fake_updater.rb alpha|zeta|mega_load [options]"
+  opts.banner = "Usage: finexclub_updater [options]"
   
   opts.on("-a", "--address ADDRESS", "Host to send, default is #{options[:host]}") do |h|
     options[:host] = h
@@ -96,25 +147,35 @@ opts = OptionParser.new do |opts|
     exit
   end
 
-  opts.on_tail("-g GENERATOR", %w/alpha zeta mega_load/, "One of the generators to send (alpha, zeta)") do |g|
+  opts.on_tail("-g GENERATOR", Generator.all, "One of the generators to send (#{(Generator.all).join(', ')})") do |g|
     options[:generator] = g
   end
+
+  opts.on_tail("-r STRATEGY", STRATEGIES, "One of the strategies to use (#{STRATEGIES.join(', ')})") do |r|
+    options[:strategy] = r
+  end
 end
 opts.parse!
 
-case options[:generator]
-when 'alpha', 'zeta'
-  FakeUpdater.new(options[:host], options[:port]).send(GenFactory.get(options[:generator]), options)
-when 'mega_load'
+unless options[:generator].nil?
+  FakeUpdater.new(options[:host], options[:port]).send(Generator.get(options[:generator]), options)
+  exit
+end
+
+case options[:strategy]
+when 'trends'
   f = FakeUpdater.new(options[:host], options[:port])
-  a = AlphaGen.new
-  z = ZetaGen.new
-  f.send(a)
+  f.send(Generator::Alpha.new)
   Finexclub::Chart::SYMBOLS.each do |symbol|
-    f.send(z, :symbol => symbol)
+    f.send(Generator::Zeta.new, :symbol => symbol)
+  end
+when 'finexclub'
+  f = FakeUpdater.new(options[:host], options[:port])
+  Finexclub::Chart::SYMBOLS.each do |symbol|
+    f.send(Generator::Octopus.new, :symbol => symbol)
+    f.send(Generator::Prognosis.new, :symbol => symbol)
   end
 else
   puts opts
 end
 
-

data/finexclub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{finexclub}
-  s.version = "0.1.1"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Levin"]
-  s.date = %q{2010-10-06}
+  s.date = %q{2010-10-11}
   s.default_executable = %q{finexclub_updater}
   s.description = %q{Finexclub gem stores and retrieves Forex signals and screenshots. It is the heart of the http://trendsonforex.com and http://finexclub.net}
   s.email = %q{clubfinex@gmail.com}
@@ -38,6 +38,8 @@ Gem::Specification.new do |s|
      "lib/finexclub/manager.rb",
      "lib/finexclub/signal.rb",
      "lib/finexclub/signals/alpha.rb",
+     "lib/finexclub/signals/octopus.rb",
+     "lib/finexclub/signals/prognosis.rb",
      "lib/finexclub/signals/zeta.rb",
      "samples/egg.png",
      "spec/finexclub/alpha_spec.rb",
@@ -47,6 +49,8 @@ Gem::Specification.new do |s|
      "spec/finexclub/document_spec.rb",
      "spec/finexclub/images_spec.rb",
      "spec/finexclub/manager_spec.rb",
+     "spec/finexclub/octopus_spec.rb",
+     "spec/finexclub/prognosis_spec.rb",
      "spec/finexclub/signal_spec.rb",
      "spec/finexclub/zeta_spec.rb",
      "spec/spec_helper.rb"
@@ -57,11 +61,13 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Little helper to maintain Forex signals and screenshots}
   s.test_files = [
-    "spec/finexclub/signal_spec.rb",
+    "spec/finexclub/octopus_spec.rb",
+     "spec/finexclub/signal_spec.rb",
      "spec/finexclub/manager_spec.rb",
      "spec/finexclub/app_spec.rb",
      "spec/finexclub/alpha_spec.rb",
      "spec/finexclub/core_spec.rb",
+     "spec/finexclub/prognosis_spec.rb",
      "spec/finexclub/images_spec.rb",
      "spec/finexclub/chart_spec.rb",
      "spec/finexclub/document_spec.rb",

data/lib/finexclub/chart.rb

@@ -15,26 +15,20 @@ module Finexclub
       @signals = {}
     end
 
-    def alpha=(arr)
-      @signals[:alpha]= arr
+    [:alpha, :zeta, :octopus, :prognosis].each do |indicator|
+      define_method("#{indicator}=") do |arr|
+        @signals[indicator] = arr
+      end
+
+      define_method(indicator) do
+        Signal.build(core, indicator, signals(indicator).last)
+      end
     end
 
-    def zeta=(arr)
-      @signals[:zeta]= arr
-    end
-
-    def signals(type)
-      @signals[type]
-    end
-
-    def alpha
-      Signal.build(core, :alpha, signals(:alpha).last)
+    def signals(indicator)
+      @signals[indicator]
     end
     
-    def zeta
-      Signal.build(core, :zeta, signals(:zeta).last)
-    end
-
     def to_doc
       {:symbol => symbol, :date => updated_date}
     end

data/lib/finexclub/core.rb

@@ -24,11 +24,14 @@ module Finexclub
       end
     end
 
-    def find(symbol, date)
-      if symbol == :all
+    def find(symbol_or_array, date)
+      case symbol_or_array
+      when :all
         signals.find(:date => date)
-      else
-        signals.find_one(:date => date, :symbol => symbol)
+      when Array
+        signals.find(:date => date, :symbol => {:$in => symbol_or_array})
+      when String
+        signals.find_one(:date => date, :symbol => symbol_or_array)
       end
     end
   end

data/lib/finexclub/fabrication.rb

@@ -46,13 +46,6 @@ module Finexclub
       }.merge(options)
     end
 
-    def add_signals
-      Chart::SYMBOLS.each do |symbol|
-        Finexclub.store(:alpha, raw_alpha_hash("symbol"=>symbol.upcase)) 
-        Finexclub.store(:zeta, raw_zeta_hash("symbol"=>symbol.upcase)) 
-      end
-    end
-
     def clear_signals
       Finexclub.signals.collection.remove
     end

data/lib/finexclub/images.rb

@@ -16,8 +16,9 @@ module Finexclub
     end
 
     def store(filename)
-      path = File.expand_path(File.join(screenshot_path, filename))
-      app.store(File.new(path))
+      path = screenshot_path || ""
+      file = File.expand_path(File.join(path, filename))
+      app.store File.new(file)
     end
 
     def configure_endpoint(path_prefix = nil)

data/lib/finexclub/signals/octopus.rb

@@ -0,0 +1,19 @@
+module Finexclub
+  module Signals
+
+    class Octopus < Signal
+      field :symbol, :symbol
+      field :updated, :timestamp
+      field :action, :string
+      field :take_profit, :float
+      field :profit, :integer
+      field :stop_loss, :float
+      field :loss, :integer
+      field :index, :integer
+      field :screenshot, :image
+
+      doc_fields :updated, :action, :take_profit, :profit, :stop_loss, :loss, :index, :screenshot
+    end
+
+  end
+end

data/lib/finexclub/signals/prognosis.rb

@@ -0,0 +1,16 @@
+module Finexclub
+  module Signals
+
+    class Prognosis < Signal
+      field :symbol, :symbol
+      field :updated, :timestamp
+      field :action, :string
+      field :take_profit, :float
+      field :profit, :integer
+      field :screenshot, :image
+
+      doc_fields :updated, :action, :take_profit, :profit, :screenshot
+    end
+
+  end
+end

data/spec/finexclub/alpha_spec.rb

@@ -3,13 +3,13 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe 'Finexclub::Signals::Alpha' do
   before do
     @core = mock_core
-    @alpha = Finexclub::Signals::Alpha.new(@core)
+    @signal = Finexclub::Signals::Alpha.new(@core)
   end
 
   it 'should provide attribute accessors' do
-    @alpha.build("direction" => 1, "index" => 100)
-    @alpha.direction.should == 1
-    @alpha.index.should == 100
+    @signal.build("direction" => 1, "index" => 100)
+    @signal.direction.should == 1
+    @signal.index.should == 100
   end
 
   {
@@ -18,8 +18,8 @@ describe 'Finexclub::Signals::Alpha' do
     0 => :bearish
   }.each do |direction, trend|
     it "should return #{trend} trend when direction is #{direction}" do
-      @alpha.direction = direction
-      @alpha.trend.should == trend
+      @signal.direction = direction
+      @signal.trend.should == trend
     end
   end
 
@@ -31,17 +31,17 @@ describe 'Finexclub::Signals::Alpha' do
     :unstable => 0..60
   }.each do |stability, range|
     it "should return #{stability} stability when index within #{range}" do
-      @alpha.index = range.first
-      @alpha.stability.should == stability
+      @signal.index = range.first
+      @signal.stability.should == stability
 
-      @alpha.index = range.last
-      @alpha.stability.should == stability
+      @signal.index = range.last
+      @signal.stability.should == stability
     end 
   end
 
   it 'should export valid doc' do
-    @alpha.build("direction" => 1, "index" => 100, "updated" => 123)
-    @alpha.to_doc.should == {:updated => 123, :index => 100, :direction => 1}
+    @signal.build("direction" => 1, "index" => 100, "updated" => 123)
+    @signal.to_doc.should == {:updated => 123, :index => 100, :direction => 1}
   end
 end
 

data/spec/finexclub/chart_spec.rb

@@ -27,19 +27,6 @@ describe 'Finexclub::Chart' do
       @chart.date.should == '2010-09-08'
       @chart.updated.should == @ts
     end
-
-    it 'should return all alpha signals' do
-      @chart.signals(:alpha).should.equal [@a1, @a2]
-    end
-
-    it 'should return all zeta signals' do
-      @chart.signals(:zeta).should.equal [@z1, @z2]
-    end
-
-    it 'should return latest alpha signal as Alpha' do
-      Finexclub::Signal.should.receive(:build).with(@core, :alpha, @a2).and_return(a = mock('alpha'))
-      @chart.alpha.should == a
-    end
     
     it 'should return latest zeta signals as Zeta' do
       Finexclub::Signal.should.receive(:build).with(@core, :zeta, @z2).and_return(z = mock('zeta'))
@@ -47,5 +34,28 @@ describe 'Finexclub::Chart' do
     end
   end
 
+  [ 
+    :alpha, 
+    :zeta, 
+    :octopus, 
+    :prognosis
+  ].each do |indicator|
+    describe "#{indicator} signals" do
+      before do
+        @s1, @s2 = mock("signal_#{indicator}_1"), mock("signal_#{indicator}_2")
+        @chart.build(indicator => [@s1, @s2])
+      end
+
+      it "should provide :#{indicator} signals" do
+        @chart.signals(indicator).should == [@s1, @s2]
+      end
+
+      it "should return latest :#{indicator} wrapped as Signal" do
+        Finexclub::Signal.should.receive(:build).with(@core, indicator, @s2).and_return(a = mock('signal'))
+        @chart.send(indicator).should == a
+      end
+    end
+  end
+
 end
 

data/spec/finexclub/core_spec.rb

@@ -1,7 +1,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe 'Finexclub::Core' do
+Finexclub.configure do |f|
+  f.signals.db = Mongo::Connection.new.db("finexclub_test")
+end
 
+describe 'Finexclub::Core' do
   describe '.instance' do
     it 'should create instance if it does not already exists' do
       app = Finexclub::Core.instance
@@ -66,6 +69,11 @@ describe 'Finexclub::Core' do
       @core.find(:all, "2010-10-01").should == c
     end
 
+    it 'should fetch an array of charts for given date' do
+      @core.signals.should.receive(:find).with({:symbol => {:$in => ["eurusd", "usdjpy"]}, :date => "2010-10-01"}).and_return(c = mock('cursor'))
+      @core.find(["eurusd", "usdjpy"], "2010-10-01").should == c
+    end
+
     it 'should allow fetching signals by date and symbol' do
       @core.signals.should.receive(:find_one).with({:date => "2010-10-01", :symbol => "eurusd"}).and_return(chart = mock('chart'))
       @core.find("eurusd", "2010-10-01").should == chart

data/spec/finexclub/octopus_spec.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'Finexclub::Signals::Octopus' do
+  before do
+    @core = mock_core
+    @signal = Finexclub::Signals::Octopus.new(@core)
+  end
+
+  it 'should have meta' do
+    Finexclub::Signals::Octopus.meta.should == {
+      :updated => :timestamp,
+      :symbol => :symbol,
+      :action => :string,
+      :take_profit => :float,
+      :profit => :integer,
+      :stop_loss => :float,
+      :loss => :integer,
+      :index => :integer,
+      :screenshot => :image
+    }
+  end
+
+  it 'should export valid doc' do
+    @core.images.stub!(:store).and_return('image_uid')
+    @signal.build("updated" => 123, "action" => "sell", "take_profit" => 1.5, "profit" => 10, "stop_loss" => 1.7, "loss"=>10, "index" => 50, "screenshot_filename"=>"whatever.png")
+    @signal.to_doc.should == {
+      :updated => 123,
+      :action => "sell", 
+      :take_profit => 1.5, 
+      :profit => 10,
+      :stop_loss => 1.7,
+      :loss => 10,
+      :index => 50,
+      :screenshot => "image_uid"
+    }
+  end
+end
+

data/spec/finexclub/prognosis_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'Finexclub::Signals::Prognosis' do
+  before do
+    @core = mock_core
+    @prognosis = Finexclub::Signals::Prognosis.new(@core)
+  end
+
+  it 'should have meta' do
+    Finexclub::Signals::Prognosis.meta.should == {
+      :updated => :timestamp,
+      :symbol => :symbol,
+      :action => :string,
+      :take_profit => :float,
+      :profit => :integer,
+      :screenshot => :image
+    }
+  end
+
+  it 'should export valid doc' do
+    @core.images.stub!(:store).and_return('image_uid')
+    @prognosis.build("updated" => 123, "action" => "sell", "take_profit" => 1.5, "profit" => 10, "screenshot_filename"=>"whatever.png")
+    @prognosis.to_doc.should == {
+      :updated => 123,
+      :action => "sell", 
+      :take_profit => 1.5, 
+      :profit => 10,
+      :screenshot => "image_uid"
+    }
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 1
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Levin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +07:00
+date: 2010-10-11 00:00:00 +07:00
 default_executable: finexclub_updater
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,8 @@ files:
 - lib/finexclub/manager.rb
 - lib/finexclub/signal.rb
 - lib/finexclub/signals/alpha.rb
+- lib/finexclub/signals/octopus.rb
+- lib/finexclub/signals/prognosis.rb
 - lib/finexclub/signals/zeta.rb
 - samples/egg.png
 - spec/finexclub/alpha_spec.rb
@@ -139,6 +141,8 @@ files:
 - spec/finexclub/document_spec.rb
 - spec/finexclub/images_spec.rb
 - spec/finexclub/manager_spec.rb
+- spec/finexclub/octopus_spec.rb
+- spec/finexclub/prognosis_spec.rb
 - spec/finexclub/signal_spec.rb
 - spec/finexclub/zeta_spec.rb
 - spec/spec_helper.rb
@@ -173,11 +177,13 @@ signing_key:
 specification_version: 3
 summary: Little helper to maintain Forex signals and screenshots
 test_files: 
+- spec/finexclub/octopus_spec.rb
 - spec/finexclub/signal_spec.rb
 - spec/finexclub/manager_spec.rb
 - spec/finexclub/app_spec.rb
 - spec/finexclub/alpha_spec.rb
 - spec/finexclub/core_spec.rb
+- spec/finexclub/prognosis_spec.rb
 - spec/finexclub/images_spec.rb
 - spec/finexclub/chart_spec.rb
 - spec/finexclub/document_spec.rb