quandl_cassinatra 0.2.2 → 0.2.3

data/README.md

@@ -11,7 +11,7 @@ include Quandl::Cassinatra
 ```
 
 
-### Quandl::Cassinatra::Model::Dataset
+### Quandl::Cassinatra::Dataset
 
 #### Find / Scope
 
@@ -19,8 +19,8 @@ include Quandl::Cassinatra
 
 require 'quandl/cassinatra'
 
-d = Quandl::Cassinatra::Model::Dataset.limit(10).transform(:rdiff).collapse(:weekly).find(293)
-d.data_table
+d = Quandl::Cassinatra::Dataset.limit(10).transform(:rdiff).collapse(:weekly).find(293)
+d.data
 => [...]
 
 d.column_ids
@@ -41,25 +41,25 @@ d.updated_at
 
 require 'quandl/cassinatra'
 
-d = Quandl::Cassinatra::Model::Dataset.new
+d = Quandl::Cassinatra::Dataset.new
 d.id = 5893853
 d.data = Quandl::Fabricate::Data::Table.rand(rows: 10, columns: 4, nils: false).to_csv
 d.save
 
-d = Quandl::Cassinatra::Model::Dataset.find(5893853)
-d.data_table
+d = Quandl::Cassinatra::Dataset.find(5893853)
+d.data
 => [...]
 
 ```
 
 
-### Quandl::Cassinatra::Model::Multiset
+### Quandl::Cassinatra::Multiset
 
 ```ruby
 
 require 'quandl/cassinatra'
 
-m = Quandl::Cassinatra::Model::Multiset.with_columns('5893853.1,293.2').limit(10).collapse(:monthly)
+m = Quandl::Cassinatra::Multiset.with_columns('5893853.1,293.2').limit(10).collapse(:monthly)
 m.data
 => [...]
 

data/UPGRADE.md

@@ -1,3 +1,13 @@
+## 0.2.3
+
+* multiset#reload
+* revise multiset
+* split dataset into attributes.
+* fetch data once
+* Cassinatra::Dataset#data
+* feature/refactor_dataset
+
+
 ## 0.2.2
 
 * delete uses destroy_existing

data/lib/quandl/cassinatra.rb

@@ -1,26 +1,20 @@
 require "quandl/cassinatra/version"
 
-require 'quandl/logger'
-
-require "active_support"
-require "active_support/inflector"
-require "active_support/core_ext/hash"
-require "active_support/core_ext/object"
-
-require 'her'
-require 'quandl/her/patch'
 require 'scope_composer'
+require 'her'
+require 'quandl/her/remove_method_data'
+require 'quandl/logger'
 require "quandl/data"
 
-require "quandl/cassinatra/core_ext"
 require 'quandl/cassinatra/middleware'
-
-require 'quandl/cassinatra/concerns'
-require 'quandl/cassinatra/her'
-require 'quandl/cassinatra/model'
+require 'quandl/cassinatra/base'
+require 'quandl/cassinatra/models/dataset'
+require 'quandl/cassinatra/models/multiset'
 
 module Quandl
   module Cassinatra
-    include Quandl::Cassinatra::Model
+    def self.use(url)
+      Quandl::Cassinatra::Base.use(url)
+    end
   end
 end

data/lib/quandl/cassinatra/base.rb

@@ -0,0 +1,58 @@
+require "active_support"
+require "active_support/inflector"
+require "active_support/core_ext/hash"
+require "active_support/core_ext/object"
+
+require 'quandl/cassinatra/base/model'
+require 'quandl/cassinatra/base/attributes'
+require 'quandl/cassinatra/base/validation'
+require 'quandl/cassinatra/base/search'
+
+class Quandl::Cassinatra::Base
+  
+  class << self
+    
+    attr_accessor :url
+  
+    def use(url)
+      self.url = url
+      models_use_her_api!
+    end
+  
+    def her_api
+      Her::API.new.setup url: url do |c|
+        c.use Faraday::Request::UrlEncoded
+        c.use Quandl::Cassinatra::Middleware::ParseJSON
+        c.use Faraday::Adapter::NetHttp
+      end
+    end
+
+    def url
+      @url ||= 'http://localhost:9292/'
+    end
+    
+    def inherited(subclass)
+      # remember models that inherit from base
+      models << subclass unless models.include?(subclass)
+      # include model behaviour
+      subclass.class_eval do
+        include Quandl::Cassinatra::Base::Model
+        include Quandl::Cassinatra::Base::Attributes
+        include Quandl::Cassinatra::Base::Validation
+        include Quandl::Cassinatra::Base::Search
+      end
+    end
+    
+    def models
+      @@models ||= []
+    end
+    
+    protected
+    
+    def models_use_her_api!
+      models.each{|m| m.use_api( her_api ) }
+    end
+ 
+  end
+  
+end

data/lib/quandl/cassinatra/base/attributes.rb

@@ -0,0 +1,51 @@
+class Quandl::Cassinatra::Base
+module Attributes
+  
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+  
+    def find_existing(id)
+      self.new(id: id)
+    end
+    
+  end
+  
+  def inspect
+    "#{self.class.name} " + attributes.inspect
+  end
+  
+  def imprint(record)
+    # ensure matching classes
+    raise(ArgumentError, "record must be kind_of?(#{self.class})") unless record.kind_of?( self.class )
+    # copy variables
+    copy_instance_variables(record)
+  end
+  
+  protected
+  
+  def copy_instance_variables(record)
+    # copy attributes if record was found
+    @attributes = record.attributes if record.exists?
+    # copy metadata and errors
+    [:metadata, :response_errors].each do |ivar|
+      self.instance_variable_set("@#{ivar}", record.instance_variable_get("@#{ivar}") )
+    end
+    self
+  end
+  
+  def write_attributes(hash)
+    @attributes = hash
+  end
+  
+  def write_attribute(attribute, value)
+    self.send(:"#{attribute}_will_change!") if @attributes[:"#{attribute}"] != value
+    @attributes[:"#{attribute}"] = value
+  end
+  
+  def read_attribute(attribute)
+    @attributes[:"#{attribute}"] 
+  end
+  
+end
+end

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

@@ -0,0 +1,14 @@
+class Quandl::Cassinatra::Base
+module Model
+  
+  extend ActiveSupport::Concern
+
+  included do
+
+    include Her::Model
+    use_api Quandl::Cassinatra::Base.her_api
+    
+  end
+  
+end
+end

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

@@ -0,0 +1,96 @@
+class Quandl::Cassinatra::Base
+module Search
+  
+  extend ActiveSupport::Concern
+
+  included do
+
+    include ScopeComposer::Model
+
+    has_scope_composer
+
+    scope.class_eval do
+      
+      def fetch_once
+        @fetch_once ||= fetch
+      end
+      
+      def fetch
+        result = find(attributes[:id])
+        result = references.imprint( result ) unless references.nil?
+        result
+      end
+      
+      def find(id)
+        begin
+          t1 = Time.now
+          result = self.class.parent.where(attributes).find(id)
+          Quandl::Logger.debug "#{self.class.name}.where(#{attributes.to_param if attributes.respond_to?(:to_param)}).find(#{id}) (#{t1.elapsed_ms})"
+        rescue => error
+          Quandl::Logger.error "#{self.class.name}.find #{error}"
+        end
+        result = self.class.parent.new(id: id) if result.nil?
+        result
+      end
+      
+      def references(*args)
+        return @references if args.first.nil?
+        @references = args.first
+        attributes[:id]  = @references.id
+        self
+      end
+      
+      protected
+      
+      def format_trim_date(date, start_or_end)
+        # parse
+        date = parse_date(date)
+        # format
+        if date.is_a?(Date)
+          date = date.send("#{start_or_end}_of_frequency", collapse) if collapse.present?
+          date.jd
+        else
+          nil
+        end
+      end
+    
+      def parse_date( date )
+        begin
+          date = Date.jd(date.to_i) if date.kind_of?(String) && numeric?(date)
+          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
+      end
+    
+      def numeric?(string)
+        string = string.to_s
+        if string =~ /^\d+$/
+          true
+        else
+          Float(string).is_a?(Float) rescue false
+        end
+      end
+      
+    end
+
+  end
+  
+  def reload
+    # reset attributes
+    @attributes = { 'id' => self.id }
+    @metadata = {}
+    # return self
+    true
+  end
+  
+  module ClassMethods
+    def scope_names
+      self.scope.scope_names
+    end
+  end
+  
+end
+end

data/lib/quandl/cassinatra/{concerns/properties.rb → base/validation.rb}

@@ -1,18 +1,10 @@
-module Quandl
-module Cassinatra
-module Concerns
+class Quandl::Cassinatra::Base
+module Validation
   
-module Properties
   extend ActiveSupport::Concern
 
   included do
-
-    include Her::Model
-    use_api Quandl::Cassinatra.her_api
   
-    before_save :touch_save_time
-    after_save :log_save_time
-    
     before_save :halt_unless_valid!
     
     def valid_with_server?
@@ -42,6 +34,10 @@ module Properties
       status >= 200 && status <= 210
     end
     
+    def queried?
+      status > 0
+    end
+    
     def status
       metadata[:status].to_i
     end
@@ -69,30 +65,12 @@ module Properties
       response_errors.present? ? { response_errors: response_errors } : {}
     end
     
-    
     protected
   
     def halt_unless_valid!
       return false unless valid?
     end
-    
-    private
-    
-    def save_timer
-      @save_timer
-    end
-    
-    def touch_save_time
-      @save_timer = Time.now
-    end
-    
-    def log_save_time
-      Quandl::Logger.info("#{self.class.name}.save (#{save_timer.elapsed_ms})")
-    end
-    
-  end      
-end
-
-end
-end
+     
+  end
 end
+end

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

@@ -0,0 +1,33 @@
+class Quandl::Cassinatra::Dataset < Quandl::Cassinatra::Base
+  
+  require 'quandl/cassinatra/models/dataset/searchable'
+  require 'quandl/cassinatra/models/dataset/attributes'
+  
+  include Quandl::Cassinatra::Dataset::Searchable
+  include Quandl::Cassinatra::Dataset::Attributes
+
+  def rows_count
+    count_data
+  end
+  
+  def count_data
+    @count_data ||= self.class.get("datasets/#{id}/count").attributes[:count]
+  end
+
+  def delete_data
+    # cant delete unsaved records
+    return false if new_record?
+    # delete and return success / failure
+    self.class.destroy_existing("#{id}/data").saved?
+  end
+
+  def delete_rows(*dates)
+    # cant delete unsaved records
+    return false if new_record?
+    # collect dates
+    query = { dates: Array(dates).flatten }.to_query
+    # delete and return success / failure
+    self.class.destroy_existing("#{id}/data/rows?#{query}").saved?
+  end
+  
+end

data/lib/quandl/cassinatra/models/dataset/attributes.rb

@@ -0,0 +1,61 @@
+module Quandl::Cassinatra::Dataset::Attributes
+
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    
+  end
+  
+  included do
+
+    attributes :id, :data, :trim_start, :trim_end, :columns, :frequency, 
+      :rows_count, :type, :updated_at, :created_at
+  
+  end
+  
+  def column_units
+    @column_units ||= columns.collect{|c| c['units'] } if columns.present?
+  end
+  
+  def column_names
+    @column_names ||= columns.collect{|c| c['name'] } if columns.present?
+  end
+  
+  def column_ids
+    @column_ids ||= columns.collect{|c| c['id'] } if columns.present?
+  end
+
+  def trim_start
+    @trim_start ||= parse_julian_date( read_attribute(:trim_start) )
+  end
+
+  def trim_end
+    @trim_end ||= parse_julian_date( read_attribute(:trim_end) )
+  end
+
+  def created_at
+    @created_at ||= Time.parse(read_attribute(:created_at)) rescue nil
+  end
+  
+  def updated_at
+    @updated_at ||= Time.parse(read_attribute(:updated_at)) rescue nil
+  end
+  
+  def reload
+    # reset instance variables
+    [:column_units, :column_names, :column_ids, :count_data, :scope, 
+      :updated_at, :created_at, :trim_start, :trim_end
+    ].each{|n| instance_variable_set("@#{n}", nil) }
+    # onwards
+    super
+  end
+  
+  protected
+  
+  def parse_julian_date(date)
+    date = date.to_i unless date.is_a?(Integer)
+    date = ( date > 0 ) ? Date.jd(date) : nil
+    date
+  end
+  
+end

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

@@ -0,0 +1,68 @@
+module Quandl::Cassinatra::Dataset::Searchable
+
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    
+    def search_scopes
+      @search_scopes ||+ search_scope.scopes.keys
+    end
+    
+  end
+  
+  included do
+    
+    scope.class_eval do
+      delegate :each, :collect, :to_a, :to_h, :count, :inspect, :[], to: :to_table, allow_nil: true
+      delegate *Quandl::Data::Table.forwardable_methods, to: :to_table, allow_nil: true
+    end
+    
+    scope_helper :to_table, -> { fetch_once.data }
+    
+    scope :row,          ->(v)       { where( row: v.to_i ) }
+    scope :limit,        ->(v)       { where( limit: v.to_i ) }
+    scope :offset,       ->(v)       { where( offset: v.to_i ) }
+    scope :accuracy,     ->(v)       { where( accuracy: v.to_i ) }
+    scope :column,       ->(v)       { where( column: v.to_i ) }
+    scope :order,        ->(dir)     { where( order: (dir.to_sym == :asc) ? 'asc' : 'desc' ) }
+    scope :trim_start,   ->(date)    { where( trim_start:  format_trim_date(date, :start)) }
+    scope :trim_end,     ->(date)    { where( trim_end:    format_trim_date(date, :end)) }
+    scope :with_id,      ->(value)   { where( id: value.to_i )}
+    scope :transform,    ->(value)   { where( transform: value.to_sym ) if Quandl::Operation::Transform.valid_transformation?( value.try(:to_sym) ) }
+    
+    scope :collapse, ->(value){
+      # set collapse
+      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
+    }
+    
+  end
+
+  def data
+    return read_data if data?
+    return scope unless queried?
+    nil
+  end
+  
+  def data=(value)
+    write_data(value)
+  end
+  
+  def scope
+    @scope ||= self.class.scope.new.references( self )
+  end
+  
+  
+  protected
+  
+  def read_data
+    Quandl::Data::Table.new( read_attribute(:data) )
+  end
+  
+  def write_data(value )
+    write_attribute(:data, Quandl::Data::Table.new(value).to_csv )
+  end
+  
+end

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

@@ -0,0 +1,27 @@
+class Quandl::Cassinatra::Multiset < Quandl::Cassinatra::Base
+  
+  include Quandl::Cassinatra::Dataset::Searchable
+  
+  # scope_helper :record, -> { find('multiset') }
+  
+  scope :columns, ->(v){ where( columns: v ) }
+  
+  attributes :id, :data, :trim_start, :trim_end, :columns, :frequency, :type, :updated_at, :created_at
+
+  def column_units
+    @column_units ||= columns.collect{|c| c['units'] }
+  end
+
+  def column_names
+    @column_names ||= columns.collect{|c| c['name'] }
+  end
+
+  def column_ids
+    @column_ids ||= columns.collect{|c| c['id'] }
+  end
+
+  def save
+    false
+  end
+  
+end

data/lib/quandl/cassinatra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassinatra
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end
 end

data/lib/quandl/her/remove_method_data.rb

@@ -0,0 +1,11 @@
+require 'yajl'
+
+module Her
+  module Model
+    # remove deprecated data method since cassinatra returns data: []
+    module DeprecatedMethods
+      remove_method( :data ) if method_defined?( :data )
+      remove_method( :data= ) if method_defined?( :data= )
+    end
+  end
+end

data/spec/factories/dataset.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
 
   factory :dataset do
     sequence(:id) { |n| (Time.now.to_f * 1000).to_i + n }
-    data_table{ Quandl::Fabricate::Data::Table.rand( rows: 730, columns: 3, nils: false ) }
+    data{ Quandl::Fabricate::Data::Table.rand( rows: 730, columns: 3, nils: false ) }
   end
 
 end

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

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Dataset do
+  subject{ Dataset.find_existing(1) }
+  its(:attributes){ should eq({ 'id' => 1 }) }
+  its(:id){ should eq 1 }
+  
+  context "#reload" do
+    before(:each){ subject.reload }
+    its(:attributes){ should eq({ 'id' => 1 }) }
+    its(:id){ should eq 1 }
+  end
+  
+  context "#id" do
+    before(:each){ subject.id = 2 }
+    its(:attributes){ should eq({ 'id' => 2 }) }
+    its(:id){ should eq 2 }
+  
+    context "#reload" do
+      before(:each){ subject.reload }
+      its(:attributes){ should eq({ 'id' => 2 }) }
+      its(:id){ should eq 2 }
+    end
+  
+  end
+end

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

@@ -17,14 +17,14 @@ describe Dataset do
 
   describe "#delete_rows" do
     
-    let(:dates_slice){ dataset.data_table.to_h.keys[10..19] }
+    let(:dates_slice){ dataset.data.to_h.keys[10..19] }
     
     before(:each){ subject.delete_rows( dates_slice ) }
     
     its(:status){ should eq 200 }
   
     it "data count should be 720" do
-      Dataset.find( dataset.id ).data_table.count.should eq 720
+      Dataset.find( dataset.id ).data.count.should eq 720
     end
   
   end

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

@@ -3,41 +3,42 @@ require 'spec_helper'
 
 describe Dataset do
   
-  context "before save" do
-    
-    subject{ build(:dataset) }
+  let(:dataset){ build(:dataset) }
   
-    it { should respond_to :columns_count }
-    it { should respond_to :data }
-    it { should respond_to :data_table }
-    
-    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
-    
+  subject{ dataset }
+  
+  it { should respond_to :data }
+  
+  describe "#data" do
+    subject{ dataset.data }
+    its(:count){ should eq 730 }
   end
   
-  context "after save" do
+  context "#save" do
+    
+    before(:each){ dataset.save }
     
-    subject{ d = create(:dataset); Dataset.find(d.id) }
+    subject{ Dataset.find(dataset.id) }
     
+    its(:count_data){ should eq dataset.data.count }
+  
+    describe "#columns" do
+      subject{ dataset.columns }
+      its(:count){ should eq 3 }
+    end
+  
     describe "#column_ids" do
-      it "should have 3 columns" do
-        subject.column_ids.count.should eq 3
-      end
-      it "should each be present" do
-        subject.column_ids.each{|cid| cid.present?.should be_true }
+      subject{ dataset.column_ids }
+      its(:count){ should eq 3 }
+      
+      it "each should be present" do
+        subject.each{|cid| cid.present?.should be_true }
       end
     end
     
     describe "#data" do
-      it "should have data" do
-        subject.data.count.should eq 730
-      end
+      subject{ dataset.data }
+      its(:count){ should eq 730 }
     end
     
   end

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

@@ -14,7 +14,7 @@ describe Dataset do
     context "after_save" do
       before(:each){ subject.save }
       it "should equal the last date" do
-        subject.trim_start.should eq subject.data_table[-1][0]
+        subject.trim_start.should eq subject.data.to_date[-1][0]
       end
     end
   end
@@ -28,7 +28,7 @@ describe Dataset do
     context "after_save" do
       before(:each){ subject.save }
       it "should equal the first date" do
-        subject.trim_end.should eq subject.data_table[0][0]
+        subject.trim_end.should eq subject.data.to_date[0][0]
       end
     end
   end

data/spec/quandl/cassinatra/multiset_spec.rb

@@ -2,15 +2,26 @@
 require 'spec_helper'
 
 describe Multiset do
-  let(:d1){ create(:dataset, data_table: Quandl::Fabricate::Data::Table.rand( rows: 10, columns: 4, nils: false ) ) }
-  let(:d2){ create(:dataset, data_table: Quandl::Fabricate::Data::Table.rand( rows: 10, columns: 4, nils: false ) ) }
+  let(:d1){ create(:dataset, data: Quandl::Fabricate::Data::Table.rand( rows: 10, columns: 4, nils: false ) ) }
+  let(:d2){ create(:dataset, data: Quandl::Fabricate::Data::Table.rand( rows: 10, columns: 4, nils: false ) ) }
+  let(:multiset){ Multiset.find_existing('ephemeral') }
+  subject{ multiset }
+  
+  describe "#data" do
+    subject{ multiset.data.columns("#{d1.id}.1,#{d2.id}.2") }
+    
+    its(:count){ should eq 10 }
+    its(:to_h){ should be_present }
+    its(:to_a){ should be_present }
+    
+  end
+  
   
   context "given ascending columns" do
     
     it "should return the expected column_ids" do
-      [d1, d2]
-      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 [
+      subject.data.columns("#{d2.id.to_i}.1,#{d1.id.to_i}.1,#{d2.id.to_i}.3,#{d1.id.to_i}.2").to_a
+      subject.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],
@@ -19,13 +30,11 @@ describe Multiset do
     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]
+      subject.data.columns("#{d2.id.to_i}.1,#{d1.id.to_i}.1,#{d2.id.to_i}.3,#{d1.id.to_i}.2")
+      subject.data[0][1].should eq d2.data[0][1]
+      subject.data[0][2].should eq d1.data[0][1]
+      subject.data[0][3].should eq d2.data[0][3]
+      subject.data[0][4].should eq d1.data[0][2]
     end
   
   end
@@ -33,8 +42,8 @@ describe Multiset do
   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]
+      subject.data.columns("#{d1.id.to_i}.2,#{d1.id.to_i}.1")
+      subject.data[0][1].should_not eq subject.data[0][2]
     end
     
   end

data/spec/spec_helper.rb

@@ -15,4 +15,6 @@ require "quandl/fabricate"
 require "quandl/cassinatra"
 Quandl::Cassinatra.use 'http://192.168.33.10:8983/wikiposit_cassandra/'
 # Quandl::Cassinatra.use 'http://localhost:9292/'
-include Quandl::Cassinatra
+include Quandl::Cassinatra
+
+# binding.pry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -236,23 +236,22 @@ files:
 - Rakefile
 - UPGRADE.md
 - lib/quandl/cassinatra.rb
-- 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/base.rb
+- lib/quandl/cassinatra/base/attributes.rb
+- lib/quandl/cassinatra/base/model.rb
+- lib/quandl/cassinatra/base/search.rb
+- lib/quandl/cassinatra/base/validation.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
-- lib/quandl/cassinatra/model/dataset_attribute.rb
-- lib/quandl/cassinatra/model/multiset.rb
+- lib/quandl/cassinatra/models/dataset.rb
+- lib/quandl/cassinatra/models/dataset/attributes.rb
+- lib/quandl/cassinatra/models/dataset/searchable.rb
+- lib/quandl/cassinatra/models/multiset.rb
 - lib/quandl/cassinatra/version.rb
-- lib/quandl/her/patch.rb
+- lib/quandl/her/remove_method_data.rb
 - quandl_cassinatra.gemspec
 - spec/factories/dataset.rb
+- spec/quandl/cassinatra/dataset/attributes_spec.rb
 - spec/quandl/cassinatra/dataset/delete_spec.rb
 - spec/quandl/cassinatra/dataset/persistence_spec.rb
 - spec/quandl/cassinatra/dataset/searchable_spec.rb
@@ -286,6 +285,7 @@ specification_version: 3
 summary: Cassinatra rest orm.
 test_files:
 - spec/factories/dataset.rb
+- spec/quandl/cassinatra/dataset/attributes_spec.rb
 - spec/quandl/cassinatra/dataset/delete_spec.rb
 - spec/quandl/cassinatra/dataset/persistence_spec.rb
 - spec/quandl/cassinatra/dataset/searchable_spec.rb

data/lib/quandl/cassinatra/concerns.rb

@@ -1,17 +0,0 @@
-require "active_support"
-require "active_support/inflector"
-require "active_support/core_ext/hash"
-require "active_support/core_ext/object"
-
-require 'quandl/cassinatra/concerns/search'
-require 'quandl/cassinatra/concerns/properties'
-
-module Quandl
-module Cassinatra
-  
-module Concerns
-
-end
-
-end
-end

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

@@ -1,26 +0,0 @@
-module Quandl
-module Cassinatra
-module Concerns
-  
-module Search
-  extend ActiveSupport::Concern
-
-  included do
-
-    include ScopeComposer::Model
-
-    scope_composer_for :search
-
-    search_helper :all, ->{ connection.where(attributes).fetch }
-    search_helper :connection, -> { self.class.parent }
-
-    search_scope.class_eval do
-      delegate *Array.forwardable_methods, to: :all
-    end
-
-  end      
-end
-
-end
-end
-end

data/lib/quandl/cassinatra/core_ext.rb

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

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

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

data/lib/quandl/cassinatra/her.rb

@@ -1,32 +0,0 @@
-module Quandl
-module Cassinatra
-  class << self
-    
-    def use(url)
-      self.rest_url = url
-    end
-    
-    def her_api
-      # setup api
-      api = Her::API.new
-      api.setup url: rest_url do |c|
-        c.use Faraday::Request::UrlEncoded
-        c.use Quandl::Cassinatra::Middleware::ParseJSON
-        c.use Faraday::Adapter::NetHttp
-      end
-    end
-
-    def rest_url
-      @rest_url ||= 'http://localhost:9292/'
-    end
-    
-    def rest_url=(url)
-      url = "http://#{url}" if ( url =~ /^http:\/\// ) == nil
-      @rest_url = url
-      Model.use_api( her_api )
-      @rest_url
-    end
-    
-  end 
-end
-end

data/lib/quandl/cassinatra/model.rb

@@ -1,27 +0,0 @@
-require 'quandl/cassinatra/model/dataset'
-require 'quandl/cassinatra/model/dataset_attribute'
-require 'quandl/cassinatra/model/multiset'
-
-module Quandl
-  module Cassinatra
-    module Model
-      class << self
-        
-        def use_api(api)
-          each{|k| k.use_api(api) }
-        end
-        
-        def each(&block)
-          models.each do |k|
-            block.call(k)
-          end
-        end
-        
-        def models
-          [Dataset, DatasetAttribute, Multiset]
-        end
-        
-      end
-    end
-  end
-end

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

@@ -1,56 +0,0 @@
-require 'quandl/cassinatra/model/dataset/searchable'
-
-module Quandl
-module Cassinatra
-module Model
-
-class Dataset
-  
-  include Concerns::Properties
-  include Searchable
-
-  attributes :id, :data, :trim_start, :trim_end, :columns
-
-  delegate :columns_count, :created_at, :frequency, :rows_count, :type, :updated_at, to: :dataset_attribute
-  
-  def column_units
-    @column_units ||= columns.collect{|c| c['units'] }
-  end
-  
-  def column_names
-    @column_names ||= columns.collect{|c| c['name'] }
-  end
-  
-  def column_ids
-    @column_ids ||= columns.collect{|c| c['id'] }
-  end
-  
-  def data_table
-    @data_table ||= Data::Table.new( self.data || [] )
-  end
-  def data_table=(value)
-    self.data = Data::Table.new(value).to_csv
-  end
-  
-  def dataset_attribute(*args)
-    return @dataset_attribute if @dataset_attribute
-    # options
-    options = args.extract_options!
-    count = options[:count] == true
-    # grab dataset_attribute
-    @dataset_attribute = DatasetAttribute.where( count: count ).find(id)
-  end
-
-  def delete_data
-    Dataset.destroy_existing("#{id.to_i}/data").status
-  end
-
-  def delete_rows(*dates)
-    query = { dates: Array(dates).flatten }.to_query
-    Dataset.destroy_existing("#{id.to_i}/data/rows?#{query}").status
-  end
-
-end
-end
-end
-end

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

@@ -1,96 +0,0 @@
-module Quandl
-module Cassinatra
-module Model
-class Dataset
-
-module Searchable
-
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-    
-    def search_scopes
-      @search_scopes ||+ search_scope.scopes.keys
-    end
-    
-  end
-  
-  included do
-  
-    include Quandl
-    include ScopeComposer::Model
-    
-    scope_composer_for :search
-    
-    search_helper :column_ids, -> { dataset.column_ids }
-    search_helper :data_table, -> { dataset.data_table }
-    
-    search_helper :dataset, -> { find(attributes[:id]) }
-    
-    search_scope.class_eval do
-      delegate *Array.forwardable_methods, to: :data_table
-      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,       ->(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)) }
-    search_scope :with_id,      ->(value)   { where( id: value.to_i )}
-    search_scope :transform,    ->(value)   { where( transform: value.to_sym ) if Quandl::Operation::Transform.valid_transformation?( value.try(:to_sym) ) }
-    
-    search_scope :collapse, ->(value){
-      # set collapse
-      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
-    }
-    
-    search_helper :format_trim_date, ->( date, start_or_end ){ 
-      # parse
-      date = parse_date(date)
-      # 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 :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
-        result = self.class.parent.where(attributes).find(id)
-        Quandl::Logger.debug "Quandl::Cassinatra::Dataset.where(#{attributes.to_param if attributes.respond_to?(:to_param)}).find(#{id}) (#{t1.elapsed_ms})"
-      rescue => error
-        Quandl::Logger.error "Quandl::Cassinatra::Dataset.find #{error}"
-      end
-      result = self.class.parent.new(id: id) if result.nil?
-      result
-    }
-    
-  end
-  
-end
-
-end
-end
-end
-end

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

@@ -1,13 +0,0 @@
-module Quandl
-module Cassinatra
-module Model
-
-class DatasetAttribute
-  
-  include Concerns::Properties
-  
-end
-
-end
-end
-end

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

@@ -1,36 +0,0 @@
-module Quandl
-module Cassinatra
-module Model
-
-class Multiset
-
-  include Model::Dataset::Searchable
-  include Concerns::Properties
-  
-  
-  search_helper :to_dataset, -> { dataset }
-  search_helper :dataset, -> { find('multiset') }
-  
-  search_scope :columns, ->(v){ where( columns: v ) }
-  
-  attributes :id, :column_ids, :data
-
-  delegate :columns_count, :created_at, :frequency, :rows_count, :type, :updated_at, to: :dataset_attribute
-
-  def data_table
-    Data::Table.new( self.data || [] )
-  end
-  def dataset_attribute(*args)
-    return @dataset_attribute if @dataset_attribute
-    # options
-    options = args.extract_options!
-    count = options[:count] == true
-    # grab dataset_attribute
-    @dataset_attribute = DatasetAttribute.where( count: count ).find(id)
-  end
-  
-end
-
-end
-end
-end

data/lib/quandl/her/patch.rb

@@ -1,30 +0,0 @@
-require 'yajl'
-
-module Her
-  module Model
-    # remove deprecated data method since cassinatra returns data: []
-    module DeprecatedMethods
-      remove_method :data
-      remove_method :data=
-    end
-  end
-  module Middleware
-    class ParseJSON < Faraday::Response::Middleware
-      # @private
-      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
-          raise Her::Errors::ParseError, message
-        end
-
-        raise Her::Errors::ParseError, message unless json.is_a?(Hash) or json.is_a?(Array)
-
-        json
-      end
-    end
-  end
-end