quandl_cassinatra 0.1.11 → 0.1.13

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

@@ -9,14 +9,6 @@ module Searchable
 
   module ClassMethods
     
-    def valid_transformation?(type)
-      Quandl::Operation::Transform.valid_transformation?(type)
-    end
-    
-    def valid_transformations
-      Quandl::Operation::Transform.valid_transformations
-    end
-    
     def search_scopes
       @search_scopes ||+ search_scope.scopes.keys
     end
@@ -49,11 +41,11 @@ module Searchable
     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)) }
     search_scope :with_id,      ->(value)   { where( id: value.to_i )}
-    search_scope :transform,    ->(value)   { where( transform: value.to_sym ) if self.class.parent.valid_transformation?(value.to_sym) }
+    search_scope :transform,    ->(value)   { where( transform: value.to_sym ) if Quandl::Operation::Transform.valid_transformation?( value.try(:to_sym) ) }
     
-    search_scope :collapse, ->(name){
+    search_scope :collapse, ->(value){
       # set collapse
-      where( collapse: name )
+      where( collapse: value ) if Quandl::Operation::Collapse.valid_collapse?( value.try(:to_sym) )
       # reset trims to force them to edge of frequency
       trim_start(trim_start) if trim_start
       trim_end(trim_end) if trim_end
@@ -61,9 +53,7 @@ module Searchable
     
     search_helper :format_trim_date, ->( date, start_or_end ){ 
       # parse
-      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 =~ /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/
+      date = parse_date(date)
       # format
       if date.is_a?(Date)
         date = date.send("#{start_or_end}_of_frequency", collapse) if collapse.present?
@@ -73,6 +63,17 @@ module Searchable
       end
     }
     
+    search_helper :parse_date, ->( date ){ 
+      begin
+        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 =~ /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/
+        date
+      rescue
+        nil
+      end
+    }
+    
     search_helper :find, ->(id){
       begin
         t1 = Time.now

data/lib/quandl/cassinatra/version.rb

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

data/quandl_cassinatra.gemspec

@@ -24,10 +24,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pry"
 
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
-  s.add_runtime_dependency "her", "~> 0.6.7"
+  s.add_runtime_dependency "her", "0.6.7"
   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.8"
-  s.add_runtime_dependency "scope_composer", ">= 0.1.0"
+  s.add_runtime_dependency "scope_composer", "~> 0.1"
+  s.add_runtime_dependency "quandl_logger", "~> 0.1"
+  s.add_runtime_dependency "quandl_operation", "~> 0.1"
+  s.add_runtime_dependency "quandl_data", "~> 0.1"
+  
 end

data/spec/quandl/cassinatra/dataset/persistence_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+require 'spec_helper'
+
+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
+  
+end

data/spec/quandl/cassinatra/dataset/searchable_spec.rb

@@ -0,0 +1,93 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dataset do
+  context "searchable" do
+  
+    describe "collapse" do
+    
+      context "given an invalid collapse" do
+        it "should ignore number" do  
+          Dataset.collapse(123).attributes[:collapse].should be_nil
+        end
+      
+        it "should ignore string" do  
+          Dataset.collapse("invalid").attributes[:collapse].should be_nil
+        end
+      
+        it "should ignore symbol" do  
+          Dataset.collapse(:invalid).attributes[:collapse].should be_nil
+        end
+      
+      end
+    
+      context "given valid collapse" do
+        it "should set daily" do
+          Dataset.collapse(:daily).attributes[:collapse].should eq :daily
+        end
+        it "should set weekly" do
+          Dataset.collapse(:weekly).attributes[:collapse].should eq :weekly
+        end
+        it "should set monthly" do
+          Dataset.collapse(:monthly).attributes[:collapse].should eq :monthly
+        end
+        it "should set quarterly" do
+          Dataset.collapse(:quarterly).attributes[:collapse].should eq :quarterly
+        end
+        it "should set annual" do
+          Dataset.collapse(:annual).attributes[:collapse].should eq :annual
+        end
+      end
+    
+    end
+  
+    describe "trim_start" do
+      
+      context "given an invalid date" do
+        
+        it "should reject string" do
+          Dataset.trim_start('0000-00-00').attributes[:trim_start].should eq nil
+        end
+      
+        it "should reject invalid date" do
+          Dataset.trim_start("").attributes[:trim_start].should eq nil
+        end
+    
+        it "should reject invalid date" do
+          Dataset.trim_start("asdf").attributes[:trim_start].should eq nil
+        end
+      
+        it "should ignore invalid collapse" do
+          Dataset.collapse('yearly').trim_start(Date.today.to_s).attributes[:trim_start].should eq Date.today.jd
+        end
+    
+      end
+      
+      context "given valid date" 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
+end

data/spec/quandl/cassinatra/multiset_spec.rb

@@ -5,34 +5,39 @@ 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}.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
+  context "given ascending columns" do
+    
+    it "should return the expected column_ids" do
+      [d1, d2]
+      sleep 0.2
+      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.column_ids.should eq [
+        Dataset.find(d2.id).column_ids[0],
+        Dataset.find(d1.id).column_ids[0],
+        Dataset.find(d2.id).column_ids[2],
+        Dataset.find(d1.id).column_ids[1],
+      ]
+    end
   
-  it "should retrieve the requested columns" do
-    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 return the expected columns" do
+      [d1, d2]
+      sleep 1
+      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
   
-  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
-    m.column_ids.should eq [
-      Dataset.find(d2.id).column_ids[0],
-      Dataset.find(d1.id).column_ids[0],
-      Dataset.find(d2.id).column_ids[2],
-      Dataset.find(d1.id).column_ids[1],
-    ]
   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]
+  context "given descending columns" do
+  
+    it "should return the expected columns" do
+      m = Multiset.columns("#{d1.id.to_i}.2,#{d1.id.to_i}.1").to_dataset
+      m.data_table[0][1].should_not eq m.data_table[0][2]
+    end
+    
   end
-
+  
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
+  prerelease: 
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -97,20 +110,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: her
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,38 +150,75 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
-  name: quandl_data
+  name: scope_composer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: scope_composer
+  name: quandl_logger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: quandl_operation
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: quandl_data
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 description: An orm for the cassinatra rest interface.
 email:
 - blake@hilscher.ca
@@ -198,35 +253,38 @@ files:
 - lib/quandl/her/patch.rb
 - quandl_cassinatra.gemspec
 - spec/factories/dataset.rb
-- spec/quandl/cassinatra/dataset_spec.rb
+- spec/quandl/cassinatra/dataset/persistence_spec.rb
+- spec/quandl/cassinatra/dataset/searchable_spec.rb
 - spec/quandl/cassinatra/multiset_spec.rb
 - spec/spec_helper.rb
 homepage: http://blake.hilscher.ca/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cassinatra rest orm.
 test_files:
 - spec/factories/dataset.rb
-- spec/quandl/cassinatra/dataset_spec.rb
+- spec/quandl/cassinatra/dataset/persistence_spec.rb
+- spec/quandl/cassinatra/dataset/searchable_spec.rb
 - spec/quandl/cassinatra/multiset_spec.rb
 - spec/spec_helper.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 321171d3425874e1162260fa7d05c1e596f3ee4a
-  data.tar.gz: 46359ab27a5299eaa1cf10bbb1c56a45b76f031b
-SHA512:
-  metadata.gz: f8b2d1bcf69667cb2ac29cead3f0e15b52156518c7dfd22f60ec96a8354ec43a7c3f3f3065f4e14d0772d65638154e8e3b6b00a9868b099587a3be02d3a35c01
-  data.tar.gz: 67d46970e491418b852204319090e30308f8110b4c947737183b868f19bab286f307763f2945e584f6d325c4beee758588584e8fb197871c0c48a2d2bcdd4242

data/spec/quandl/cassinatra/dataset_spec.rb

@@ -1,66 +0,0 @@
-# encoding: utf-8
-require 'spec_helper'
-
-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
-      
-      it "should reject invalid date" do
-        Dataset.trim_start("").attributes[:trim_start].should eq nil
-      end
-      
-      it "should reject invalid date" do
-        Dataset.trim_start("asdf").attributes[:trim_start].should eq nil
-      end
-
-    end
-    
-  end
-  
-end