foreman_content 0.3 → 0.4

data/app/models/content/content_view_repository_clone.rb

@@ -1,5 +1,5 @@
 class Content::ContentViewRepositoryClone < ActiveRecord::Base
   belongs_to :content_view
-  belongs_to :repository_clone
-  validate :content_view_id, :repository_clone_id, :presence => true
+  belongs_to :repository, :polymorphic => true
+  validate :content_view_id, :repository_id, :repository_type, :presence => true
 end

data/app/models/content/product.rb

@@ -2,7 +2,7 @@ module Content
   class Product < ActiveRecord::Base
     include ::Taxonomix
 
-    has_many :repositories
+    has_many :repositories, :as => :originator
     has_many :repository_clones, :through => :repositories
     has_many :content_views, :as => :originator
 

data/app/models/content/repository.rb

@@ -2,24 +2,29 @@ module Content
   class Repository < ActiveRecord::Base
     include Content::Orchestration::Pulp::Sync
     include Foreman::STI
+    include Content::RepositoryCommon
 
     YUM_TYPE       = 'yum'
     KICKSTART_TYPE = 'kickstart'
     FILE_TYPE      = 'iso'
     TYPES          = [YUM_TYPE, KICKSTART_TYPE, FILE_TYPE]
 
-    belongs_to :product, :class_name => 'Content::Product'
-    belongs_to :operatingsystem
+    belongs_to :originator, :polymorphic => true
     belongs_to :gpg_key
     belongs_to :architecture
     has_many :repository_clones
+    has_many :content_view_repository_clones, :dependent => :destroy, :as => :repository
 
+    before_validation :set_originator_type
     before_destroy EnsureNotUsedBy.new(:repository_clones)
 
     validates_presence_of :type # can't create this object, only child
 
+    validates_presence_of :originator_id, :originator_type
+
     validates :name, :presence => true
-    validates_uniqueness_of :name, :scope => [:operatingsystem_id, :product_id]
+    validates_uniqueness_of :name, :scope => [:originator_type, :originator_id]
+    validates :feed, :presence => true, :uniqueness => true
     validates_inclusion_of :content_type,
                            :in          => TYPES,
                            :allow_blank => false,
@@ -27,19 +32,30 @@ module Content
 
     scoped_search :on => [:name, :enabled], :complete_value => :true
     scoped_search :in => :architecture, :on => :name, :rename => :architecture, :complete_value => :true
-    scoped_search :in => :operatingsystem, :on => :name, :rename => :os, :complete_value => :true
-    scoped_search :in => :product, :on => :name, :rename => :product, :complete_value => :true
+    belongs_to :search_operatingsystems, :class_name => 'Operatingsystem', :foreign_key => :originator_id,
+               :conditions => '"content_repositories"."originator_type" = "Operatingsystem"'
+    belongs_to :search_products, :class_name => 'Content::Product', :foreign_key => :originator_id,
+               :conditions => '"content_repositories"."originator_type" = "Content::Product"'
+    scoped_search :in => :search_products, :on => :name, :rename => :product,
+                  :complete_value => :true, :only_explicit => true
+    scoped_search :in => :search_operatingsystems, :on => :name, :rename => :operatingsystem,
+                  :complete_value => :true, :only_explicit => true
 
     scope :kickstart, where(:content_type => KICKSTART_TYPE)
     scope :yum, where(:content_type => YUM_TYPE)
 
+    scope :for_content_views, lambda { |ids|
+      joins(:content_view_repository_clones).
+        where('content_content_view_repository_clones' => {:content_view_id => ids})
+    }
+
     def content_types
       TYPES
     end
 
     # The label is used as a repository label in a yum repo file.
     def to_label
-      "#{entity_name}-#{name}".parameterize
+      "#{entity_name}/#{name}"
     end
 
     #inhariters are expected to override this method
@@ -47,11 +63,11 @@ module Content
       ''
     end
 
-    def publish content_view
+    def clone content_view
       repository_clones.create!(
         :content_views => [content_view],
         :name => self.name + "_clone",
-        :relative_path => "content_views/#{to_label}/#{Foreman.uuid}"
+        :relative_path => "content_views/#{entity_name}/#{name}/#{Foreman.uuid}"
       )
     end
 

data/app/models/content/repository/operating_system.rb

@@ -1,7 +1,6 @@
 module Content
   class Repository::OperatingSystem < Repository
-
-    validates_presence_of :operatingsystem
+    alias_method :operatingsystem, :originator
 
     def self.model_name
       Repository.model_name
@@ -10,5 +9,15 @@ module Content
     def entity_name
       operatingsystem.to_label
     end
+
+    def description
+      entity_name
+    end
+
+    private
+
+    def set_originator_type
+      self.originator_type ||= 'Operatingsystem'
+    end
   end
 end

data/app/models/content/repository/product.rb

@@ -1,10 +1,9 @@
 module Content
   class Repository::Product < Repository
-
+    alias_method :product, :originator
     has_many :operatingsystem_repositories, :foreign_key => :repository_id, :dependent => :destroy, :uniq => true
     has_many :operatingsystems, :through => :operatingsystem_repositories
-
-    validates_presence_of :product
+    delegate :description, :to => :product
 
     def self.model_name
       Repository.model_name
@@ -17,5 +16,11 @@ module Content
     def entity_name
       product.name
     end
+
+    private
+
+    def set_originator_type
+      self.originator_type = 'Content::Product'
+    end
   end
 end

data/app/models/content/repository_clone.rb

@@ -1,29 +1,24 @@
 module Content
   class RepositoryClone < ActiveRecord::Base
     include Content::Orchestration::Pulp::Clone
-
-    REPO_PREFIX = '/pulp/repos/'
+    include Content::RepositoryCommon
 
     belongs_to :repository
-    has_many :content_view_repository_clones, :dependent => :destroy
+    has_many :content_view_repository_clones, :dependent => :destroy, :as => :repository
     has_many :content_views, :through => :content_view_repository_clones
     before_destroy EnsureNotUsedBy.new(:content_views)
 
     attr_accessible :description, :last_published, :name, :pulp_id, :relative_path, :status, :content_views
     validate :relative_path, :repository_id, :presence => true
 
-    delegate :content_type, :architecture, :unprotected, :gpg_key, :product, :to => :repository
+    delegate :content_type, :architecture, :unprotected, :gpg_key, :product, :operatingsystem, :enabled, :to => :repository
 
     scope :for_content_views, lambda { |ids|
       joins(:content_view_repository_clones).
         where('content_content_view_repository_clones' => {:content_view_id => ids})
     }
 
-    def full_path
-      pulp_url = URI.parse(Setting.pulp_url)
-      scheme   = (unprotected ? 'http' : 'https')
-      port     = (pulp_url.port == 443 || pulp_url.port == 80 ? "" : ":#{pulp_url.port}")
-      "#{scheme}://#{pulp_url.host}#{port}#{REPO_PREFIX}#{relative_path}"
-    end
+    default_scope { includes(:repository) }
+
   end
 end

data/app/services/content/content_view_factory.rb

@@ -1,32 +1,11 @@
 module Content
   class ContentViewFactory
     include ActiveModel::Conversion
-    extend  ActiveModel::Naming
+    include ActiveModel::Validations
+    extend ActiveModel::Naming
 
-    attr_accessor :type, :originator_id, :parent_cv, :product_cv, :os_cv
-    # create a content view of a single product
-    def self.create_product_content_view(product_id)
-      product = Product.find_by_id(product_id)
-      ContentView.new(:source_repositories => product.repositories, :originator => product)
-    end
-
-    # create a content view of an operating system
-    def self.create_os_content_view(operatingsystem_id)
-      os = Operatingsystem.find_by_id(operatingsystem_id)
-      ContentView.new(:source_repositories => os.repositories, :originator => os)
-    end
-
-    # create a composite content view of a hostgroup (the hostgroup may have a list of products) and a parent
-    # content view. The parent content view is one of the hostgroup parent content views.
-    # A hostgroup may have number of content views representing different versions of that hostgroup content.
-    def self.create_composite_content_view(options = {})
-      factory   = new(options)
-      hostgroup = Hostgroup.find_by_id(factory.originator_id)
-      clone_ids = Content::RepositoryClone.for_content_views([factory.product_cv, factory.os_cv]).
-        pluck(:id)
-      ContentView.new(:source_repositories=> [], :originator => hostgroup,
-                      :repository_clone_ids => clone_ids, :parent_id => factory.parent_cv)
-    end
+    attr_accessor :originator_type, :originator_id, :parent_cv, :product_cv, :os_cv, :source_repositories
+    validates_presence_of :originator_type, :originator_id
 
     def initialize(attributes = {})
       attributes.each do |name, value|
@@ -37,5 +16,47 @@ module Content
     def persisted?
       false
     end
+
+    def content_view
+      case originator_type
+        when 'Hostgroup'
+          create_composite_content_view
+        else
+          ContentView.new(:repository_ids_to_clone => originator.repositories, :originator => originator)
+      end
+    end
+
+    def repositories
+      originator.repositories
+    end
+
+    private
+
+    def originator
+     originator ||= case originator_type
+                      when 'Content::Product'
+                        Product.find(originator_id)
+                      when 'Operatingsystem'
+                        Operatingsystem.find(originator_id)
+                      when 'Hostgroup'
+                        Hostgroup.find(originator_id)
+                      else
+                        raise _('Unknown type')
+                    end
+    end
+
+    # create a composite content view of a hostgroup (the hostgroup may have a list of products) and a parent
+    # content view. The parent content view is one of the hostgroup parent content views.
+    # A hostgroup may have number of content views representing different versions of that hostgroup content.
+    def create_composite_content_view
+      clone_ids = Content::RepositoryClone.for_content_views([product_cv, os_cv]).pluck(:id)
+      source_ids = Content::Repository.for_content_views([product_cv, os_cv]).pluck(:id)
+      ContentView.new(:originator => originator,
+                      :repository_clone_ids => clone_ids,
+                      :repository_source_ids => source_ids,
+                      :parent_id => parent_cv)
+    end
+
+
   end
 end

data/app/services/content/pulp/repository.rb

@@ -126,6 +126,19 @@ class Content::Pulp::Repository
     true
   end
 
+  def sync_schedule=(schedule)
+    type = Runcible::Extensions::YumImporter::ID
+    if schedule.present?
+      Runcible::Resources::RepositorySchedule.create(pulp_id, type, schedule)
+    else
+      Runcible::Extensions::Repository.remove_schedules(pulp_id, type)
+    end
+  end
+
+  def sync_schedule
+    Runcible::Resources::RepositorySchedule.list(pulp_id, Runcible::Extensions::YumImporter::ID)
+  end
+
   private
 
   def create_repository pulp_distributors = []

data/app/services/content/pulp/repository_sync_history.rb

@@ -1,5 +1,5 @@
 class Content::Pulp::RepositorySyncHistory
-  attr_reader :exception, :removed_count, :started, :completed, :summary,
+  attr_reader :exception, :removed_count, :started, :completed,
     :error_message, :added_count, :updated_count, :details, :result
 
   def initialize(attrs)
@@ -12,7 +12,7 @@ class Content::Pulp::RepositorySyncHistory
     {
       :comps    => summary[:time_total_sec],
       :errata   => summary[:errata_time_total_sec],
-      :packages => summary[:packages][:time_total_sec]
+      :packages => (summary[:packages][:time_total_sec] rescue 0)
     }
   end
 
@@ -32,4 +32,10 @@ class Content::Pulp::RepositorySyncHistory
     }
   end
 
+  private
+
+  def summary
+    @summary ||= Hash.new(0)
+  end
+
 end

data/app/views/content/content_views/{_step2.html.erb → _composite.html.erb}

@@ -1,5 +1,5 @@
 <%= wizard_header 2, _("Select source type"), _("Select content"), _("Create") %>
-<%= form_for Content::ContentViewFactory.new, :url => hash_for_new_content_view_path, :class => 'form-horizontal well', :method => :get do |f| %>
+<%= form_for @factory, :url => hash_for_new_content_view_path, :class => 'form-horizontal well', :method => :get do |f| %>
   <%= f.hidden_field :originator_id, :value => @hostgroup.id %>
   <%= f.hidden_field :originator_type, :value => @hostgroup.class.name %>
   <%= select_f f, :parent_cv, @hostgroup.parent.try(:content_views) || [], "id", "name",

data/app/views/content/content_views/_form.html.erb

@@ -1,3 +1,5 @@
+<%= wizard_header 2, _('Select source type'), _('Select content'), _('Create') %>
+
 <%= form_for @content_view, :url => (@content_view.new_record? ? content_views_path : content_view_path(@content_view)) do |f| %>
   <%= base_errors_for @content_view %>
 
@@ -11,30 +13,31 @@
       <%= text_f f, :name, :value => @content_view.to_label %>
 
       <% if @content_view.new_record? %>
-        <% @content_view.source_repositories.each do |repo| %>
-          <%= f.hidden_field :source_repositories, :multiple => true, :value => repo.id %>
-        <% end if @content_view.source_repositories %>
-        <% @content_view.repository_clones.each do |repo| %>
-          <%= f.hidden_field :repository_clone_ids, :multiple => true, :value => repo.id %>
-        <% end if @content_view.repository_clones %>
-
         <%= f.hidden_field :originator_id, :value => @content_view.originator_id %>
         <%= f.hidden_field :originator_type, :value => @content_view.originator_type %>
       <% end %>
 
       <table class="table table-bordered">
         <tr>
+          <th></th>
           <th><%= _("Name") %></th>
           <th><%= _("State") %></th>
-          <th><%= _("Last publish") %></th>
+          <th><%= f.object.kind_of?(Content::Repository) ? _('Last Sync') : _('Last Publish') %></th>
           <th><%= _("Content type") %></th>
         </tr>
-        <% repositories(@content_view).each do |repository| %>
-          <tr>
-            <td><%= repository.name %></td>
-            <td><%= repository.try(:state) %></td>
-            <td><%= last_time(repository.last_published) %></td>
-            <td><%= repository.content_type %></td>
+        <% repositories.each do |repository| %>
+          <tr class='repository_selection'>
+            <td>
+              <% if @content_view.new_record? %>
+                <%= check_box_tag nil, repository.id, true %>
+                <%= f.hidden_field :repository_ids_to_clone, :value => repository.id, :multiple => true, :id => "clone-#{repository.id}",
+                                   :disabled => true %>
+                <%= f.hidden_field :repository_source_ids,   :value => repository.id, :multiple => true, :id => "latest-#{repository.id}",
+                                   :disabled => true %>
+                <%= select_tag(nil, options_for_type_selection(repository), {:class => 'cv-repo-selection span2', :id => "select-#{repository.id}"}) %>
+              <% end %>
+            </td>
+            <%= render :partial => 'content/repositories/repository', :locals => {:repository => repository} %>
           </tr>
         <% end %>
       </table>

data/app/views/content/content_views/index.html.erb

@@ -2,7 +2,7 @@
 <% title_actions select_action_button( _('New content view'),
                  display_link_if_authorized(_("Product view"), hash_for_new_content_view_path(:type=>'product')),
                  display_link_if_authorized(_("Operating system view"), hash_for_new_content_view_path(:type=>'operatingsystem')),
-                 display_link_if_authorized(_("Hostgroup view"), hash_for_new_content_view_path(:type=>'hostgroup'))) %>
+                 display_link_if_authorized(_("Composite hostgroup view"), hash_for_new_content_view_path(:type=>'hostgroup'))) %>
 
 
 <table class="table table-bordered table-striped">
@@ -14,11 +14,12 @@
   </tr>
   <% @content_views.each do |content_view| %>
     <tr>
-      <td><%= link_to_if_authorized(h(content_view.name), hash_for_edit_content_view_path(content_view)) %></td>
+      <td><%= link_to_if_authorized(h(content_view.name), hash_for_content_view_path(content_view)) %></td>
       <td><%= @counter[content_view.id] || '0' %></td>
       <td><%= _("%s ago") % time_ago_in_words(content_view.created_at) %></td>
       <td><%= action_buttons(
-            display_delete_if_authorized(hash_for_content_view_path(content_view), :confirm => "Delete #{content_view}?")
+                  display_link_if_authorized(_("Edit"), hash_for_edit_content_view_path(content_view)),
+                  display_delete_if_authorized(hash_for_content_view_path(content_view), :confirm => "Delete #{content_view}?")
       )%></td>
     </tr>
   <% end %>

data/app/views/content/content_views/new.html.erb

@@ -2,10 +2,4 @@
 
 <% title _("New Content View") %>
 
-<% if @content_view %>
-  <%= render :partial => 'form' %>
-<% elsif @hostgroup %>
-  <%= render :partial => 'step2' %>
-<% else %>
-  <%= render :partial => 'step1' %>
-<% end %>
+<%= render :partial => step? %>

data/app/views/content/content_views/show.erb

@@ -0,0 +1,22 @@
+<% title @content_view.to_label %>
+
+<%= title_actions(button_group(
+                      link_to_if_authorized(_("Edit"), hash_for_edit_content_view_path(@content_view)),
+                      display_delete_if_authorized(hash_for_content_view_path(@content_view), :class => 'btn-danger', :confirm => "Delete #{@content_view.name}?")
+                  )) %>
+
+<h3><%= _('Repositories') %></h3>
+<table class="table table-bordered table-striped">
+  <tr>
+    <th><%= sort :name, :as => s_("Name") %></th>
+    <th><%= _("State") %></th>
+    <th><%= _("Last sync status") %></th>
+    <th><%= _("Content type") %></th>
+  </tr>
+  <% @content_view.repository_clones.each do |repository| %>
+    <tr>
+      <%= render :partial => 'content/repositories/repository', :locals => { :repository => repository } %>
+    </tr>
+  <% end %>
+</table>
+

data/app/views/content/products/_form.html.erb

@@ -1,15 +1,9 @@
 <%= javascript 'content/content.js' %>
 <%= form_for @product, :url => (@product.new_record? ? products_path : product_path(@product)) do |f| %>
   <%= base_errors_for @product %>
-  <ul class="nav nav-tabs" data-tabs="tabs">
-    <li class="active"><a href="#primary" data-toggle="tab"><%= _("Product") %></a></li>
-  </ul>
-  <div class="tab-content">
-    <div class="tab-pane active" id="primary">
-      <%= text_f f, :name %>
-      <%= textarea_f f, :description, :class => "input-xlarge" , :rows=> '3' %>
-    </div>
 
-  </div>
+  <%= text_f f, :name %>
+  <%= textarea_f f, :description, :class => "input-xlarge", :rows => '3' %>
+
   <%= submit_or_cancel f %>
 <% end %>