quandl_cassandra 0.3.0 → 0.3.1

data/UPGRADE.md

@@ -1,3 +1,7 @@
+## 0.3.1
+* refactor dataset columns into Dataset::Columns
+* with_connection logs and raises error
+
 ## 0.3.0
 
 * Base::Connection methods use #with_connection

data/lib/quandl/cassandra/base/connection.rb

@@ -35,15 +35,15 @@ module Quandl::Cassandra::Base::Connection
       begin
         yield(connection)
         
-      rescue Cql::Io::ConnectionError => e
-        Quandl::Logger.error(e)
+      rescue Cql::Io::ConnectionError => err
+        Quandl::Logger.error(err)
         reset_connection
-        raise Cql::Io::ConnectionError
+        raise
         
-      rescue Cql::NotConnectedError => e
-        Quandl::Logger.error(e)
+      rescue Cql::NotConnectedError => err
+        Quandl::Logger.error(err)
         reset_connection
-        raise Cql::NotConnectedError
+        raise
         
       end
     end

data/lib/quandl/cassandra/version.rb

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

data/lib/quandl/cassandra_models/dataset/columns.rb

@@ -0,0 +1,61 @@
+module Quandl::Cassandra::Dataset::Columns
+  
+  extend ActiveSupport::Concern
+  
+  included do
+    # define_attributes :column_ids
+    before_save :save_columns
+
+  end
+  
+  module ClassMethods
+
+    def find_column_ids_by_id(id)
+      Quandl::Cassandra::Dataset.where( id: id ).pluck(:column_id, :position).sort_by{|r| r[1] }.collect{|r| r[0] }
+    end
+    
+  end
+  
+  def column_attributes=(column_attrs)
+    column_attrs.each_with_index do |attrs, index|
+      self.columns[index] ||=  Quandl::Cassandra::Column.new
+      self.columns[index].assign_attributes(attrs)
+    end
+  end
+
+  def column_units
+    @column_units ||= columns.collect(&:unit)
+  end
+
+  def column_names
+    @column_names ||= columns.collect(&:name)
+  end
+
+  def columns
+    return @columns if @columns
+    # find columns
+    columns = Quandl::Cassandra::ColumnAttribute.where( id: column_ids ).all
+    # build column where column_id was not found
+    @columns = column_ids.collect{|cid| columns.detect{|c| c.id.to_s == cid.to_s } || Quandl::Cassandra::ColumnAttribute.new( id: cid ) }
+  end
+
+  def column_ids
+    @column_ids ||= id.blank? ? [] : self.class.find_column_ids_by_id(id)
+  end
+
+
+  protected
+  
+  def clear_attributes!
+    @columns = nil
+    @column_ids = nil
+  end
+  
+  
+  private
+  
+  def save_columns
+    columns.each(&:save)
+  end
+  
+end

data/lib/quandl/cassandra_models/dataset.rb

@@ -1,33 +1,18 @@
 class Quandl::Cassandra::Dataset < Quandl::Cassandra::Base
-
+  
+  require_relative 'dataset/columns'
+  
+  include Quandl::Cassandra::Dataset::Columns
+  
   table_name :datasets
   autosave_changes false
   
-  define_attributes :id, :data, :column_ids
+  define_attributes :id, :data
   
-  before_save :save_columns, :save_data, :save_dataset_attribute
+  before_save :save_data, :save_dataset_attribute
   after_save :clear_attributes!
   
   delegate :type, :updated_at, :created_at, :frequency, to: :dataset_attribute, allow_nil: true
-
-  def self.find_column_ids_by_id(id)
-    Quandl::Cassandra::Dataset.where( id: id ).pluck(:column_id, :position).sort_by{|r| r[1] }.collect{|r| r[0] }
-  end
-
-  def column_attributes=(column_attrs)
-    column_attrs.each_with_index do |attrs, index|
-      self.columns[index] ||=  Quandl::Cassandra::Column.new
-      self.columns[index].assign_attributes(attrs)
-    end
-  end
-  
-  def columns
-    @columns ||= column_ids.collect{|cid| Quandl::Cassandra::ColumnAttribute.find(cid) }
-  end
-  
-  def column_ids
-    @column_ids ||= id.blank? ? [] : self.class.find_column_ids_by_id(id)
-  end
   
   def trim_start
     @trim_start ||= Date.jd( data.scoped.limit(1).order(:asc)[0][0] )
@@ -73,19 +58,14 @@ class Quandl::Cassandra::Dataset < Quandl::Cassandra::Base
     dataset_attribute.save
   end
   
-  def save_columns
-    columns.each(&:save)
-  end
-  
   def save_data
     Quandl::Cassandra::Column.write( id: id, data: data ) if data_changed?
   end
   
   def clear_attributes!
+    super if defined?(super)
     @trim_start = nil
     @trim_end = nil
-    @columns = nil
-    @column_ids = nil
     @attributes = { id: id }
   end
   

data/spec/lib/quandl/cassandra_models/dataset_spec.rb

@@ -56,7 +56,12 @@ describe Quandl::Cassandra::Dataset do
         subject{ Quandl::Cassandra::Dataset.find(id) }
         its(:data){ should eq dataset.data.to_table }
         its(:frequency){ should eq 'daily' }
-
+        
+        describe "#columns" do
+          subject{ Quandl::Cassandra::Dataset.find(id).columns }
+          its(:first){ should be_a Quandl::Cassandra::ColumnAttribute }
+        end
+        
         it "data should count and return data" do
           subject.data.count.should eq 10
           subject.data.to_table.should be_a Quandl::Cassandra::Data

data/spec/lib/quandl/cassandra_models/multiset/collapse_spec.rb

@@ -74,7 +74,7 @@ describe Multiset do
       }
       
       it "should return the data" do
-        data_hash = subject.data.to_table.to_h
+        data_hash = subject.data.scoped.collapse(:annual).to_table.to_h
         # check daily
         daily_row = Dataset.find(dataset_daily.id).data.column(1).collapse(:annual)
         daily_date = daily_row[0][0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -279,6 +279,7 @@ files:
 - 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