cloudrider 0.3.21 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 088ae68a4eca11260a60843b241dce38eb9074a6
-  data.tar.gz: 86a4b4eee6817a359c1f83c3ce4e6a7cadd34dfe
+  metadata.gz: 9fcfb4633e2558a041466937f836ba50ce063168
+  data.tar.gz: 390f69c4c086a0d04ec6c4e3dfbaacd3060ba014
 SHA512:
-  metadata.gz: 5a045aedd738cbb8eccbb4c80d592f87fa581930dc2b208a95cca1fb934551922394fc36c62fab957144b581d18fde6a7435435bca72f0843ea43291ce3df499
-  data.tar.gz: 155c134d30344e4be430e912cee358c0e8dcac421818216c1d4413e9126894a136fb834396ae5763c08f058009ef84585c8e2bf78302e4474a4323d279a8d1bd
+  metadata.gz: 3bdc1d45f1b8cdfa9f0aa304fc9933e85a59c82019fbec8969e319ba10f172f909c959c974cb2312ede046af2440d08254260a3dbbe52dbffff9a30bbedc97cd
+  data.tar.gz: fea6c1ef0c6d3ceb482a4530fcd8b2a7411f614e0e516ecd547fc2475e0bd3da28a6e4fe96ef30ef1d83ec020b51a2964ac9190c12297763eede22794a49a448

data/generica/Gemfile

@@ -18,7 +18,7 @@ gem 'paranoia', '~> 2.0.2'
 gem 'premailer-rails', '~> 1.8.0'
 gem 'gmail', '~> 0.4.2'
 gem 'god', '~> 0.13.4'
-gem 'arrows', '>= 0.0.2'
+gem 'arrows', '>= 0.0.6'
 
 # Support
 gem "haml", "~> 4.0.0"

data/generica/Gemfile.lock

@@ -1,38 +1,41 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    active_model_serializers (0.9.0)
+    active_model_serializers (0.9.1)
       activemodel (>= 3.2)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.6)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    addressable (2.3.6)
     annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
     arel (5.0.1.20140414130214)
+    arrows (0.0.2)
+      activesupport (>= 2.3)
     barber (0.5.0)
       ember-source
       execjs
@@ -53,7 +56,7 @@ GEM
     chunky_png (1.3.3)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
@@ -77,8 +80,10 @@ GEM
     compass-rails (1.1.7)
       compass (>= 0.12.2)
       sprockets (<= 2.11.0)
+    css_parser (1.3.5)
+      addressable
     decent_exposure (2.3.2)
-    did_you_mean (0.8.0)
+    did_you_mean (0.9.4)
       interception
     diff-lcs (1.2.5)
     easy_translate (0.5.0)
@@ -98,7 +103,7 @@ GEM
     elasticsearch-transport (1.0.6)
       faraday
       multi_json
-    ember-data-source (1.0.0.beta.11)
+    ember-data-source (1.0.0.beta.12)
       ember-source
     ember-rails (0.15.0)
       active_model_serializers
@@ -109,7 +114,7 @@ GEM
       handlebars-source (> 1.0.0)
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (1.7.1)
+    ember-source (1.7.0)
       handlebars-source (~> 1.0)
     ember_script (0.0.5)
       ember_script-source (>= 0.0.2)
@@ -140,16 +145,31 @@ GEM
     functional_support (0.0.12)
       activesupport (>= 2.3)
     gctools (0.2.3)
-    haml (4.0.5)
+    gmail (0.4.2)
+      gmail_xoauth (>= 0.3.0)
+      mail (>= 2.2.1)
+      mime (>= 0.1)
+    gmail_xoauth (0.4.1)
+      oauth (>= 0.3.6)
+    god (0.13.4)
+    haml (4.0.6)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.6.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     handlebars-source (1.3.0)
-    hashie (3.3.1)
+    hashie (3.3.2)
     hike (1.2.3)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
+    htmlentities (4.3.2)
     i18n (0.6.11)
     i18n-js (2.1.2)
       i18n
@@ -160,10 +180,10 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.1)
-    jwt (1.0.0)
+    jwt (1.2.0)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -177,18 +197,19 @@ GEM
       railties
       tilt
     livescript-source (1.2.0)
-    mail (2.6.1)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    mime (0.4.2)
     mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
+    mini_portile (0.6.1)
+    minitest (5.4.3)
     modernizr-rails (2.7.1)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
+    mysql2 (0.3.17)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     numbers_and_words (0.10.0)
       activesupport
       i18n
@@ -203,39 +224,45 @@ GEM
       activesupport (>= 3)
       capybara (~> 2.4)
       selenium-webdriver (~> 2.41.0)
-    paperclip (4.2.0)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    paranoia (2.0.2)
+    paranoia (2.0.4)
       activerecord (~> 4.0)
+    premailer (1.8.2)
+      css_parser (>= 1.3.5)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.8.0)
+      actionmailer (>= 3, < 5)
+      premailer (~> 1.7, >= 1.7.9)
     probability (1.0.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -256,18 +283,21 @@ GEM
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
     rubyzip (1.1.6)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 2.12)
       sprockets-rails (~> 2.0)
     selenium-webdriver (2.41.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
+    sexp_processor (4.4.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -276,16 +306,20 @@ GEM
       bcrypt (~> 3.1)
       oauth (~> 0.4, >= 0.4.4)
       oauth2 (>= 0.8.0, < 1.0.0)
-    spring (1.1.3)
+    spring (1.2.0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    squash_rails (1.3.3)
+      squash_ruby
+    squash_ruby (2.0.0)
+      json
     stringex (2.1.2)
     thor (0.19.1)
     thread (0.1.4)
@@ -293,7 +327,7 @@ GEM
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.7.0)
@@ -310,6 +344,7 @@ PLATFORMS
 
 DEPENDENCIES
   annotate (>= 2.5.0.pre1)
+  arrows (>= 0.0.2)
   capybara (~> 2.4.4)
   coffee-rails (~> 4.0.1)
   commerce_units (>= 0.0.5)
@@ -331,6 +366,8 @@ DEPENDENCIES
   foundation-rails (~> 5.3.1.0)
   functional_support (>= 0.0.12)
   gctools (~> 0.2.3)
+  gmail (~> 0.4.2)
+  god (~> 0.13.4)
   haml (~> 4.0.0)
   haml-rails (~> 0.4)
   i18n-js
@@ -345,8 +382,9 @@ DEPENDENCIES
   painful_translate (>= 0.0.4)
   paperclip (~> 4.2.0)
   paranoia (~> 2.0.2)
+  premailer-rails (~> 1.8.0)
   probability (= 1)
-  rails (= 4.1.6)
+  rails (~> 4.1.8)
   rails_12factor
   rspec (~> 3.1)
   rspec-rails (~> 3.1)
@@ -355,6 +393,8 @@ DEPENDENCIES
   simplecov (~> 0.7.1)
   sorcery (~> 0.8.6)
   spring
+  squash_rails (~> 1.3.3)
+  squash_ruby (~> 2.0.0)
   stringex (~> 2.1.2)
   uglifier (>= 1.3.0)
   underscore-rails

data/generica/app/assets/javascripts/components/product-display.js.em

@@ -1,3 +1,6 @@
 class Apiv1.ProductDisplayComponent extends Ember.Component
   attributeBindings: ["class"]
-  classNames: ['product-display']
+  classNames: ['product-display']
+
+  +computed product.pictures.firstObject.picUrl
+  productImageStyle: -> "background-image: url(#{@get 'product.pictures.firstObject.picUrl' });"

data/generica/app/assets/javascripts/components/product-listing.js.em

@@ -1,3 +1,6 @@
 class Apiv1.ProductListingComponent extends Ember.Component
   attributeBindings: ["class"]
-  classNames: ['product-listing']
+  classNames: ['product-listing']
+
+  +computed product.pictures.firstObject.picUrl
+  productImageStyle: -> "background-image: url(#{@get 'product.pictures.firstObject.picUrl' });"

data/generica/app/assets/javascripts/components/site-footer.js.em

@@ -1,7 +1,19 @@
 class Apiv1.SiteFooterComponent extends Ember.Component
   tagName: 'footer'
   classNames: ["site-footer"]
+  +computed Apiv1.CurrentUserSession.data
+  user: -> Apiv1.HashEx.camelize get$(Apiv1, "CurrentUserSession.data")
 
+  +computed user.userRank, userLoggedIn
+  adminLoggedIn: ->
+    @userLoggedIn and @get("user.userRank") is "admin"
+    
+  +computed Apiv1.CurrentUserSession.id
+  userLoggedIn: ->
+    get$(Apiv1, "CurrentUserSession.id")
+  +computed userLoggedIn
+  notLoggedIn: ->
+    not @userLoggedIn
   actions:
     displayModal: (modal) ->
       @sendAction 'action', modal

data/generica/app/assets/javascripts/components/site-nav.js.em

@@ -24,6 +24,21 @@ class Apiv1.SiteNavComponent extends Ember.Component
     $("#page-wrapper").unbind "touchmove"
     $("#page-wrapper").unbind "scroll"
 
+  +computed Apiv1.CurrentUserSession.id
+  userLoggedIn: -> 
+    get$ Apiv1, "CurrentUserSession.id"
+
+  +computed userLoggedIn
+  notLoggedIn: ->
+    not @userLoggedIn
+
+  +computed Apiv1.CurrentUserSession.data
+  user: -> Apiv1.HashEx.camelize get$(Apiv1, "CurrentUserSession.data")
+
+  +computed user.userRank, userLoggedIn
+  adminLoggedIn: ->
+    @userLoggedIn and @get("user.userRank") is "admin"
+    
   actions:
     displayModal: (modal) ->
       @sendAction 'action', modal

data/generica/app/assets/javascripts/config/router.js.ls

@@ -1,9 +1,25 @@
 Apiv1.Router.map ->
-  @route "about"
-  @route "contacts"
+  
   @resource "products", path: "/products", ->
     @resource "products.product", path: "/product/:product_id", ->
       @route "show"
+      @resource "products.product.offers", path: "/offers", ->
+        @route "new"
+
+  @resource "users", path: "/users", ->
+    @resource "users.products", path: "/products", ->
+      @route "index"
+      @route "new"
+    @resource "users.product", path: "/product/:product_id", ->
+      @route "edit"
+    @resource "users.contacts", path: "/contacts", ->
+      @route "index"
+      @route "new"
+    @resource "users.contact", path: "/contact/:contact_id", ->
+      @route "edit"
+
+    @resource "users.offers", path: "/offers", ->
+      @route "index"
 
   @resource "admin", path: "/admin", ->
     @resource "admin.translations", path: "/translations", ->

data/generica/app/assets/javascripts/controllers/modals/fork_controller.js.em

@@ -0,0 +1,4 @@
+class Apiv1.ModalsForkController extends Ember.ObjectController
+  actions:
+    gotoMyAccount: ->
+      @transitionToRoute "users.index"

data/generica/app/assets/javascripts/controllers/modals/login_controller.js.em

@@ -20,10 +20,7 @@ class Apiv1.ModalsLoginController extends Ember.ObjectController
     @redirectOut()
 
   redirectOut: ->
-    if @get("model.isAdmin")
-      @transitionToRoute "admin.index" 
-    else
-      @transitionToRoute "users.index"
+    @send "displayModal", "fork"
 
   failedLogin: (reason) ->
     Apiv1.Flash.register "warning", "login failed", 5000

data/generica/app/assets/javascripts/controllers/modals/register_controller.js.em

@@ -7,7 +7,7 @@ class Apiv1.ModalsRegisterController extends Ember.ObjectController
   user: -> @model
 
   redirectToIndex: ->
-    @transitionToRoute 'users.index'
+    @send "displayModel", "fork"
   notifySuccess: ->
     Apiv1.Flash.register "success", "account created!", 4000
   successfulSave: (user) ->