quandl_cassinatra 0.1.9 → 0.1.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 45ca43fd651a20aa4d3080d9c1014e6ed72aa856
+  data.tar.gz: 73f0f991491d825d937f72dc00bcc85bed694a8f
+SHA512:
+  metadata.gz: 01debd1e9b40f1d9663880e720ecd9d3f10377314fc46328eaf96064b039a7cc5b6a6a172b6201d5c059fd3ea6c04065497b293aa8fba5517d6b59dbe04a56c8
+  data.tar.gz: d31b1ab614e56d96871d88f3ee96e364537cf55632ef1be67c5fa5e25fc580c7e19ef1e69e6050a985c048785eb39c0b6d5197d7b9d188dc5d0e5ca7e511dd70

data/lib/quandl/cassinatra/her.rb

@@ -11,7 +11,7 @@ module Cassinatra
       api = Her::API.new
       api.setup url: rest_url do |c|
         c.use Faraday::Request::UrlEncoded
-        c.use Her::Middleware::DefaultParseJSON
+        c.use Quandl::Cassinatra::Middleware::ParseJSON
         c.use Faraday::Adapter::NetHttp
       end
     end

data/lib/quandl/cassinatra/middleware/parse_json.rb

@@ -0,0 +1,51 @@
+module Quandl
+module Cassinatra
+module Middleware
+
+class ParseJSON < Faraday::Response::Middleware
+
+  def on_complete(env)
+    env[:body] = case env[:status]
+    when 204
+      parse('{}', env)
+    else
+      parse(env[:body], env)
+    end
+  end
+
+  def parse(body, env)
+    json = parse_json(body)
+    errors = json.delete(:errors) || {}
+    metadata = json.delete(:metadata) || {}
+    # collect some response data
+    metadata.merge!({
+      status:                 env[:status],
+      headers:                env[:response_headers],
+      })
+    # return object
+    object = {
+      :data => json,
+      :errors => errors,
+      :metadata => metadata
+    }
+    env[:status] = 200
+    object
+  end
+
+  def parse_json(body = nil)
+    body ||= '{}'
+    message = "Response from the API must behave like a Hash or an Array (last JSON response was #{body.inspect})"
+
+    json = begin
+      Yajl.load(body, :symbolize_keys => true)
+    rescue Yajl::ParseError
+      { id: 1, errors: { parse_error: message } }
+    end
+    json
+  end
+
+end
+
+end
+end
+end

data/lib/quandl/cassinatra/middleware.rb

@@ -0,0 +1,10 @@
+require 'faraday'
+require 'quandl/cassinatra/middleware/parse_json'
+
+module Quandl
+module Cassinatra
+module Middleware
+
+end
+end
+end

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

@@ -60,11 +60,17 @@ 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 = date.send("#{start_or_end}_of_frequency", collapse) if collapse.present?
-      date.jd
+      date = Date.parse(date) if date.is_a?(String) && date =~ /^[0-9]{4}\-[0-9]{2}\-[0-9]{2}$/
+      # format
+      if date.is_a?(Date)
+        date = date.send("#{start_or_end}_of_frequency", collapse) if collapse.present?
+        date.jd
+      else
+        nil
+      end
     }
     
     search_helper :find, ->(id){

data/lib/quandl/cassinatra/version.rb

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

data/lib/quandl/cassinatra.rb

@@ -13,6 +13,7 @@ require 'scope_composer'
 require "quandl/data"
 
 require "quandl/cassinatra/core_ext"
+require 'quandl/cassinatra/middleware'
 
 require 'quandl/cassinatra/concerns'
 require 'quandl/cassinatra/her'

data/spec/quandl/cassinatra/dataset_spec.rb

@@ -50,6 +50,14 @@ describe Dataset 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
     

data/spec/quandl/cassinatra/multiset_spec.rb

@@ -19,10 +19,12 @@ describe Multiset do
   
   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
+    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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.1.9
-  prerelease: 
+  version: 0.1.10
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fivemat
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,39 +69,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: her
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,33 +139,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: quandl_data
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: scope_composer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 description: An orm for the cassinatra rest interface.
@@ -210,6 +187,8 @@ files:
 - lib/quandl/cassinatra/core_ext.rb
 - lib/quandl/cassinatra/core_ext/string.rb
 - lib/quandl/cassinatra/her.rb
+- lib/quandl/cassinatra/middleware.rb
+- lib/quandl/cassinatra/middleware/parse_json.rb
 - lib/quandl/cassinatra/model.rb
 - lib/quandl/cassinatra/model/dataset.rb
 - lib/quandl/cassinatra/model/dataset/searchable.rb
@@ -225,27 +204,26 @@ files:
 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: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Cassinatra rest orm.
 test_files:
 - spec/factories/dataset.rb