pendulum 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc5be8a5a9ee22af8db653d00440f081c8c368d7
-  data.tar.gz: 38ad5a3d2c26a564c4067abf3507b1b431b253c3
+  metadata.gz: 1cae79bb4f1c0795054e3ce9da0cffeda994daa5
+  data.tar.gz: 4e60f9c46bdac7093fc655b87ce45d505e7563d3
 SHA512:
-  metadata.gz: d1db1129a5724d97b214bbf17b163de97d7e1ff75740c01f16e3446cfc738dcf5c342c65b2abc3cf70190c0c41bde228649ca9cdaa2cb79085c679fb9260c5a7
-  data.tar.gz: 0bafc9e48d4c623cff9b472b378b5c58c68a4a7cd0d32138beb3bcf9e8dd0fd33263f031d918e4d7f6369d95f5c821aede6f87d2f8f92f8a1bcc008510745e9f
+  metadata.gz: faea929e28c412ddbf15282eae6f2d8941d8553cb27bfd6531d729ecdf5a8dad4df4cc1e99899acdb4dbcdef4db8a35f7ec9435f5cc2235027c99a2c4f58056a
+  data.tar.gz: ea297310a42fe6bb76319209177762b169b1d67347b845a4fd908b09ab9f53ea00ddd0351c2e6f4e70a51c9f92ae62187c14a659ecff10d7495c4e77d142ddc4

data/lib/pendulum.rb

@@ -1,3 +1,4 @@
+require "json"
 require "pendulum/version"
 require "pendulum/client"
 require "pendulum/settings"
@@ -8,6 +9,7 @@ require "pendulum/dsl/result"
 require "pendulum/dsl/output/base"
 require "pendulum/dsl/output/treasure_data"
 require "pendulum/dsl/output/postgresql"
+require "pendulum/dsl/output/nend"
 require "pendulum/dsl/output/result"
 require "pendulum/dsl/converter"
 require "pendulum/command/apply"

data/lib/pendulum/command/apply/result_url.rb

@@ -9,6 +9,28 @@ module Pendulum::Command
       end
 
       def changed?
+        if from.start_with?('{')
+          json_changed?
+        else
+          url_changed?
+        end
+      end
+
+      private
+
+      def json_changed?
+        to_json = JSON.parse(to)
+
+        name = to_json['type']
+        result = result_by(name)
+        to_json = JSON.parse(result.url) if result
+
+        to_json.delete('apikey')
+
+        JSON.parse(from) != to_json
+      end
+
+      def url_changed?
         from_uri = to_uri(from)
         to_uri   = mask(to_uri(to))
 
@@ -16,8 +38,6 @@ module Pendulum::Command
           query_hash(from_uri) != query_hash(to_uri)
       end
 
-      private
-
       def mask(uri)
         uri.password = '***' if uri.user
         uri

data/lib/pendulum/command/apply/schedule.rb

@@ -62,7 +62,7 @@ module Pendulum::Command
 
         @diff ||= begin
                     default_params.merge(to.to_params).select do |k, v|
-                      if k == :result
+                      if k == :result || k == :result_json
                         result_url_changed?(from.result_url, v)
                       else
                         v != from.send(k)
@@ -75,9 +75,16 @@ module Pendulum::Command
         return diff unless diff.key?(:result)
 
         masked = diff.dup
-        uri = URI.parse(masked[:result])
-        uri.password = '***' if uri.user
-        masked[:result] = uri.to_s
+
+        if masked[:result].start_with?('{') || diff.key?(:result_json)
+          hashed_result = JSON.parse(masked[:result])
+          hashed_result.delete('apikey')
+          masked[:result] = hashed_result.to_json
+        else
+          uri = URI.parse(masked[:result])
+          uri.password = '***' if uri.user
+          masked[:result] = uri.to_s
+        end
 
         masked
       end

data/lib/pendulum/dsl/output/nend.rb

@@ -0,0 +1,19 @@
+module Pendulum::DSL::Output
+  class Nend < Base
+    define_setter :api_key, :type, :name,
+                  :retry_delay, :retry_limit
+
+    def to_url
+      {
+        type:                   'nend',
+        apikey:                 @api_key,
+        target_type:            @type,
+        target_name:            @name,
+        retry_initial_wait_sec: @retry_delay || 5,
+        retry_limit:            @retry_limit || 4,
+        application_name:       'Treasure Data nend Output'
+      }.to_json
+    end
+  end
+end
+

data/lib/pendulum/dsl/result.rb

@@ -20,6 +20,8 @@ module Pendulum::DSL
         Output::TreasureData.new
       when :postgresql
         Output::Postgresql.new
+      when :nend
+        Output::Nend.new
       else
         Output::Result.new(type)
       end

data/lib/pendulum/dsl/schedule.rb

@@ -33,6 +33,10 @@ module Pendulum::DSL
       @result = result.to_url
     end
 
+    def result_json(type, hash = {})
+      @result = {type: type}.merge(hash).to_json
+    end
+
     def to_params
       instance_variables.inject({}) do |params, v|
         params[v.to_s.delete('@').to_sym] = instance_variable_get(v)

data/lib/pendulum/version.rb

@@ -1,3 +1,3 @@
 module Pendulum
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pendulum
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - monochromegane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: td
@@ -149,6 +149,7 @@ files:
 - lib/pendulum/dsl/converter.rb
 - lib/pendulum/dsl/helper.rb
 - lib/pendulum/dsl/output/base.rb
+- lib/pendulum/dsl/output/nend.rb
 - lib/pendulum/dsl/output/postgresql.rb
 - lib/pendulum/dsl/output/result.rb
 - lib/pendulum/dsl/output/treasure_data.rb