quandl_cassandra_models 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39360a544240f7e75f02fea8cce478d515ab4c8b
-  data.tar.gz: 1ab7b958e622a92ee3d991d6db2c20711a93c153
+  metadata.gz: 1dba8a80af70ec60a10f0214ab262a68aff64dee
+  data.tar.gz: b425b1bfaba56bbccda9e859b92eb3635c119770
 SHA512:
-  metadata.gz: 128c3f627afa74ea9a5bc29fec16f7009777b0984d0059e415014e8d8f786932855e025f274e476c588ee1a4fd3b0802c8ed51cb9da50c2e5cfd2784830cef9f
-  data.tar.gz: 1b108b8d76af34e34957daf65a9a3ecb946be96909ebca9d13b41824471ffff7b672ae9d573e40d5a20eedc92b46525e3b9a64c23fe2dbce0d0fcddbb64abb09
+  metadata.gz: cc80a451921d95abbf80c0555e816c2338b9b3567b8e1dbff8b75653cfa363eef3c1b6981d4b55c69fb714b9157873c717a3b3e1c4aae638f673357533c040bf
+  data.tar.gz: 54eea88045fd66edb7702aff58338283cd599a396b9726a45cb47f2b48d10ed3f721d134cbd21d6ebbb72374b7c4b8932a94f5f7a2e8f62a56f2159a7cd22ce9

data/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+group :specs do
+  guard :rspec, :cli => '--color --format doc --fail-fast' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^(lib/.+)\.rb$})                { |m| "spec/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')             { 'spec' }
+  end
+end

data/UPGRADE.md

@@ -1,3 +1,10 @@
+## 0.3.10
+
+* Quandl::Cassandra::Models::Column::Read::Offset#required_attributes_present?
+* WIKI-18 #comment Column.find_max_time_by_ids passes spec
+* Add guard, guard-rspec
+
+
 ## 0.3.9
 
 * bump quandl packages

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

@@ -1,12 +1,17 @@
 class Quandl::Cassandra::Models::Column::Read::Offset < Quandl::Cassandra::Models::Column::Read
   
   def perform
-    # apply offset
-    return unless column_ids.present?
+    # skip strategy unless all required attriutes are present
+    return unless required_attributes_present?
+    # apply strategy
     apply_offset_with_transform
     apply_offset
   end
   
+  def required_attributes_present?
+    column_ids.present? && trim_start.is_a?(Date) && trim_end.is_a?(Date)
+  end
+  
   def apply_offset_with_transform
     # rdiff_from needs the data from the current to offset
     if attributes[:row].present? && attributes[:transform] == :rdiff_from

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

@@ -25,16 +25,16 @@ class Quandl::Cassandra::Models::Column < Quandl::Cassandra::Base
     def find_max_time_by_ids_and_collapses(ids, collapses, order)
       # otherwise lookup each column seperately
       times = []
-      column_ids.each_with_index do |id, index|
+      ids.each_with_index do |id, index|
         column_collapse = collapses[index]
         next if column_collapse.blank?
-        times << limit(1).order("type #{order}, time #{order}").where( id: id, type: collapse ).select(:time, :type).to_a[0]['time']
+        times << limit(1).order("type #{order}, time #{order}").where( id: id, type: column_collapse ).select(:time, :type).to_a[0].try(:[], 'time')
       end
       times.flatten.max
     end
     
     def find_max_time_by_ids_and_collapse(ids, collapse, order)
-      limit(1).order("type #{order}, time #{order}").where( id: ids, type: collapse ).select(:time, :type).to_a[0]['time']
+      limit(1).order("type #{order}, time #{order}").where( id: ids, type: collapse ).select(:time, :type).to_a[0].try(:[], 'time')
     end
     
   end

data/lib/quandl/cassandra/models/dataset/columns.rb

@@ -23,8 +23,12 @@ module Quandl::Cassandra::Models::Dataset::Columns
     end
   end
 
+  def column_frequencies
+    @column_frequencies ||= columns.collect(&:frequency)
+  end
+
   def column_units
-    @column_units ||= columns.collect(&:unit)
+    @column_units ||= columns.collect(&:units)
   end
 
   def column_names
@@ -51,6 +55,9 @@ module Quandl::Cassandra::Models::Dataset::Columns
   def clear_attributes!
     @columns = nil
     @column_ids = nil
+    @column_frequencies = nil
+    @column_names = nil
+    @column_units = nil
   end
   
   

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

@@ -1,7 +1,7 @@
 module Quandl
 module Cassandra
 module Models
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end
 end
 end

data/quandl_cassandra_models.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "factory_girl_rails"
   s.add_development_dependency "fivemat", "~> 1.2"
   s.add_development_dependency "pry"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
 
   s.add_runtime_dependency "quandl_cassandra", "~> 1.1"
   

data/spec/lib/quandl/cassandra/models/column_spec.rb

@@ -6,12 +6,55 @@ describe Quandl::Cassandra::Models::Column do
   let(:data){ Quandl::Fabricate::Data.rand( rows: 10, columns: 2, nils: false ) }
   let(:dataset){ Quandl::Cassandra::Models::Dataset.create( id: id, data: data ) }
   
+  let(:column_ids){ dataset.column_ids }
+  let(:collapses){ ['source', 'source'] }
+  let(:column_order){ :desc }
+  
   describe ".read" do
     before(:each){ Quandl::Cassandra::Models::Column.write( id: id, data: data ); sleep(0.2) }
     
     subject{ Quandl::Cassandra::Models::Column.read( id: id ) }
     its(:count){ should eq 10 }
     it{ should eq data }
+    
+    context "offset with missing data" do
+      before(:each){ dataset.data.scoped.delete_all }
+      subject{ Quandl::Cassandra::Models::Column.read( id: id, offset: 20 ) }
+      its(:count){ should eq 0 }
+    end
+    
+  end
+  
+  describe ".find_max_time_by_ids" do
+    let(:data){ Quandl::Fabricate::Data.rand( rows: 2, columns: 2, nils: false ) }
+    subject{ Quandl::Cassandra::Models::Column.find_max_time_by_ids(column_ids, collapses, column_order) }
+
+    it{ should be_a Date }
+    it{ should eq dataset.data.scoped.to_table.to_date.first.first }
+    
+    context "asc order" do
+      let(:column_order){ :asc }
+      it{ should be_a Date }
+      it{ should eq dataset.data.scoped.to_table.to_date.last.first }
+    end
+    
+    context "invalid collapse" do
+      let(:collapses){ ['invalid', 'invalid'] }
+      it{ should be_nil }
+    end
+    
+  end
+  
+  describe ".find_max_time_by_ids_and_collapses" do
+    subject{ Quandl::Cassandra::Models::Column.find_max_time_by_ids_and_collapses(column_ids, collapses, column_order) }
+    it{ should be_a Integer }
+    it{ should eq dataset.data.scoped.to_table.first.first }
+  end
+  
+  describe ".find_max_time_by_ids_and_collapse" do
+    subject{ Quandl::Cassandra::Models::Column.find_max_time_by_ids_and_collapse(column_ids, collapses.first, column_order) }
+    it{ should be_a Integer }
+    it{ should eq dataset.data.scoped.to_table.first.first }
   end
   
 end

data/spec/lib/quandl/cassandra/models/dataset/columns_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Quandl::Cassandra::Models::Dataset::Columns do
+    
+  subject { create(:dataset, data: Quandl::Fabricate::Data.rand( rows: 10, columns: 4, nils: false, frequency: :quarterly ) ) }
+    
+  its(:column_frequencies){ should eq 4.times.collect{'quarterly'} }
+  its(:column_units){ should eq 4.times.collect{nil} }
+  its(:column_names){ should eq 4.times.collect{nil} }
+    
+  it "should return first column" do
+    subject.data.column(1)[0][1].should eq subject.data.scoped.to_table[0][1]
+  end
+    
+  it "should return second column" do
+    subject.data.column(2)[0][1].should eq subject.data.scoped.to_table[0][2]
+  end
+    
+  it "should return third column" do
+    subject.data.column(2)[0][1].should eq subject.data.scoped.to_table[0][2]
+  end
+   
+end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 QUANDL_LOGGER = true
 
+require 'guard'
+
 require "rspec"
 require 'factory_girl'
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra_models
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -80,6 +80,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: quandl_cassandra
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +131,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -149,7 +178,7 @@ files:
 - spec/lib/quandl/cassandra/models/column_spec.rb
 - spec/lib/quandl/cassandra/models/data_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/collapse_spec.rb
-- spec/lib/quandl/cassandra/models/dataset/column_spec.rb
+- spec/lib/quandl/cassandra/models/dataset/columns_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/persistence_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/row_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/transform_spec.rb
@@ -198,7 +227,7 @@ test_files:
 - spec/lib/quandl/cassandra/models/column_spec.rb
 - spec/lib/quandl/cassandra/models/data_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/collapse_spec.rb
-- spec/lib/quandl/cassandra/models/dataset/column_spec.rb
+- spec/lib/quandl/cassandra/models/dataset/columns_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/persistence_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/row_spec.rb
 - spec/lib/quandl/cassandra/models/dataset/transform_spec.rb

data/spec/lib/quandl/cassandra/models/dataset/column_spec.rb

@@ -1,24 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-describe Quandl::Cassandra::Models::Dataset do
-  
-  context "column" do
-    
-    subject { create(:dataset) }
-    
-    it "should return first column" do
-      subject.data.column(1)[0][1].should eq subject.data.scoped.to_table[0][1]
-    end
-    
-    it "should return second column" do
-      subject.data.column(2)[0][1].should eq subject.data.scoped.to_table[0][2]
-    end
-    
-    it "should return third column" do
-      subject.data.column(2)[0][1].should eq subject.data.scoped.to_table[0][2]
-    end
-    
-  end
-  
-end