temp

diff --cc app/assets/javascripts/configurations.js.coffee.erb
Simple merge

diff --cc app/controllers/comics_controller.rb
index a95fa02,95a97ae..c685315
--- 1/app/controllers/comics_controller.rb
--- 2/app/controllers/comics_controller.rb
+++ b/app/controllers/comics_controller.rb
@@@ -11,16 -11,12 +11,15 @@@ class ComicsController < ApplicationCon
    before_filter :authenticate_admin!, :only => [:list, :browse]
  
    @@model = Comic
-   @@filer_manager = Pettanr::FilerManager.new @@model.item_name, Pettanr.manifest
-   @@profiler_manager = Pettanr::ProfilerManager.new @@model.item_name, Pettanr.manifest
-   @@list_manager = Pettanr::ListManager.new @@model.item_name, Pettanr.manifest
 +  @@controller = Pettanr::ControllerManager.new @@model.item_name, Pettanr.manifest
 -  @@filer_manager = Pettanr::Application::manifest.list_managers[@@model.item_name]
 -  @@profiler_manager = Pettanr::Application::manifest.list_managers[@@model.item_name]
+   @@list_manager = Pettanr::Application::manifest.list_managers[@@model.item_name]
++  @@filer_manager = Pettanr::Application::manifest.filer_managers[@@model.item_name]
++  @@profiler_manager = Pettanr::Application::manifest.profiler_managers[@@model.item_name]
 +  
    def index
-     set_filer
 -    @list = @@list_manager.open('public', @page, @page_size, @operators)
 -    @items = @list.items
 +    @c = @@controller.open(params[:action])
-     @list = @c.list.open(@page, @page_size, @operators)
-     @items = @list.items
++    @list = @@list_manager.open(@page, @page_size, @operators)
++    @items = @c.items
      respond_to do |format|
        format.html {
          @filer = @@filer_manager.open(@items, @operators, @list.paginate)

diff --cc db/migrate/20131121230958_artist_belongs_to_user.rb
index 0ceb469,0ceb469..42ea845
--- 1/db/migrate/20131121230958_artist_belongs_to_user.rb
--- 2/db/migrate/20131121230958_artist_belongs_to_user.rb
+++ b/db/migrate/20131121230958_artist_belongs_to_user.rb
@@@ -2,18 -2,18 +2,8 @@@ class ArtistBelongsToUser < ActiveRecor
    def up
      add_column :artists, :user_id, :integer
      add_column :artists, :provider_id, :integer
--    Artist.find(:all).each do |artist|
--      if artist.author_id
--        artist.user_id = Author.find(artist.author_id).user_id
--      else
--        par = ProviderArtist.find_by_demanders_artist_id(artist.id)
--        artist.provider = par.provider_id
--      end
--      artist.save!
--    end
    end
  
    def down
--    remove_column :artists, :author_id
    end
  end

diff --cc db/migrate/20131205030518_artist_belongs_to_user_data.rb
index 0000000,0000000..51eef28
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/db/migrate/20131205030518_artist_belongs_to_user_data.rb
@@@ -1,0 -1,0 +1,17 @@@
++class ArtistBelongsToUserData < ActiveRecord::Migration
++  def up
++    Artist.find(:all).each do |artist|
++      if artist.author_id
++        artist.user_id = Author.find(artist.author_id).user_id
++      else
++        par = ProviderArtist.find_by_demanders_artist_id(artist.id)
++        artist.provider_id = par.provider_id
++      end
++      artist.save!
++    end
++    remove_column :artists, :author_id
++  end
++
++  def down
++  end
++end

diff --cc lib/manifest/manifest.rb
index 43f0ebd,32b644a..5facf00
--- 1/lib/manifest/manifest.rb
--- 2/lib/manifest/manifest.rb
+++ b/lib/manifest/manifest.rb
@@@ -1,23 -1,8 +1,23 @@@
  
  module Pettanr
    class Manifest
 +    class Controller
 +      attr :conf, :attributes, :associations
 +      def initialize item_name, conf, manifest
 +        @item_name = item_name
 +        @conf = conf || {}
 +        @manifest = manifest
 +        @model_name = @conf['model_name']
 +      end
 +      
 +      def actions
 +        @model_manifest['actions'] || {}
 +      end
 +      
 +    end
 +    
      class Model
-       attr :conf, :attributes, :associations
+       attr :item_name, :conf, :manifest, :attributes, :associations
        def initialize item_name, conf, manifest
          @item_name = item_name
          @conf = conf || {}
@@@ -85,31 -111,45 +126,49 @@@
        
      end
      
+     attr :licenses, :elements, :speech_balloon_templates, :writing_formats, :profile,
+       :model_managers, :list_managers, :profiler_managers, :filer_managers, :form_managers
      def initialize manifest
        @manifest = manifest || {}
 +      @controllers = {}
        @models = {}
        @lists = {}
+       @licenses = License.new(manifest) 
+       @elements = Element.new(manifest)
+       @speech_balloon_templates = SpeechBalloonTemplate.new(manifest)
+       @writing_formats = WritingFormat.new(manifest)
+       @profile = Profile.new(manifest)
        @profilers = {}
        @filers = {}
        @forms = {}
-       manifest['controller'].each {|item_name, controller_conf|
+       @model_managers = {}
+       @list_managers = {}
+       @profiler_managers = {}
+       @filer_managers = {}
+       @form_managers = {}
++      (@manifest['controllers'] || {}).each {|item_name, controller_conf|
 +        @controllers[item_name] = Controller.new(item_name, controller_conf, manifest) 
 +      }
-       manifest['models'].each {|item_name, model_conf|
+       (@manifest['models'] || {}).each {|item_name, model_conf|
          @models[item_name] = Model.new(item_name, model_conf, manifest) 
+         @model_managers[item_name] = Pettanr::ModelManager.new @models[item_name]
        }
-       manifest['lists'].each {|item_name, list_manifest|
-         @lists[item_name] = List.new(item_name, list_manifest) 
+       (@manifest['lists'] || {}).each {|item_name, list_conf|
+         @lists[item_name] = List.new(item_name, list_conf, manifest) 
+         @list_managers[item_name] = Pettanr::ListManager.new @lists[item_name]
        }
-       manifest['locals']['profilers'].each {|item_name, profiler_manifest|
-         @profilers[item_name] = Profiler.new item_name, profiler_manifest
+       @locals = @manifest['locals'] || {}
+       (@locals['profilers'] || {}).each {|item_name, profiler_conf|
+         @profilers[item_name] = Profiler.new item_name, profiler_conf, manifest
+         @profiler_managers[item_name] = Pettanr::ProfilerManager.new @profilers[item_name]
        }
-       manifest['locals']['filers'].each {|item_name, filer_manifest|
-         @filers[item_name] = Filer.new item_name, filer_manifest
+       (@locals['filers'] || {}).each {|item_name, filer_conf|
+         @filers[item_name] = Filer.new item_name, filer_conf, manifest
+         @filer_managers[item_name] = Pettanr::FilerManager.new @filers[item_name]
        }
-       manifest['locals']['forms'].each {|item_name, form_manifest|
-         @forms[item_name] = Form.new item_name, form_manifest
+       (@locals['forms'] || {}).each {|item_name, form_conf|
+         @forms[item_name] = Form.new item_name, form_conf, manifest
+         @form_managers[item_name] = Pettanr::FormManager.new @forms[item_name]
        }
      end