quandl_client 0.1.17 → 2.0.0

data/README.md

@@ -32,7 +32,7 @@ Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
 
 #### Search
 
-search_scope :rows, :exclude_data, :exclude_headers, :trim_start, :trim_end, :transform, :collapse
+scope :rows, :exclude_data, :exclude_headers, :trim_start, :trim_end, :transform, :collapse
 
 ```ruby
 
@@ -52,15 +52,15 @@ attributes :data, :source_code, :code, :name, :urlize_name,
 
 d = Quandl::Client::Dataset.find('OFDP/COBALT_51')
 d.full_code
-d.data_table
+d.data
 
 
 d = Quandl::Client::Dataset.collapse('weekly').trim_start("2012-03-31").trim_end("2013-06-30").find('OFDP/COBALT_51')
-d.data_table
+d.data
 
 
 d = Quandl::Client::Dataset.exclude_data('true').find('OFDP/COBALT_51')
-d.data_table
+d.data
 
 ```
 
@@ -95,7 +95,7 @@ d = Dataset.create( attributes )
 
 d = Dataset.find( d.full_code )
 d.name = 'New Name'
-d.data = Quandl::Fabricate::Data::Table.rand.to_csv
+d.data = Quandl::Fabricate::Data.rand.to_csv
 d.save
 
 d = Dataset.collapse(:weekly).find( d.full_code )
@@ -118,6 +118,22 @@ Dataset.find('SOME_SOURCE/SOME_CODE')
 ```
 
 
+#### Delete Data
+
+```ruby
+
+d = Dataset.find('SOME_SOURCE/SOME_CODE')
+d.delete_data
+d.data
+=> nil
+
+d.delete_rows( '1998-02-01','1998-03-03' )
+d.data
+=> # given rows are deleted
+
+```
+
+
 #### Error Handling
 
 ```ruby

data/UPGRADE.md

@@ -1,3 +1,7 @@
+## 2.0.0
+
+* update client to take advantage of new /api/v2 routes
+
 ## 0.1.17
 
 * Dataset#source_code is optional

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

@@ -0,0 +1,16 @@
+class Quandl::Client::Base
+module Attributes
+  
+  extend ActiveSupport::Concern
+
+  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/client/base/model.rb

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

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

@@ -0,0 +1,45 @@
+class Quandl::Client::Base
+module Search
+  
+  extend ActiveSupport::Concern
+  
+  module ClassMethods
+    def forwardable_scope_methods
+      @forwardable_scope_methods ||= Array.forwardable_methods.reject{|m| [:find, :fetch].include?(m) }
+    end
+  end
+  
+  included do
+
+    include ScopeComposer::Model
+
+    has_scope_composer
+
+    scope :with_id,      ->(value)   { where( id: value.to_i )}
+    scope_helper :all, ->{ connection.where(attributes).fetch }
+    scope_helper :connection, -> { self.class.parent }
+    
+    scope.class_eval do
+    
+      delegate *Array.forwardable_methods.reject{|m| [:find, :fetch].include?(m) }, to: :all
+      
+      def fetch_once
+        @fetch_once ||= fetch
+      end
+    
+      def fetch
+        find(attributes[:id])
+      end
+    
+      def find(id)
+        result = self.class.parent.where(attributes).find(id)
+        result = self.class.parent.new(id: id) if result.nil?
+        result
+      end
+    
+    end
+  
+  end
+end
+
+end

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

@@ -1,18 +1,10 @@
-module Quandl
-module Client
-module Concerns
+class Quandl::Client::Base
+module Validation
   
-module Properties
   extend ActiveSupport::Concern
 
   included do
-
-    include Her::Model
-    use_api Client.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/client/base.rb

@@ -1,12 +1,71 @@
-require 'scope_composer'
-require "quandl/data"
+require "active_support"
+require "active_support/inflector"
+require "active_support/core_ext/hash"
+require "active_support/core_ext/object"
 
-module Quandl
-module Client
+require 'quandl/client/base/model'
+require 'quandl/client/base/attributes'
+require 'quandl/client/base/validation'
+require 'quandl/client/base/search'
 
-class Base
+class Quandl::Client::Base
   
-end
+  class << self
+    
+    attr_accessor :url, :token
+  
+    def use(url)
+      self.url = File.join( url, Quandl::Client.api_version )
+      models_use_her_api!
+    end
+    
+    def token=(token)
+      @token = token
+      models_use_her_api!
+    end
+    
+    def her_api
+      Her::API.new.setup url: url do |c|
+        c.use TokenAuthentication
+        c.use Faraday::Request::UrlEncoded
+        c.use Quandl::Client::Middleware::ParseJSON
+        c.use Faraday::Adapter::NetHttp
+      end
+    end
 
-end
+    def url
+      @url ||= "http://localhost:3000/api/"
+    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::Client::Base::Model
+        include Quandl::Client::Base::Attributes
+        include Quandl::Client::Base::Validation
+        include Quandl::Client::Base::Search
+      end
+    end
+    
+    def models
+      @@models ||= []
+    end
+    
+    protected
+    
+    def models_use_her_api!
+      models.each{|m| m.use_api( her_api ) }
+    end
+    
+    class TokenAuthentication < Faraday::Middleware
+      def call(env)
+        env[:request_headers]["X-API-Token"] = Quandl::Client::Base.token if Quandl::Client::Base.token.present?
+        @app.call(env)
+      end
+    end
+    
+  end
+  
 end

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

@@ -0,0 +1,38 @@
+class Quandl::Client::Dataset::Data < Quandl::Client::Base
+  
+  @_her_resource_path = "datasets/:id/data"
+  
+  has_scope_composer
+  
+  scope *[:row, :rows, :limit, :offset, :accuracy, :column, :order, 
+    :trim_start, :trim_end, :transform, :collapse, :exclude_headers]
+  
+  scope_helper :to_table, -> { fetch_once.data }
+  
+  scope.class_eval do
+    delegate *Quandl::Client::Dataset::Data.forwardable_scope_methods, :to_h, to: :to_table, allow_nil: true
+    delegate *Quandl::Data.forwardable_methods, to: :to_table, allow_nil: true
+  end
+    
+  attributes :id, :limit, :collapse, :transformation, :trim_start, :trim_end, 
+    :rows, :row, :frequency, :data, :from_date, :to_date
+
+  def data
+    read_data
+  end
+  
+  def data=(value)
+    write_data(value)
+  end
+  
+  protected
+  
+  def read_data
+    Quandl::Data.new( read_attribute(:data) )
+  end
+  
+  def write_data(value )
+    write_attribute(:data, Quandl::Data.new(value).to_csv )
+  end
+  
+end

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

@@ -1,27 +1,15 @@
-module Quandl
-module Client
-
-class Dataset
-  
-  include Concerns::Search
-  include Concerns::Properties
+class Quandl::Client::Dataset < Quandl::Client::Base
   
+  require 'quandl/client/models/dataset/data'
   
   ##########  
   # SCOPES #
   ##########
   
   # SEARCH
-  search_scope :query, :rows
-  search_scope :page, ->(p){ where( page: p.to_i )}
-  search_scope :source_code, ->(c){ where( code: c.to_s.upcase )}
-  
-  # SHOW
-  scope_composer_for :show
-  show_scope :rows, :exclude_data, :exclude_headers, :trim_start, :trim_end, :transform, :collapse
-  show_helper :find, ->(id){ connection.where(attributes).find( id ) }
-  show_helper :connection, -> { self.class.parent }
-  
+  scope :query, :rows
+  scope :page, ->(p){ where( page: p.to_i )}
+  scope :source_code, ->(c){ where( code: c.to_s.upcase )}
   
   ###############
   # ASSOCIATIONS #
@@ -31,7 +19,6 @@ class Dataset
     @source ||= Source.find(self.source_code)
   end
   
-  
   ###############
   # VALIDATIONS #
   ###############
@@ -48,7 +35,7 @@ class Dataset
     :description, :updated_at, :frequency,
     :from_date, :to_date, :column_names, :private, :type,
     :display_url, :column_spec, :import_spec, :import_url,
-    :locations_attributes, :data, :availability_delay, :refreshed_at
+    :locations_attributes, :availability_delay, :refreshed_at
     
   before_save :enforce_required_formats
   
@@ -58,23 +45,51 @@ class Dataset
   def full_code
     @full_code ||= File.join(self.source_code, self.code)
   end
+  
+  # DATA
+  
+  def data
+    dataset_data.data? ? dataset_data.data : Dataset::Data.with_id(id)
+  end
+  
+  def data=(value)
+    dataset_data.data = value
+  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 data_table
-    Data::Table.new( raw_data )
+  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
   
-  def raw_data
-    @raw_data ||= (self.data || Dataset.find(full_code).data || [])
+  def dataset_data
+    @dataset_data ||= Dataset::Data.new( id: id )
   end
   
+  after_save :save_dataset_data
+  
   protected
   
+  def save_dataset_data
+    dataset_data.id = id
+    dataset_data.save
+    # update dataset's attributes with dataset_data's attributes
+    attributes.each{|k,v| attributes[k] = dataset_data.attributes[k] if dataset_data.attributes.has_key?(k) }
+  end
+  
   def enforce_required_formats
-    self.data = Quandl::Data::Table.new(data).to_csv
+    # self.data = Quandl::Data.new(data).to_csv
     self.locations_attributes = locations_attributes.to_json if locations_attributes.respond_to?(:to_json) && !locations_attributes.kind_of?(String)
   end
   
-end
-
-end
 end

data/lib/quandl/client/models/sheet.rb

@@ -1,17 +1,13 @@
 module Quandl
 module Client
 
-class Sheet
-  
-  include Concerns::Search
-  include Concerns::Properties
-  
+class Sheet < Quandl::Client::Base
   
   ##########  
   # SCOPES #
   ##########
   
-  search_scope :query, :page, :parent_url_title
+  scope :query, :page, :parent_url_title
   
   
   ################

data/lib/quandl/client/models/source.rb

@@ -1,18 +1,15 @@
 module Quandl
 module Client
 
-class Source
-  
-  include Concerns::Search
-  include Concerns::Properties
+class Source < Quandl::Client::Base
   
   ##########  
   # SCOPES #
   ##########
   
-  search_scope :query
-  search_scope :page, ->(p){ where( page: p.to_i )}
-  search_scope :code, ->(c){ where( code: c.to_s.upcase )}
+  scope :query
+  scope :page, ->(p){ where( page: p.to_i )}
+  scope :code, ->(c){ where( code: c.to_s.upcase )}
   
   
   ###############

data/lib/quandl/client/version.rb

@@ -1,7 +1,7 @@
 module Quandl
 module Client
-  VERSION = '0.1.17'
-  API_VERSION = 'v1'
+  VERSION = '2.0.0'
+  API_VERSION = 'v2'
   
   class << self
     

data/lib/quandl/client.rb

@@ -1,17 +1,25 @@
 require "quandl/client/version"
 
-require "active_support"
-require "active_support/inflector"
-require "active_support/core_ext/hash"
-require "active_support/core_ext/object"
+require 'scope_composer'
+require 'her'
+require 'quandl/her/remove_method_data'
+require 'quandl/logger'
+require "quandl/data"
 
 require 'quandl/client/middleware'
-require 'quandl/client/her'
-require 'quandl/client/concerns'
 require 'quandl/client/base'
-require 'quandl/client/models'
+require 'quandl/client/models/dataset'
+require 'quandl/client/models/sheet'
+require 'quandl/client/models/source'
 
 module Quandl
   module Client
+    def self.use(url)
+      Quandl::Client::Base.use(url)
+    end
+    def self.token=(value)
+      Quandl::Client::Base.token = value
+    end
+    
   end
 end

data/lib/quandl/her/{patch.rb → remove_method_data.rb}

@@ -4,8 +4,8 @@ module Her
   module Model
     # remove deprecated data method since cassinatra returns data: []
     module DeprecatedMethods
-      remove_method :data
-      remove_method :data=
+      remove_method( :data ) if method_defined?( :data )
+      remove_method( :data= ) if method_defined?( :data= )
     end
   end
 end

data/quandl_client.gemspec

@@ -28,9 +28,9 @@ 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 "scope_composer", "~> 0.1"
+  s.add_runtime_dependency "scope_composer", "~> 0.3"
   s.add_runtime_dependency "quandl_logger", "~> 0.1"
   s.add_runtime_dependency "quandl_operation", "~> 0.1"
-  s.add_runtime_dependency "quandl_data", "~> 0.1"
+  s.add_runtime_dependency "quandl_data", "~> 1.0"
   
 end

data/spec/lib/quandl/client/dataset/data_spec.rb

@@ -4,12 +4,13 @@ require 'spec_helper'
 describe Dataset do
 
   let(:dataset){ 
-    create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data::Table.rand( rows: 10, columns: 4 ) )
+    create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data.rand( rows: 10, columns: 4 ) )
   }
 
   describe "#data" do
     subject{ Dataset.find( dataset.id ).data }
     its(:count){ should eq 10 }
+    its(:to_h){ should be_a Hash }
   end
   
   context "updated" do
@@ -20,19 +21,50 @@ describe Dataset do
     }
     
     describe "#data" do
-      before(:each){ subject.data = Quandl::Fabricate::Data::Table.rand( rows: 12, columns: 4 ); subject.save }
+      before(:each){ subject.data = Quandl::Fabricate::Data.rand( rows: 12, columns: 4 ); sleep(1); subject.save }
       its(:updated_at){ should_not eq dataset.updated_at }
       its(:data){ should_not eq dataset.data }
       its(:refreshed_at){ should_not eq dataset.refreshed_at }
     end
   
     context "#column_spec" do
-      before(:each){ subject.column_spec = "[0,[\"Date \\n\",{}],[\"Column 1 \",{}],[\"New Column Name \",{}]]"; subject.save }
+      before(:each){ subject.column_spec = "[0,[\"Date \\n\",{}],[\"Column 1 \",{}],[\"New Column Name \",{}]]"; sleep(1); subject.save }
       its(:updated_at){ should_not eq dataset.updated_at }
       its(:column_spec){ should_not eq dataset.column_spec }
     end
   
   end
   
-
+  describe "#delete_data" do
+    subject{ Dataset.find( dataset.id ) }
+    before(:each){ subject.delete_data }
+    its(:data){ should be_blank }
+  end
+  
+  describe "#delete_rows" do
+    subject{ Dataset.find( dataset.id ) }
+    
+    let(:dates_slice){ dataset.data.to_h.keys[5..8] }
+    
+    it "should have the dates" do
+      dates = Dataset.find( dataset.id ).data.to_h.keys
+      dates_slice.each{|date| dates.include?(date).should be_true }
+    end
+    
+    context "after deleting rows" do
+    
+      before(:each){ subject.delete_rows(dates_slice) }
+      
+      it "data count should be 16" do
+        Dataset.find( dataset.id ).data.count.should eq 6
+      end
+    
+      it "data should have dates" do
+        dates = Dataset.find( dataset.id ).data.to_h
+        dates.each{|date| dates_slice.include?(date).should be_false }
+      end
+    
+    end
+  end
+  
 end

data/spec/lib/quandl/client/dataset/persistence_spec.rb

@@ -31,7 +31,7 @@ describe Dataset do
     end
     context "with data" do
       
-      let(:dataset){ create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data::Table.rand(rows: 20, columns: 2, nils: false) ) }
+      let(:dataset){ create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data.rand(rows: 20, columns: 2, nils: false) ) }
       subject{ dataset }
   
       its(:saved?){ should be_true }
@@ -42,25 +42,25 @@ describe Dataset do
   
   context "when updated" do
   
-    let(:dataset){ create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data::Table.rand(rows: 20, columns: 2, nils: false).to_csv ) }
+    let(:dataset){ create(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data.rand(rows: 20, columns: 2, nils: false).to_csv ) }
     subject{ Dataset.find(dataset.id) }
     
     it "should include new row" do
       new_data = 10.times.collect{|i| [Date.parse(subject.to_date) + i + 1, rand(12), rand(12) ] }
-      new_data = Quandl::Data::Table.new(new_data).sort_descending
+      new_data = Quandl::Data.new(new_data).sort_descending
       subject.data = new_data
       subject.save
       updated_dataset = Dataset.find(subject.id)
-      updated_dataset.data_table.to_date[0].should eq new_data.to_date[0]
+      updated_dataset.data.to_date[0].should eq new_data.to_date[0]
     end
       
     it "should include old rows" do
       new_data = 10.times.collect{|i| [Date.parse(subject.to_date) + i + 2, rand(12), rand(12) ] }
-      new_data = Quandl::Data::Table.new(new_data).sort_descending
+      new_data = Quandl::Data.new(new_data).sort_descending
       subject.data = new_data
       subject.save
       updated_dataset = Dataset.find(subject.id)
-      updated_dataset.data_table.count.should eq 30
+      updated_dataset.data.count.should eq 30
     end
     
   end
@@ -75,7 +75,7 @@ describe Dataset do
     end
     
     context "as a user" do
-
+      
       it "should not delete the dataset with a user token" do
         id = dataset.id
         # behave as a user

data/spec/lib/quandl/client/dataset/search_spec.rb

@@ -14,7 +14,7 @@ describe Dataset do
   end
   
   it "should exclude_data" do
-    Dataset.exclude_data(true).find(dataset.id).data.should be_blank
+    Dataset.find(dataset.id).attributes[:data].should be_blank
   end
   
 end

data/spec/lib/quandl/client/dataset/trim_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Dataset do
   
-  subject{ build(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data::Table.rand(rows: 20, columns: 2) ) }
+  subject{ build(:dataset, source_code: "QUANDL_CLIENT_TEST_SOURCE", data: Quandl::Fabricate::Data.rand(rows: 20, columns: 2) ) }
   
   describe "#from_date" do
     context "before_save" do
@@ -14,7 +14,7 @@ describe Dataset do
     context "after_save" do
       before(:each){ subject.save }
       it "should equal the last date" do
-        subject.from_date.should eq subject.data_table.to_date[-1][0].to_s
+        subject.from_date.should eq subject.data.to_date[-1][0].to_s
       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.to_date.should eq subject.data_table.to_date[0][0].to_s
+        subject.to_date.should eq subject.data.to_date[0][0].to_s
       end
     end
   end

data/spec/spec_helper.rb

@@ -11,11 +11,13 @@ require "quandl/client"
 require "quandl/fabricate"
 
 include Quandl::Client
-Quandl::Client.use 'http://localhost:3000/api/'
-# Quandl::Client.use 'http://staging.quandl.com/api/'
-# Quandl::Client.use 'http://quandl.com/api/'
+Quandl::Client.use ENV['QUANDL_API_HOST']
+Quandl::Client.use 'http://staging.quandl.com/api/'
+
 Quandl::Client.token = ENV['QUANDL_AUTH_TOKEN']
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
-end
+end
+
+# binding.pry

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_client
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: quandl_logger
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 description: An orm for the cassinatra rest interface.
 email:
 - blake@hilscher.ca
@@ -237,18 +237,18 @@ files:
 - UPGRADE.md
 - lib/quandl/client.rb
 - lib/quandl/client/base.rb
-- lib/quandl/client/concerns.rb
-- lib/quandl/client/concerns/properties.rb
-- lib/quandl/client/concerns/search.rb
-- lib/quandl/client/her.rb
+- lib/quandl/client/base/attributes.rb
+- lib/quandl/client/base/model.rb
+- lib/quandl/client/base/search.rb
+- lib/quandl/client/base/validation.rb
 - lib/quandl/client/middleware.rb
 - lib/quandl/client/middleware/parse_json.rb
-- lib/quandl/client/models.rb
 - lib/quandl/client/models/dataset.rb
+- lib/quandl/client/models/dataset/data.rb
 - lib/quandl/client/models/sheet.rb
 - lib/quandl/client/models/source.rb
 - lib/quandl/client/version.rb
-- lib/quandl/her/patch.rb
+- lib/quandl/her/remove_method_data.rb
 - quandl_client.gemspec
 - spec/factories/dataset.rb
 - spec/factories/sheet.rb

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

@@ -1,26 +0,0 @@
-module Quandl
-module Client
-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/client/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/client/concerns/search'
-require 'quandl/client/concerns/properties'
-
-module Quandl
-module Client
-
-module Concerns
-
-end
-
-end
-end

data/lib/quandl/client/her.rb

@@ -1,57 +0,0 @@
-require 'her'
-require 'quandl/her/patch'
-
-module Quandl
-module Client
-  class << self
-    
-    def use(url)
-      self.rest_url = url
-    end
-    
-    def token
-      @token
-    end
-    def token=(token)
-      @token = token
-      reload_models
-    end
-    
-    def her_api
-      # setup api
-      api = Her::API.new
-      api.setup url: rest_url do |c|
-        c.use TokenAuthentication
-        c.use Faraday::Request::UrlEncoded
-        # c.use Her::Middleware::DefaultParseJSON
-        c.use Quandl::Client::Middleware::ParseJSON
-        c.use Faraday::Adapter::NetHttp
-      end
-    end
-
-    def rest_url
-      @rest_url ||= "http://localhost:3000/api/#{API_VERSION}/"
-    end
-    
-    def rest_url=(url)
-      url = "http://#{url}" if ( url =~ /^http:\/\// ) == nil
-      url = File.join(url, "#{API_VERSION}/")
-      @rest_url = url
-      reload_models
-      @rest_url
-    end
-    
-    def reload_models
-      Models.use_api( her_api )
-    end
-    
-    class TokenAuthentication < Faraday::Middleware
-      def call(env)
-        env[:request_headers]["X-API-Token"] = Quandl::Client.token if Quandl::Client.token.present?
-        @app.call(env)
-      end
-    end
-    
-  end 
-end
-end

data/lib/quandl/client/models.rb

@@ -1,25 +0,0 @@
-require 'quandl/client/models/source'
-require 'quandl/client/models/dataset'
-require 'quandl/client/models/sheet'
-
-module Quandl
-  module Client
-    module Models
-      class << self
-        
-        def use_api(api)
-          each{|k| k.use_api(api) }
-        end
-        
-        def each(&block)
-          types.each{|k| block.call(k) }
-        end
-        
-        def types
-          [Source, Dataset, Sheet]
-        end
-        
-      end
-    end
-  end
-end