flydata 0.0.4.4 → 0.0.5.0

data/Gemfile

@@ -5,7 +5,7 @@ gem "i18n"
 gem "activesupport"
 gem "json"
 gem "highline"
-gem "fluentd"
+gem "fluentd", "0.10.35"
 
 group :development do
   gem "bundler"
@@ -15,4 +15,7 @@ group :development do
   gem "autotest-standalone"
   gem "autotest-notification"
   gem "ZenTest"
+  gem "activemodel"
+  gem "activerecord"
+  gem "sqlite3"
 end

data/Gemfile.lock

@@ -2,22 +2,32 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.8.2)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-notification (2.3.4)
       autotest-standalone (~> 4.5)
     autotest-standalone (4.5.9)
-    cool.io (1.1.0)
+    builder (3.0.4)
+    cool.io (1.1.1)
       iobuffer (>= 1.0.0)
     diff-lcs (1.1.3)
-    fluentd (0.10.25)
+    fluentd (0.10.35)
       cool.io (~> 1.1.0)
       http_parser.rb (~> 0.5.1)
       json (>= 1.4.3)
-      msgpack (~> 0.4.4)
+      msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       yajl-ruby (~> 1.0)
     git (1.2.5)
     highline (1.6.15)
@@ -31,7 +41,7 @@ GEM
       rdoc
     json (1.7.5)
     mime-types (1.19)
-    msgpack (0.4.7)
+    msgpack (0.5.5)
     multi_json (1.3.6)
     rake (0.9.2.2)
     rdoc (3.12)
@@ -46,6 +56,8 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    sqlite3 (1.3.7)
+    tzinfo (0.3.37)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -53,15 +65,18 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
+  activemodel
+  activerecord
   activesupport
   autotest
   autotest-notification
   autotest-standalone
   bundler
-  fluentd
+  fluentd (= 0.10.35)
   highline
   i18n
   jeweler
   json
   rest-client
   rspec
+  sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.4.4
+0.0.5.0

data/flydata.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "flydata"
-  s.version = "0.0.4.4"
+  s.version = "0.0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Koichi Fujikawa"]
-  s.date = "2013-07-09"
+  s.date = "2013-08-14"
   s.description = "FlyData Command Line Interface"
   s.email = "sysadmin@flydata.co"
   s.executables = ["flydata"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/flydata",
     "flydata.gemspec",
+    "lib/fly_data_model.rb",
     "lib/flydata.rb",
     "lib/flydata/api/base.rb",
     "lib/flydata/api/data_entry.rb",
@@ -42,17 +43,22 @@ Gem::Specification.new do |s|
     "lib/flydata/cron.rb",
     "lib/flydata/flydata_crontab.sh",
     "lib/flydata/helpers.rb",
+    "lib/flydata/heroku.rb",
+    "lib/flydata/heroku/configuration_methods.rb",
+    "lib/flydata/heroku/instance_methods.rb",
     "lib/flydata/log_monitor.rb",
     "lib/flydata/proxy.rb",
+    "spec/fly_data_model_spec.rb",
     "spec/flydata/api/data_entry_spec.rb",
     "spec/flydata/command/sender_spec.rb",
+    "spec/flydata/heroku_spec.rb",
     "spec/flydata_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://flydata.co/"
   s.licenses = ["All right reserved."]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "1.8.25"
   s.summary = "FlyData CLI"
 
   if s.respond_to? :specification_version then
@@ -64,7 +70,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
-      s.add_runtime_dependency(%q<fluentd>, [">= 0"])
+      s.add_runtime_dependency(%q<fluentd>, ["= 0.10.35"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -72,13 +78,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<autotest-standalone>, [">= 0"])
       s.add_development_dependency(%q<autotest-notification>, [">= 0"])
       s.add_development_dependency(%q<ZenTest>, [">= 0"])
+      s.add_development_dependency(%q<activemodel>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
-      s.add_dependency(%q<fluentd>, [">= 0"])
+      s.add_dependency(%q<fluentd>, ["= 0.10.35"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -86,6 +95,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<autotest-standalone>, [">= 0"])
       s.add_dependency(%q<autotest-notification>, [">= 0"])
       s.add_dependency(%q<ZenTest>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
@@ -93,7 +105,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
-    s.add_dependency(%q<fluentd>, [">= 0"])
+    s.add_dependency(%q<fluentd>, ["= 0.10.35"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
@@ -101,6 +113,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<autotest-standalone>, [">= 0"])
     s.add_dependency(%q<autotest-notification>, [">= 0"])
     s.add_dependency(%q<ZenTest>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end
 

data/lib/fly_data_model.rb

@@ -0,0 +1,4 @@
+module FlyDataModel
+  extend ActiveSupport::Concern
+  include ActiveModel::Serialization
+end

data/lib/flydata.rb

@@ -13,4 +13,6 @@ ActiveSupport::Dependencies.autoload_paths << lib_dir
 
 module Flydata
   HOME_DIR="#{ENV['HOME']}/.flydata"
+
+  include Flydata::Heroku
 end

data/lib/flydata/heroku.rb

@@ -0,0 +1,150 @@
+module Flydata
+  module Heroku
+    extend ActiveSupport::Concern
+
+    included do
+      if defined? ActiveModel
+        # Reopen ActiveModel::Serialization to add flydata support
+        module ActiveModel::Serialization
+          extend ActiveSupport::Concern
+          include Flydata::Heroku::InstanceMethods
+          include Flydata::Heroku::ConfigurationMethods
+        end
+      end
+    end
+
+    module ClassMethods
+      # Puts a JSON string that represents args to $stdout
+      #
+      # @example
+      #   send_to('table_name', { key: 'value' })
+      #   send_to('table_name', [{ key: 'value' }, { key: 'value' ])
+      #
+      # @example
+      #   send_to(:table_name, { key: 'value' })
+      #   send_to(:table_name', [{ key: 'value' }, { key: 'value' ])
+      #
+      # @example
+      #   send_to(active_record)
+      #   send_to(active_record, active_record)
+      #
+      # @example
+      #   send_to([user, user])
+      #
+      # @param [String, Symbol] table name
+      # @param [Hash] values
+      # @param [Array<Hash>] array of value
+      # @param [ActiveRecord::Base] record
+      # @param [ActiveModel::Serialization] model
+      # @param [Array<ActiveRecord::Base>] array of record
+      # @param [Array<ActiveModel::Serialization>] array of model
+      def send_to(*args)
+        if args[0].nil?
+          raise ArgumentError, 'The argument of send_to must be non-nil'
+        end
+
+        if args[0].respond_to?(:empty?) && args[0].empty?
+          raise ArgumentError, 'The 1st argument of send_to must not be empty'
+        end
+
+        if (args[0].kind_of?(String) || args[0].kind_of?(Symbol))
+          unless structured_data?(args[1])
+            raise ArgumentError, 'The 2nd argument of send_to must be an Array or Hash'
+          end
+        end
+
+        obj = case args[0]
+              when String
+                structured_data_as_flydata(args[0], args[1])
+              when Symbol
+                structured_data_as_flydata(args[0].to_s, args[1])
+              when Array
+                ancestors = args[0][0].class.ancestors
+                if defined?(ActiveModel) && ancestors.include?(ActiveModel::Serialization)
+                  active_models_as_flydata(args[0])
+                end
+              else
+                ancestors = args[0].class.ancestors
+                if defined?(ActiveModel) && ancestors.include?(ActiveModel::Serialization)
+                  multiple_active_models_as_flydata(args)
+                end
+              end
+        $stdout.puts(obj.to_json) if obj
+      end
+
+      # Formats a Time object for Redshift
+      #
+      # @param [#strftime]
+      # @return [String, Objct]
+      def format_time_for_redshift(time)
+        time.respond_to?(:strftime) ? time.strftime('%Y-%m-%d %H:%M:%S') : time
+      end
+
+      # Formats a Time object for Redshift
+      #
+      # @param [#strftime]
+      # @return [String, Objct]
+      def format_date_for_redshift(time)
+        time.respond_to?(:strftime) ? time.strftime('%Y-%m-%d') : time
+      end
+
+      private
+
+      # @param [String]
+      # @param [Hash, Array]
+      # @return [Hash]
+      def structured_data_as_flydata(table_name, values)
+        { table_name => format_for_flydata(values) }
+      end
+
+      # @param [Object]
+      # @return [Object]
+      def format_for_flydata(obj)
+        case obj
+        when Hash
+          obj.each { |k, v| obj[k] = format_for_flydata(v) }
+        when Array
+          obj.map { |item| item.kind_of?(Hash) ? format_for_flydata(item) : item }
+        when Time
+          format_time_for_redshift(obj)
+        when DateTime
+          format_time_for_redshift(obj)
+        when Date
+          format_date_for_redshift(obj)
+        else
+          obj
+        end
+      end
+
+      # @param [Object]
+      # @return [Boolean]
+      def structured_data?(value)
+        value.kind_of?(Array) || value.kind_of?(Hash)
+      end
+
+      if defined?(ActiveModel)
+        # @param [Array<ActiveModel::Serialization>]
+        # @return [Hash]
+        def active_models_as_flydata(models)
+          table_name = models[0].class.flydata_table_name
+          { table_name => models.map(&:as_flydata) }
+        end
+
+        # @param [Array<ActiveModel::Serialization>]
+        # @return [Hash]
+        def multiple_active_models_as_flydata(models)
+          hash = {}
+          models.group_by { |record| record.class.flydata_table_name }.each do |table_name, models|
+            hash[table_name] = if models.size == 1
+                                 models[0].as_flydata
+                               else
+                                 models.map(&:as_flydata)
+                               end
+          end
+          hash
+        end
+      end
+    end
+
+  end
+end

data/lib/flydata/heroku/configuration_methods.rb

@@ -0,0 +1,47 @@
+module Flydata
+  module Heroku
+    module ConfigurationMethods
+      extend ActiveSupport::Concern
+
+      included do
+        if respond_to?(:class_attribute)
+          class_attribute :_flydata_table_name
+          class_attribute :_flydata_attributes
+        else
+          class_inheritable_accessor :_flydata_table_name
+          class_inheritable_accessor :_flydata_attributes
+        end
+        self._flydata_table_name = nil
+        self._flydata_attributes = nil
+      end
+
+      module ClassMethods
+        # @example
+        #   class User < ActiveRecord::Base
+        #     flydata_attr :id, :name
+        #   end
+        def flydata_attr(*attributes)
+          raise "flydata_attr attributes cannot be blank" if attributes.empty?
+          self._flydata_attributes = attributes.map(&:to_sym)
+        end
+
+        # @example
+        #   class User < ActiveRecord::Base
+        #     flydata_table :other_table
+        #   end
+        def flydata_table(table_name)
+          self._flydata_table_name = table_name
+        end
+
+        # @return [String]
+        def flydata_table_name
+          self._flydata_table_name ||= if self.ancestors.include?(ActiveRecord::Base)
+                                         self.table_name
+                                       else
+                                         self.name.tableize
+                                       end
+        end
+      end
+    end
+  end
+end

data/lib/flydata/heroku/instance_methods.rb

@@ -0,0 +1,42 @@
+module Flydata
+  module Heroku
+    module InstanceMethods
+      # @return [Hash]
+      def as_flydata
+        # Logic borrowed from activemodel/lib/active_model/serialization.rb
+        options = { :root => nil }
+        attribute_names = self.class._flydata_attributes || attributes.keys.sort
+        hash = {}
+        attribute_names.each do |n|
+          value = read_attribute_for_serialization(n)
+          hash[n] = case value
+                    when Time
+                      Flydata.format_time_for_redshift(value)
+                    when DateTime
+                      Flydata.format_time_for_redshift(value)
+                    when Date
+                      Flydata.format_date_for_redshift(value)
+                    else
+                      value
+                    end
+        end
+        method_names = Array.wrap(options[:methods]).select { |n| respond_to?(n) }
+        method_names.each { |n| hash[n] = send(n) }
+
+        serializable_add_includes(options) do |association, records, opts|
+          hash[association] = if records.is_a?(Enumerable)
+                                records.map { |a| a.serializable_hash(opts) }
+                              else
+                                records.serializable_hash(opts)
+                              end
+        end
+
+        hash
+      end
+
+      def send_to_flydata
+        $stdout.puts({ self.class.flydata_table_name => as_flydata }.to_json)
+      end
+    end
+  end
+end