embulk-parser-twitter_ads_stats 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1833c6a364918557a8792567828b322c53c1b0
-  data.tar.gz: 0a8b23dadeadcbf655be8f4da408ffe66cdfd034
+  metadata.gz: b01ca4d919c7b6a4b43fd5becbd2b2606a522a68
+  data.tar.gz: 3b013591fcb20ca7a2b3a0dd1bf45ce4e6687a0d
 SHA512:
-  metadata.gz: 49e6ccdc2b3aa45b56b9a3908549eff06d0eed15dea8d6681bbb371a4b24642ee57ace7020e7647e55bf425c871415a34838f4352c399a924b783c72a51ef022
-  data.tar.gz: 62c0e5ef405ae59c9545715f4845e22d95eb0b524977141eff0eccc6a006a00cb36a193ddf2478d70c85bf47f206851e95c82cdc2e5eddef8f425ab08fef95ee
+  metadata.gz: 00d138b86ec59902fc4cf150807af1343732d04541a6fe18d1915d8453226a37e21ee6f745e5ddd4df0384b8ab7f27151e486b00c5c437b0747f1551cd30bc58
+  data.tar.gz: 936209667f89677725f4d7b19c7efb86b7b4cf70ba57239b0abaee4cb3b7ad762ccb3fe4e210407744ea0c720289d061bc3b44ef447b079240d4de7a505422ad

data/.travis.yml

@@ -0,0 +1,21 @@
+language: scala
+
+scala:
+  - 2.12.3
+
+script:
+  - >-
+    sbt
+    ++$TRAVIS_SCALA_VERSION
+    scalafmt::test
+    test:scalafmt::test
+    sbt:scalafmt::test
+    test
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt/launchers
+before_cache:
+  - find $HOME/.sbt -name "*.lock" | xargs rm
+  - find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

data/README.md

@@ -1,8 +1,13 @@
 # Twitter Ads Stats parser plugin for Embulk
 
+[![Build Status](https://travis-ci.org/septeni-original/embulk-parser-twitter_ads_stats.svg?branch=master)](https://travis-ci.org/septeni-original/embulk-parser-twitter_ads_stats)
+
 This plugin parse [Twitter Ads Stats](https://developer.twitter.com/en/docs/ads/analytics/overview/metrics-and-segmentation) json file.
 
-##Parse Logic
+## Notice
+This plugin is an EXPERIMENTAL and support only Java8.
+
+## Parse Logic
 1. Flatten to metrics by date.
 2. Group Metrics into Metrics Group by json type.
 
@@ -28,7 +33,7 @@ I suppose this kind of [input file](https://github.com/septeni-original/embulk-p
 in:
   type: any file input plugin type
   parser:
-    type: sample
+    type: twitter_ads_stats
     stop_on_invalid_record: true
 ```
 
@@ -75,5 +80,5 @@ sbt test
 
 ## Acknowledgement
 
-I developed this library with reference to [embulk-parser-firebase_avro](https://github.com/smdmts/embulk-parser-firebase_avro)
+I developed this library with reference to [embulk-parser-firebase_avro](https://github.com/smdmts/embulk-parser-firebase_avro).  
 Thank you very much.

data/build.gradle

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

data/build.sbt

@@ -1,15 +1,19 @@
-lazy val core = (project in file(".")).
-  settings(
-    inThisBuild(List(
+lazy val core = (project in file(".")).settings(
+  inThisBuild(
+    List(
       organization := "jp.co.septeni-original",
       scalaVersion := "2.12.3",
       version := "0.1.0-SNAPSHOT"
-    )),
-    name := "embulk-parser-twitter_ads_stats"
-  )
+    )
+  ),
+  name := "embulk-parser-twitter_ads_stats"
+)
 
 enablePlugins(ScalafmtPlugin)
 
 resolvers += Resolver.jcenterRepo
 libraryDependencies ++= Dependencies.value
 scalacOptions += "-Xexperimental"
+
+scalafmtVersion in ThisBuild := "1.2.0"
+scalafmtOnCompile in ThisBuild := true

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

@@ -9,10 +9,10 @@ object Column {
   def createEmbulkColumns(metricElementNames: MetricElementNames): Seq[EmbulkColumn] = {
     @scala.annotation.tailrec
     def loop(
-              curIndex: Int,
-              curNames: List[String],
-              acc: Seq[EmbulkColumn]
-            ): Seq[EmbulkColumn] = {
+        curIndex: Int,
+        curNames: List[String],
+        acc: Seq[EmbulkColumn]
+    ): Seq[EmbulkColumn] = {
       curNames match {
         case Nil => acc.reverse
         case x :: xs =>
@@ -24,7 +24,6 @@ object Column {
       }
     }
 
-
     val baseColumns = Seq(
       new EmbulkColumn(0, "id", Types.STRING),
       new EmbulkColumn(1, "date", Types.STRING),
@@ -42,9 +41,9 @@ object Column {
 }
 
 case class Column(
-                   id: String,
-                   date: LocalDate,
-                   segment: Option[String],
-                   placement: String,
-                   metricsGroup: Map[String, MetricsGroup]
-                 )
+    id: String,
+    date: LocalDate,
+    segment: Option[String],
+    placement: String,
+    metricsGroup: Map[String, MetricsGroup]
+)

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

@@ -18,9 +18,12 @@ case class MetricElementNames(names: Map[String, Seq[String]]) {
 
   import MetricElementNames._
 
-  def getSortedMetricsGroupNames:List[String] = names.keys.toList.sorted
+  def getSortedMetricsGroupNames: List[String] = names.keys.toList.sorted
 
-  private[twitter_ads_stats] def resolveMetrics(resolveMetricTimeSeries: (List[String], Option[JsValue]) => MetricTimeSeries, json: JsObject): Metrics =
+  private[twitter_ads_stats] def resolveMetrics(
+      resolveMetricTimeSeries: (List[String], Option[JsValue]) => MetricTimeSeries,
+      json: JsObject
+  ): Metrics =
     Metrics(
       names.flatMap { v =>
         v._2.map { value =>
@@ -44,4 +47,4 @@ object MetricElementNames {
   def replaceSeparator(name: String): String = {
     name.replaceAll("[.]", separator)
   }
-}
+}

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

@@ -8,7 +8,7 @@ object MetricsGroupJson {
 
     private def toJValue(element: Option[Long]): JsValue = element match {
       case Some(e) => e.toJson
-      case None => JsNull
+      case None    => JsNull
     }
 
     override def write(obj: MetricsGroup): JsValue = {

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

@@ -1,25 +1,23 @@
 package org.embulk.parser.twitter_ads_stats
 
 sealed abstract class ParseException(
-                                      message: String,
-                                      cause: Throwable
-                                    ) extends Throwable
-
+    message: String,
+    cause: Throwable
+) extends Throwable
 
 case class InvalidMetricTimeSeriesException(
-                                             message: String,
-                                             cause: Throwable
-                                           ) extends ParseException(message, cause) {
+    message: String,
+    cause: Throwable
+) extends ParseException(message, cause) {
   def this(cause: Throwable, index: Int) = {
     this(s"Not Found index: $index", cause)
   }
 }
 
 case class InvalidInputFileException(
-                                      message: String,
-                                      cause: Throwable
-                                    )
-  extends ParseException(message, cause) {
+    message: String,
+    cause: Throwable
+) extends ParseException(message, cause) {
 
   def this(cause: Throwable) = {
     this(s"Input file can't parse", cause)

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

@@ -26,13 +26,13 @@ class TwitterAdsStatsParserPlugin extends ParserPlugin {
 
   override def run(taskSource: TaskSource, schema: Schema, input: FileInput, output: PageOutput): Unit = {
 
-    val task = taskSource.loadTask(classOf[PluginTask])
+    val task                = taskSource.loadTask(classOf[PluginTask])
     val stopOnInvalidRecord = task.getStopOnInvalidRecord
 
     LoanPattern(new PageBuilder(Exec.getBufferAllocator, schema, output)) { pb =>
       while (input.nextFile()) {
         (for {
-          root <- createRootFrom(input)
+          root    <- createRootFrom(input)
           columns <- root.resolveColumns(metricElementNames)
         } yield addRecord(pb, columns, root)) match {
           case Right(_) =>
@@ -54,15 +54,15 @@ class TwitterAdsStatsParserPlugin extends ParserPlugin {
         (column, embulkColumn.getName) match {
           case (Column(id, _, _, _, _), "id") =>
             pb.setString(embulkColumn, id)
-          case (Column(_, date, _, _,_), "date") =>
+          case (Column(_, date, _, _, _), "date") =>
             pb.setString(embulkColumn, date.toString)
-          case (Column(_, _, Some(segment),_, _), "segment") =>
+          case (Column(_, _, Some(segment), _, _), "segment") =>
             pb.setString(embulkColumn, segment)
-          case (Column(_, _, None,_, _), "segment") =>
+          case (Column(_, _, None, _, _), "segment") =>
             pb.setNull(embulkColumn)
-          case (Column(_, _, _,placement, _), "placement") =>
+          case (Column(_, _, _, placement, _), "placement") =>
             pb.setString(embulkColumn, placement)
-          case (Column(_, _, _, _,metricsGroup), key) =>
+          case (Column(_, _, _, _, metricsGroup), key) =>
             metricsGroup.get(key) match {
               case Some(m) =>
                 pb.setJson(
@@ -84,7 +84,7 @@ class TwitterAdsStatsParserPlugin extends ParserPlugin {
     val stream = new FileInputInputStream(input)
     try {
       val jsValue = scala.io.Source.fromInputStream(stream).mkString.parseJson
-      val root = new RootJson(metricElementNames).RootReader.read(jsValue)
+      val root    = new RootJson(metricElementNames).RootReader.read(jsValue)
       Right(root)
     } catch {
       case NonFatal(e) => Left(new InvalidInputFileException(e))
@@ -94,5 +94,5 @@ class TwitterAdsStatsParserPlugin extends ParserPlugin {
 
 object TwitterAdsStatsParserPlugin {
   val logger: Logger = Exec.getLogger(classOf[TwitterAdsStatsParserPlugin])
-  val jsonParser = new JsonParser
+  val jsonParser     = new JsonParser
 }

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

@@ -3,17 +3,20 @@ package org.embulk.parser.twitter_ads_stats.define
 import org.embulk.parser.twitter_ads_stats.{Column, MetricElementNames, ParseException}
 
 case class Data(id: String, id_data: Seq[IDData]) {
-  private[define] def resolveColumns(metricElementNames: MetricElementNames, request: Request): Either[ParseException, Seq[Column]] = {
-    id_data.map { idData =>
-      idData.resolveColumns(id, metricElementNames, request)
-    }.foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
-      case (Left(e), _) => Left(e)
-      case (Right(_), Left(e)) => Left(e)
-      case (Right(seq1), Right(seq2)) => Right(seq1 ++: seq2)
-    }
+  private[define] def resolveColumns(metricElementNames: MetricElementNames,
+                                     request: Request): Either[ParseException, Seq[Column]] = {
+    id_data
+      .map { idData =>
+        idData.resolveColumns(id, metricElementNames, request)
+      }
+      .foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
+        case (Left(e), _)               => Left(e)
+        case (Right(_), Left(e))        => Left(e)
+        case (Right(seq1), Right(seq2)) => Right(seq1 ++: seq2)
+      }
   }
 }
 
 object Data {
-  val fieldNames:Array[String] = FieldNameUtil.fieldList[Data]
-}
+  val fieldNames: Array[String] = FieldNameUtil.fieldList[Data]
+}

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

@@ -6,28 +6,35 @@ import org.embulk.parser.twitter_ads_stats._
 
 case class IDData(metrics: Metrics, segment: Option[String]) {
   private def resolveColumn(
-                             id: String,
-                             metricElementNames: MetricElementNames,
-                             date: (LocalDate, Int),
-                             placement: String
-                           ): Either[ParseException, Column] = {
-    metricElementNames.names.map { name =>
-      (name._1, metrics.findMetricsGroup(date._2, name._2))
-    }.foldRight[Either[ParseException, Map[String, MetricsGroup]]](Right(Map.empty)) {
-      case ((_, Left(e)), _) => Left(e)
-      case ((_, Right(_)), Left(e)) => Left(e)
-      case ((s, Right(r)), Right(acc)) => Right(acc + (s -> r))
-    }.map(Column(id, date._1, segment, placement, _))
+      id: String,
+      metricElementNames: MetricElementNames,
+      date: (LocalDate, Int),
+      placement: String
+  ): Either[ParseException, Column] = {
+    metricElementNames.names
+      .map { name =>
+        (name._1, metrics.findMetricsGroup(date._2, name._2))
+      }
+      .foldRight[Either[ParseException, Map[String, MetricsGroup]]](Right(Map.empty)) {
+        case ((_, Left(e)), _)           => Left(e)
+        case ((_, Right(_)), Left(e))    => Left(e)
+        case ((s, Right(r)), Right(acc)) => Right(acc + (s -> r))
+      }
+      .map(Column(id, date._1, segment, placement, _))
   }
 
-  private[define] def resolveColumns(id: String, metricElementNames: MetricElementNames, request: Request): Either[ParseException, Seq[Column]] = {
-    request.params.targetDates.zipWithIndex.map { date =>
-      resolveColumn(id, metricElementNames, date, request.params.placement)
-    }.foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
-      case (Left(e), _) => Left(e)
-      case (Right(_), Left(e)) => Left(e)
-      case (Right(a), Right(seq)) => Right(a +: seq)
-    }
+  private[define] def resolveColumns(id: String,
+                                     metricElementNames: MetricElementNames,
+                                     request: Request): Either[ParseException, Seq[Column]] = {
+    request.params.targetDates.zipWithIndex
+      .map { date =>
+        resolveColumn(id, metricElementNames, date, request.params.placement)
+      }
+      .foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
+        case (Left(e), _)           => Left(e)
+        case (Right(_), Left(e))    => Left(e)
+        case (Right(a), Right(seq)) => Right(a +: seq)
+      }
   }
 }
 

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

@@ -1,24 +1,25 @@
 package org.embulk.parser.twitter_ads_stats.define
 
-import java.time.{LocalDate, LocalDateTime}
+import java.time.LocalDate
 
 case class Request(
-                    params: Params
-                  )
+    params: Params
+)
 
 object Request {
   val fieldNames: Array[String] = FieldNameUtil.fieldList[Request]
 }
 
 case class Params(
-                   start_time: LocalDateTime,
-                   end_time: LocalDateTime,
-                   placement: String
-                 ) {
+    start_time: StatsDateTime,
+    end_time: StatsDateTime,
+    placement: String
+) {
   require(!start_time.isAfter(end_time))
+  require(start_time.isSameOffsetTime(end_time))
 
-  val startDate = start_time.toLocalDate
-  val endDate = end_time.toLocalDate
+  val startDate = start_time.adAccountLocalDate
+  val endDate   = end_time.adAccountLocalDate
 
   /**
     * MetricTimeSeries の期間
@@ -29,7 +30,7 @@ case class Params(
     def loop(curDate: LocalDate, acc: List[LocalDate]): List[LocalDate] = {
       acc match {
         case x :: _ if !x.isBefore(endDate.minusDays(1)) => acc.reverse
-        case _ => loop(curDate.plusDays(1), curDate :: acc)
+        case _                                           => loop(curDate.plusDays(1), curDate :: acc)
       }
     }
 

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

@@ -3,19 +3,21 @@ package org.embulk.parser.twitter_ads_stats.define
 import org.embulk.parser.twitter_ads_stats.{Column, MetricElementNames, ParseException}
 
 case class Root(
-                 data: Seq[Data],
-                 request: Request
-               ) {
+    data: Seq[Data],
+    request: Request
+) {
   def resolveColumns(metricElementNames: MetricElementNames): Either[ParseException, Seq[Column]] = {
-    data.map { d =>
-      d.resolveColumns(metricElementNames, request)
-    }.foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
-      case (Left(e), _) => Left(e)
-      case (Right(_), Left(e)) => Left(e)
-      case (Right(seq1), Right(seq2)) => Right(seq1 ++: seq2)
-    }
+    data
+      .map { d =>
+        d.resolveColumns(metricElementNames, request)
+      }
+      .foldRight[Either[ParseException, Seq[Column]]](Right(Nil)) {
+        case (Left(e), _)               => Left(e)
+        case (Right(_), Left(e))        => Left(e)
+        case (Right(seq1), Right(seq2)) => Right(seq1 ++: seq2)
+      }
   }
 }
 object Root {
-  val fieldNames:Array[String] = FieldNameUtil.fieldList[Root]
-}
+  val fieldNames: Array[String] = FieldNameUtil.fieldList[Root]
+}

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

@@ -1,8 +1,5 @@
 package org.embulk.parser.twitter_ads_stats.define
 
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-
 import org.embulk.parser.twitter_ads_stats.{MetricElementNames, MetricTimeSeries}
 import spray.json.{DefaultJsonProtocol, DeserializationException, JsArray, JsString, JsValue, RootJsonReader}
 
@@ -13,7 +10,7 @@ class RootJson(metricElementNames: MetricElementNames) extends DefaultJsonProtoc
     private def readMetricTimeSeries(jsValue: JsValue): MetricTimeSeries = {
       jsValue match {
         case JsArray(arr) => Some(arr.map(_.convertTo[Long]))
-        case _ => None
+        case _            => None
       }
     }
 
@@ -68,11 +65,9 @@ class RootJson(metricElementNames: MetricElementNames) extends DefaultJsonProtoc
         val fieldNames = Params.fieldNames.toList
         json.asJsObject.getFields(fieldNames: _*) match {
           case Seq(JsString(a), JsString(b), c) =>
-            val formatter = DateTimeFormatter.ISO_DATE_TIME
-            //todo DateTimeFormatterでフォーマットが出来ない場合の例外処理
             Params(
-              LocalDateTime.parse(a, formatter),
-              LocalDateTime.parse(b, formatter),
+              StatsDateTime(a),
+              StatsDateTime(b),
               c.convertTo[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/define/StatsDateTime.scala

@@ -0,0 +1,25 @@
+package org.embulk.parser.twitter_ads_stats.define
+
+import java.time.{LocalDate, LocalDateTime}
+import java.time.format.DateTimeFormatter
+
+/**
+  * @param iso8601DateTime This datetime represents midnight in the timezone of the advertiser's account.
+  */
+case class StatsDateTime(iso8601DateTime: String) {
+
+  private val utcDateTime: LocalDateTime = LocalDateTime.parse(iso8601DateTime, DateTimeFormatter.ISO_DATE_TIME)
+
+  def adAccountLocalDate: LocalDate = utcDateTime.plusHours(StatsDateTime.DateLineOffsetHours).toLocalDate
+
+  def isAfter(that: StatsDateTime): Boolean = this.utcDateTime.isAfter(that.utcDateTime)
+
+  def isSameOffsetTime(that: StatsDateTime): Boolean = this.utcDateTime.toLocalTime == that.utcDateTime.toLocalTime
+
+}
+
+object StatsDateTime {
+
+  val DateLineOffsetHours = 12
+
+}

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

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

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

@@ -6,7 +6,7 @@ class MetricElementNamesSpec extends UnitSpec {
     val names = MetricElementNames(
       Map("b" -> emptySeq, "a" -> emptySeq, "c" -> emptySeq)
     )
-    val actual = names.getSortedMetricsGroupNames
+    val actual   = names.getSortedMetricsGroupNames
     val expected = List("a", "b", "c")
 
     assert(actual == expected)

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

@@ -1,6 +1,6 @@
 package org.embulk.parser.twitter_ads_stats
 
-import spray.json.{JsNull, JsNumber, JsObject, pimpAny}
+import spray.json.{pimpAny, JsNull, JsNumber, JsObject}
 
 class MetricsGroupJsonSpec extends UnitSpec {
   "json write" in {
@@ -11,8 +11,8 @@ class MetricsGroupJsonSpec extends UnitSpec {
     val actual = v.toJson
 
     val expected = JsObject(
-      "a" -> JsNumber(3),
-      "b" -> JsNumber(6),
+      "a"   -> JsNumber(3),
+      "b"   -> JsNumber(6),
       "c_e" -> JsNull
     )
     assert(actual == expected)

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

@@ -44,8 +44,8 @@ class MetricsJsonSpec extends UnitSpec {
     val actual = new RootJson(metricElementNames).MetricsReader.read(jsValue)
     val expected = Metrics(
       Map(
-        "a" -> Some(Vector(510, 494, 364)),
-        "b" -> Some(Vector(1, 2, 3)),
+        "a"   -> Some(Vector(510, 494, 364)),
+        "b"   -> Some(Vector(1, 2, 3)),
         "c_e" -> Some(Vector(1, 2, 3)),
         "c_f" -> None,
         "d_e" -> Some(Vector(2, 3, 4)),

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

@@ -1,12 +1,12 @@
 package org.embulk.parser.twitter_ads_stats.define
 
-import java.time.{LocalDate, LocalDateTime}
+import java.time.LocalDate
 
 import org.embulk.parser.twitter_ads_stats.UnitSpec
 
 class ParamsSpec extends UnitSpec {
   "開始日~(終了日-1)の日程を取得する" in {
-    val period = Params(LocalDateTime.of(2017, 1, 1, 0, 0, 0), LocalDateTime.of(2017, 1, 4, 23, 23, 23), "")
+    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-03T15:00:00Z"), "")
     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(LocalDateTime.of(2017, 1, 1, 0, 0, 0), LocalDateTime.of(2017, 1, 1, 23, 23, 23), "")
+    val period = Params(StatsDateTime("2016-12-31T15:00:00Z"), StatsDateTime("2017-01-01T15:00:00Z"), "")
     val actual = period.targetDates
     val expected = List(
       LocalDate.of(2017, 1, 1)

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

@@ -17,4 +17,4 @@ class RootJsonSpec extends UnitSpec {
     val root = new RootJson(twitter_ads_stats.metricElementNames).RootReader.read(largeJsonSource)
     //    println(root)
   }
-}
+}

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

@@ -20,11 +20,11 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(1),
+            "media_views"       -> Some(1),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-            "billed_engagements" -> Some(1),
+            "billed_engagements"        -> Some(1),
             "billed_charge_local_micro" -> Some(1)
           ),
           "web_conversion" -> Map(
@@ -39,11 +39,11 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(2),
+            "media_views"       -> Some(2),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-            "billed_engagements" -> Some(2),
+            "billed_engagements"        -> Some(2),
             "billed_charge_local_micro" -> Some(2)
           ),
           "web_conversion" -> Map(
@@ -58,13 +58,13 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(10),
+            "media_views"       -> Some(10),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-              "billed_engagements" -> Some(10),
-              "billed_charge_local_micro" -> Some(10)
-            ),
+            "billed_engagements"        -> Some(10),
+            "billed_charge_local_micro" -> Some(10)
+          ),
           "web_conversion" -> Map(
             "conversion_purchases_assisted" -> Some(10)
           )
@@ -77,11 +77,11 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(20),
+            "media_views"       -> Some(20),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-            "billed_engagements" -> Some(20),
+            "billed_engagements"        -> Some(20),
             "billed_charge_local_micro" -> Some(20)
           ),
           "web_conversion" -> Map(
@@ -96,13 +96,13 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(1),
+            "media_views"       -> Some(1),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-              "billed_engagements" -> Some(1),
-              "billed_charge_local_micro" -> Some(1)
-            ),
+            "billed_engagements"        -> Some(1),
+            "billed_charge_local_micro" -> Some(1)
+          ),
           "web_conversion" -> Map(
             "conversion_purchases_assisted" -> Some(1)
           )
@@ -115,11 +115,11 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(2),
+            "media_views"       -> Some(2),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-            "billed_engagements" -> Some(2),
+            "billed_engagements"        -> Some(2),
             "billed_charge_local_micro" -> Some(2)
           ),
           "web_conversion" -> Map(
@@ -134,13 +134,13 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(10),
+            "media_views"       -> Some(10),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-              "billed_engagements" -> Some(10),
-              "billed_charge_local_micro" -> Some(10)
-            ),
+            "billed_engagements"        -> Some(10),
+            "billed_charge_local_micro" -> Some(10)
+          ),
           "web_conversion" -> Map(
             "conversion_purchases_assisted" -> Some(10)
           )
@@ -153,11 +153,11 @@ class RootSpec extends UnitSpec {
         "",
         Map(
           "media" -> Map(
-            "media_views" -> Some(20),
+            "media_views"       -> Some(20),
             "media_engagements" -> None
           ),
           "billing" -> Map(
-            "billed_engagements" -> Some(20),
+            "billed_engagements"        -> Some(20),
             "billed_charge_local_micro" -> Some(20)
           ),
           "web_conversion" -> Map(
@@ -175,8 +175,8 @@ class RootSpec extends UnitSpec {
     val actual = createRoot(
       Request(
         params = Params(
-          start_time = LocalDateTime.of(2017, 1, 1, 1, 1, 1),
-          end_time = LocalDateTime.of(2017, 1, 4, 1, 1, 1),
+          start_time = StatsDateTime("2017-01-01T01:01:01Z"),
+          end_time = StatsDateTime("2017-01-04T01:01:01Z"),
           placement = ""
         )
       )
@@ -192,17 +192,17 @@ class RootSpec extends UnitSpec {
     val names = MetricElementNames(
       Map(
         "media" ->
-          Seq(
-            "media_views"
-          )
+        Seq(
+          "media_views"
+        )
       )
     )
 
     val actual = createRoot(
       Request(
         params = Params(
-          start_time = LocalDateTime.of(2017, 1, 1, 1, 1, 1),
-          end_time = LocalDateTime.of(2017, 1, 1, 1, 1, 1),
+          start_time = StatsDateTime("2017-01-01T01:01:01Z"),
+          end_time = StatsDateTime("2017-01-01T01:01:01Z"),
           placement = ""
         )
       )
@@ -265,8 +265,8 @@ object RootSpec {
   val defaultRoot: Root = createRoot(
     Request(
       params = Params(
-        start_time = LocalDateTime.of(2017, 1, 1, 1, 1, 1),
-        end_time = LocalDateTime.of(2017, 1, 3, 1, 1, 1),
+        start_time = StatsDateTime("2017-01-01T01:01:01Z"),
+        end_time = StatsDateTime("2017-01-03T01:01:01Z"),
         placement = ""
       )
     )
@@ -281,10 +281,10 @@ object RootSpec {
             IDData(
               metrics = Metrics(
                 Map(
-                  "billed_engagements" -> Some(Vector(1, 2)),
-                  "billed_charge_local_micro" -> Some(Vector(1, 2)),
-                  "media_views" -> Some(Vector(1, 2)),
-                  "media_engagements" -> None,
+                  "billed_engagements"            -> Some(Vector(1, 2)),
+                  "billed_charge_local_micro"     -> Some(Vector(1, 2)),
+                  "media_views"                   -> Some(Vector(1, 2)),
+                  "media_engagements"             -> None,
                   "conversion_purchases_assisted" -> Some(Vector(1, 2))
                 )
               ),
@@ -293,10 +293,10 @@ object RootSpec {
             IDData(
               metrics = Metrics(
                 Map(
-                  "billed_engagements" -> Some(Vector(10, 20)),
-                  "billed_charge_local_micro" -> Some(Vector(10, 20)),
-                  "media_views" -> Some(Vector(10, 20)),
-                  "media_engagements" -> None,
+                  "billed_engagements"            -> Some(Vector(10, 20)),
+                  "billed_charge_local_micro"     -> Some(Vector(10, 20)),
+                  "media_views"                   -> Some(Vector(10, 20)),
+                  "media_engagements"             -> None,
                   "conversion_purchases_assisted" -> Some(Vector(10, 20))
                 )
               ),
@@ -310,10 +310,10 @@ object RootSpec {
             IDData(
               metrics = Metrics(
                 Map(
-                  "billed_engagements" -> Some(Vector(1, 2)),
-                  "billed_charge_local_micro" -> Some(Vector(1, 2)),
-                  "media_views" -> Some(Vector(1, 2)),
-                  "media_engagements" -> None,
+                  "billed_engagements"            -> Some(Vector(1, 2)),
+                  "billed_charge_local_micro"     -> Some(Vector(1, 2)),
+                  "media_views"                   -> Some(Vector(1, 2)),
+                  "media_engagements"             -> None,
                   "conversion_purchases_assisted" -> Some(Vector(1, 2))
                 )
               ),
@@ -322,10 +322,10 @@ object RootSpec {
             IDData(
               metrics = Metrics(
                 Map(
-                  "billed_engagements" -> Some(Vector(10, 20)),
-                  "billed_charge_local_micro" -> Some(Vector(10, 20)),
-                  "media_views" -> Some(Vector(10, 20)),
-                  "media_engagements" -> None,
+                  "billed_engagements"            -> Some(Vector(10, 20)),
+                  "billed_charge_local_micro"     -> Some(Vector(10, 20)),
+                  "media_views"                   -> Some(Vector(10, 20)),
+                  "media_engagements"             -> None,
                   "conversion_purchases_assisted" -> Some(Vector(10, 20))
                 )
               ),

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

@@ -0,0 +1,21 @@
+package org.embulk.parser.twitter_ads_stats.define
+
+import java.time.LocalDate
+
+import org.embulk.parser.twitter_ads_stats.UnitSpec
+
+class StatsDateTimeSpec extends UnitSpec {
+
+  "Twitter APIの日時パラメータをアドアカウントでのローカル日付に変換できる" should {
+    "2017-08-20T15:00:00Z は 2017/08/21になる(JST)" in {
+      assert(StatsDateTime("2017-08-20T15:00:00Z").adAccountLocalDate == LocalDate.of(2017, 8, 21))
+    }
+    "2017-08-20T08:00:00Z は 2017/08/20になる(PST)" in {
+      assert(StatsDateTime("2017-08-20T08:00:00Z").adAccountLocalDate == LocalDate.of(2017, 8, 20))
+    }
+    "2017-08-20T10:00:00Z は 2017/08/20になる(Pacific/Honolulu)" in {
+      assert(StatsDateTime("2017-08-20T10:00:00Z").adAccountLocalDate == LocalDate.of(2017, 8, 20))
+    }
+  }
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-parser-twitter_ads_stats
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - kimutyam
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .scalafmt.conf
+- .travis.yml
 - LICENSE.txt
 - README.md
 - build.gradle
@@ -74,6 +75,7 @@ files:
 - src/main/scala/org/embulk/parser/twitter_ads_stats/define/Request.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/define/Root.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/define/RootJson.scala
+- src/main/scala/org/embulk/parser/twitter_ads_stats/define/StatsDateTime.scala
 - src/main/scala/org/embulk/parser/twitter_ads_stats/package.scala
 - src/test/resources/test.json
 - src/test/scala/org/embulk/parser/twitter_ads_stats/ColumnSpec.scala
@@ -84,7 +86,8 @@ files:
 - 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
-- classpath/embulk-parser-twitter_ads_stats-0.1.1.jar
+- src/test/scala/org/embulk/parser/twitter_ads_stats/define/StatsDateTimeSpec.scala
+- classpath/embulk-parser-twitter_ads_stats-0.1.2.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