Upgrade emblem template

Gemfile

@@ -39,7 +39,8 @@ group :assets do
   #gem 'ember-source', '~> 1.13.9'
   #gem 'emblem-rails'
   gem 'ember-validations-rails'
-  gem 'ember-emblem-template'
+  gem 'ember-emblem-template', github: 'bterkuile/ember-emblem-template'
+  #gem 'ember-emblem-template', path: '/home/benjamin/development/rails/components/ember-emblem-template'
 
   gem 'foundation-rails' #, github: 'bterkuile/foundation-rails'
   gem 'ace-rails-ap'

Gemfile.lock

@@ -21,6 +21,14 @@ GIT
     devise_simply_stored (0.3.0)
       devise
 
+GIT
+  remote: git://github.com/bterkuile/ember-emblem-template.git
+  revision: 22f657eaba09fa8992005a2e86d24c85306244e2
+  specs:
+    ember-emblem-template (0.3.0)
+      barber (>= 0.9.0)
+      sprockets (>= 3.3, < 3.4)
+
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
   revision: 05cb3a06a9d4a3588efd4491db42fac84276befb
@@ -171,14 +179,10 @@ GEM
       activemodel
     ember-data-source (2.0.0)
       ember-source (>= 1.8, < 3.0)
-    ember-emblem-template (0.2.2)
+    ember-handlebars-template (0.4.1)
       barber (>= 0.9.0)
-      sprockets (>= 2.1, < 3.0)
+      sprockets (>= 3.3, < 3.4)
-    ember-handlebars-template (0.3.2)
+    ember-rails (0.19.2)
-      barber (>= 0.9.0)
-      sprockets (>= 2.1, < 3.4)
-      tilt
-    ember-rails (0.19.1)
       active-model-adapter-source (>= 1.13.0)
       active_model_serializers
       ember-data-source (>= 1.13.0)
@@ -226,7 +230,6 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
-    hike (1.2.3)
     hitimes (1.2.2)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -402,11 +405,8 @@ GEM
     spring (1.3.6)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
-    sprockets (2.12.4)
+    sprockets (3.3.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -481,7 +481,7 @@ DEPENDENCIES
   devise
   devise-i18n
   devise_simply_stored!
-  ember-emblem-template
+  ember-emblem-template!
   ember-rails
   ember-validations-rails
   factory_girl_rails

app/assets/javascripts/supplier/app/app.js.coffee

@@ -2,7 +2,7 @@
   LOG_TRANSITIONS: true
   LOG_VIEW_LOOKUPS: true
   rootElement: '#ember-app-container'
-  store: -> @__container__.lookup('controller:application').store
+  store: -> @__container__.lookup('service:store')
 @App.modals = Ember.Namespace.create()
 @Modals = @App.modals
 

app/assets/javascripts/supplier/app/components/form/my-select.js.coffee

@@ -1,6 +1,6 @@
 App.MySelectComponent = Ember.Component.extend
   # possible passed-in values with their defaults:
-  layoutName: 'supplier/app/form/my-select'
+  layoutName: 'form/my-select'
   content: null
   prompt: null
   optionValuePath: 'id'

app/assets/javascripts/supplier/app/components/list/order.js.coffee

@@ -1,4 +1,4 @@
 App.ListOrderComponent = Ember.Component.extend
-  layoutName: 'lists/list-order'
+  layoutName: 'list/order'
   classNames: ['list-order-container']
   classNameBindings: ['order.state']

app/assets/javascripts/supplier/app/templates/list.emblem

@@ -1,5 +1,5 @@
 .row: .small-12.columns
   h2.main-section-header=t 'models.list'
-  partial "list_content"
+  partial "list/content"
   link-to 'lists' class="button"
     span=t 'list.go_to_lists'

app/assets/javascripts/user/app/app.js.coffee

@@ -29,6 +29,10 @@ Ember.Application.initializer
     application.inject('component', 'globals', 'global:variables')
     application.inject('route', 'globals', 'global:variables')
 
+#Ember.Application.initializer
+#  name: 'storeInComponents'
+#  initialize: (container, application)->
+#    container.typeInjection('component', 'store', 'store:main')
 @App = Ember.Application.create
   LOG_TRANSITIONS: true
   rootElement: '#ember-app-container'

app/assets/javascripts/user/app/components/menu_item_product_orders.js.coffee

@@ -1,7 +1,12 @@
 App.MenuItemProductOrdersComponent = Ember.Component.extend
-  templateName: 'components/menu/product_orders'
+  product_orders: (->
+    debugger
+  ).property()
+  layoutName: 'components/menu/product_orders'
   classNames: ['menu-list-item', 'menu-list-item-product-orders']
-  classNameBindings: ['controller.controllers.product_orders.product_orders.length:show:hide', 'currentRoute:active']
+  classNameBindings: ['product_orders.length:show:hide', 'currentRoute:active']
-  currentRoute: (-> @get('controller.currentRouteName') is 'product_orders' ).property('controller.currentRouteName')
+  currentRoute: (-> @get('targetObject.currentRouteName') is 'product_orders' ).property('targetObject.currentRouteName')
+  orderTotal: Ember.computed 'product_orders.@each.total', ->
+    3
   click: ->
     @get('controller').transitionToRoute 'product_orders'

app/assets/javascripts/user/app/templates/components/menu/product_orders.emblem

@@ -1 +1 @@
-span=currency controller.controllers.product_orders.orderTotal
+span=currency orderTotal

app/assets/javascripts/user/app/templates/global/_top_menu.emblem

@@ -5,15 +5,15 @@
         if globals.list.id
           link-to 'index' class="top-menu-logo with-list"
             = image-tag 'user/logo-small.png'
-          = menu-item route="active_list" reference_controller=controller
+          = menu-item route="active_list"
-          = menu-item route="table" route_param=globals.list.table.id reference_controller=controller
+          = menu-item route="table" route_param=globals.list.table.id
-          = menu-item-list-needs-help reference_controller=controller
+          = menu-item-list-needs-help
-          = menu-item-list-needs-payment reference_controller=controller
+          = menu-item-list-needs-payment
         else
           link-to 'index' class="top-menu-logo without-list"
             = image-tag 'user/logo-small.png'
-          = menu-item-scan-qr reference_controller=controller
+          = menu-item-scan-qr
-        = menu-item-product-orders reference_controller=controller
+        = menu-item-product-orders
   if globals.list
     .extra-info{action "showSupplierStatusInfo"}
       .supplier-info-row

app/controllers/suppliers/lists_controller.rb

@@ -63,7 +63,7 @@ module Suppliers
           if params[:old_style] then
             render json: @list.with_orders_as_json
           else
-            render json: @list, serializer: SupplierListSerializer
+            render json: @list, serializer: Suppliers::ListSerializer
           end
         end
       end

config/initializers/emblem.rb

@@ -1,9 +1,11 @@
-if "Ember::Emblem::Template".safe_constantize
+if defined?(Ember::Emblem::Template)
+  namespaces = %w[supplier waiter user]
+  template_roots = namespaces.map{|namespace| namespace + '/app/templates'}
   Ember::Emblem::Template.configure do |config|
     config.templates_root = ['app/templates']
 
-    config.templates_root = %w[supplier/app/templates waiter/app/templates user/app/templates]
+    config.templates_root = template_roots
     # You can overwrite other config
   end
+  Rails.application.config.handlebars.templates_root = template_roots
 end
-