quandl_cassinatra 0.0.7 → 0.0.8

data/.gitignore

@@ -1,4 +1,5 @@
 /Gemfile.lock
 /pkg
 /tmp
-quandl_cassinatra-*
+*.gem
+*.log

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

@@ -0,0 +1,68 @@
+module Quandl
+module Cassinatra
+module Concerns
+  
+module Properties
+  extend ActiveSupport::Concern
+
+  included do
+
+    include Her::Model
+    use_api Quandl::Cassinatra.her_api
+  
+    before_save :touch_save_time
+    before_save :halt_unless_valid!
+    
+    after_save :log_save_time
+    
+    def valid_with_server?
+      return false unless valid?
+      return false unless errors_params.blank?
+      return false unless errors_server.blank?
+      true
+    end
+    
+    def error_messages
+      valid?
+      errors_client.deep_merge(errors_server).deep_merge(errors_params)
+    end
+    
+    def errors_client
+      errors.messages || {}
+    end
+    
+    def errors_server
+      self.attributes[:errors] || {}
+    end
+    
+    def errors_params
+      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

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

@@ -0,0 +1,26 @@
+module Quandl
+module Cassinatra
+module Concerns
+  
+module Search
+  extend ActiveSupport::Concern
+
+  included do
+
+    include ScopeBuilder::Model
+  
+    scope_builder_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/concerns.rb

@@ -0,0 +1,17 @@
+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/model/dataset/searchable.rb

@@ -67,9 +67,9 @@ module Searchable
       begin
         t1 = Time.now
         result = self.class.parent.where(attributes).find(id)
-        puts "parent.where(#{attributes.to_param if attributes.respond_to?(:to_param)}).find(#{id}) (#{t1.elapsed_ms})"
+        Quandl::Logger.debug "Quandl::Cassinatra::Dataset.where(#{attributes.to_param if attributes.respond_to?(:to_param)}).find(#{id}) (#{t1.elapsed_ms})"
       rescue => error
-        puts "ERROR: Cassandra #{error}"
+        Quandl::Logger.error "Quandl::Cassinatra::Dataset.find #{error}"
       end
       result = self.class.parent.new(id: id) if result.nil?
       result

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

@@ -1,5 +1,4 @@
 require 'quandl/cassinatra/model/dataset/searchable'
-require 'quandl/cassinatra/model/dataset/rest_orm'
 
 module Quandl
 module Cassinatra
@@ -7,9 +6,29 @@ module Model
 
 class Dataset
   
+  include Concerns::Properties
   include Searchable
-  include RestOrm
-  
+
+  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 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
+
 end
 end
 end

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

@@ -4,8 +4,7 @@ module Model
 
 class DatasetAttribute
   
-  include Her::Model
-  use_api Quandl::Cassinatra.her_api
+  include Concerns::Properties
   
 end
 

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

@@ -5,13 +5,25 @@ module Model
 class Multiset
 
   include Model::Dataset::Searchable
-  include Model::Dataset::RestOrm
+  include Concerns::Properties
   
   search_helper :dataset, -> { find('multiset') }
   search_scope :columns
-  
-  def data_table=(value)
-    false
+
+  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

data/lib/quandl/cassinatra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassinatra
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end
 end

data/lib/quandl/cassinatra.rb

@@ -1,5 +1,7 @@
 require "quandl/cassinatra/version"
 
+require 'quandl/logger'
+
 require "active_support"
 require "active_support/inflector"
 require "active_support/core_ext/hash"
@@ -10,6 +12,7 @@ require 'quandl/her/patch'
 require 'scope_builder'
 require "quandl/data"
 
+require 'quandl/cassinatra/concerns'
 require 'quandl/cassinatra/her'
 require 'quandl/cassinatra/model'
 

data/quandl_cassinatra.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activesupport", ">= 3.0.0"
   s.add_runtime_dependency "her", "~> 0.6.7"
   s.add_runtime_dependency "scope_builder", "~> 0.0.6"
-  s.add_runtime_dependency "quandl_data", "~> 0.0.5"
+  s.add_runtime_dependency "quandl_data", "~> 0.0.8"
   s.add_runtime_dependency "yajl-ruby", "~> 1.1.0"
   s.add_runtime_dependency 'json', '~> 1.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassinatra
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -188,10 +188,12 @@ 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/her.rb
 - lib/quandl/cassinatra/model.rb
 - lib/quandl/cassinatra/model/dataset.rb
-- lib/quandl/cassinatra/model/dataset/rest_orm.rb
 - lib/quandl/cassinatra/model/dataset/searchable.rb
 - lib/quandl/cassinatra/model/dataset_attribute.rb
 - lib/quandl/cassinatra/model/multiset.rb

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

@@ -1,41 +0,0 @@
-module Quandl
-module Cassinatra
-module Model
-class Dataset
-
-module RestOrm
-
-  extend ActiveSupport::Concern
-  
-  included do
-    
-    include Her::Model
-    use_api Cassinatra.her_api
-  
-    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 data_table=(value)
-      self.data = Data::Table.new(value).to_jd.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
-  end
-
-end
-
-end
-end
-end
-end