quandl_cassandra 0.3.1 → 1.0.0

data/UPGRADE.md

@@ -1,4 +1,10 @@
+## 1.0.0
+
+* extract Quandl::Cassandra::Models to separate gem
+
+
 ## 0.3.1
+
 * refactor dataset columns into Dataset::Columns
 * with_connection logs and raises error
 

data/lib/quandl/cassandra.rb

@@ -19,13 +19,6 @@ require 'quandl/cassandra/base'
 require 'quandl/cassandra/configuration'
 require 'quandl/cassandra/batch'
 
-require 'quandl/cassandra_models/column'
-require 'quandl/cassandra_models/column_attribute'
-require 'quandl/cassandra_models/data'
-require 'quandl/cassandra_models/dataset'
-require 'quandl/cassandra_models/dataset_attribute'
-require 'quandl/cassandra_models/multiset'
-
 module Quandl
 module Cassandra
 end

data/lib/quandl/cassandra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassandra
-  VERSION = '0.3.1'
+  VERSION = '1.0.0'
 end
 end

data/spec/lib/quandl/cassandra/base/scoping_spec.rb

@@ -11,16 +11,16 @@ describe Quandl::Cassandra::Base::Scoping do
   end
   
   its(:scope_names){ should eq TestModel.scope.scope_names }
-  
-  describe ".find_or_build" do
-    it "given nil should be a new record" do
-      Dataset.find_or_build(nil).new_record?.should be_true
-    end
-    it "given empty sting should be a new record" do
-      Dataset.find_or_build('').new_record?.should be_true
-    end
-  end
-  
+  # 
+  # describe ".find_or_build" do
+  #   it "given nil should be a new record" do
+  #     TestModel.find_or_build(nil).new_record?.should be_true
+  #   end
+  #   it "given empty sting should be a new record" do
+  #     TestModel.find_or_build('').new_record?.should be_true
+  #   end
+  # end
+  # 
   describe ".to_cql" do
     
     let(:scope) { TestModel.scope.new }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -260,53 +260,12 @@ files:
 - lib/quandl/cassandra/types/utf8_type.rb
 - lib/quandl/cassandra/types/uuid_type.rb
 - lib/quandl/cassandra/version.rb
-- lib/quandl/cassandra_models/column.rb
-- lib/quandl/cassandra_models/column/read.rb
-- lib/quandl/cassandra_models/column/read/collapse.rb
-- lib/quandl/cassandra_models/column/read/column.rb
-- lib/quandl/cassandra_models/column/read/data.rb
-- lib/quandl/cassandra_models/column/read/offset.rb
-- lib/quandl/cassandra_models/column/read/row.rb
-- lib/quandl/cassandra_models/column/read/select_columns.rb
-- lib/quandl/cassandra_models/column/read/transform.rb
-- lib/quandl/cassandra_models/column/read/type.rb
-- lib/quandl/cassandra_models/column/write.rb
-- lib/quandl/cassandra_models/column/write/group_data_by_column.rb
-- lib/quandl/cassandra_models/column/write/group_data_by_frequency.rb
-- lib/quandl/cassandra_models/column/write/insert_column_attributes.rb
-- lib/quandl/cassandra_models/column/write/insert_columns.rb
-- lib/quandl/cassandra_models/column_attribute.rb
-- lib/quandl/cassandra_models/data.rb
-- lib/quandl/cassandra_models/data/search.rb
-- lib/quandl/cassandra_models/dataset.rb
-- lib/quandl/cassandra_models/dataset/columns.rb
-- lib/quandl/cassandra_models/dataset_attribute.rb
-- lib/quandl/cassandra_models/multiset.rb
 - lib/quandl/strategy.rb
 - quandl_cassandra.gemspec
 - spec/expectations/string.rb
 - spec/expectations/time.rb
-- spec/factories/dataset.rb
 - spec/lib/quandl/cassandra/base/sanitization_spec.rb
 - spec/lib/quandl/cassandra/base/scoping_spec.rb
-- spec/lib/quandl/cassandra_models/column/write/group_data_by_frequency_spec.rb
-- spec/lib/quandl/cassandra_models/column/write_spec.rb
-- spec/lib/quandl/cassandra_models/column_attribute_spec.rb
-- 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/persistence_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/row_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/transform_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/trim_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/update_spec.rb
-- spec/lib/quandl/cassandra_models/dataset_attribute_spec.rb
-- spec/lib/quandl/cassandra_models/dataset_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/collapse_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/columns_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/data_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/transform_spec.rb
 - spec/lib/quandl/cassandra_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
@@ -337,26 +296,7 @@ summary: Quandl cassandra interface.
 test_files:
 - spec/expectations/string.rb
 - spec/expectations/time.rb
-- spec/factories/dataset.rb
 - spec/lib/quandl/cassandra/base/sanitization_spec.rb
 - spec/lib/quandl/cassandra/base/scoping_spec.rb
-- spec/lib/quandl/cassandra_models/column/write/group_data_by_frequency_spec.rb
-- spec/lib/quandl/cassandra_models/column/write_spec.rb
-- spec/lib/quandl/cassandra_models/column_attribute_spec.rb
-- 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/persistence_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/row_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/transform_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/trim_spec.rb
-- spec/lib/quandl/cassandra_models/dataset/update_spec.rb
-- spec/lib/quandl/cassandra_models/dataset_attribute_spec.rb
-- spec/lib/quandl/cassandra_models/dataset_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/collapse_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/columns_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/data_spec.rb
-- spec/lib/quandl/cassandra_models/multiset/transform_spec.rb
 - spec/lib/quandl/cassandra_spec.rb
 - spec/spec_helper.rb

data/lib/quandl/cassandra_models/column.rb

@@ -1,20 +0,0 @@
-class Quandl::Cassandra::Column < Quandl::Cassandra::Base
-
-  table_name :columns
-
-  require_relative 'column/read'
-  require_relative 'column/write'
-  
-  class << self
-    
-    def read(*args)
-      Quandl::Cassandra::Column::Read.perform(*args)[:data]
-    end
-    
-    def write(*args)
-      Quandl::Cassandra::Column::Write.perform(*args)
-    end
-    
-  end
-  
-end

data/lib/quandl/cassandra_models/column/read.rb

@@ -1,32 +0,0 @@
-class Quandl::Cassandra::Column::Read < Quandl::Strategy::Strategize
-
-  require_relative 'read/collapse'
-  require_relative 'read/column'
-  require_relative 'read/data'
-  require_relative 'read/offset'
-  require_relative 'read/select_columns'
-  require_relative 'read/row'
-  require_relative 'read/transform'
-  require_relative 'read/type'
-
-  define_attributes :id
-
-  def self.perform(attributes)
-    strategy = Quandl::Strategy.new( attributes ) do |c|
-      c.use Quandl::Cassandra::Column::Read::Type
-      c.use Quandl::Cassandra::Column::Read::Row
-      c.use Quandl::Cassandra::Column::Read::Column
-      c.use Quandl::Cassandra::Column::Read::Collapse
-      c.use Quandl::Cassandra::Column::Read::Transform
-      c.use Quandl::Cassandra::Column::Read::Offset
-      c.use Quandl::Cassandra::Column::Read::SelectColumns
-      c.use Quandl::Cassandra::Column::Read::Data
-    end
-    strategy.perform
-  end
-  
-  def count?
-    attributes[:count] == true
-  end
-  
-end

data/lib/quandl/cassandra_models/column/read/collapse.rb

@@ -1,65 +0,0 @@
-class Quandl::Cassandra::Column::Read::Collapse < Quandl::Cassandra::Column::Read
-  
-  def perform
-    # assign
-    attributes[:collapse] = collapse
-    attributes[:frequency] = frequency
-    attributes[:column_frequencies] = column_frequencies
-    attributes[:column_collapses] = column_collapses
-  end
-  
-  def collapse
-    # collapse is the collapse
-    coll = attributes[:collapse]
-    # when pristine.frequency and collapse are equal, the source data is being requested
-    coll = :source if attributes[:pristine][:frequency] == attributes[:collapse]
-    # when the collapse is daily, source data is being requested
-    coll = :source if coll == :daily || coll.blank?
-    coll
-  end
-  
-  def frequency
-    # frequency is the given frequency
-    freq = attributes[:frequency]
-    # grab from database
-    freq = Quandl::Cassandra::DatasetAttribute.where(id: id).pluck(:frequency).first if freq.blank? and id.present?
-    # fallback to collapse
-    freq = attributes[:collapse] if freq.blank?
-    # if freq is source, daily is being requested
-    freq = :daily if freq == :source
-    freq = freq.to_sym
-    freq
-  end
-  
-  def column_frequencies
-    # default to passed value
-    freqs = attributes[:column_frequencies]
-    # fallback to collapse value
-    freqs = attributes[:column_ids].collect{ attributes[:frequency] } if freqs.blank?
-    freqs
-  end
-  
-  # INPUT   column_frequencies: [ :daily, :weekly, :monthly ], collapse: :monthly
-  # OUPUT   [ :monthly, :monthly, :source ]
-  
-  # INPUT   column_frequencies: [ :daily, :weekly, :monthly ], collapse: :source
-  # OUPUT   [ :source, :source, :source ]
-
-  # INPUT   column_frequencies: [ :daily, :monthly, :annual ], collapse: :monthly
-  # OUPUT   [ :monthly, :source, :source ]
-  
-  def column_collapses
-    attributes[:column_frequencies].collect do |frequency|
-      # is frequency less than collapse?
-      if Quandl::Operation::Collapse.collapses_greater_than( frequency ).include?( attributes[:collapse] )
-        # this column needs to be collapsed
-        attributes[:collapse]
-      # otherwise frequency is greater than or equal to collapse
-      else
-        # so collapse is not needed
-        :source
-      end
-    end
-  end
-  
-end

data/lib/quandl/cassandra_models/column/read/column.rb

@@ -1,19 +0,0 @@
-class Quandl::Cassandra::Column::Read::Column < Quandl::Cassandra::Column::Read
-  
-  def perform
-    # given an id, this is a dataset
-    attributes[:column_ids] ||= Quandl::Cassandra::Dataset.find(id).try(:column_ids) if id.present?
-    attributes[:column_ids] = [] if attributes[:column_ids].blank?
-    # given a column, this is requesting a specific column
-    attributes[:column_ids] = pluck_column_id if column.present? && attributes[:column_ids].present?
-  end
-  
-  def pluck_column_id
-    [ attributes[:column_ids][ column ] ]
-  end
-  
-  def column
-    attributes[:column].present? ? attributes[:column] - 1 : nil
-  end
-  
-end

data/lib/quandl/cassandra_models/column/read/data.rb

@@ -1,59 +0,0 @@
-class Quandl::Cassandra::Column::Read::Data < Quandl::Cassandra::Column::Read
-  
-  def perform
-    attributes[:data] = quandl_data( attributes[:data] ) unless count?
-  end
-  
-  def quandl_data(data)
-    # init
-    data = Quandl::Cassandra::Data.new( data )
-    data.dataset_id = attributes[:id]
-    data.column_ids = attributes[:column_ids] unless attributes[:column].present?
-    data.column_frequencies = attributes[:column_frequencies] unless attributes[:column].present?
-    # post process
-    data = collapse(data)
-    data = transform(data)
-    data = trim(data)
-    data = sort( data )
-    data = row( data )
-    data = limit(data)
-    data
-  end
-  
-  def trim(data)
-    return data unless attributes[:data_table].present?
-    data = data.sort_order( :asc ) if attributes[:data_table][:trim_start] || attributes[:data_table][:trim_end]
-    data = data.trim_start( attributes[:data_table][:trim_start] ) if attributes[:data_table][:trim_start]
-    data = data.trim_end( attributes[:data_table][:trim_end] ) if attributes[:data_table][:trim_end]
-    data
-  end
-  
-  def sort(data)
-    data = data.sort_order( attributes[:order] )
-  end
-  
-  def collapse(data)
-    data = data.collapse( attributes[:collapse] ) if attributes[:collapse]
-    data
-  end
-  
-  def transform(data)
-    data = data.transform( attributes[:transform] ) if attributes[:transform]
-    data
-  end
-  
-  def limit(data)
-    data = data.limit( attributes[:pristine][:limit] ) if attributes[:pristine][:limit]
-    data
-  end
-  
-  def row(data)
-    # if a row was requested and the data count is greater than a single row
-    if attributes[:row].present? && data.count > 1
-      # grab the last row
-      data.data_array = [data.data_array[-1]]
-    end
-    data
-  end
-  
-end

data/lib/quandl/cassandra_models/column/read/offset.rb

@@ -1,118 +0,0 @@
-class Quandl::Cassandra::Column::Read::Offset < Quandl::Cassandra::Column::Read
-  
-  def perform
-    # apply offset
-    return unless column_ids.present?
-    apply_offset_with_transform
-    apply_offset
-  end
-  
-  def apply_offset_with_transform
-    # rdiff_from needs the data from the current to offset
-    if attributes[:row].present? && attributes[:transform] == :rdiff_from
-      # limit the results by trim 
-      attributes[:trim_start] = trim_start.occurrences_of_frequency_ago( attributes[:row], collapse_with_frequency ).end_of_frequency(collapse_with_frequency).jd if order == :desc
-      attributes[:trim_end] = trim_end.occurrences_of_frequency_ahead( attributes[:row], collapse_with_frequency ).end_of_frequency(collapse_with_frequency).jd if order == :asc
-      # the query should not limit or offset the data
-      attributes[:limit] = nil
-      attributes[:offset] = nil
-    end
-  end
-  
-  def apply_offset
-    return unless attributes[:offset].present?
-    order == :asc ? apply_offset_asc : apply_offset_desc
-  end
-  
-  def apply_offset_asc
-    # calculate ranges
-    offset_start  = trim_end.occurrences_of_frequency_ahead( offset, collapse_with_frequency ).start_of_frequency(collapse_with_frequency)
-    offset_end    = offset_start.occurrences_of_frequency_ahead( accuracy_with_limit, collapse_with_frequency ).end_of_frequency( collapse_with_frequency ) if limit
-    # set trims
-    attributes[:trim_start]  = offset_start.jd
-    attributes[:trim_end]    = offset_end.jd  if limit
-  end
-  
-  def apply_offset_desc
-    # calculate ranges
-    offset_start  = trim_start.occurrences_of_frequency_ago( offset, collapse_with_frequency ).end_of_frequency(collapse_with_frequency)
-    offset_end    = offset_start.occurrences_of_frequency_ago( accuracy_with_limit, collapse_with_frequency ).start_of_frequency( collapse_with_frequency ) if limit
-    # set trims
-    attributes[:trim_start] = offset_end.jd  if limit
-    attributes[:trim_end]   = offset_start.jd
-  end
-  
-  def trim_start
-    return @trim_start if defined?(@trim_start)
-    times = column_ids.collect do |id|
-      Quandl::Cassandra::Column.limit(1).order("type DESC").where( id: id, type: collapse ).pluck(:time) 
-    end
-    max_time = times.flatten.max
-    @trim_start = Date.jd( max_time )
-  end
-  
-  def trim_end
-    return @trim_end if defined?(@trim_end)
-    times = column_ids.collect do |id|
-      Quandl::Cassandra::Column.limit(1).order("type ASC").where( id: id, type: collapse ).pluck(:time)
-    end
-    max_time = times.flatten.max
-    @trim_end = Date.jd( max_time )
-  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
-  end
-  
-  def accuracy
-    # did the query include an accuracy?
-    accuracy = attributes[:accuracy]
-    # otherwise guess at the accuracy by collapse
-    if accuracy.blank?
-      accuracy = case frequency
-      when :daily     then 0
-      when :weekly    then 1
-      when :monthly   then 1
-      when :quarterly then 1
-      when :annual    then 0
-      else
-        3
-      end
-    end
-    accuracy
-  end
-  
-  def column_ids
-    attributes[:column_ids]
-  end
-  
-  def limit
-    @limit ||= attributes[:limit]
-  end
-  
-  def offset
-    attributes[:offset]
-  end
-  
-  def order
-    @order ||= attributes[:order] == :asc ? :asc : :desc
-  end
-  
-  def collapse_with_frequency
-    collapse == :source ? frequency : collapse
-  end
-  
-  def frequency
-    attributes[:frequency]
-  end
-  
-  def collapse
-    attributes[:collapse]
-  end
-  
-end