woople-theme 0.6.9 → 0.6.10

data/app/presenters/content_image.rb

@@ -1,6 +1,6 @@
 module ContentImage
-  DEFAULT_IMAGE = 'woople-theme/missing.png'
-  MISSING_WOOPLE_IMAGE = '/images/original/missing.png'
+  DEFAULT_IMAGE        = 'woople-theme/missing.png'
+  MISSING_WOOPLE_IMAGE = '/assets/retina_thumb/missing.png'
 
   def image(&block)
     yield(normalized(__getobj__.image) || DEFAULT_IMAGE) if __getobj__.respond_to? :image
@@ -9,7 +9,7 @@ module ContentImage
   private
 
   def normalized(image)
-    if image.is_a?(Paperclip::Attachment) && image.to_s == MISSING_WOOPLE_IMAGE
+    if image == MISSING_WOOPLE_IMAGE
       DEFAULT_IMAGE
     else
       image

data/app/presenters/menu_section_presenter.rb

@@ -14,6 +14,4 @@ class MenuSectionPresenter < SimpleDelegator
   def section
     __getobj__
   end
-
 end
-

data/app/presenters/profile_link_presenter.rb

@@ -0,0 +1,5 @@
+require 'explicit_delegator'
+
+class ProfileLinkPresenter < ExplicitDelegator
+  enforce_definitions :name, :url
+end

data/app/presenters/profile_presenter.rb

@@ -1,9 +1,30 @@
-require 'delegate'
+require 'explicit_delegator'
 
-class ProfilePresenter < SimpleDelegator
-  def each(*)
-    super do |e|
-      yield ThemePresentation.wrap(e, ProfilePresenter)
+class ProfilePresenter < ExplicitDelegator
+  DEFAULT_IMAGE        = 'woople-theme/missing-profile.png'
+  MISSING_WOOPLE_IMAGE = '/assets/retina_thumb/missing.png'
+
+  enforce_definitions :image, :sections
+
+  def image
+    normalized(profile.image)
+  end
+
+  def sections
+    @sections ||= ThemePresentation.wrap_collection(profile.sections, ProfileSectionPresenter)
+  end
+
+  private
+
+  def profile
+    __getobj__
+  end
+
+  def normalized(image)
+    if image.nil? || image == MISSING_WOOPLE_IMAGE
+      DEFAULT_IMAGE
+    else
+      image
     end
   end
 end

data/app/presenters/profile_section_presenter.rb

@@ -0,0 +1,14 @@
+require 'delegate'
+
+class ProfileSectionPresenter < SimpleDelegator
+
+  def links
+    ThemePresentation.wrap_collection(section, ProfileLinkPresenter)
+  end
+
+  private
+
+  def section
+    __getobj__
+  end
+end

data/app/views/woople-theme/_profile.html.erb

@@ -5,16 +5,15 @@
   </form>
   <ul class="nav nav-pills profile-link">
     <li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= image_tag('woople-theme/missing-profile.png') %></a>
-    <ul id="menu1" class="dropdown-menu">
-      <% profile.each do |section| %>
-        <% section.each do |link| %>
-          <li><a href="<%= link.url %>"><%= link.name %></a></li>
+      <%= link_to(image_tag(profile.image), "#", class: 'dropdown-toggle', data: { toggle: 'dropdown' }) %>
+      <ul id="menu1" class="dropdown-menu">
+        <% profile.sections.each do |section| %>
+          <% section.links.each do |link| %>
+            <li><%= link_to(link.name, link.url) %></li>
+          <% end %>
+          <li class="divider"></li>
         <% end %>
-        <li class="divider"></li>
-      <% end %>
-    </ul>
+      </ul>
     </li>
   </ul>
 </div>
-

data/lib/woople-theme/version.rb

@@ -1,3 +1,3 @@
 module WoopleTheme
-  VERSION = '0.6.9'
+  VERSION = '0.6.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woople-theme
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors:
@@ -207,7 +207,9 @@ files:
 - app/presenters/outline_presenter.rb
 - app/presenters/outline_video_presenter.rb
 - app/presenters/page_header_presenter.rb
+- app/presenters/profile_link_presenter.rb
 - app/presenters/profile_presenter.rb
+- app/presenters/profile_section_presenter.rb
 - app/presenters/submitted_assessment_form_presenter.rb
 - app/presenters/theme_presentation.rb
 - app/presenters/woople_theme/answer_presenter.rb