finexclub 0.3.4 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.3

data/bin/finexclub_updater

@@ -26,6 +26,10 @@ module Generator
     def rand_index
       rand(100) 
     end
+
+    def rand_array(arr)
+      arr[rand(arr.length)] 
+    end
   end
 
 
@@ -35,8 +39,10 @@ module Generator
     end
 
     def generate(options = {})
+      timeframe = options[:timeframe] || raise("--tf option is missing")
       Finexclub::Chart::SYMBOLS.inject([]) do |data, symbol| 
         data << ["alpha[][symbol]", symbol.upcase]
+        data << ["alpha[][timeframe]", timeframe]
         data << ["alpha[][index]", Generator.rand_index]
         data << ["alpha[][direction]", rand > 0.5? 1 : 0]
       end
@@ -50,8 +56,10 @@ module Generator
 
     def generate(options = {})
       symbol = options[:symbol] || raise("--symbol option is missing")
+      timeframe = options[:timeframe] || raise("--tf option is missing")
       data = []
       data << ["zeta[][symbol]", symbol.upcase]
+      data << ["zeta[][timeframe]", timeframe]
       data << ["zeta[][up_support]", Generator.rand_price]
       data << ["zeta[][up_resist]", Generator.rand_price]
       data << ["zeta[][down_support]", Generator.rand_price]
@@ -67,13 +75,20 @@ module Generator
 
     def generate(options = {})
       symbol = options[:symbol] || raise("--symbol option is missing")
+      timeframe = options[:timeframe] || raise("--tf option is missing")
       actions = %w(buy sell hold_sell hold_buy stop)
       data = []
       data << ["prognosis[][symbol]", symbol.upcase]
+      data << ["prognosis[][timeframe]", timeframe]
       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"]
+      data << ["prognosis[][profit]", rand(100)]
+      data << ["prognosis[][stop_loss]", Generator.rand_price]
+      data << ["prognosis[][loss]", rand(100)]
+      data << ["prognosis[][acceleration]", Generator.rand_array(%w(low high undefined))]
+      data << ["prognosis[][tsi]", Generator.rand_index]
+      data << ["prognosis[][trend]", rand > 0.4 ? 1 : 0 ]
+      data << ["prognosis[][screenshot_filename]", "PROGNOSIS.gif"]
     end
   end
 
@@ -84,16 +99,20 @@ module Generator
 
     def generate(options = {})
       symbol = options[:symbol] || raise("--symbol option is missing")
+      timeframe = options[:timeframe] || raise("--tf option is missing")
       actions = %w(buy sell hold_sell hold_buy stop)
       data = []
       data << ["octopus[][symbol]", symbol.upcase]
+      data << ["octopus[][timeframe]", timeframe]
       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"]
+      data << ["octopus[][tsi]", Generator.rand_index]
+      data << ["octopus[][trend]", rand > 0.4 ? 1 : 0 ]
+      data << ["octopus[][screenshot_filename]", "OCTOPUS.gif"]
     end
   end
 end
@@ -122,7 +141,10 @@ class FakeUpdater
   end
 end
 
-STRATEGIES = %w(trends finexclub)
+STRATEGIES = %w(trends finexclub octopus prognosis)
+FINEXCLUB_TIMEFRAMES = %w(h1 h4 d1)
+TRENDSONFOREX_SYMBOLS = Finexclub::Chart::SYMBOLS
+FINEXCLUB_SYMBOLS = %w(eurusd gbpusd eurgbp audusd usdjpy usdcad)
 
 options = {}
 options[:host] = 'localhost'
@@ -142,6 +164,10 @@ opts = OptionParser.new do |opts|
     options[:symbol] = s
   end
 
+  opts.on("-t", "--tf TIMEFRAME", "Timeframe (h1, h4, d1)") do |t|
+    options[:timeframe] = t 
+  end
+
   opts.on_tail("-h", "Help") do |s|
     puts opts
     exit
@@ -162,18 +188,28 @@ unless options[:generator].nil?
   exit
 end
 
+f = FakeUpdater.new(options[:host], options[:port])
+
 case options[:strategy]
 when 'trends'
-  f = FakeUpdater.new(options[:host], options[:port])
-  f.send(Generator::Alpha.new)
+  f.send(Generator::Alpha.new, :timeframe => 'h1')
   Finexclub::Chart::SYMBOLS.each do |symbol|
-    f.send(Generator::Zeta.new, :symbol => symbol)
+    f.send(Generator::Zeta.new, :symbol => symbol, :timeframe => 'h1')
   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)
+  FINEXCLUB_TIMEFRAMES.each do |tf|
+    FINEXCLUB_SYMBOLS.each do |symbol|
+      f.send(Generator::Octopus.new, :symbol => symbol, :timeframe => tf)
+      f.send(Generator::Prognosis.new, :symbol => symbol, :timeframe => tf)
+    end
+  end
+when 'octopus'
+  FINEXCLUB_SYMBOLS.each do |symbol|
+    f.send(Generator::Octopus.new, :symbol => symbol, :timeframe => 'h1')
+  end
+when 'prognosis'
+  FINEXCLUB_SYMBOLS.each do |symbol|
+    f.send(Generator::Prognosis.new, :symbol => symbol, :timeframe => 'h1')
   end
 else
   puts opts

data/finexclub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{finexclub}
-  s.version = "0.3.4"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Levin"]
-  s.date = %q{2010-12-03}
+  s.date = %q{2010-12-20}
   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}

data/lib/finexclub/chart.rb

@@ -6,6 +6,7 @@ module Finexclub
 
     field :updated, :timestamp
     field :symbol, :symbol
+    field :timeframe, :string
     field :date, :string
 
     attr_reader :core

data/lib/finexclub/manager.rb

@@ -36,6 +36,7 @@ module Finexclub
       signal = Signal.build(core, signal_type, params.merge(:updated => Time.now))
       c = {
         :symbol => signal.symbol,
+        :timeframe => signal.timeframe,
         :date => signal.updated_at.strftime("%Y-%m-%d")
       }
       collection.update(c, {"$push" => {signal_type => signal.to_doc}, "$set" => {:updated => signal.updated}}, :upsert => true)

data/lib/finexclub/signals/alpha.rb

@@ -3,6 +3,7 @@ module Finexclub
 
     class Alpha < Signal
       field :symbol, :symbol
+      field :timeframe, :string
       field :updated, :timestamp
       field :index, :integer
       field :direction, :integer

data/lib/finexclub/signals/octopus.rb

@@ -3,6 +3,7 @@ module Finexclub
 
     class Octopus < Signal
       field :symbol, :symbol
+      field :timeframe, :string
       field :updated, :timestamp
       field :action, :trade_action 
       field :take_profit, :float
@@ -10,9 +11,11 @@ module Finexclub
       field :stop_loss, :float
       field :loss, :integer
       field :index, :integer
+      field :tsi, :integer
+      field :trend, :integer        # 1 - uptrend, 0 - downtrend
       field :screenshot, :image
 
-      doc_fields :updated, :action, :take_profit, :profit, :stop_loss, :loss, :index, :screenshot
+      doc_fields :updated, :action, :take_profit, :profit, :stop_loss, :loss, :index, :tsi, :trend, :screenshot
     end
 
   end

data/lib/finexclub/signals/prognosis.rb

@@ -3,14 +3,19 @@ module Finexclub
 
     class Prognosis < Signal
       field :symbol, :symbol
+      field :timeframe, :string
       field :updated, :timestamp
       field :action, :trade_action
-      field :acceleration, :string
+      field :acceleration, :string     # high, low, undefined
       field :take_profit, :float
       field :profit, :integer
+      field :stop_loss, :float
+      field :loss, :integer
+      field :tsi, :integer
+      field :trend, :integer           # 1 - uptrend, 0 - downtrend
       field :screenshot, :image
 
-      doc_fields :updated, :action, :acceleration, :take_profit, :profit, :screenshot
+      doc_fields :updated, :action, :acceleration, :take_profit, :profit, :stop_loss, :loss, :tsi, :trend, :screenshot
     end
 
   end

data/lib/finexclub/signals/zeta.rb

@@ -3,6 +3,7 @@ module Finexclub
 
     class Zeta < Signal
       field :symbol, :symbol
+      field :timeframe, :string
       field :updated, :timestamp
 
       field :up_support,   :float

data/spec/finexclub/alpha_spec.rb

@@ -3,13 +3,32 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe 'Finexclub::Signals::Alpha' do
   before do
     @core = mock_core
-    @signal = Finexclub::Signals::Alpha.new(@core)
+    @alpha = Finexclub::Signals::Alpha.new(@core)
   end
 
-  it 'should provide attribute accessors' do
-    @signal.build("direction" => 1, "index" => 100)
-    @signal.direction.should == 1
-    @signal.index.should == 100
+  it 'should have meta' do
+    Finexclub::Signals::Alpha.meta.should == {
+      :symbol => :symbol,
+      :timeframe => :string,
+      :updated => :timestamp,
+      :index => :integer,
+      :direction => :integer
+    }
+  end
+
+  it 'should export valid doc' do
+    @alpha.build(
+      "symbol" => 'eurusd', 
+      "timeframe" => 'h1', 
+      "updated" => 123, 
+      "index" => 80, 
+      "direction" => 1)
+
+    @alpha.to_doc.should == {
+      :updated => 123,
+      :index => 80,
+      :direction => 1
+    }
   end
 
   {
@@ -18,8 +37,8 @@ describe 'Finexclub::Signals::Alpha' do
     0 => :bearish
   }.each do |direction, trend|
     it "should return #{trend} trend when direction is #{direction}" do
-      @signal.direction = direction
-      @signal.trend.should == trend
+      @alpha.direction = direction
+      @alpha.trend.should == trend
     end
   end
 
@@ -31,17 +50,13 @@ describe 'Finexclub::Signals::Alpha' do
     :unstable => 0..60
   }.each do |stability, range|
     it "should return #{stability} stability when index within #{range}" do
-      @signal.index = range.first
-      @signal.stability.should == stability
+      @alpha.index = range.first
+      @alpha.stability.should == stability
 
-      @signal.index = range.last
-      @signal.stability.should == stability
+      @alpha.index = range.last
+      @alpha.stability.should == stability
     end 
   end
 
-  it 'should export valid doc' do
-    @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

@@ -15,6 +15,7 @@ describe 'Finexclub::Chart' do
       chart_doc = {
         :symbol => 'eurusd',
         :date => '2010-09-08',
+        :timeframe => 'h1',
         :updated => @ts,
         :alpha => [ @a1, @a2 ],
         :zeta => [ @z1, @z2 ]
@@ -24,6 +25,7 @@ describe 'Finexclub::Chart' do
 
     it 'should have attribute accessors' do
       @chart.symbol.should == 'eurusd'
+      @chart.timeframe.should == 'h1'
       @chart.date.should == '2010-09-08'
       @chart.updated.should == @ts
     end

data/spec/finexclub/manager_spec.rb

@@ -60,6 +60,7 @@ describe 'Finexclub::Manager' do
     before do
       class Omega < Finexclub::Signal
         field :symbol, :symbol
+        field :timeframe, :string
         field :updated, :timestamp
         field :foo, :string
 
@@ -75,6 +76,7 @@ describe 'Finexclub::Manager' do
       @manager.collection.should.receive(:update).with(
         {
           :date => '2010-10-04',
+          :timeframe => 'h1',
           :symbol => 'eurusd'
         },
         {
@@ -85,7 +87,7 @@ describe 'Finexclub::Manager' do
       )
       
       Timecop.travel(Time.at(ts))
-      @manager.add_signal(:omega, {"foo" => "bar", "symbol" => "EURUSD"})
+      @manager.add_signal(:omega, {"foo" => "bar", "timeframe" => 'h1', "symbol" => "EURUSD"})
     end
   end
 

data/spec/finexclub/octopus_spec.rb

@@ -10,19 +10,36 @@ describe 'Finexclub::Signals::Octopus' do
     Finexclub::Signals::Octopus.meta.should == {
       :updated => :timestamp,
       :symbol => :symbol,
+      :timeframe => :string,
       :action => :trade_action,
       :take_profit => :float,
       :profit => :integer,
       :stop_loss => :float,
       :loss => :integer,
       :index => :integer,
+      :tsi => :integer,
+      :trend => :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.build(
+      "symbol" => 'eurusd', 
+      "timeframe" => 'h1', 
+      "updated" => 123, 
+      "action" => "sell", 
+      "take_profit" => 1.5, 
+      "profit" => 10, 
+      "stop_loss" => 1.7, 
+      "loss"=>10, 
+      "index" => 50, 
+      "tsi" => 80, 
+      "trend" => 1, 
+      "screenshot_filename"=>"whatever.png"
+    )
+
     @signal.to_doc.should == {
       :updated => 123,
       :action => "sell", 
@@ -31,6 +48,8 @@ describe 'Finexclub::Signals::Octopus' do
       :stop_loss => 1.7,
       :loss => 10,
       :index => 50,
+      :tsi => 80,
+      :trend => 1,
       :screenshot => "image_uid"
     }
   end

data/spec/finexclub/prognosis_spec.rb

@@ -10,10 +10,15 @@ describe 'Finexclub::Signals::Prognosis' do
     Finexclub::Signals::Prognosis.meta.should == {
       :updated => :timestamp,
       :symbol => :symbol,
+      :timeframe => :string,
       :action => :trade_action,
       :acceleration => :string,
       :take_profit => :float,
       :profit => :integer,
+      :stop_loss => :float,
+      :loss => :integer,
+      :tsi => :integer,
+      :trend => :integer,
       :screenshot => :image
     }
   end
@@ -21,11 +26,16 @@ describe 'Finexclub::Signals::Prognosis' do
   it 'should export valid doc' do
     @core.images.stub!(:store).and_return('image_uid')
     @prognosis.build(
+      "symbol" => 'eurusd', 
+      "timeframe" => 'h1', 
       "updated" => 123, 
-      "action" => 
-      "sell", 
+      "action" => "sell", 
       "take_profit" => 1.5, 
       "profit" => 10, 
+      "stop_loss" => 1.7, 
+      "loss"=> 10, 
+      "tsi" => 80,
+      "trend" => 1,
       "acceleration" => "undefined", 
       "screenshot_filename"=>"whatever.png")
 
@@ -34,9 +44,14 @@ describe 'Finexclub::Signals::Prognosis' do
       :action => "sell", 
       :take_profit => 1.5, 
       :profit => 10,
+      :stop_loss => 1.7,
+      :loss => 10,
+      :tsi => 80,
+      :trend => 1,
       :acceleration => "undefined",
       :screenshot => "image_uid"
     }
   end
+
 end
 

data/spec/finexclub/zeta_spec.rb

@@ -10,6 +10,7 @@ describe 'Finexclub::Signals::Zeta' do
     Finexclub::Signals::Zeta.meta.should == {
       :updated => :timestamp,
       :symbol => :symbol,
+      :timeframe => :string,
       :up_support => :float,
       :up_resist => :float,
       :down_support => :float,
@@ -38,7 +39,16 @@ describe 'Finexclub::Signals::Zeta' do
 
   it 'should export valid doc' do
     @core.images.stub!(:store).and_return('image_uid')
-    @zeta.build("up_support" => "1.1", "up_resist" => "1.2", "down_support" => "2.1", "down_resist" => "2.2", "updated" => 123, "screenshot_filename" => "egg.png")
+    @zeta.build(
+      "symbol" => 'eurusd', 
+      "timeframe" => 'h1', 
+      "updated" => 123, 
+      "up_support" => "1.1", 
+      "up_resist" => "1.2", 
+      "down_support" => "2.1", 
+      "down_resist" => "2.2", 
+      "screenshot_filename" => "egg.png"
+    )
     @zeta.to_doc.should == {
       :updated => 123,
       :up_support => 1.1, 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
   - 4
-  version: 0.3.4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Alex Levin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 +07:00
+date: 2010-12-20 00:00:00 +07:00
 default_executable: finexclub_updater
 dependencies: 
 - !ruby/object:Gem::Dependency