finexclub 0.5.3 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.5

data/finexclub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{finexclub}
-  s.version = "0.5.3"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Levin"]
-  s.date = %q{2011-02-04}
+  s.date = %q{2011-02-07}
   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/app.rb

@@ -26,7 +26,7 @@ module Finexclub
       indicator_data = params[indicator].is_a?(Array) ? params[indicator] : [ params[indicator] ]
       indicator_data.each do |s|
         ap s.merge(:updated => Time.now.utc)
-        Finexclub.signals.add_signal(indicator, s, Time.now.utc)
+        Finexclub.signals.store(indicator, s, Time.now.utc)
       end
 
       status 200

data/lib/finexclub/chart.rb

@@ -24,19 +24,30 @@ module Finexclub
       self.class.handler_for(indicator)
     end
 
-    def self.build_new(core, symbol, tf, time)
+    def self.timeframe_range(tf, time)
       time = time.is_a?(Time) ? time : Time.at(time).utc
 
-      delta = self.timeframe_delta(tf)
+      delta = case tf
+        when 'h1', :h1 then 1
+        when 'h4', :h4 then 4
+        when 'd1', :d1 then 24
+        else 1
+      end
       starts = Time.utc(time.year, time.month, time.day, (time.hour/delta)*delta, 0)
       expires = starts + delta*60*60
+
+      { :starts => starts.to_i, :expires => expires.to_i }
+    end
+
+    def self.build_new(core, symbol, tf, time)
+      tf_hash = self.timeframe_range(tf, time)
         
       c = Chart.new(core)
       c.updated= time.to_i 
       c.symbol= symbol
       c.timeframe = tf
-      c.starts = starts.to_i
-      c.expires = expires.to_i
+      c.starts = tf_hash[:starts]
+      c.expires = tf_hash[:expires] 
       c
     end
 
@@ -70,14 +81,5 @@ module Finexclub
     indicator_handler :zeta,  Finexclub::Signals::Zeta
     indicator_handler :octopus,  Finexclub::Signals::Octopus
     indicator_handler :prognosis,  Finexclub::Signals::Prognosis
-
-    def self.timeframe_delta(tf)
-      case tf
-      when 'h1', :h1 then 1
-      when 'h4', :h4 then 4
-      when 'd1', :d1 then 24
-      end
-    end
-
   end
 end

data/lib/finexclub/manager.rb

@@ -9,6 +9,7 @@ module Finexclub
 
     def initialize(core)
       @core = core
+      @db = nil
     end
 
     def collection
@@ -23,24 +24,32 @@ module Finexclub
     def find_one(symbol, tf, time = nil)
       time ||= Time.now.utc
       time = time.respond_to?(:to_i) ? time.to_i : time
-      find({:symbol => symbol, :timeframe => tf, :starts => {:$lte => time}, :expires => {:$gt => time}}, :limit => 1, :sort => [[:expires, -1]]).first
+      find({:symbol => symbol, :timeframe => tf, :starts => {:$lte => time}, :expires => {:$gt => time}}, :limit => 1, :sort => [[:expires, :desc]]).first
     end
 
     def find_many(symbol_or_array, tf, time = nil)
       time ||= Time.now.utc
       time = time.respond_to?(:to_i) ? time.to_i : time
-      find({:symbol => {:$in => symbol_or_array}, :timeframe => tf, :starts => {:$lte => time}, :expires => {:$gt => time}}, :limit => 1, :sort => [[:expires, -1]])
+      find({:symbol => {:$in => symbol_or_array}, :timeframe => tf, :starts => {:$lte => time}, :expires => {:$gt => time}}, :limit => 1, :sort => [[:expires, :desc]])
     end
 
     def find_latest(symbol, tf)
       find({:symbol => symbol, :timeframe => tf}, :sort => [[:expires, :desc]], :limit => 1).first
     end
 
-    def find_one_or_create(symbol, tf, time)
+    def find_one_or_duplicate(symbol, tf, time)
       chart = find_one(symbol, tf, time)
       return chart if chart
 
-      id = collection.insert(Chart.build_new(core, symbol, tf, time).to_doc)
+      latest = find_latest(symbol, tf) 
+      if latest
+        chart = latest
+        chart.build(Chart.timeframe_range(tf, time))
+      else
+        chart = Chart.build_new(core, symbol, tf, time)
+      end
+
+      id = collection.insert( chart.to_doc )
       find({"_id" => id}).first
     end
 
@@ -54,19 +63,13 @@ module Finexclub
       ts.nil? ? nil : Time.at(ts).utc
     end
 
-    def add_signal(indicator, params, time)
+    def store(indicator, params, time)
       time = time.respond_to?(:to_i) ? time.to_i : time
 
       signal = Signal.build(core, indicator, params.merge(:updated => time))
-      chart = find_one_or_create(signal.symbol, signal.timeframe, time)
-
-      c = if chart._id
-        {"_id" => chart._id}
-      else
-        chart.to_doc
-      end
+      chart = find_one_or_duplicate(signal.symbol, signal.timeframe, time)
 
-      collection.update(c, {"$set" => {:updated => signal.updated, "indicators.#{indicator}" => signal.to_doc}}, :upsert => true)
+      collection.update({"_id" => chart._id}, {"$set" => {:updated => signal.updated, "indicators.#{indicator}" => signal.to_doc}}, :upsert => true)
     end
 
     class Cursor

data/spec/finexclub/chart_spec.rb

@@ -33,7 +33,7 @@ describe 'Finexclub::Chart' do
       describe '#omega signal accessor' do
         before do
           @omega_doc = {:symbol => 'usdjpy', :timeframe => 'h1', :foo => "Ololo!"}
-          Finexclub.signals.add_signal(:omega, @omega_doc, Time.utc(2010, 12, 27, 11, 5))
+          Finexclub.signals.store(:omega, @omega_doc, Time.utc(2010, 12, 27, 11, 5))
           @chart = Finexclub.signals.find_one('usdjpy', 'h1', Time.utc(2010, 12, 27, 11, 10))
         end
 
@@ -60,10 +60,10 @@ describe 'Finexclub::Chart' do
 
     describe 'complex chart with default indicators' do
       before do
-        Finexclub.signals.add_signal(:alpha, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
-        Finexclub.signals.add_signal(:zeta, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
-        Finexclub.signals.add_signal(:octopus, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
-        Finexclub.signals.add_signal(:prognosis, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
+        Finexclub.signals.store(:alpha, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
+        Finexclub.signals.store(:zeta, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
+        Finexclub.signals.store(:octopus, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
+        Finexclub.signals.store(:prognosis, {:symbol => 'eurusd', :timeframe => 'h1'}, Time.now.utc) 
       end
 
       {
@@ -87,24 +87,7 @@ describe 'Finexclub::Chart' do
   describe 'Chart.build_signal(indicator, params)' do
   end
 
-  describe 'Chart.build_new(symbol, tf, time)' do
-    describe 'h1 timeframe' do
-      it 'should return valid new (unsaved) chart instance' do
-        chart = Finexclub::Chart.build_new(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30).to_i)
-        chart._id.should == nil
-        chart.symbol.should     == 'eurusd'
-        chart.timeframe.should  == 'h1'
-        chart.starts.should     == Time.utc(2010, 12, 27, 11, 0).to_i
-        chart.expires.should    == Time.utc(2010, 12, 27, 12, 0).to_i
-        chart.updated.should    == Time.utc(2010, 12, 27, 11, 30).to_i
-        chart.indicators.should == {}
-      end
-
-      it 'should build valid chart given time as Time object' do
-        Finexclub::Chart.build_new(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30)).starts.should == Time.utc(2010, 12, 27, 11, 0).to_i
-      end
-    end
-
+  describe 'Chart.tf_boundaries(tf, time)' do
     {
       :h1 => {
         [2010, 12, 27, 00, 00] => [[2010, 12, 27, 00, 00], [2010, 12, 27, 01, 00]],
@@ -124,33 +107,45 @@ describe 'Finexclub::Chart' do
         [2010, 12, 27, 16, 37] => [[2010, 12, 27, 00, 00], [2010, 12, 28, 00, 00]],
         [2010, 12, 27, 23, 59] => [[2010, 12, 27, 00, 00], [2010, 12, 28, 00, 00]]
       }
-    }.each do |tf, time_table|
+    }.each do |tf, examples|
       describe "#{tf} timeframe" do
-        time_table.each do |initial_time, tf_boundary|
+        examples.each do |initial_time, tf_range|
           time = Time.utc(*initial_time)
-          starts = Time.utc(*tf_boundary.first)
-          expires = Time.utc(*tf_boundary.last)
+          starts = Time.utc(*tf_range.first)
+          expires = Time.utc(*tf_range.last)
 
-          describe "chart at #{time}" do
+          describe "range for #{time}" do
             it "should start at #{starts}, expire at #{expires}" do
-              chart = Finexclub::Chart.build_new(@core, 'eurusd', tf, time)
-              chart.starts.should == starts.to_i
-              chart.expires.should == expires.to_i
+              tf_hash = Finexclub::Chart.timeframe_range(tf, time)
+              tf_hash[:starts].should == starts.to_i
+              tf_hash[:expires].should == expires.to_i
             end
           end
         end
-
       end
     end
+  end
 
+  describe 'Chart.build_new(symbol, tf, time)' do
+    it 'should return valid new (unsaved) chart instance' do
+      chart = Finexclub::Chart.build_new(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30).to_i)
+      chart._id.should == nil
+      chart.symbol.should     == 'eurusd'
+      chart.timeframe.should  == 'h1'
+      chart.starts.should     == Time.utc(2010, 12, 27, 11, 0).to_i
+      chart.expires.should    == Time.utc(2010, 12, 27, 12, 0).to_i
+      chart.updated.should    == Time.utc(2010, 12, 27, 11, 30).to_i
+      chart.indicators.should == {}
+    end
+
+    it 'should build valid chart given time as Time object' do
+      chart = Finexclub::Chart.build_new(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30))
+      chart.starts.should == Time.utc(2010, 12, 27, 11, 0).to_i
+    end
   end
-  
 
-  describe 'instance' do
+  describe 'Chart instance' do
     before do
-      @a1, @a2 = mock('a1'), mock('a2')
-      @z1 = mock('z1')
-      
       @chart_doc = {
         :symbol => 'eurusd',
         :timeframe => 'h1',
@@ -158,24 +153,62 @@ describe 'Finexclub::Chart' do
         :expires => Time.utc(2010, 12, 27, 12, 0).to_i,
         :updated => Time.utc(2010, 12, 27, 11, 5).to_i,
         :indicators => {
-          :alpha => @a1,
-          :zeta => @z1
+          :omega => {:foo => 'bar'},
+          :gamma => {:ololo => 'piu'},
         }
       }
 
       @chart.build(@chart_doc)
     end
 
-    it 'should provide access to raw indicator documents' do
-      @chart.indicators[:alpha].should == @a1
-      @chart.indicators[:zeta].should == @z1
+    describe 'common attributes' do
+      it 'should provide common accessors' do
+        @chart.symbol.should == 'eurusd'
+        @chart.timeframe.should == 'h1'
+        @chart.updated.should == @chart_doc[:updated]
+        @chart.starts.should == @chart_doc[:starts]
+        @chart.expires.should == @chart_doc[:expires]
+        @chart.indicators.should == @chart_doc[:indicators]
+      end
     end
 
-    it 'should update raw indicator document' do
-      @chart.indicators[:alpha] = @a2
-      @chart.indicators[:alpha].should == @a2
+    describe 'Chart.indicators' do
+      it 'should access raw indications' do
+        @chart.indicators[:omega].should == {:foo => 'bar'}
+        @chart.indicators[:gamma].should == {:ololo => 'piu'}
+      end
+
+      it 'should update indication' do
+        @chart.indicators[:gamma] = {:ololo => 'yarr!'}
+        @chart.indicators[:gamma].should == {:ololo => 'yarr!'}
+      end
     end
 
+    describe 'Chart.to_doc' do
+      it 'should export valid document' do
+        @chart.to_doc.should == @chart_doc
+      end
+    end
+  end
+
+  describe 'Chart.build(doc_hash)' do
+    before do
+      @chart_doc = {
+        :symbol => 'eurusd',
+        :timeframe => 'h1',
+        :starts => Time.utc(2010, 12, 27, 11, 0).to_i,
+        :expires => Time.utc(2010, 12, 27, 12, 0).to_i,
+        :updated => Time.utc(2010, 12, 27, 11, 5).to_i,
+        :indicators => {
+          :omega => {:foo => 'bar'},
+          :gamma => {:ololo => 'piu'},
+        }
+      }
+
+      @chart.build(@chart_doc)
+    end
+
+
     it 'should provide common accessors' do
       @chart.symbol.should == 'eurusd'
       @chart.timeframe.should == 'h1'

data/spec/finexclub/manager_spec.rb

@@ -2,19 +2,12 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe 'Finexclub::Manager' do
   before do
-    @core = mock_core
-    @manager = Finexclub::Manager.new(@core)
+    @core = test_core
 
-    @mongo = test_mongo
-    @manager.db = @mongo
+    @manager = Finexclub::Manager.new(@core)
+    @manager.db = test_mongo
 
-    @mongo.collection("charts").drop
-  end
-
-  describe '.db' do
-    it 'should return mongo instance' do
-      @manager.db.should == @mongo
-    end
+    @manager.collection.drop
   end
 
   describe '.collection' do
@@ -31,7 +24,7 @@ describe 'Finexclub::Manager' do
 
   describe 'finding charts' do
     before do
-      charts = @mongo.collection('charts')
+      charts = @manager.collection
       charts.drop
       @c1 = {:symbol => 'eurusd', :timeframe => 'h1', :starts => Time.utc(2010, 12, 27, 11, 0).to_i, :expires => Time.utc(2010, 12, 27, 12, 0).to_i, :updated => Time.utc(2010, 12, 27, 11, 3).to_i}
       @c2 = {:symbol => 'eurusd', :timeframe => 'h1', :starts => Time.utc(2010, 12, 27, 12, 0).to_i, :expires => Time.utc(2010, 12, 27, 13, 0).to_i, :updated => Time.utc(2010, 12, 27, 12, 5).to_i}
@@ -89,20 +82,22 @@ describe 'Finexclub::Manager' do
         end
       end
 
-      describe '.find_one_or_create(symbol, tf, time)' do
+      describe '.find_one_or_duplicate(symbol, tf, time)' do
         it 'should return existing chart for given symbol, timeframe and time' do
-          c = @manager.find_one_or_create('eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30))
+          c = @manager.find_one_or_duplicate('eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30))
           c._id.should == @id1
         end
 
-        #it 'should build valid chart if no chart exists' do
-          #Finexclub::Chart.should.receive(:build_new).with(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 13, 5)).and_return(c = mock('chart'))
-          #@manager.find_one_or_create('eurusd', 'h1', Time.utc(2010, 12, 27, 13, 5)).should == c
-        #end
+        it 'should create duplicate latest chart if no chart exists' do
+          indicators = {
+            "omega" => {"foo" => 'ololo!'}
+          }
+          @manager.collection.update({:_id => @id2}, {:$set => {:indicators => indicators}})
 
-        it 'should create a new chart if no chart exists' do
-          c = @manager.find_one_or_create('eurusd', 'h1', Time.utc(2010, 12, 27, 13, 5))
+          # this should insert after @c2 copying indications from there
+          c = @manager.find_one_or_duplicate('eurusd', 'h1', Time.utc(2010, 12, 27, 13, 5))
           c._id.should.not.be.nil?
+          c.indicators.should == indicators
         end
       end
 
@@ -158,7 +153,7 @@ describe 'Finexclub::Manager' do
     
   end
 
-  describe 'saving signals' do
+  describe 'storing signals' do
     before do
       class Omega < Finexclub::Signal
         field :symbol, :symbol
@@ -170,7 +165,17 @@ describe 'Finexclub::Manager' do
       end
       Finexclub::Chart.indicator_handler(:omega, Omega)
 
-      charts = @mongo.collection('charts')
+      class Gamma < Finexclub::Signal
+        field :symbol, :symbol
+        field :timeframe, :string
+        field :updated, :timestamp
+        field :ololo, :string
+
+        doc_fields :ololo, :updated
+      end
+      Finexclub::Chart.indicator_handler(:gamma, Gamma)
+
+      charts = @manager.collection
       charts.drop
       @c1 = {
         :symbol => 'eurusd',
@@ -194,9 +199,13 @@ describe 'Finexclub::Manager' do
       @id2 = charts.insert(@c2)
     end
 
-    describe '.add_signal(indicator, raw_params, time)' do
+    describe '.store(indicator, raw_params, time)' do
       it 'should add signal to existing chart' do
-        @manager.add_signal(:omega, {"symbol" => "EURUSD", "timeframe" => "h1", "foo" => "bar"}, Time.utc(2010, 12, 27, 11, 5))
+        @manager.store(
+          :omega, 
+          {"symbol" => "EURUSD", "timeframe" => "h1", "foo" => "bar"}, 
+          Time.utc(2010, 12, 27, 11, 5)
+        )
 
         c = @manager.collection.find_one({"_id" => @id1})
         c["symbol"].should == 'eurusd'
@@ -211,7 +220,11 @@ describe 'Finexclub::Manager' do
       end
 
       it 'should update existing signal on existing chart' do
-        @manager.add_signal(:omega, {"symbol" => "USDCAD", "timeframe" => "h1", "foo" => "ololo!"}, Time.utc(2010, 12, 27, 11, 30))
+        @manager.store(
+          :omega, 
+          {"symbol" => "USDCAD", "timeframe" => "h1", "foo" => "ololo!"}, 
+          Time.utc(2010, 12, 27, 11, 30)
+        )
 
         c = @manager.collection.find_one({"_id" => @id2})
         c["symbol"].should == 'usdcad'
@@ -225,28 +238,36 @@ describe 'Finexclub::Manager' do
         }
       end
 
-      it 'should add signals to non-existent chart' do
-        @manager.add_signal(:omega, {"symbol" => "EURUSD", "timeframe" => "h4", "foo" => "bar"}, Time.utc(2010, 12, 27, 11, 5))
+      describe 'no chart mathes for given time' do
+        before do
+          # store signal after @c2 and transfer @c2.omega indications
+          @manager.store(
+            :gamma, 
+            {"symbol" => "USDCAD", "timeframe" => "h1", "ololo" => "yarr!"}, 
+            Time.utc(2010, 12, 27, 12, 5)
+          )
+          @c = @manager.collection.find({:symbol => 'usdcad', :timeframe => 'h1'}).sort([[:expires, :desc]]).first
+        end
 
-        c = @manager.collection.find_one({:symbol => 'eurusd', :timeframe => 'h4'})
-        c["symbol"].should == 'eurusd'
-        c["timeframe"].should == 'h4'
-        c["starts"].should == Time.utc(2010, 12, 27, 8, 0).to_i
-        c["expires"].should == Time.utc(2010, 12, 27, 12, 0).to_i
-        c["updated"].should == Time.utc(2010, 12, 27, 11, 5).to_i
-        c["indicators"]["omega"].should == {
-          "foo" => "bar",
-          "updated" => Time.utc(2010, 12, 27, 11, 5).to_i
-        }
-      end
-    end
-  end
+        it 'should add signals to new valid chart' do
+          @c["symbol"].should == 'usdcad'
+          @c["timeframe"].should == 'h1'
+          @c["starts"].should == Time.utc(2010, 12, 27, 12, 0).to_i
+          @c["expires"].should == Time.utc(2010, 12, 27, 13, 0).to_i
+          @c["updated"].should == Time.utc(2010, 12, 27, 12, 5).to_i
+          @c["indicators"]["gamma"].should == {
+            "ololo" => "yarr!",
+            "updated" => Time.utc(2010, 12, 27, 12, 5).to_i
+          }
+        end
 
-  describe 'Cursor' do
-    before do
-      @mongo_cursor = mock('mongo_cursor')
-      class Foo; end
-      @cursor = Finexclub::Manager::Cursor.new(@core, Foo, @mongo_cursor)
+        it 'should transfer indications from latest chart' do
+          @c["indicators"]["omega"].should == {
+            "foo" => "bar",
+            "updated" => Time.utc(2010, 12, 27, 11, 3).to_i
+          }
+        end
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Alex Levin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +07:00
+date: 2011-02-07 00:00:00 +07:00
 default_executable: finexclub_updater
 dependencies: 
 - !ruby/object:Gem::Dependency