chili_pepper 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61039b400230929e6ab13346dea4b736853c4096
-  data.tar.gz: aaa3d2f22996b4cb4461678bc904f39bffd9de5e
+  metadata.gz: 916f2b214cee4aee6005696c377e6d90bde762d8
+  data.tar.gz: d8fcec7a30d05a7b9b3d7d38316e540f038e1a7b
 SHA512:
-  metadata.gz: 6da604f13d226608e8575d905d6161f7763457315b412042c0a1c65ede2eb16de702f476a7341898cec4a1039795f88dc6b7028c2ca74b77a419492b8378fdfd
-  data.tar.gz: 048734f2d4ff32d7b692f082de2027825ce558cfeae9d60412799600238a0836a7a1a03cf42d1e6685fd45f98142cf037f6c9022a7064bf39c33faad582c4423
+  metadata.gz: 86098858c6b909974bfdd8fa189978cbfb9e5f936d720cdd06d5d26156e5d928d08eb1355a6d7ec976761b40b6a39633e43ce4d7787ed5244329005e4e53b5f4
+  data.tar.gz: b8b1408e1bc4fe3089b3b7e7a6185c5057fb210acc3b96e496c0daae9e85abc63d7a5f1cf75619b94aa47e24d9249fb46a380a8c45950dac6698c30ec00fb163

data/app/controllers/chili_pepper/menus_controller.rb

@@ -9,12 +9,12 @@ module ChiliPepper
       menu_type = params[:menu_type] || :food
       if admin_signed_in?
         @menu = Menu
-                .where(menu_type: Menu::menu_types[menu_type])
+                .where(menu_type: Menu.menu_types[menu_type])
                 .first
         redirect_to @menu.present? ? @menu : new_menu_path
       else
         @menu = Menu.published
-                .where(menu_type: Menu::menu_types[menu_type])
+                .where(menu_type: Menu.menu_types[menu_type])
                 .first
         redirect_to @menu.present? ? @menu : main_app.root_path
       end
@@ -24,7 +24,7 @@ module ChiliPepper
       @similar_menus = pick_similar_menus
 
       if @menu.sections.any?
-        redirect_to menu_section_path(@menu, @menu.sections.first)
+        redirect_to menu_section_path(@menu, @menu.sections.position_sorted.first)
       else
         @section = ''
         render layout: 'chili_pepper/menu'

data/app/decorators/chili_pepper/section_decorator.rb

@@ -6,8 +6,8 @@ module ChiliPepper
     def show_section_header
       if description? || heading?
         header_content = ''
-        header_content += h.content_tag(:h1, h.markdown(heading), class: 'menu_section_heading') if heading?
         header_content += h.image_tag(image.url(:medium), class: 'menu_section_image') if image?
+        header_content += h.content_tag(:h1, h.markdown(heading), class: 'menu_section_heading') if heading?
         header_content += (h.content_tag :p, h.markdown(description), class: 'menu_section_description') if description?
         h.content_tag :section, h.raw(header_content), class: 'section_header'
       end

data/app/models/chili_pepper/section.rb

@@ -18,17 +18,21 @@
 
 module ChiliPepper
   class Section < ActiveRecord::Base
-  belongs_to :menu, class_name: "ChiliPepper::Menu", touch: true
-  validates :menu, :name, presence: true
-  has_many :items, class_name: "ChiliPepper::Item", dependent: :destroy
-  acts_as_list scope: :menu
+    belongs_to :menu, class_name: 'ChiliPepper::Menu', touch: true
+    validates :menu, :name, presence: true
+    has_many :items, class_name: 'ChiliPepper::Item', dependent: :destroy
+    acts_as_list scope: :menu
     extend FriendlyId
-  friendly_id :name, use: :slugged
+    friendly_id :name, use: :slugged
     has_attached_file :image,
                       styles: {
                         medium: ChiliPepper.section_medium_image,
                         thumb: '100x100>'
                       }
     validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/
+
+    def self.position_sorted
+      order('position asc')
+    end
   end
 end

data/lib/chili_pepper/version.rb

@@ -1,3 +1,3 @@
 module ChiliPepper
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili_pepper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Loic Seigland