quandl_cassinatra 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45ca43fd651a20aa4d3080d9c1014e6ed72aa856
-  data.tar.gz: 73f0f991491d825d937f72dc00bcc85bed694a8f
+  metadata.gz: 321171d3425874e1162260fa7d05c1e596f3ee4a
+  data.tar.gz: 46359ab27a5299eaa1cf10bbb1c56a45b76f031b
 SHA512:
-  metadata.gz: 01debd1e9b40f1d9663880e720ecd9d3f10377314fc46328eaf96064b039a7cc5b6a6a172b6201d5c059fd3ea6c04065497b293aa8fba5517d6b59dbe04a56c8
-  data.tar.gz: d31b1ab614e56d96871d88f3ee96e364537cf55632ef1be67c5fa5e25fc580c7e19ef1e69e6050a985c048785eb39c0b6d5197d7b9d188dc5d0e5ca7e511dd70
+  metadata.gz: f8b2d1bcf69667cb2ac29cead3f0e15b52156518c7dfd22f60ec96a8354ec43a7c3f3f3065f4e14d0772d65638154e8e3b6b00a9868b099587a3be02d3a35c01
+  data.tar.gz: 67d46970e491418b852204319090e30308f8110b4c947737183b868f19bab286f307763f2945e584f6d325c4beee758588584e8fb197871c0c48a2d2bcdd4242

data/lib/quandl/cassinatra/model/multiset.rb

@@ -11,18 +11,8 @@ class Multiset
   search_helper :to_dataset, -> { dataset }
   search_helper :dataset, -> { find('multiset') }
   
-  search_scope :columns, ->(v){ where( columns: format_columns(v) ) }
+  search_scope :columns, ->(v){ where( columns: v ) }
   
-  search_helper :format_columns, ->(cols){
-    cols.split(',').collect do |column|
-      id_position = column.split('.')
-      id = id_position.first.to_i
-      position = id_position.last.to_i
-      position = position - 1 if position > 0
-      "#{id}.#{position}"
-    end.join(',')
-  }
-
   attributes :id, :column_ids, :data
 
   delegate :columns_count, :created_at, :frequency, :rows_count, :type, :updated_at, to: :dataset_attribute

data/lib/quandl/cassinatra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassinatra
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end
 end

data/spec/quandl/cassinatra/multiset_spec.rb

@@ -6,15 +6,15 @@ describe Multiset do
   let(:d2){ create(:dataset, data_table: Quandl::Data::Random.table( rows: 10, columns: 4, nils: false ) ) }
   
   it "should retrieve the requested columns" do
-    m = Multiset.columns("#{d1.id.to_i}.0,#{d2.id.to_i}.0").to_dataset
+    m = Multiset.columns("#{d1.id.to_i}.1,#{d2.id.to_i}.1").to_dataset
     m.data_table[0][1].should eq d1.data_table[0][1]
     m.data_table[0][2].should eq d2.data_table[0][1]
   end
   
   it "should retrieve the requested columns" do
-    m = Multiset.columns("#{d2.id.to_i}.1,#{d1.id.to_i}.1").to_dataset
-    m.data_table[0][1].should eq d2.data_table[0][1]
-    m.data_table[0][2].should eq d1.data_table[0][1]
+    m = Multiset.columns("#{d2.id.to_i}.2,#{d1.id.to_i}.2").to_dataset
+    m.data_table[0][1].should eq d2.data_table[0][2]
+    m.data_table[0][2].should eq d1.data_table[0][2]
   end
   
   it "should be in the right order" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Blake Hilscher