Updating model structure
commit7d2a59336dde52f4e3c10b577490f838ca03d5aa
authorBrendan Hay <brendan.g.hay@gmail.com>
dateSat 26 Sep 2015, 08:54 (11 years ago)
parent49fee24
gen/Makefile+1−1
@@ -14,7 +14,7 @@ CLIENT_VERSION = $(call version,$(TOP)/gen/gogol-gen.cabal)
1414
1515MODELS ?= $(shell find $(MODEL_DIR) -type f -name '*.json' | sort)
1616
17−.PHONY: $(BIN)/gogol-gen gen format
17+.PHONY: gen format
1818
1919release: gen format
2020
gen/model/adexchangebuyer/adexchangebuyer/v1.2/adexchangebuyer-api.json → gen/model/adexchangebuyer/v1.2/adexchangebuyer-api.jsonrenamed
The content is the same.
gen/model/adexchangebuyer/adexchangebuyer/v1.3/adexchangebuyer-api.json → gen/model/adexchangebuyer/v1.3/adexchangebuyer-api.jsonrenamed
The content is the same.
gen/model/adexchangebuyer/adexchangebuyer/v1.4/adexchangebuyer-api.json → gen/model/adexchangebuyer/v1.4/adexchangebuyer-api.jsonrenamed
The content is the same.
gen/model/adexchangeseller/adexchangeseller/v1.1/adexchangeseller-api.json → gen/model/adexchangeseller/v1.1/adexchangeseller-api.jsonrenamed
The content is the same.
gen/model/adexchangeseller/adexchangeseller/v1/adexchangeseller-api.json → gen/model/adexchangeseller/v1/adexchangeseller-api.jsonrenamed
The content is the same.
gen/model/adexchangeseller/adexchangeseller/v2.0/adexchangeseller-api.json → gen/model/adexchangeseller/v2.0/adexchangeseller-api.jsonrenamed
The content is the same.
gen/model/admin/admin/datatransfer/v1/admin-api.json → gen/model/admin/datatransfer/v1/admin-api.jsonrenamed
The content is the same.
gen/model/admin/admin/directory/v1/admin-api.json → gen/model/admin/directory/v1/admin-api.jsonrenamed
The content is the same.
gen/model/admin/admin/email_migration/v2/admin-api.json → gen/model/admin/email_migration/v2/admin-api.jsonrenamed
The content is the same.
gen/model/admin/admin/reports/v1/admin-api.json → gen/model/admin/reports/v1/admin-api.jsonrenamed
The content is the same.
gen/model/adsense/adsense/v1.2/adsense-api.json → gen/model/adsense/v1.2/adsense-api.jsonrenamed
The content is the same.
gen/model/adsense/adsense/v1.3/adsense-api.json → gen/model/adsense/v1.3/adsense-api.jsonrenamed
The content is the same.
gen/model/adsense/adsense/v1.4/adsense-api.json → gen/model/adsense/v1.4/adsense-api.jsonrenamed
The content is the same.
gen/model/adsensehost/adsensehost/v4.1/adsensehost-api.json → gen/model/adsensehost/v4.1/adsensehost-api.jsonrenamed
The content is the same.
gen/model/analytics/analytics/v2.4/analytics-api.json → gen/model/analytics/v2.4/analytics-api.jsonrenamed
The content is the same.
gen/model/analytics/analytics/v3/analytics-api.json → gen/model/analytics/v3/analytics-api.jsonrenamed
The content is the same.
gen/model/androidenterprise/androidenterprise/v1/androidenterprise-api.json → gen/model/androidenterprise/v1/androidenterprise-api.jsonrenamed
The content is the same.
gen/model/androidpublisher/androidpublisher/v1.1/androidpublisher-api.json → gen/model/androidpublisher/v1.1/androidpublisher-api.jsonrenamed
The content is the same.
gen/model/androidpublisher/androidpublisher/v1/androidpublisher-api.json → gen/model/androidpublisher/v1/androidpublisher-api.jsonrenamed
The content is the same.
gen/model/androidpublisher/androidpublisher/v2/androidpublisher-api.json → gen/model/androidpublisher/v2/androidpublisher-api.jsonrenamed
The content is the same.
gen/model/appengine/appengine/v1beta4/appengine-api.json → gen/model/appengine/v1beta4/appengine-api.jsonrenamed
The content is the same.
gen/model/appsactivity/appsactivity/v1/appsactivity-api.json → gen/model/appsactivity/v1/appsactivity-api.jsonrenamed
The content is the same.
gen/model/appstate/appstate/v1/appstate-api.json → gen/model/appstate/v1/appstate-api.jsonrenamed
The content is the same.
gen/model/autoscaler/autoscaler/v1beta2/autoscaler-api.json → gen/model/autoscaler/v1beta2/autoscaler-api.jsonrenamed
The content is the same.
gen/model/bigquery/bigquery/v2/bigquery-api.json → gen/model/bigquery/v2/bigquery-api.jsonrenamed
The content is the same.
gen/model/blogger/blogger/v2/blogger-api.json → gen/model/blogger/v2/blogger-api.jsonrenamed
The content is the same.
gen/model/blogger/blogger/v3/blogger-api.json → gen/model/blogger/v3/blogger-api.jsonrenamed
The content is the same.
gen/model/books/books/v1/books-api.json → gen/model/books/v1/books-api.jsonrenamed
The content is the same.
gen/model/calendar/calendar/v3/calendar-api.json → gen/model/calendar/v3/calendar-api.jsonrenamed
The content is the same.
gen/model/civicinfo/civicinfo/v2/civicinfo-api.json → gen/model/civicinfo/v2/civicinfo-api.jsonrenamed
The content is the same.
gen/model/classroom/classroom/v1/classroom-api.json → gen/model/classroom/v1/classroom-api.jsonrenamed
The content is the same.
gen/model/cloudbilling/cloudbilling/v1/cloudbilling-api.json → gen/model/cloudbilling/v1/cloudbilling-api.jsonrenamed
The content is the same.
gen/model/clouddebugger/clouddebugger/v2/clouddebugger-api.json → gen/model/clouddebugger/v2/clouddebugger-api.jsonrenamed
The content is the same.
gen/model/cloudlatencytest/cloudlatencytest/v2/cloudlatencytest-api.json → gen/model/cloudlatencytest/v2/cloudlatencytest-api.jsonrenamed
The content is the same.
gen/model/cloudmonitoring/cloudmonitoring/v2beta2/cloudmonitoring-api.json → gen/model/cloudmonitoring/v2beta2/cloudmonitoring-api.jsonrenamed
The content is the same.
gen/model/cloudresourcemanager/cloudresourcemanager/v1beta1/cloudresourcemanager-api.json → gen/model/cloudresourcemanager/v1beta1/cloudresourcemanager-api.jsonrenamed
The content is the same.
gen/model/clouduseraccounts/clouduseraccounts/v0.alpha/clouduseraccounts-api.json → gen/model/clouduseraccounts/v0.alpha/clouduseraccounts-api.jsonrenamed
The content is the same.
gen/model/clouduseraccounts/clouduseraccounts/v0.beta/clouduseraccounts-api.json → gen/model/clouduseraccounts/v0.beta/clouduseraccounts-api.jsonrenamed
The content is the same.
gen/model/clouduseraccounts/clouduseraccounts/vm_alpha/clouduseraccounts-api.json → gen/model/clouduseraccounts/vm_alpha/clouduseraccounts-api.jsonrenamed
The content is the same.
gen/model/clouduseraccounts/clouduseraccounts/vm_beta/clouduseraccounts-api.json → gen/model/clouduseraccounts/vm_beta/clouduseraccounts-api.jsonrenamed
The content is the same.
gen/model/compute/compute/v0.beta/compute-api.json → gen/model/compute/v0.beta/compute-api.jsonrenamed
The content is the same.
gen/model/compute/compute/v1/compute-api.json → gen/model/compute/v1/compute-api.jsonrenamed
The content is the same.
gen/model/container/container/v1/container-api.json → gen/model/container/v1/container-api.jsonrenamed
The content is the same.
gen/model/container/container/v1beta1/container-api.json → gen/model/container/v1beta1/container-api.jsonrenamed
The content is the same.
gen/model/content/content/v2/content-api.json → gen/model/content/v2/content-api.jsonrenamed
The content is the same.
gen/model/content/content/v2sandbox/content-api.json → gen/model/content/v2sandbox/content-api.jsonrenamed
The content is the same.
gen/model/coordinate/coordinate/v1/coordinate-api.json → gen/model/coordinate/v1/coordinate-api.jsonrenamed
The content is the same.
gen/model/customsearch/customsearch/v1/customsearch-api.json → gen/model/customsearch/v1/customsearch-api.jsonrenamed
The content is the same.
gen/model/dataflow/dataflow/v1b3/dataflow-api.json → gen/model/dataflow/v1b3/dataflow-api.jsonrenamed
The content is the same.
gen/model/datastore/datastore/v1beta1/datastore-api.json → gen/model/datastore/v1beta1/datastore-api.jsonrenamed
The content is the same.
gen/model/datastore/datastore/v1beta2/datastore-api.json → gen/model/datastore/v1beta2/datastore-api.jsonrenamed
The content is the same.
gen/model/deploymentmanager/deploymentmanager/v2/deploymentmanager-api.json → gen/model/deploymentmanager/v2/deploymentmanager-api.jsonrenamed
The content is the same.
gen/model/deploymentmanager/deploymentmanager/v2beta1/deploymentmanager-api.json → gen/model/deploymentmanager/v2beta1/deploymentmanager-api.jsonrenamed
The content is the same.
gen/model/deploymentmanager/deploymentmanager/v2beta2/deploymentmanager-api.json → gen/model/deploymentmanager/v2beta2/deploymentmanager-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v1.1/dfareporting-api.json → gen/model/dfareporting/v1.1/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v1.2/dfareporting-api.json → gen/model/dfareporting/v1.2/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v1.3/dfareporting-api.json → gen/model/dfareporting/v1.3/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v1/dfareporting-api.json → gen/model/dfareporting/v1/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v2.0/dfareporting-api.json → gen/model/dfareporting/v2.0/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v2.1/dfareporting-api.json → gen/model/dfareporting/v2.1/dfareporting-api.jsonrenamed
The content is the same.
gen/model/dfareporting/dfareporting/v2.2/dfareporting-api.json → gen/model/dfareporting/v2.2/dfareporting-api.jsonrenamed
The content is the same.
gen/model/discovery/discovery/v1/discovery-api.json → gen/model/discovery/v1/discovery-api.jsonrenamed
The content is the same.
gen/model/dns/dns/v1/dns-api.json → gen/model/dns/v1/dns-api.jsonrenamed
The content is the same.
gen/model/dns/dns/v1beta1/dns-api.json → gen/model/dns/v1beta1/dns-api.jsonrenamed
The content is the same.
gen/model/doubleclickbidmanager/doubleclickbidmanager/v1/doubleclickbidmanager-api.json → gen/model/doubleclickbidmanager/v1/doubleclickbidmanager-api.jsonrenamed
The content is the same.
gen/model/doubleclicksearch/doubleclicksearch/v2/doubleclicksearch-api.json → gen/model/doubleclicksearch/v2/doubleclicksearch-api.jsonrenamed
The content is the same.
gen/model/drive/drive/v1/drive-api.json → gen/model/drive/v1/drive-api.jsonrenamed
The content is the same.
gen/model/drive/drive/v2/drive-api.json → gen/model/drive/v2/drive-api.jsonrenamed
The content is the same.
gen/model/fitness/fitness/v1/fitness-api.json → gen/model/fitness/v1/fitness-api.jsonrenamed
The content is the same.
gen/model/freebase/freebase/v1/freebase-api.json → gen/model/freebase/v1/freebase-api.jsonrenamed
The content is the same.
gen/model/fusiontables/fusiontables/v1/fusiontables-api.json → gen/model/fusiontables/v1/fusiontables-api.jsonrenamed
The content is the same.
gen/model/fusiontables/fusiontables/v2/fusiontables-api.json → gen/model/fusiontables/v2/fusiontables-api.jsonrenamed
The content is the same.
gen/model/games/games/v1/games-api.json → gen/model/games/v1/games-api.jsonrenamed
The content is the same.
gen/model/gamesconfiguration/gamesconfiguration/v1configuration/gamesconfiguration-api.json → gen/model/gamesconfiguration/v1configuration/gamesconfiguration-api.jsonrenamed
The content is the same.
gen/model/gamesmanagement/gamesmanagement/v1management/gamesmanagement-api.json → gen/model/gamesmanagement/v1management/gamesmanagement-api.jsonrenamed
The content is the same.
gen/model/gan/gan/v1beta1/gan-api.json → gen/model/gan/v1beta1/gan-api.jsonrenamed
The content is the same.
gen/model/genomics/genomics/v1/genomics-api.json → gen/model/genomics/v1/genomics-api.jsonrenamed
The content is the same.
gen/model/genomics/genomics/v1beta2/genomics-api.json → gen/model/genomics/v1beta2/genomics-api.jsonrenamed
The content is the same.
gen/model/gmail/gmail/v1/gmail-api.json → gen/model/gmail/v1/gmail-api.jsonrenamed
The content is the same.
gen/model/groupsmigration/groupsmigration/v1/groupsmigration-api.json → gen/model/groupsmigration/v1/groupsmigration-api.jsonrenamed
The content is the same.
gen/model/groupssettings/groupssettings/v1/groupssettings-api.json → gen/model/groupssettings/v1/groupssettings-api.jsonrenamed
The content is the same.
gen/model/identitytoolkit/identitytoolkit/v3/identitytoolkit-api.json → gen/model/identitytoolkit/v3/identitytoolkit-api.jsonrenamed
The content is the same.
gen/model/licensing/licensing/v1/licensing-api.json → gen/model/licensing/v1/licensing-api.jsonrenamed
The content is the same.
gen/model/logging/logging/v1beta3/logging-api.json → gen/model/logging/v1beta3/logging-api.jsonrenamed
The content is the same.
gen/model/manager/manager/v1beta2/manager-api.json → gen/model/manager/v1beta2/manager-api.jsonrenamed
The content is the same.
gen/model/mapsengine/mapsengine/exp2/mapsengine-api.json → gen/model/mapsengine/exp2/mapsengine-api.jsonrenamed
The content is the same.
gen/model/mapsengine/mapsengine/v1/mapsengine-api.json → gen/model/mapsengine/v1/mapsengine-api.jsonrenamed
The content is the same.
gen/model/mirror/mirror/v1/mirror-api.json → gen/model/mirror/v1/mirror-api.jsonrenamed
The content is the same.
gen/model/oauth2/oauth2/v1/oauth2-api.json → gen/model/oauth2/v1/oauth2-api.jsonrenamed
The content is the same.
gen/model/oauth2/oauth2/v2/oauth2-api.json → gen/model/oauth2/v2/oauth2-api.jsonrenamed
The content is the same.
gen/model/pagespeedonline/pagespeedonline/v1/pagespeedonline-api.json → gen/model/pagespeedonline/v1/pagespeedonline-api.jsonrenamed
The content is the same.
gen/model/pagespeedonline/pagespeedonline/v2/pagespeedonline-api.json → gen/model/pagespeedonline/v2/pagespeedonline-api.jsonrenamed
The content is the same.
gen/model/partners/partners/v2/partners-api.json → gen/model/partners/v2/partners-api.jsonrenamed
The content is the same.
gen/model/playmoviespartner/playmoviespartner/v1/playmoviespartner-api.json → gen/model/playmoviespartner/v1/playmoviespartner-api.jsonrenamed
The content is the same.
gen/model/plus/plus/v1/plus-api.json → gen/model/plus/v1/plus-api.jsonrenamed
The content is the same.
gen/model/plusdomains/plusdomains/v1/plusdomains-api.json → gen/model/plusdomains/v1/plusdomains-api.jsonrenamed
The content is the same.
gen/model/prediction/prediction/v1.2/prediction-api.json → gen/model/prediction/v1.2/prediction-api.jsonrenamed
The content is the same.
gen/model/prediction/prediction/v1.3/prediction-api.json → gen/model/prediction/v1.3/prediction-api.jsonrenamed
The content is the same.
gen/model/prediction/prediction/v1.4/prediction-api.json → gen/model/prediction/v1.4/prediction-api.jsonrenamed
The content is the same.
gen/model/prediction/prediction/v1.5/prediction-api.json → gen/model/prediction/v1.5/prediction-api.jsonrenamed
The content is the same.
gen/model/prediction/prediction/v1.6/prediction-api.json → gen/model/prediction/v1.6/prediction-api.jsonrenamed
The content is the same.
gen/model/proximitybeacon/proximitybeacon/v1beta1/proximitybeacon-api.json → gen/model/proximitybeacon/v1beta1/proximitybeacon-api.jsonrenamed
The content is the same.
gen/model/pubsub/pubsub/v1/pubsub-api.json → gen/model/pubsub/v1/pubsub-api.jsonrenamed
The content is the same.
gen/model/pubsub/pubsub/v1beta1/pubsub-api.json → gen/model/pubsub/v1beta1/pubsub-api.jsonrenamed
The content is the same.
gen/model/pubsub/pubsub/v1beta1a/pubsub-api.json → gen/model/pubsub/v1beta1a/pubsub-api.jsonrenamed
The content is the same.
gen/model/pubsub/pubsub/v1beta2/pubsub-api.json → gen/model/pubsub/v1beta2/pubsub-api.jsonrenamed
The content is the same.
gen/model/qpxexpress/qpxexpress/v1/qpxexpress-api.json → gen/model/qpxexpress/v1/qpxexpress-api.jsonrenamed
The content is the same.
gen/model/replicapool/replicapool/v1beta1/replicapool-api.json → gen/model/replicapool/v1beta1/replicapool-api.jsonrenamed
The content is the same.
gen/model/replicapool/replicapool/v1beta2/replicapool-api.json → gen/model/replicapool/v1beta2/replicapool-api.jsonrenamed
The content is the same.
gen/model/replicapoolupdater/replicapoolupdater/v1beta1/replicapoolupdater-api.json → gen/model/replicapoolupdater/v1beta1/replicapoolupdater-api.jsonrenamed
The content is the same.
gen/model/reseller/reseller/v1/reseller-api.json → gen/model/reseller/v1/reseller-api.jsonrenamed
The content is the same.
gen/model/reseller/reseller/v1sandbox/reseller-api.json → gen/model/reseller/v1sandbox/reseller-api.jsonrenamed
The content is the same.
gen/model/resourceviews/resourceviews/v1beta1/resourceviews-api.json → gen/model/resourceviews/v1beta1/resourceviews-api.jsonrenamed
The content is the same.
gen/model/resourceviews/resourceviews/v1beta2/resourceviews-api.json → gen/model/resourceviews/v1beta2/resourceviews-api.jsonrenamed
The content is the same.
gen/model/siteverification/siteverification/v1/siteverification-api.json → gen/model/siteverification/v1/siteverification-api.jsonrenamed
The content is the same.
gen/model/spectrum/spectrum/v1explorer/spectrum-api.json → gen/model/spectrum/v1explorer/spectrum-api.jsonrenamed
The content is the same.
gen/model/sqladmin/sqladmin/v1beta3/sqladmin-api.json → gen/model/sqladmin/v1beta3/sqladmin-api.jsonrenamed
The content is the same.
gen/model/sqladmin/sqladmin/v1beta4/sqladmin-api.json → gen/model/sqladmin/v1beta4/sqladmin-api.jsonrenamed
The content is the same.
gen/model/storage/storage/v1/storage-api.json → gen/model/storage/v1/storage-api.jsonrenamed
The content is the same.
gen/model/storage/storage/v1beta1/storage-api.json → gen/model/storage/v1beta1/storage-api.jsonrenamed
The content is the same.
gen/model/storage/storage/v1beta2/storage-api.json → gen/model/storage/v1beta2/storage-api.jsonrenamed
The content is the same.
gen/model/storagetransfer/storagetransfer/v1/storagetransfer-api.json → gen/model/storagetransfer/v1/storagetransfer-api.jsonrenamed
The content is the same.
gen/model/tagmanager/tagmanager/v1/tagmanager-api.json → gen/model/tagmanager/v1/tagmanager-api.jsonrenamed
The content is the same.
gen/model/taskqueue/taskqueue/v1beta1/taskqueue-api.json → gen/model/taskqueue/v1beta1/taskqueue-api.jsonrenamed
The content is the same.
gen/model/taskqueue/taskqueue/v1beta2/taskqueue-api.json → gen/model/taskqueue/v1beta2/taskqueue-api.jsonrenamed
The content is the same.
gen/model/tasks/tasks/v1/tasks-api.json → gen/model/tasks/v1/tasks-api.jsonrenamed
The content is the same.
gen/model/translate/translate/v2/translate-api.json → gen/model/translate/v2/translate-api.jsonrenamed
The content is the same.
gen/model/urlshortener/urlshortener/v1/urlshortener-api.json → gen/model/urlshortener/v1/urlshortener-api.jsonrenamed
The content is the same.
gen/model/webfonts/webfonts/v1/webfonts-api.json → gen/model/webfonts/v1/webfonts-api.jsonrenamed
The content is the same.
gen/model/webmasters/webmasters/v3/webmasters-api.json → gen/model/webmasters/v3/webmasters-api.jsonrenamed
The content is the same.
gen/model/youtube/youtube/v3/youtube-api.json → gen/model/youtube/v3/youtube-api.jsonrenamed
The content is the same.
gen/model/youtubeanalytics/youtubeanalytics/v1/youtubeanalytics-api.json → gen/model/youtubeanalytics/v1/youtubeanalytics-api.jsonrenamed
The content is the same.
gen/model/youtubeanalytics/youtubeanalytics/v1beta1/youtubeanalytics-api.json → gen/model/youtubeanalytics/v1beta1/youtubeanalytics-api.jsonrenamed
The content is the same.
gen/src/Gen/Types.hs+1−1
@@ -125,7 +125,7 @@ specFromPath x = Spec n p v x
125125 -- FIXME:
126126 n = Text.init
127127 . Text.intercalate "/"
128− . drop 2
128+ . drop 1
129129 . dropWhile (/= "model")
130130 $ Text.split (== '/') p
131131
gen/template/toc.ede+4
@@ -54,6 +54,10 @@ type {{ api }} = ()
5454{{ api | lowerHead }} :: Proxy {{ api }}
5555{{ api | lowerHead }} = Proxy
5656
57+{{ resources.name }}
58+
59+
60+
5761{# type {{ api }} = #}
5862{# {% for resource in resources %} #}
5963{# {% if resource.first %} {% else %}:<|>{% endif %} {{ resource.value.name }} #}