finexclub 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/finexclub.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{finexclub}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Levin"]

data/lib/finexclub/chart.rb

@@ -27,12 +27,19 @@ module Finexclub
     def self.build_new(core, symbol, tf, time)
       time = time.is_a?(Time) ? time : Time.at(time).utc
 
+      delta = self.timeframe_delta(tf)
+      starts = Time.utc(time.year, time.month, time.day, (time.hour/delta)*delta, 0)
+      expires = Chronic.parse("#{delta} hours from now", :now => starts)
+        
+      #c.starts = Time.utc(time.year, time.month, time.day, time.hour, 0).to_i
+      #c.expires = c.starts + 1*60*60
+      
       c = Chart.new(core)
       c.updated= time.to_i 
       c.symbol= symbol
       c.timeframe = tf
-      c.starts = Time.utc(time.year, time.month, time.day, time.hour, 0).to_i
-      c.expires = c.starts + 1*60*60
+      c.starts = starts.to_i
+      c.expires = expires.to_i
       c
     end
 
@@ -66,5 +73,14 @@ 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/spec/finexclub/chart_spec.rb

@@ -88,22 +88,59 @@ describe 'Finexclub::Chart' do
   end
 
   describe 'Chart.build_new(symbol, tf, time)' do
-    before do
-      @chart = Finexclub::Chart.build_new(@core, 'eurusd', 'h1', Time.utc(2010, 12, 27, 11, 30).to_i)
-    end
+    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 return valid new (unsaved) chart instance' do
-      @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 == {}
+      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
 
-    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
+    {
+      :h1 => {
+        [2010, 12, 27, 00, 00] => [[2010, 12, 27, 00, 00], [2010, 12, 27, 01, 00]],
+        [2010, 12, 27, 03, 07] => [[2010, 12, 27, 03, 00], [2010, 12, 27, 04, 00]],
+        [2010, 12, 27, 16, 37] => [[2010, 12, 27, 16, 00], [2010, 12, 27, 17, 00]],
+        [2010, 12, 27, 23, 59] => [[2010, 12, 27, 23, 00], [2010, 12, 28, 00, 00]]
+      },
+      :h4 => {
+        [2010, 12, 27, 00, 00] => [[2010, 12, 27, 00, 00], [2010, 12, 27, 04, 00]],
+        [2010, 12, 27, 03, 07] => [[2010, 12, 27, 00, 00], [2010, 12, 27, 04, 00]],
+        [2010, 12, 27, 16, 37] => [[2010, 12, 27, 16, 00], [2010, 12, 27, 20, 00]],
+        [2010, 12, 27, 23, 59] => [[2010, 12, 27, 20, 00], [2010, 12, 28, 00, 00]]
+      },
+      :d1 => {
+        [2010, 12, 27, 00, 00] => [[2010, 12, 27, 00, 00], [2010, 12, 28, 00, 00]],
+        [2010, 12, 27, 03, 07] => [[2010, 12, 27, 00, 00], [2010, 12, 28, 00, 00]],
+        [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|
+      describe "#{tf} timeframe" do
+        time_table.each do |initial_time, tf_boundary|
+          time = Time.utc(*initial_time)
+          starts = Time.utc(*tf_boundary.first)
+          expires = Time.utc(*tf_boundary.last)
+
+          describe "chart at #{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
+            end
+          end
+        end
+
+      end
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Alex Levin