From 8ddabd1c21c3ce9598e7b2870efd2c024c0f1ac2 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Wed, 2 Jul 2014 14:07:33 +0900 Subject: [PATCH] fix ap --- app/assets/javascripts/main.js.coffee | 3 +- .../javascripts/manifest/controller.js.coffee | 20 ++++------ .../manifest/controller/action/base.js.coffee | 4 +- .../manifest/controller/action/count.js.coffee | 4 +- .../manifest/controller/action/list.js.coffee | 4 +- app/assets/javascripts/manifest/manifest.js.coffee | 45 +++++++--------------- app/assets/javascripts/manifest/model.js.coffee | 42 ++++++++------------ .../manifest/model/association.js.coffee | 22 +++-------- .../javascripts/manifest/model/attribute.js.coffee | 24 ++---------- .../javascripts/manifest/system_resource.js.coffee | 16 ++------ .../manifest/system_resource/template.js.coffee | 7 +--- .../javascripts/manifest_base/base.js.coffee | 24 +----------- .../manifest_base/type_name_args.coffee | 33 ++-------------- .../javascripts/manifest_base/values.js.coffee | 25 +++--------- 14 files changed, 69 insertions(+), 204 deletions(-) diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 2e2c8162..a4830707 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -12,8 +12,7 @@ $ -> ) $.ajaxSetup({async: true}) loaded_manifest.init() - t = new ManifestBase.Base('manifest', 'name', 'json', 'module_name') - t.set_default() + loaded_manifest class Pettanr extends Backbone.View el: '#pettanr' initialize: -> diff --git a/app/assets/javascripts/manifest/controller.js.coffee b/app/assets/javascripts/manifest/controller.js.coffee index e332a38e..cd39c9df 100644 --- a/app/assets/javascripts/manifest/controller.js.coffee +++ b/app/assets/javascripts/manifest/controller.js.coffee @@ -1,21 +1,17 @@ class Manifest.Controller extends ManifestBase.Base - _item_name = null - _actions = null - - item_name: () -> - _item_name - - actions: () -> - _actions set_default: () -> super() - @json['item_name'] ||= Manifest.singularize(@name ) - @json['actions'] ||= {} + @json + @json.actions ||= {} + @json.item_name = Manifest.singularize(@name) init: () -> super() - _item_name = @json['item_name'] - _actions = ManifestBase.load_type_name_args this, @json, 'actions', Manifest.ControllerModule.ActionFactory + @item_name = @json.item_name + @actions = ManifestBase.load_type_name_args this, @json, 'actions', Manifest.ControllerModule.ActionFactory + constructor: (manifest, name, json, module_name) -> + super(manifest, name, json, module_name) + class Manifest.ControllerModule diff --git a/app/assets/javascripts/manifest/controller/action/base.js.coffee b/app/assets/javascripts/manifest/controller/action/base.js.coffee index 2cb71340..1ef6a23c 100644 --- a/app/assets/javascripts/manifest/controller/action/base.js.coffee +++ b/app/assets/javascripts/manifest/controller/action/base.js.coffee @@ -2,10 +2,10 @@ class Manifest.ControllerModule.ActionModule.Base extends ManifestBase.TypeNameA set_default: () -> super() - @args['item_name'] ||= @parent.item_name # not parent.name. follow singularized name + @args.item_name ||= @parent.item_name # not parent.name. follow singularized name init: () -> super() - @item_name = @args['item_name'] + @item_name = @args.item_name diff --git a/app/assets/javascripts/manifest/controller/action/count.js.coffee b/app/assets/javascripts/manifest/controller/action/count.js.coffee index 7e4b4caf..8fd22155 100644 --- a/app/assets/javascripts/manifest/controller/action/count.js.coffee +++ b/app/assets/javascripts/manifest/controller/action/count.js.coffee @@ -2,9 +2,9 @@ class Manifest.ControllerModule.ActionModule.ActionCount extends Manifest.Contro set_default: () -> super() - @args['list_name'] ||= @name().replace(/^count_/, '') + @args.list_name ||= @name.replace(/^count_/, '') init: () -> super() - @list_name = @args['list_name'] + @list_name = @args.list_name diff --git a/app/assets/javascripts/manifest/controller/action/list.js.coffee b/app/assets/javascripts/manifest/controller/action/list.js.coffee index 910e059f..802f5166 100644 --- a/app/assets/javascripts/manifest/controller/action/list.js.coffee +++ b/app/assets/javascripts/manifest/controller/action/list.js.coffee @@ -2,9 +2,9 @@ class Manifest.ControllerModule.ActionModule.ActionList extends Manifest.Control set_default: () -> super() - @args['list_name'] ||= @name + @args.list_name ||= @name init: () -> super() - @list_name = @args['list_name'] + @list_name = @args.list_name diff --git a/app/assets/javascripts/manifest/manifest.js.coffee b/app/assets/javascripts/manifest/manifest.js.coffee index 4e45bf26..db5c39fc 100644 --- a/app/assets/javascripts/manifest/manifest.js.coffee +++ b/app/assets/javascripts/manifest/manifest.js.coffee @@ -1,42 +1,14 @@ class Manifest - _system_resources = null - _magic_numbers = null - _items = null - _controllers = null - _models = null _module_names = null - system_resources: () -> - _system_resources - - magic_numbers: () -> - _magic_numbers - - items: () -> - _items - - controllers: () -> - _controllers - - models: () -> - _models - module_names: () -> _module_names - constructor: (global_json) -> - _module_names = [] - @global_json = global_json || {} - _system_resources = new Manifest.SystemResource( - this, Manifest.SystemResource.set_default(@global_json['system_resources']) - ) - _magic_numbers = @global_json['magic_numbers'] - init: () -> # managers can't initialize before load application.rb - _items = ManifestBase.load_type_name_args(this, @global_json, 'items', Manifest.ItemFactory) - _controllers = Manifest.Controller.load(this, @global_json, 'controllers', Manifest.Controller) - _models = Manifest.Model.load(this, @global_json, 'models', Manifest.Model) + @items = ManifestBase.load_type_name_args(this, @global_json, 'items', Manifest.ItemFactory) + @controllers = Manifest.Controller.load(this, @global_json, 'controllers', Manifest.Controller) + @models = Manifest.Model.load(this, @global_json, 'models', Manifest.Model) true @singularize: (name) -> @@ -45,4 +17,15 @@ class Manifest @pluralize: (name) -> name.pluralize + constructor: (global_json) -> + _module_names = [] + @global_json = global_json || {} + @system_resources = new Manifest.SystemResource( + this, Manifest.SystemResource.set_default(@global_json['system_resources']) + ) + @magic_numbers = @global_json['magic_numbers'] + @items = {} + @controllers = {} + @models = {} + @Manifest = Manifest diff --git a/app/assets/javascripts/manifest/model.js.coffee b/app/assets/javascripts/manifest/model.js.coffee index 35974b2d..65e839ac 100644 --- a/app/assets/javascripts/manifest/model.js.coffee +++ b/app/assets/javascripts/manifest/model.js.coffee @@ -1,47 +1,35 @@ class Manifest.Model extends ManifestBase.Base - _attributes = null - _associations = null - _list = null - - attributes: () -> - _attributes - - associations: () -> - _associations - - list: () -> - _list set_default: () -> super - @json['attributes'] ||= {} - @json['associations'] ||= {} - @json['list'] ||= {} - @json['attributes']['id'] = { + @json.attributes ||= {} + @json.associations ||= {} + @json.list ||= {} + @json.attributes.id = { 'type': 'number', 'primary_key': 1, 'rules': { 'number': true } } - @json['attributes']['created_at'] = { + @json.attributes.created_at = { 'type': 'datetime', } - @json['attributes']['updated_at'] = { + @json.attributes.updated_at = { 'type': 'datetime', } init: () -> super - _attributes = ManifestBase.load_name_values this, @json, 'attributes', Manifest.ModelModule.Attribute - _associations = ManifestBase.load_value this, @json, 'associations', Manifest.ModelModule.Association - _list = ManifestBase.load_value this, @json, 'list', Manifest.ModelModule.List + @attributes = ManifestBase.load_name_values this, @json, 'attributes', Manifest.ModelModule.Attribute + @associations = ManifestBase.load_value this, @json, 'associations', Manifest.ModelModule.Association + @list = ManifestBase.load_value this, @json, 'list', Manifest.ModelModule.List model_name: () -> - _name + @name classify: () -> - Manifest.item_name_to_model _name + Manifest.item_name_to_model @name table_name: () -> @classify.table_name @@ -54,8 +42,8 @@ class Manifest.Model extends ManifestBase.Base r owner_type: () -> - return 'author' if @attributes['author_id'] - return 'artist' if @attributes['artist_id'] + return 'author' if @attributes.author_id + return 'artist' if @attributes.artist_id false content_model: () -> @@ -76,9 +64,9 @@ class Manifest.Model extends ManifestBase.Base child_element_names: () -> _.map @child_models, (child_model) -> - _associations.child_element_name(child_model) + @associations.child_element_name(child_model) child_element_name: (item_name) -> - _associations.child_element_name(child_model_manifest) + @associations.child_element_name(child_model_manifest) class Manifest.ModelModule diff --git a/app/assets/javascripts/manifest/model/association.js.coffee b/app/assets/javascripts/manifest/model/association.js.coffee index 3b636a15..ac05eb3b 100644 --- a/app/assets/javascripts/manifest/model/association.js.coffee +++ b/app/assets/javascripts/manifest/model/association.js.coffee @@ -1,16 +1,4 @@ class Manifest.ModelModule.Association extends ManifestBase.Values - _belongs_to = null - _has_many = null - _has_one = null - - belongs_to: () -> - _belongs_to - - has_many: () -> - _has_many - - has_one: () -> - _has_one set_default: () -> super() @@ -20,12 +8,12 @@ class Manifest.ModelModule.Association extends ManifestBase.Values init: () -> super() - _belongs_to = ManifestBase.load_name_values this, @values, 'belongs_to', Manifest.ModelModule.AssociationModule.BelongsTo - _has_many = ManifestBase.load_name_values this, @values, 'has_many', Manifest.ModelModule.AssociationModule.HasMany - _has_one = ManifestBase.load_name_values this, @values, 'has_one', Manifest.ModelModule.AssociationModule.HasOne + @belongs_to = ManifestBase.load_name_values this, @values, 'belongs_to', Manifest.ModelModule.AssociationModule.BelongsTo + @has_many = ManifestBase.load_name_values this, @values, 'has_many', Manifest.ModelModule.AssociationModule.HasMany + @has_one = ManifestBase.load_name_values this, @values, 'has_one', Manifest.ModelModule.AssociationModule.HasOne model_name: () -> - _parent.name + @parent.name each_parent_model: () -> _.each _belongs_to, (belongs_to_manifest, name) -> @@ -43,7 +31,7 @@ class Manifest.ModelModule.Association extends ManifestBase.Values child_model.table_name is_has_one: (child_model) -> - if _has_one[child_model.item_name] + if @has_one[child_model.item_name] true else false diff --git a/app/assets/javascripts/manifest/model/attribute.js.coffee b/app/assets/javascripts/manifest/model/attribute.js.coffee index 11898cd9..7e472c01 100644 --- a/app/assets/javascripts/manifest/model/attribute.js.coffee +++ b/app/assets/javascripts/manifest/model/attribute.js.coffee @@ -1,20 +1,4 @@ class Manifest.ModelModule.Attribute extends ManifestBase.NameValues - _type = null - _primary_key = null - _rules = null - _source = null - - type: () -> - _type - - primary_key: () -> - _primary_key - - rules: () -> - _rules - - source: () -> - _source set_default: () -> super() @@ -24,11 +8,11 @@ class Manifest.ModelModule.Attribute extends ManifestBase.NameValues init: () -> super() - _type = @values['type'] # do not remove - _primary_key = @values['primary_key'] - _rules = @values['rules'] + @type = @values['type'] # do not remove + @primary_key = @values['primary_key'] + @rules = @values['rules'] if @values['source'] - _source = ManifestBase.load_type_args this, @values, 'source', Manifest.ModelModule.AttributeModule.SourceFactory + @source = ManifestBase.load_type_args this, @values, 'source', Manifest.ModelModule.AttributeModule.SourceFactory model_name: () -> @parent.name diff --git a/app/assets/javascripts/manifest/system_resource.js.coffee b/app/assets/javascripts/manifest/system_resource.js.coffee index 28d6aaaa..2f0be345 100644 --- a/app/assets/javascripts/manifest/system_resource.js.coffee +++ b/app/assets/javascripts/manifest/system_resource.js.coffee @@ -1,12 +1,4 @@ class Manifest.SystemResource - _templates = null - _select_items = null - - templates: () -> - _templates - - select_items: () -> - _select_items @set_default: (system_resource_manifest) -> system_resource_manifest['templates'] ||= {} @@ -41,9 +33,7 @@ class Manifest.SystemResource # puts 'skip store select_items:' + resource_model_name + '.' + resource_list_name #end - constructor: (manifest, system_resource_manifest) -> - @manifest = manifest - @system_resource_manifest = system_resource_manifest - _templates = Manifest.SystemResource.Template.manager(this, @system_resource_manifest['templates']) - _select_items = system_resource_manifest['select_items'] + constructor: (@manifest, @system_resource_manifest) -> + @templates = Manifest.SystemResource.Template.manager(this, @system_resource_manifest['templates']) + @select_items = system_resource_manifest['select_items'] diff --git a/app/assets/javascripts/manifest/system_resource/template.js.coffee b/app/assets/javascripts/manifest/system_resource/template.js.coffee index 2c90a147..a0cf51c4 100644 --- a/app/assets/javascripts/manifest/system_resource/template.js.coffee +++ b/app/assets/javascripts/manifest/system_resource/template.js.coffee @@ -2,7 +2,7 @@ class Manifest.SystemResource.Template @manager: (system_resource, my_manifests) -> templates = {} - _.each my_manifests, (template_name, my_manifest) -> + _.each my_manifests, (my_manifest, template_name) -> templates[template_name] = new Manifest.SystemResource.Template(system_resource, template_name, my_manifest) templates @@ -17,10 +17,7 @@ class Manifest.SystemResource.Template is_add_route: () -> @has_route > 0 - constructor: (system_resource, template_name, my_manifest) -> - @system_resource = system_resource - @template_name = template_name - @my_manifest = my_manifest + constructor: (@system_resource, @template_name, @my_manifest) -> @set_default() @init() diff --git a/app/assets/javascripts/manifest_base/base.js.coffee b/app/assets/javascripts/manifest_base/base.js.coffee index a35f22c0..4c608501 100644 --- a/app/assets/javascripts/manifest_base/base.js.coffee +++ b/app/assets/javascripts/manifest_base/base.js.coffee @@ -1,20 +1,4 @@ class ManifestBase.Base - _manifest = null - _name = null - _json = null - _module_name = null - - manifest: () -> - _manifest - - name: () -> - _name - - json: () -> - _json - - module_name: () -> - _module_name @load: (manifest, jsons, module_name, klass) -> r = {} @@ -27,16 +11,12 @@ class ManifestBase.Base init: () -> module_names: () -> - _manifest.module_names().concat([@module_name, @name]) + @manifest.module_names().concat([@module_name, @name]) module_message: () -> ManifestBase.module_message(@module_names) - constructor: (manifest, name, json, module_name) -> - _manifest = manifest - @name = name - @json = json - _module_name = module_name + constructor: (@manifest, @name, @json, @module_name) -> @set_default() @init() diff --git a/app/assets/javascripts/manifest_base/type_name_args.coffee b/app/assets/javascripts/manifest_base/type_name_args.coffee index 4f6d9513..30e2b97b 100644 --- a/app/assets/javascripts/manifest_base/type_name_args.coffee +++ b/app/assets/javascripts/manifest_base/type_name_args.coffee @@ -1,29 +1,13 @@ class ManifestBase.TypeNameArgs - _parent = null - _name = null - _json = null _module_name = null - _type = null - - parent: () -> - _parent - - name: () -> - _name - - json: () -> - _json module_name: () -> _module_name - type: () -> - _type - set_default: () -> - _json['args'] ||= {} - _type = _json['type'] - @args = _json['args'] + @json['args'] ||= {} + @type = @json.type + @args = @json.args init: () -> @@ -33,16 +17,7 @@ class ManifestBase.TypeNameArgs module_message: () -> ManifestBase.module_message(@module_names) - parent_name: () -> - _parent.name - - parent_json: () -> - _parent.json - - constructor: (parent, name, json, module_name) -> - _parent = parent - _name = name - _json = json + constructor: (@parent, @name, @json, module_name) -> _module_name = module_name @set_default() @init() diff --git a/app/assets/javascripts/manifest_base/values.js.coffee b/app/assets/javascripts/manifest_base/values.js.coffee index 9c622ce3..a6233f95 100644 --- a/app/assets/javascripts/manifest_base/values.js.coffee +++ b/app/assets/javascripts/manifest_base/values.js.coffee @@ -1,38 +1,23 @@ class ManifestBase.Values - _parent = null - _json = null - _module_name = null - - parent: () -> - _parent - - json: () -> - _json - - module_name: () -> - _module_name set_default: () -> - @values = _json + @values = @json init: () -> module_names: () -> - _parent.module_names + [_module_name] + @parent.module_names + [@module_name] module_message: () -> ManifestBase.module_message(@module_names) parent_name: () -> - _parent.name + @parent.name parent_json: () -> - _parent.json + @parent.json - constructor: (parent, json, module_name) -> - _parent = parent - _json = json - _module_name = module_name + constructor: (@parent, @json, @module_name) -> @set_default() @init() -- 2.11.0