quandl_cassandra_models 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d22ebaef57fca90a9ffab18635ffb33f6cf4d85b
-  data.tar.gz: f9e5c8ab3b033b3478551e6833568c9e4b8c1bcf
+  metadata.gz: aed3773469f277df0b8e8eabd8a23dee5f7aeecd
+  data.tar.gz: 0e3a85bbe925f1c1ac37d1cde9f117067e6b3c88
 SHA512:
-  metadata.gz: 9a59a536e6e8d8ca42f090a12606c30eb1758c1bc64018103aa1434af78f40b66dda50c3a21ced85212c71d03ac20606def5841844815880a5aefeed8ff3e037
-  data.tar.gz: b0a5d4a870bcbc01e157c0e56371ea4373a1bde000276f67ed43bc55b6f181097992bacf8fc0617dfa41072377dd913111a5048e8cb52c18a88f9aedba673c67
+  metadata.gz: f5a9cf178b53e5c5dcf03f73eceb8b5eba7d3665a1e7f03b7e8fb0576c84986625a60ef348c303d6351f5a46357f01facaf962922633e2cd3d9d80e4862b7f71
+  data.tar.gz: 24227cf92fcdd8bbea8c67706f38291a018cb00fcf45621b8af18d32eec0c61361fba6d7f32d507cb3e961943aa337a65131c8853d1141c6898ad2aaced8bbc1

data/UPGRADE.md

@@ -1,3 +1,8 @@
+## 0.3.7
+
+* write specs for row=index with frequencies
+
+
 ## 0.3.5
 
 * fixes quandl/wikiposit#417

data/lib/quandl/cassandra/models/column/read/collapse.rb

@@ -9,7 +9,7 @@ class Quandl::Cassandra::Models::Column::Read::Collapse < Quandl::Cassandra::Mod
   
   def select_column_frequencies
     freqs = Quandl::Cassandra::Models::ColumnAttribute.where( id: column_ids ).select(:id, :frequency).to_a
-    column_ids.collect{|id| freqs.detect{|f| f['id'] == id }.try(:[], 'frequency') }
+    column_ids.collect{|id| freqs.detect{|f| f['id'] == id }.try(:[], 'frequency') }.collect(&:to_sym)
   end
   
   def build_column_collapses_using_frequencies(freqs, collapse)

data/lib/quandl/cassandra/models/column/read/offset.rb

@@ -51,9 +51,6 @@ class Quandl::Cassandra::Models::Column::Read::Offset < Quandl::Cassandra::Model
   end
   
   def accuracy_with_limit
-    # # short circuit for now
-    # return 0
-    # revist this at a later date:
     awl = accuracy
     awl = awl + limit - 1 if limit && limit > 0
     awl

data/lib/quandl/cassandra/models/column.rb

@@ -17,8 +17,8 @@ class Quandl::Cassandra::Models::Column < Quandl::Cassandra::Base
     
     def find_max_time_by_ids(ids, collapses, order)
       unique = collapses.uniq.count == 1
-      time = find_max_time_by_ids_and_collapse(ids, collapses.first, "DESC") if unique
-      time = find_max_time_by_ids_and_collapses(ids, collapses, "DESC") unless unique
+      time = find_max_time_by_ids_and_collapse(ids, collapses.first, order) if unique
+      time = find_max_time_by_ids_and_collapses(ids, collapses, order) unless unique
       Date.jd(time) if time.is_a?(Integer)
     end
     

data/lib/quandl/cassandra/models/version.rb

@@ -1,7 +1,7 @@
 module Quandl
 module Cassandra
 module Models
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end
 end
 end

data/spec/lib/quandl/cassandra/models/column/read_spec.rb

@@ -1,27 +1,43 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Quandl::Cassandra::Models::Column::Write do
+describe Quandl::Cassandra::Models::Column do
 
   let(:id){ rand(10000*10000) + 10000*10000 }
-  let(:data){ Quandl::Fabricate::Data.rand( columns: 1, rows: 15, nils: false, frequency: :annual ) }
-  before(:each){ Quandl::Cassandra::Models::Column.write( id: id, data: data ) }
 
-  attrs = {}
-  {
-    transform:  :rdiff,
-    collapse:   :annual,
-    row:        0, 
-    column:     1,
-  }.each do |key, value|
-    attrs[key] = value
-    it "should read #{attrs.to_query}" do
-      attrs[:id] = id
-      attrs[:column_ids] = Quandl::Cassandra::Dataset.find(id).column_ids
-      Quandl::Cassandra::Models::Column.read(attrs).should be_present
+  describe ".read" do
+    context "data presence" do
+      
+      let(:data){ Quandl::Fabricate::Data.rand( columns: 1, rows: 15, nils: false, frequency: :annual ) }
+      before(:each){ Quandl::Cassandra::Models::Column.write( id: id, data: data ) }
+      
+      attrs = {}
+      { transform: :rdiff, collapse: :annual, row: 0,  column: 1 }.each do |key, value|
+        attrs[key] = value
+        it "should read #{attrs.to_query}" do
+          attrs[:id] = id
+          attrs[:column_ids] = Quandl::Cassandra::Dataset.find(id).column_ids
+          Quandl::Cassandra::Models::Column.read(attrs).should be_present
+        end
+      end
     end
-    
+  
+    [:daily, :weekly, :monthly, :quarterly, :annual].each do |frequency|
+      context "data #{frequency}" do
+      
+        let(:data){ Quandl::Fabricate::Data.rand( columns: 1, rows: 15, nils: false, frequency: frequency ) }
+        before(:each){ Quandl::Cassandra::Models::Column.write( id: id, data: data ) }
+        
+        [-4, -1, 0, 3].each do |row_index|
+          it "should read row=#{row_index}" do
+            expected_date = data[row_index][0]
+            Quandl::Cassandra::Models::Column.read({ id: id, row: row_index })[0][0].should eq expected_date
+          end
+        end
+        
+      end
+    end
+  
   end
-
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra_models
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Blake Hilscher