embulk-parser-twitter_ads_stats 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93219dadb40ae3f94d32c5eddad58f1a8b4d94b6
-  data.tar.gz: 5a204dfced19354a50327532c32aef666f0533dc
+  metadata.gz: e69b0390b7c28349313aaebf2524b549ab16c9d6
+  data.tar.gz: bf8dd7e7a60dda0a5953e3010a1c0981e95aac4e
 SHA512:
-  metadata.gz: cc52f765282f057a53ea9c89a323c1614b8c4b96adffde596eb910a329bad316fa8f67c8462edbdc37ab0579b47c43d9c20d81bce70a849c1afc1f72f6284629
-  data.tar.gz: a478b63c6530108db5a57a2c718a716189b17ef79b285b7239877b5a7d94b0d49641676dd8633cd661319168704f16d7d759191c193ff1706aa8e11465bda217
+  metadata.gz: b4b04c28a0e215d3a04c52ae8111f1a1ca41429f8363bf3048a5cadf655729453f32da3102e812034b6b105cc40ee0a4acb82f90d8a8e550254fa86995bc9649
+  data.tar.gz: efce4bd51917e7f461607ce8f22881b5514a44a2045c18d1738d57496a5bf155630b4ea9e63512d193c7300154edabb97ff44dd90b5c2ead638dd7182463b8b1

data/README.md

@@ -43,7 +43,7 @@ in:
 *************************** 1 ***************************
                id (string) : xxxxx
              date (string) : 2017-08-20
-          segment (string) :
+          segment (  json) :
         placement (string) : ALL_ON_TWITTER
           billing (  json) : {"billed_charge_local_micro":100000000000,"billed_engagements":100}
        engagement (  json) : {"likes":1,"engagements":1,"app_clicks":100,"clicks":100,"card_engagements":100,"qualified_impressions":null,"retweets":1,"impressions":1,"follows":1,"replies":1,"url_clicks":1}
@@ -54,7 +54,7 @@ mobile_conversion (  json) : {"mobile_conversion_rates_order_quantity":null,"mob
 *************************** 2 ***************************
                id (string) : xxxxx
              date (string) : 2017-08-21
-          segment (string) :
+          segment (  json) : {"segment_name":"hoge","segment_value":"fuga"}
         placement (string) : ALL_ON_TWITTER
           billing (  json) : {"billed_charge_local_micro":200000000000,"billed_engagements":200}
        engagement (  json) : {"likes":2,"engagements":2,"app_clicks":200,"clicks":200,"card_engagements":200,"qualified_impressions":null,"retweets":2,"impressions":2,"follows":2,"replies":2,"url_clicks":2}

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.3"
+version = "0.1.4"
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7

data/src/main/scala/org/embulk/parser/twitter_ads_stats/Column.scala

@@ -27,7 +27,7 @@ object Column {
     val baseColumns = Seq(
       new EmbulkColumn(0, "id", Types.STRING),
       new EmbulkColumn(1, "date", Types.STRING),
-      new EmbulkColumn(2, "segment", Types.STRING),
+      new EmbulkColumn(2, "segment", Types.JSON),
       new EmbulkColumn(3, "placement", Types.STRING)
     )
 
@@ -43,7 +43,7 @@ object Column {
 case class Column(
     id: String,
     date: LocalDate,
-    segment: Option[String],
+    segment: Option[Segment],
     placement: String,
     metricsGroup: Map[String, MetricsGroup]
 )

data/src/main/scala/org/embulk/parser/twitter_ads_stats/SegmentJson.scala

@@ -0,0 +1,16 @@
+package org.embulk.parser.twitter_ads_stats
+
+import spray.json.DefaultJsonProtocol._
+import spray.json._
+
+object SegmentJson {
+  implicit object SegmentJsonWriter extends RootJsonWriter[Segment] {
+
+    private def toJValue(element: String): JsValue = element.toJson
+
+    override def write(obj: Segment): JsValue = {
+      val jsFields = obj.map(v => (v._1, toJValue(v._2)))
+      JsObject(jsFields)
+    }
+  }
+}

data/src/main/scala/org/embulk/parser/twitter_ads_stats/TwitterAdsStatsParserPlugin.scala

@@ -10,6 +10,7 @@ import spray.json.{pimpAny, pimpString}
 import scala.util.control.NonFatal
 import scala.collection.JavaConverters._
 import MetricsGroupJson._
+import SegmentJson._
 import org.embulk.parser.twitter_ads_stats.define.{Root, RootJson}
 
 class TwitterAdsStatsParserPlugin extends ParserPlugin {
@@ -57,7 +58,7 @@ class TwitterAdsStatsParserPlugin extends ParserPlugin {
           case (Column(_, date, _, _, _), "date") =>
             pb.setString(embulkColumn, date.toString)
           case (Column(_, _, Some(segment), _, _), "segment") =>
-            pb.setString(embulkColumn, segment)
+            pb.setJson(embulkColumn, jsonParser.parse(segment.toJson.compactPrint))
           case (Column(_, _, None, _, _), "segment") =>
             pb.setNull(embulkColumn)
           case (Column(_, _, _, placement, _), "placement") =>

data/src/main/scala/org/embulk/parser/twitter_ads_stats/define/IDData.scala

@@ -4,7 +4,7 @@ import java.time.LocalDate
 
 import org.embulk.parser.twitter_ads_stats._
 
-case class IDData(metrics: Metrics, segment: Option[String]) {
+case class IDData(metrics: Metrics, segment: Option[Segment]) {
   private def resolveColumn(
       id: String,
       metricElementNames: MetricElementNames,

data/src/main/scala/org/embulk/parser/twitter_ads_stats/define/Request.scala

@@ -13,7 +13,8 @@ object Request {
 case class Params(
     start_time: StatsDateTime,
     end_time: StatsDateTime,
-    placement: String
+    placement: String,
+    segmentation_type: Option[String]
 ) {
   require(!start_time.isAfter(end_time))
   require(start_time.isSameOffsetTime(end_time))

data/src/main/scala/org/embulk/parser/twitter_ads_stats/define/RootJson.scala

@@ -1,6 +1,6 @@
 package org.embulk.parser.twitter_ads_stats.define
 
-import org.embulk.parser.twitter_ads_stats.{MetricElementNames, MetricTimeSeries}
+import org.embulk.parser.twitter_ads_stats.{MetricElementNames, MetricTimeSeries, Segment}
 import spray.json.{DefaultJsonProtocol, DeserializationException, JsArray, JsString, JsValue, RootJsonReader}
 
 class RootJson(metricElementNames: MetricElementNames) extends DefaultJsonProtocol {
@@ -36,7 +36,7 @@ class RootJson(metricElementNames: MetricElementNames) extends DefaultJsonProtoc
         case Seq(a: JsValue, b) =>
           IDData(
             MetricsReader.read(a.asJsObject),
-            b.convertTo[Option[String]]
+            b.convertTo[Option[Segment]]
           )
         case x => throw DeserializationException(msg = s"id_data can't deserialize json: $x", fieldNames = fieldNames)
       }
@@ -64,11 +64,12 @@ class RootJson(metricElementNames: MetricElementNames) extends DefaultJsonProtoc
       override def read(json: JsValue): Params = {
         val fieldNames = Params.fieldNames.toList
         json.asJsObject.getFields(fieldNames: _*) match {
-          case Seq(JsString(a), JsString(b), c) =>
+          case Seq(JsString(a), JsString(b), c, segmentationType) =>
             Params(
               StatsDateTime(a),
               StatsDateTime(b),
-              c.convertTo[String]
+              c.convertTo[String],
+              segmentationType.convertTo[Option[String]]
             )
           case x => throw DeserializationException(msg = s"params can't deserialize json: $x", fieldNames = fieldNames)
         }

data/src/main/scala/org/embulk/parser/twitter_ads_stats/package.scala

@@ -3,6 +3,7 @@ package org.embulk.parser
 package object twitter_ads_stats {
   type MetricTimeSeries = Option[Vector[Long]]
   type MetricsGroup     = Map[String, Option[Long]]
+  type Segment          = Map[String, String]
 
   val metricElementNames = MetricElementNames(
     Map(

data/src/test/scala/org/embulk/parser/twitter_ads_stats/ColumnSpec.scala

@@ -22,10 +22,10 @@ class ColumnSpec extends UnitSpec {
     val expected = Seq(
       new EmbulkColumn(0, "id", Types.STRING),
       new EmbulkColumn(1, "date", Types.STRING),
-      new EmbulkColumn(2, "segment", Types.STRING),
+      new EmbulkColumn(2, "segment", Types.JSON),
       new EmbulkColumn(3, "placement", Types.STRING),
       new EmbulkColumn(4, "billing", Types.JSON),
-      new EmbulkColumn(5, "video", Types.JSON),
+      new EmbulkColumn(5, "video", Types.JSON)
     )
 
     assert(actual == expected)

data/src/test/scala/org/embulk/parser/twitter_ads_stats/SegmentJsonSpec.scala

@@ -0,0 +1,19 @@
+package org.embulk.parser.twitter_ads_stats
+
+import spray.json.{pimpAny, JsObject, JsString}
+
+class SegmentJsonSpec extends UnitSpec {
+  "json write" in {
+    import SegmentJson._
+
+    val v: Segment = Map("segment_name" -> "hoge", "segment_value" -> "fuga")
+
+    val actual = v.toJson
+
+    val expected = JsObject(
+      "segment_name"  -> JsString("hoge"),
+      "segment_value" -> JsString("fuga")
+    )
+    assert(actual == expected)
+  }
+}

data/src/test/scala/org/embulk/parser/twitter_ads_stats/define/ParamsSpec.scala

@@ -6,7 +6,7 @@ import org.embulk.parser.twitter_ads_stats.UnitSpec
 
 class ParamsSpec extends UnitSpec {
   "開始日~(終了日-1)の日程を取得する" in {
-    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-03T15:00:00Z"), "")
+    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-03T15:00:00Z"), "", None)
     val actual = period.targetDates
     val expected = List(
       LocalDate.of(2017, 1, 1),
@@ -16,7 +16,7 @@ class ParamsSpec extends UnitSpec {
     assert(actual == expected)
   }
   "開始日から終了日までの全日程は、開始日から終了日が同一な場合は同一な日程となる" in {
-    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-01T15:00:00Z"), "")
+    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-01T15:00:00Z"), "", None)
     val actual = period.targetDates
     val expected = List(
       LocalDate.of(2017, 1, 1)

data/src/test/scala/org/embulk/parser/twitter_ads_stats/define/RootSpec.scala

@@ -177,7 +177,8 @@ class RootSpec extends UnitSpec {
         params = Params(
           start_time = StatsDateTime("2017-01-01T01:01:01Z"),
           end_time = StatsDateTime("2017-01-04T01:01:01Z"),
-          placement = ""
+          placement = "",
+          segmentation_type = None
         )
       )
     ).resolveColumns(metricElementNames)
@@ -203,7 +204,8 @@ class RootSpec extends UnitSpec {
         params = Params(
           start_time = StatsDateTime("2017-01-01T01:01:01Z"),
           end_time = StatsDateTime("2017-01-01T01:01:01Z"),
-          placement = ""
+          placement = "",
+          segmentation_type = None
         )
       )
     ).resolveColumns(names)
@@ -267,7 +269,8 @@ object RootSpec {
       params = Params(
         start_time = StatsDateTime("2017-01-01T01:01:01Z"),
         end_time = StatsDateTime("2017-01-03T01:01:01Z"),
-        placement = ""
+        placement = "",
+        segmentation_type = None
       )
     )
   )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-twitter_ads_stats
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - kimutyam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - src/main/scala/org/embulk/parser/twitter_ads_stats/MetricsGroupJson.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/ParseException.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/PluginTask.scala
+- src/main/scala/org/embulk/parser/twitter_ads_stats/SegmentJson.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/TwitterAdsStatsParserPlugin.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/define/Data.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/define/FieldNameUtil.scala
@@ -81,13 +82,14 @@ files:
 - src/test/scala/org/embulk/parser/twitter_ads_stats/ColumnSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/MetricElementNamesSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/MetricsGroupJsonSpec.scala
+- src/test/scala/org/embulk/parser/twitter_ads_stats/SegmentJsonSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/UnitSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/define/MetricsJsonSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/define/ParamsSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/define/RootJsonSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/define/RootSpec.scala
 - src/test/scala/org/embulk/parser/twitter_ads_stats/define/StatsDateTimeSpec.scala
-- classpath/embulk-parser-twitter_ads_stats-0.1.3.jar
+- classpath/embulk-parser-twitter_ads_stats-0.1.4.jar
 - classpath/scala-library-2.12.3.jar
 - classpath/spray-json_2.12-1.3.3.jar
 homepage: https://github.com/septeni-original/embulk-parser-twitter_ads_stats