chili_pepper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d892da3db9a37bb1e379e8412cbe838f810497
-  data.tar.gz: 5ed59d1cf3bf770c9b696546ea73a88e6e9497ac
+  metadata.gz: 61039b400230929e6ab13346dea4b736853c4096
+  data.tar.gz: aaa3d2f22996b4cb4461678bc904f39bffd9de5e
 SHA512:
-  metadata.gz: e82e2b9ea961e987b4033e00ff4d552af928bda75a0553f273881fb3e0abe2ec6f7a57a8e57c4e348cdbe69812aac5f8f54189cd97e46935116cf3688711b997
-  data.tar.gz: b3d619fcdc3d21b8d2421b490cad8d24036c30c3b0266c1e0cd2bc2fa3007b957caab2231e0a6ad2db744150e8aee9228b1a1620db0dfea61ce27cb9568672a0
+  metadata.gz: 6da604f13d226608e8575d905d6161f7763457315b412042c0a1c65ede2eb16de702f476a7341898cec4a1039795f88dc6b7028c2ca74b77a419492b8378fdfd
+  data.tar.gz: 048734f2d4ff32d7b692f082de2027825ce558cfeae9d60412799600238a0836a7a1a03cf42d1e6685fd45f98142cf037f6c9022a7064bf39c33faad582c4423

data/app/controllers/chili_pepper/sections_controller.rb

@@ -74,7 +74,7 @@ module ChiliPepper
     end
 
     def section_params
-      params.require(:section).permit(:name, :description, :image, :menu_id)
+      params.require(:section).permit(:name, :description, :image, :menu_id, :heading)
     end
   end
 end

data/app/decorators/chili_pepper/menu_decorator.rb

@@ -14,7 +14,7 @@ module ChiliPepper
 
       def display_availability
         if availability?
-          h.content_tag(:h2, availability, class: 'menu_availibilities')
+          h.content_tag(:h2, h.markdown(availability), class: 'menu_availibilities')
         end
       end
       

data/app/decorators/chili_pepper/section_decorator.rb

@@ -3,17 +3,18 @@ module ChiliPepper
     delegate_all
     decorates_association :items
 
-    def show_section_description
-      if description?
-        h.content_tag(:p, h.markdown(description), :class => 'menu_section_description')
+    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 :p, h.markdown(description), class: 'menu_section_description') if description?
+        h.content_tag :section, h.raw(header_content), class: 'section_header'
       end
     end
 
     def admin_show_section_img
-      if section_image?
-        h.image_tag image.url(:thumb), :class => 'menu_img_thumb'
-      end
+      h.image_tag(image.url(:thumb), class: 'menu_img_thumb') if section_image?
     end
-
   end
 end

data/app/models/chili_pepper/section.rb

@@ -18,12 +18,17 @@
 
 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
-  	extend FriendlyId
+  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
-    has_attached_file :image, :styles => { :medium => "1200x720>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
+    has_attached_file :image,
+                      styles: {
+                        medium: ChiliPepper.section_medium_image,
+                        thumb: '100x100>'
+                      }
+    validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/
   end
 end

data/app/views/chili_pepper/sections/_form.html.haml

@@ -1,8 +1,9 @@
 = simple_form_for([@menu, @section]) do |f|
   %ul
     = f.input :name
-    = f.input :description
     %fieldset
+      = f.input :heading
+      = f.input :description
       -# admin_show_section_img(@section)
       = f.input :image
     = f.input :menu_id, :as => :hidden

data/app/views/chili_pepper/sections/show.html.haml

@@ -17,9 +17,10 @@
     = @menu.pdf_link
   
   %section#menu_dishes
-    = @section.show_section_description
-    - @columns_number.times do |i|
-      = render :partial => 'column', :locals => {:col_num => i, :item_group => @item_groups[i], :section_id => @section.id}
+    = @section.show_section_header
+    %section#dishes_list
+      - @columns_number.times do |i|
+        = render :partial => 'column', :locals => {:col_num => i, :item_group => @item_groups[i], :section_id => @section.id}
     = @menu.footnotes
     
 

data/app/views/layouts/chili_pepper/menu.html.haml

@@ -20,7 +20,7 @@
                   = link_to "Delete Menu", menu_path(@menu), :method => :delete, :class => "delete admin"
            
               = @menu.display_availability
-              -# @menu.display_description
+              = @menu.display_description
 
 
           - if @menu.image?

data/db/migrate/20140811150635_add_heading_to_chili_pepper_sections.rb

@@ -0,0 +1,5 @@
+class AddHeadingToChiliPepperSections < ActiveRecord::Migration
+  def change
+    add_column :chili_pepper_sections, :heading, :string
+  end
+end

data/db/migrate/20140811163304_change_availibility_to_text.rb

@@ -0,0 +1,9 @@
+class ChangeAvailibilityToText < ActiveRecord::Migration
+  def up
+      change_column :chili_pepper_menus, :availability, :text
+    end
+
+    def down
+      change_column :chili_pepper_menus, :availability, :string
+    end
+end

data/lib/chili_pepper/engine.rb

@@ -14,9 +14,14 @@ module ChiliPepper
 
 
   class << self
-       mattr_accessor :columns_number, :menu_medium_image, :restaurant_name
+       mattr_accessor :columns_number,
+                      :menu_medium_image,
+                      :restaurant_name,
+                      :section_medium_image
+
        self.columns_number = 2
        self.menu_medium_image = '430x184>'
+       self.section_medium_image = '530x230>'
        self.restaurant_name = 'Restaurant'
 
        # add default values of more config vars here

data/lib/chili_pepper/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chili_pepper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Loic Seigland
@@ -332,20 +332,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: annotate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
 description: Using in-place editing etc.
 email:
 - loic@loicseigland.ie
@@ -435,11 +421,12 @@ files:
 - db/migrate/20140616163238_add_attachments_to_sections.rb
 - db/migrate/20140810170249_create_chili_pepper_annotations.rb
 - db/migrate/20140810170608_add_annotation_id_to_items.rb
+- db/migrate/20140811150635_add_heading_to_chili_pepper_sections.rb
+- db/migrate/20140811163304_change_availibility_to_text.rb
 - lib/chili_pepper.rb
 - lib/chili_pepper/configuration.rb
 - lib/chili_pepper/engine.rb
 - lib/chili_pepper/version.rb
-- lib/tasks/auto_annotate_models.rake
 - lib/tasks/chili_pepper_tasks.rake
 - lib/templates/haml/scaffold/_form.html.haml
 homepage: ''

data/lib/tasks/auto_annotate_models.rake

@@ -1,34 +0,0 @@
-# NOTE: only doing this in development as some production environments (Heroku)
-# NOTE: are sensitive to local FS writes, and besides -- it's just not proper
-# NOTE: to have a dev-mode tool do its thing in production.
-if Rails.env.development?
-  task :set_annotation_options do
-    # You can override any of these by setting an environment variable of the
-    # same name.
-    Annotate.set_defaults({
-      'position_in_routes'   => "before",
-      'position_in_class'    => "before",
-      'position_in_test'     => "before",
-      'position_in_fixture'  => "before",
-      'position_in_factory'  => "before",
-      'show_indexes'         => "true",
-      'simple_indexes'       => "false",
-      'model_dir'            => "app/models",
-      'include_version'      => "false",
-      'require'              => "",
-      'exclude_tests'        => "false",
-      'exclude_fixtures'     => "false",
-      'exclude_factories'    => "false",
-      'ignore_model_sub_dir' => "false",
-      'skip_on_db_migrate'   => "false",
-      'format_bare'          => "true",
-      'format_rdoc'          => "false",
-      'format_markdown'      => "false",
-      'sort'                 => "false",
-      'force'                => "false",
-      'trace'                => "false",
-    })
-  end
-
-  Annotate.load_tasks
-end