chili_pepper 0.0.2 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0549b3418e8a065e5638d7fa82a122496418aa0
-  data.tar.gz: e57bb127cbe1436ca6766b93fde4391bd050bf4e
+  metadata.gz: a2cc9fbae80c7d653e65073069858aae7fc85a56
+  data.tar.gz: 1b135bb9920088588544dfa0814c031ce1b6f428
 SHA512:
-  metadata.gz: dd6ca94fe0bbe93c5f4b424c9756cbb3eb824a1cfceba57d9db3ef094e1b89973bbdc5cf02607362a93db60257f3515406ef96e0544f7e3f9ffeb4473625e15f
-  data.tar.gz: 22865f5bf949c91955237fc9a90a116110142e19bc4eb9cf52ec5c38bcd26eef70c32fa0b02d720b9149d205314608c192cefa6649c3f7d16ce1cbfbba4a366c
+  metadata.gz: 4571c0de0c25107aa800b93373fd75486e83f2110b58fe1bd085a3b2df94798c280a4e974bab5f09cbacb378d51a256210075712b0327e06ed9f94690ac6ba59
+  data.tar.gz: c8849f2f6a703977c9bbcc48bb2c48b3dd2b4dc794c03fa9c6df0750a2f2f3097f01ff5924b939dbaa59ce63fd4b476e5c8c7e8d800885947ede37cbf99431f4

data/app/assets/javascripts/chili_pepper/layout.js.coffee

@@ -6,5 +6,7 @@ jQuery ->
   if $('#new_dish').length
     DishForm.act_on_select()
 
+  MenuForm.init()
+
 
 

data/app/assets/javascripts/chili_pepper/menus.js.coffee

@@ -0,0 +1,20 @@
+@MenuForm = 
+  init: ->
+    $('.admin_form form').on 'click', '.remove_fields', (event) ->
+      $(this).prev('ul').find('li input[type=hidden]').val('1')
+      $(this).parent('li').hide()
+      event.preventDefault()
+    $('.admin_form form').on 'click', '.add_fields', (event) ->
+      time = new Date().getTime()
+      regexp = new RegExp($(this).data('id'), 'g')
+      $(this).parent('li').before($(this).data('fields').replace(regexp, time))
+      event.preventDefault()
+
+# @MenusAdminControls =
+#   init_sort: ->
+#     $('#menu_nav ul').removeClass('regular').addClass('sortable').sortable(
+#       axis: 'x'
+#       update: ->
+#        $.post($(this).data('update-url'), $(this).sortable('serialize'))
+#     )
+          

data/app/controllers/chili_pepper/dishes_controller.rb

@@ -75,7 +75,7 @@ module ChiliPepper
         :picture,
         :coeliac,
         :vegetarian,
-        items_attributes: [:section_id, :price, :column, :dish_id, :id]
+        items_attributes: [:section_id, :price, :column, :dish_id, :id, :annotation_id]
       )
     end
   end

data/app/controllers/chili_pepper/menus_controller.rb

@@ -88,7 +88,8 @@ module ChiliPepper
         :price,
         :published,
         :downloadable_pdf,
-        :image
+        :image,
+        annotations_attributes: [:id, :description, :_destroy]
         )
     end
   end

data/app/decorators/chili_pepper/item_decorator.rb

@@ -24,6 +24,12 @@ module ChiliPepper
       end
     end
 
+    def show_annotation
+      if annotation.present?
+        h.content_tag(:span, annotation.description, class: 'annotation')
+      end
+    end
+
     def show_description
       if dish.description?
         h.content_tag(:p, h.markdown(dish.description), class: 'dish_description')

data/app/helpers/chili_pepper/application_helper.rb

@@ -1,23 +1,32 @@
 module ChiliPepper
   module ApplicationHelper
-      def markdown(text)
-        renderer = Redcarpet::Render::HTML.new(hard_wrap: true, filter_html: true)
-        options = {
-          autolink: true,
-          no_intra_emphasis: true
-        }
-        rtxt = Redcarpet::Markdown.new(renderer, options).render(text)
-      return Regexp.new(/\A<p>(.*)<\/p>\Z/m).match(rtxt)[1].html_safe
-      end
+    def markdown(text)
+      renderer = Redcarpet::Render::HTML.new(hard_wrap: true, filter_html: true)
+      options = {
+        autolink: true,
+        no_intra_emphasis: true
+      }
+      rtxt = Redcarpet::Markdown.new(renderer, options).render(text)
+    return Regexp.new(/\A<p>(.*)<\/p>\Z/m).match(rtxt)[1].html_safe
+    end
 
-      def cache_or_admin(fragment_name, &block_to_be_executed)
-        if !admin_signed_in? 
-          cache(fragment_name) do
-            block_to_be_executed.call
-          end
-        else
+    def cache_or_admin(fragment_name, &block_to_be_executed)
+      if !admin_signed_in?
+        cache(fragment_name) do
           block_to_be_executed.call
         end
+      else
+        block_to_be_executed.call
+      end
+    end
+
+    def link_to_add_fields(name, f, association)
+      new_object = f.object.send(association).klass.new
+      id = new_object.object_id
+      fields = f.fields_for(association, new_object, child_index: id) do |builder|
+        render(association.to_s.singularize + "_fields", f: builder)
       end
+      link_to(name, '#', class: "add_fields", data: {id: id, fields: fields.gsub("\n", "")})
+    end
   end
 end

data/app/models/chili_pepper/annotation.rb

@@ -0,0 +1,7 @@
+module ChiliPepper
+  class Annotation < ActiveRecord::Base
+    belongs_to :menu, touch: true
+    has_many :items, dependent: :nullify
+    acts_as_list scope: :menu
+  end
+end

data/app/models/chili_pepper/item.rb

@@ -16,6 +16,7 @@ module ChiliPepper
   class Item < ActiveRecord::Base
     belongs_to :dish, class_name: 'ChiliPepper::Dish'
     belongs_to :section, class_name: 'ChiliPepper::Section'
+    belongs_to :annotation, class_name: 'ChiliPepper::Annotation'
     validates :section, presence: true
     acts_as_list scope: :section
     after_destroy :check_dish_relevance

data/app/models/chili_pepper/menu.rb

@@ -32,6 +32,9 @@ module ChiliPepper
     extend FriendlyId
     friendly_id :name, use: :slugged
 
+    has_many :annotations, dependent: :destroy
+    accepts_nested_attributes_for :annotations, allow_destroy: true
+
     has_attached_file :image,
                       styles: {
                         medium: ChiliPepper.menu_medium_image,

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

@@ -19,7 +19,7 @@
       %fieldset
         = item_form.input :section_id, :as => :hidden, :input_html => { :value => @item.section_id}
         = item_form.input :column, :as => :hidden, :input_html => { :value => @item.column}
-        / = item_form.association :menu_annotation, :collection => @section.menu.menu_annotations, :value_method => lambda {|x| x.id}, :label_method => lambda {|x| x.description}
+        = item_form.association :annotation, :collection => @menu.annotations, :value_method => lambda {|x| x.id}, :label_method => lambda {|x| x.description}
     = hidden_field_tag 'section_id', @section.id
     - if @item.present?
       = hidden_field_tag 'item_id', @item.id

data/app/views/chili_pepper/items/_item.html.haml

@@ -6,7 +6,7 @@
     %h4.dish_name
       = item.dish.name
       = item.show_price
-      / = item.show_annotation
+      = item.show_annotation
     
       - if admin_signed_in?
         = link_to "Edit Dish", edit_dish_path(item.dish, section_id: item.section_id, item_id: item.id), class: "admin edit"

data/app/views/chili_pepper/menus/_annotation_fields.haml

@@ -0,0 +1,5 @@
+%li
+  %ul.annotation_field
+    = f.input :description, :label => false
+    = f.input :_destroy, :as => :hidden
+  = link_to "remove", '#', class: "remove_fields"

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

@@ -13,14 +13,14 @@
       = f.input :image
 
     
-    / %fieldset.menu_notes
-    /   %p.form_tag
-    /     Menu Notes
-    /   %ul
-    /     = f.simple_fields_for :menu_annotations do |note_builder|
-    /       = render 'menu_annotation_fields', f: note_builder 
-    /   %li.add_annotation
-    /     = link_to_add_fields "Add note", f, :menu_annotations
+    %fieldset.menu_notes
+      %p.form_tag
+        Menu Notes
+      %ul
+        = f.simple_fields_for :annotations do |note_builder|
+          = render 'annotation_fields', f: note_builder 
+      %li.add_annotation
+        = link_to_add_fields "Add note", f, :annotations
     
       
     

data/db/migrate/20140810170249_create_chili_pepper_annotations.rb

@@ -0,0 +1,11 @@
+class CreateChiliPepperAnnotations < ActiveRecord::Migration
+  def change
+    create_table :chili_pepper_annotations do |t|
+      t.integer :menu_id
+      t.integer :position
+      t.string :description
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140810170608_add_annotation_id_to_items.rb

@@ -0,0 +1,5 @@
+class AddAnnotationIdToItems < ActiveRecord::Migration
+  def change
+    add_column :chili_pepper_items, :annotation_id, :integer
+  end
+end

data/lib/chili_pepper/version.rb

@@ -1,3 +1,3 @@
 module ChiliPepper
-  VERSION = "0.0.2"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chili_pepper
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.8
 platform: ruby
 authors:
 - Loic Seigland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -381,6 +381,7 @@ files:
 - app/helpers/chili_pepper/menus_helper.rb
 - app/helpers/chili_pepper/sections_helper.rb
 - app/models/chili_pepper/admin.rb
+- app/models/chili_pepper/annotation.rb
 - app/models/chili_pepper/dish.rb
 - app/models/chili_pepper/item.rb
 - app/models/chili_pepper/menu.rb
@@ -389,6 +390,7 @@ files:
 - app/views/chili_pepper/dishes/edit.html.haml
 - app/views/chili_pepper/dishes/new.html.haml
 - app/views/chili_pepper/items/_item.html.haml
+- app/views/chili_pepper/menus/_annotation_fields.haml
 - app/views/chili_pepper/menus/_form.html.haml
 - app/views/chili_pepper/menus/_navigation.html.haml
 - app/views/chili_pepper/menus/edit.html.haml
@@ -431,6 +433,8 @@ files:
 - db/migrate/20140616162854_add_pictures_to_dishes.rb
 - db/migrate/20140616163025_add_attachements_to_menus.rb
 - 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
 - lib/chili_pepper.rb
 - lib/chili_pepper/configuration.rb
 - lib/chili_pepper/engine.rb