quandl_cassinatra 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae7b31b51fc6f62d2c609056fbff56c11a85097
-  data.tar.gz: fdf372ce2162393f3004283773b8b71bdac6ef18
+  metadata.gz: 45a95dc8da2c6c36d90fab270ae451dad6664cbb
+  data.tar.gz: 4aa4b14387f7a9cefa3497e0ebb7e3d4fc072e0d
 SHA512:
-  metadata.gz: e84b06ef67562343c3612f615e51ce9c7386c53026efba232e9e365db6e703148f767bc149ffa74afa3f3be48786afd29f86de5fe9293a734734cef5d420e4af
-  data.tar.gz: 35bec6ab3b0b0dabeb9a61af543e58129e2e50171e17c77a453eedc71228ed1561d78c8cfd9a9aa28a9a7cd6a371e0e9c07146035f8b77ae551415b32c95f866
+  metadata.gz: 033f0adbf5d98363b3841dc6b0c9aa820fa87c8fdf405d8bcf5375b101688025c8159a6c2f368b826c8f07bd4ac27328fba3621d18a441bf3d7c5e318fe7f6d3
+  data.tar.gz: 65ec2ad1d5fa2c5ef4cf0bfb5ce49a0aab7341e52b288e45d250b6ae166a00e78a12d9abead16936f506f77b8ca98cf8edc0b00b8aa811b716a90c657183143f

data/lib/quandl/cassinatra/concerns/properties.rb

@@ -22,6 +22,10 @@ module Properties
       true
     end
     
+    def save!
+      save
+    end
+    
     def error_messages
       valid?
       errors_client.deep_merge(errors_server).deep_merge(errors_params)

data/lib/quandl/cassinatra/concerns/search.rb

@@ -8,7 +8,7 @@ module Search
   included do
 
     include ScopeComposer::Model
-  
+
     scope_composer_for :search
 
     search_helper :all, ->{ connection.where(attributes).fetch }

data/lib/quandl/cassinatra/core_ext/string.rb

@@ -0,0 +1,8 @@
+class String
+  
+  def numeric?
+    return true if self =~ /^\d+$/
+    true if Float(self) rescue false
+  end
+  
+end

data/lib/quandl/cassinatra/core_ext.rb

@@ -0,0 +1 @@
+require "quandl/cassinatra/core_ext/string"

data/lib/quandl/cassinatra/model/dataset/searchable.rb

@@ -40,11 +40,11 @@ module Searchable
       delegate *Data::Table.forwardable_methods, to: :data_table
     end
     
-    search_scope :row,          ->(v){ where( row: v.to_i ) }
-    search_scope :limit,        ->(v){ where( limit: v.to_i ) }
-    search_scope :offset,       ->(v){ where( offset: v.to_i ) }
-    search_scope :accuracy,     ->(v){ where( accuracy: v.to_i ) }
-    search_scope :column,       ->(index)   { where( column: index.to_i ) }
+    search_scope :row,          ->(v)       { where( row: v.to_i ) }
+    search_scope :limit,        ->(v)       { where( limit: v.to_i ) }
+    search_scope :offset,       ->(v)       { where( offset: v.to_i ) }
+    search_scope :accuracy,     ->(v)       { where( accuracy: v.to_i ) }
+    search_scope :column,       ->(v)       { where( column: v.to_i ) }
     search_scope :order,        ->(dir)     { where( order: (dir.to_sym == :asc) ? 'asc' : 'desc' ) }
     search_scope :trim_start,   ->(date)    { where( trim_start:  format_trim_date(date, :start)) }
     search_scope :trim_end,     ->(date)    { where( trim_end:    format_trim_date(date, :end)) }
@@ -60,6 +60,7 @@ module Searchable
     }
     
     search_helper :format_trim_date, ->( date, start_or_end ){ 
+      date = Date.jd(date.to_i) if date.kind_of?(String) && date.numeric?
       date = Date.jd(date) if date.is_a?(Integer)
       date = Date.parse(date) if date.is_a?(String)
       date = date.send("#{start_or_end}_of_frequency", collapse) if collapse.present?

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

@@ -14,7 +14,7 @@ class Dataset
   delegate :columns_count, :created_at, :frequency, :rows_count, :type, :updated_at, to: :dataset_attribute
 
   def data_table
-    Data::Table.new( self.data || [] )
+    @data_table ||= Data::Table.new( self.data || [] )
   end
   def data_table=(value)
     self.data = Data::Table.new(value).to_csv

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

@@ -7,8 +7,20 @@ class Multiset
   include Model::Dataset::Searchable
   include Concerns::Properties
   
+  
+  search_helper :to_dataset, -> { dataset }
   search_helper :dataset, -> { find('multiset') }
-  search_scope :columns
+  search_scope :columns, -> (v) { where( columns: format_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
 

data/lib/quandl/cassinatra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassinatra
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end
 end

data/lib/quandl/cassinatra.rb

@@ -12,6 +12,8 @@ require 'quandl/her/patch'
 require 'scope_composer'
 require "quandl/data"
 
+require "quandl/cassinatra/core_ext"
+
 require 'quandl/cassinatra/concerns'
 require 'quandl/cassinatra/her'
 require 'quandl/cassinatra/model'

data/quandl_cassinatra.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 2.13"
+  s.add_development_dependency "factory_girl", "~> 4.2.0"
   s.add_development_dependency "fivemat", "~> 1.2"
   s.add_development_dependency "pry"
 
@@ -27,6 +28,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "yajl-ruby", "~> 1.1.0"
   s.add_runtime_dependency 'json', '~> 1.7.7'
   
-  s.add_runtime_dependency "quandl_data", ">= 0.1.7"
+  s.add_runtime_dependency "quandl_data", ">= 0.1.8"
   s.add_runtime_dependency "scope_composer", ">= 0.1.0"
 end

data/spec/factories/dataset.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+
+  factory :dataset do
+    sequence(:id) { |n| (Time.now.to_f * 1000).to_i + n }
+    data_table{ Quandl::Data::Random.table( rows: 730, columns: 3, nils: false ) }
+  end
+
+end

data/spec/quandl/cassinatra/dataset_spec.rb

@@ -1,11 +1,58 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Quandl::Cassinatra::Dataset do
-  subject { Quandl::Cassinatra::Dataset.new }
+describe Dataset do
+  subject { Dataset.new }
   
   it { should respond_to :columns_count }
   it { should respond_to :data }
   it { should respond_to :data_table }
   
+  context "create" do
+    
+    subject{ build(:dataset) }
+    
+    it "should have data" do
+      subject.data_table.count.should eq 730
+    end
+    
+    it "should have four columns" do
+      subject.data_table[0].count.should eq 4
+    end
+    
+    it "should create the dataset" do
+      subject.save
+      Dataset.find(subject.id).data.count.should eq 730
+    end
+    
+  end
+  
+  context "searchable" do
+    
+    describe "trim_start" do
+  
+      it "should accept date" do
+        date = Date.today
+        Dataset.trim_start(date).attributes[:trim_start].should eq Date.today.jd
+      end
+  
+      it "should accept string date" do
+        date = Date.today.to_s
+        Dataset.trim_start(date).attributes[:trim_start].should eq Date.today.jd
+      end
+  
+      it "should accept string julian date" do
+        date = Date.today.jd.to_s
+        Dataset.trim_start(date).attributes[:trim_start].should eq Date.today.jd
+      end
+      
+      it "should accept integer" do
+        date = Date.today.jd
+        Dataset.trim_start(date).attributes[:trim_start].should eq Date.today.jd
+      end
+
+    end
+    
+  end
+  
 end

data/spec/quandl/cassinatra/multiset_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Multiset do
+  let(:d1){ create(:dataset, data_table: Quandl::Data::Random.table( rows: 10, columns: 4, nils: false ) ) }
+  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.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]
+  end
+  
+  it "should be in the right order" do
+    m = Multiset.columns("#{d2.id.to_i}.1,#{d1.id.to_i}.1,#{d2.id.to_i}.3,#{d1.id.to_i}.2").to_dataset
+    c1 = Dataset.find(d1.id).column_ids
+    c2 = Dataset.find(d2.id).column_ids
+    requested_order = [ c2[0], c1[0], c2[2], c1[1] ]
+    m.column_ids.should eq requested_order
+  end
+  
+  it "should retrieve the requested columns" do
+    m = Multiset.columns("#{d2.id.to_i}.1,#{d1.id.to_i}.1,#{d2.id.to_i}.3,#{d1.id.to_i}.2").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.data_table[0][3].should eq d2.data_table[0][3]
+    m.data_table[0][4].should eq d1.data_table[0][2]
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,4 +1,19 @@
 $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require "rspec"
-require "quandl/cassinatra"
+require 'pry'
+require 'factory_girl'
+
+factory_dir = File.join( File.dirname(__FILE__), 'factories/**/*.rb' )
+Dir.glob( factory_dir ).each{|f| require(f); puts f }
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end
+
+
+# LOAD GEM
+
+require "quandl/cassinatra"
+Quandl::Cassinatra.use 'http://192.168.33.10:8983/wikiposit_cassandra/'
+include Quandl::Cassinatra

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: factory_girl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: scope_composer
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +184,8 @@ files:
 - lib/quandl/cassinatra/concerns.rb
 - lib/quandl/cassinatra/concerns/properties.rb
 - lib/quandl/cassinatra/concerns/search.rb
+- lib/quandl/cassinatra/core_ext.rb
+- lib/quandl/cassinatra/core_ext/string.rb
 - lib/quandl/cassinatra/her.rb
 - lib/quandl/cassinatra/model.rb
 - lib/quandl/cassinatra/model/dataset.rb
@@ -179,7 +195,9 @@ files:
 - lib/quandl/cassinatra/version.rb
 - lib/quandl/her/patch.rb
 - quandl_cassinatra.gemspec
+- spec/factories/dataset.rb
 - spec/quandl/cassinatra/dataset_spec.rb
+- spec/quandl/cassinatra/multiset_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
 licenses:
@@ -206,5 +224,7 @@ signing_key:
 specification_version: 4
 summary: Cassinatra rest orm.
 test_files:
+- spec/factories/dataset.rb
 - spec/quandl/cassinatra/dataset_spec.rb
+- spec/quandl/cassinatra/multiset_spec.rb
 - spec/spec_helper.rb