lanes 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3733c06e6d643586d352406448ab55ed6812e860
-  data.tar.gz: 79c1d5bdebb6522539c01b5844e67cb25a404431
+  metadata.gz: 61899d6310319e01eeb5f8d3143de6381d59ef22
+  data.tar.gz: 7684de7e8724e81d9bb3a294dc995d3f74a7a8e5
 SHA512:
-  metadata.gz: 3ee768c759d3cefbc9a8f855b88842efbba485873d9f3f11121710826b93e13469cf46ee635338802ecb8d06c0aa064b78233947215db3751a98d58fdbab4746
-  data.tar.gz: 2ce0dcc798cce89666e00a7c4da30a90c9821f5a366460b5f9ccb8e4161ed15d8a90af3984cf94d073e2e004abd30c320d6280ef96ce3ea031046cf1396048fb
+  metadata.gz: 6037b22dcff009ca206df7145b6058bd8b0e4403e0459f1ce0367afc63a94db7cdd700d225d9cd1c29d86e065392bb087927e71b0f9d039a5c023a14d52b031e
+  data.tar.gz: b227ee2a57df19679fff4767d23734ff4fff44cb92d98494ec1f75c97669793356a6b4610470de0885dba064d91a455ec93e8b0eeac092493ebe50331f67779c

data/client/lanes/components/shared/AssetsListing.cjsx

@@ -0,0 +1,17 @@
+class Lanes.Components.AssetsListing extends Lanes.React.Component
+
+    propTypes:
+        assets: Lanes.PropTypes.Collection.isRequired
+        size: React.PropTypes.oneOf([
+            'thumb', 'medium', 'original'
+        ]).isRequired
+
+    modelBindings:
+        assets: 'props'
+
+    render: ->
+        <div className="assets-listing">
+            {@assets.map (asset) ->
+                <LC.ImageAsset key={asset.cid}
+                    asset={asset} size="thumb" />}
+        </div>

data/client/lanes/components/shared/FieldSet.cjsx

@@ -1,11 +1,12 @@
 class Lanes.Components.FieldSet extends Lanes.React.Component
 
-    getDefaultProps: ->
-        expanded: true
-
     propTypes:
         title: React.PropTypes.string.isRequired
         expanded: React.PropTypes.bool
+        containerClassName: React.PropTypes.string
+
+    getDefaultProps: ->
+        expanded: true
 
     getInitialState: ->
         expanded: @props.expanded
@@ -17,7 +18,8 @@ class Lanes.Components.FieldSet extends Lanes.React.Component
         @setState(expanded: not @state.expanded)
 
     render: ->
-        colProps = _.omit(@props, 'name', 'expanded')
+        colProps = _.omit(@props, 'name', 'expanded', 'bodyClassName')
+        bodyClassName = _.classnames("container", @props.containerClassName)
         <BS.Col {...colProps}>
             <fieldset className={
                 _.classnames("collapsible", @props.className, @state.icon
@@ -27,7 +29,7 @@ class Lanes.Components.FieldSet extends Lanes.React.Component
                     {@props.title}
                 </legend>
                 <BS.Collapse in={@state.expanded}>
-                    <div ref="body" className="fieldset-fields">
+                    <div ref="body" className={bodyClassName} >
                         {@props.children}
                     </div>
                 </BS.Collapse>

data/client/lanes/components/shared/ImageAsset.cjsx

@@ -1,14 +1,13 @@
 class Lanes.Components.ImageAsset extends Lanes.React.Component
 
     propTypes:
-        model: Lanes.PropTypes.Model.isRequired
-        name: React.PropTypes.string.isRequired
+        asset: Lanes.PropTypes.Model.isRequired
         size: React.PropTypes.oneOf([
             'thumb', 'medium', 'original'
         ]).isRequired
 
     modelBindings:
-        asset: -> @props.model[@props.name]
+        asset: 'props'
 
     listenNetworkEvents: true
 
@@ -30,20 +29,18 @@ class Lanes.Components.ImageAsset extends Lanes.React.Component
         className = _.classnames('image-asset', @props.className, {
             'with-image': @asset.hasImage
         })
-        console.log @asset.file_data
-        <LC.FieldWrapper
-            {...@props}
+        <BS.Col
+            {...Lanes.u.bsSizes(@props)}
             className={className}
-            displayComponent={Component}
         >
             <Component />
             <form>
                 <label className="selector">
                     <span>
-                        {if @asset.hasImage then 'Update' else 'Choose'}
+                        {if @asset.isPresent then 'Change' else 'Add'}
                     </span>
                     <input id='file' className="file" type="file"
                         onChange={@handleImageChange} />
                 </label>
             </form>
-        </LC.FieldWrapper>
+        </BS.Col>

data/client/lanes/components/shared/image-asset.scss

@@ -1,6 +1,7 @@
 @import "../../styles/bootstrap/buttons";
 
 .image-asset {
+    position: relative;
     &.field {
         .value {
             border-bottom: 0;
@@ -36,3 +37,17 @@
         width: 100%;
     }
 }
+
+.assets-listing {
+
+    display: flex;
+
+    .image-asset {
+        max-width: 200px;
+        & + .image-asset {
+            border-left: 1px dotted lightgrey;
+            padding-left: 10px;
+            margin-left: 10px;
+        }
+    }
+}

data/client/lanes/lib/utilFunctions.coffee

@@ -16,10 +16,14 @@ distillTypes = (type, ns) ->
 
 Lanes.u = {
     cleanBsSizes: (props) ->
-        _.omit(props,
-            'xs', 'sm', 'md', 'lg',
-            'xsOffset', 'smOffset', 'mdOffset', 'lgOffset'
-        )
+        _.omit(props, @getBsSizeProps() )
+
+    bsSizes: (props) ->
+        _.pick(props, @getBsSizeProps())
+
+    getBsSizeProps: ->
+        [ 'xs', 'sm', 'md', 'lg',
+          'xsOffset', 'smOffset', 'mdOffset', 'lgOffset' ]
 
     makeComparatorUsing: (method) ->
         (a, b) -> Lanes.u.comparator(a[method], b[method])

data/client/lanes/models/Asset.coffee

@@ -31,6 +31,10 @@ class Lanes.Models.Asset extends Lanes.Models.Base
             deps: ['data', 'file_data'], fn: ->
                 if @data then @data else @urlFor('thumbnail')
 
+        isPresent:
+            deps: ['data', 'file_data'], fn: ->
+                @data || !_.isEmpty(@file_data)
+
         hasImage:
             deps: ['data', 'file_data'], fn: ->
                 (@data && IS_IMAGE(@metadata.content_type)) ||
@@ -55,14 +59,11 @@ class Lanes.Models.Asset extends Lanes.Models.Base
 
     onBlobChange: ->
         if @blob
-            @metadata = {
-                content_type: @blob.type
-            }
+            @metadata = { content_type: @blob.type }
             reader = new FileReader()
             reader.onloadend = (ev) =>
                 @data = reader.result if ev.type is 'loadend'
             reader.readAsDataURL(@blob)
-
         else
             @data = null
             @mdatadata?.content_type = undefined

data/client/lanes/models/AssociationMap.coffee

@@ -80,8 +80,9 @@ class Lanes.Models.AssociationMap
             new target_class(options.models || [], options)
         else
             options.model = target_class
-            options.association_name=name
-            new Lanes.Models.AssociationCollection(options.models || [], options)
+            options.association_name = name
+            klass = options.collectionClass or Lanes.Models.AssociationCollection
+            new klass(options.models || [], options)
 
     # returns a collection for the given association.
     collectionFor: (name, model, options = {}) ->

data/client/lanes/models/AssociationProxy.coffee

@@ -62,12 +62,15 @@ ProxyMethods = {
 
     on: (ev, rest...) ->
         rememberEvents( @_proxied_events ||= {}, ev, rest )
+        @
 
     once: (ev, rest...) ->
         rememberEvents( @_proxied_once_events ||= {}, ev, rest )
+        @
 
     off: (ev, rest...) ->
         delete @_proxied_events[ev]
+        @
 
 }
 

data/client/lanes/models/PubSub.coffee

@@ -81,9 +81,8 @@ CableChannel = {
         @perform("off", {channel})
 
     received: (data) ->
-        [channel, model, id] = data.channel.match(/(.*)\/(\d+)/)
+        [channel, model, id] = data.channel.match(/(.*)\/([^\/]+)/)
         Lanes.log.info "[pubsub] change recvd for: #{channel}"
-
         Lanes.Models.PubSub.onChange(
             model, id, _.omit(data, 'channel')
         )

data/client/lanes/screens/SystemSettings.cjsx

@@ -55,7 +55,8 @@ class Lanes.Screens.SystemSettings extends Lanes.React.Screen
                 </BS.NavItem>
             </BS.Nav>
             <BS.Row>
-                <LC.ImageAsset sm=4 model={@config} name='logo'
+
+                <LC.ImageAsset sm=4 asset={@config.logo}
                     label='Logo' size='thumb' />
             </BS.Row>
             {for id, Ext of Lanes.Extensions.instances when Ext.getSettingsElement

data/lib/lanes/api/default_routes.rb

@@ -1,5 +1,15 @@
+require_relative "handlers/asset.rb"
+
 module Lanes
     API.routes.draw do
+        # WS endpoint must come first
+        get Lanes.config.api_path + '/ws' do
+            API::Cable.server.call(env)
+        end
+
+        Extensions.each(reversed: true) do | ext |
+            ext.route(self)
+        end
 
         put Lanes.config.api_path + '/system-settings.json',
             &SystemSettings.update_handler
@@ -10,18 +20,9 @@ module Lanes
         get Lanes.config.api_path + '/asset/*',
             &API::Handlers::Asset.getter
 
-        get Lanes.config.api_path + '/ws' do
-            API::Cable.server.call(env)
-        end
-
         post Lanes.config.api_path + '/dev-file-change.json' do
             API::PubSub.publish("file-change", data)
             "OK"
         end
-
-        Extensions.each(reversed: true) do | ext |
-            ext.route(self)
-        end
-
     end
 end

data/lib/lanes/api/handlers/asset.rb

@@ -4,6 +4,7 @@ module Lanes::API::Handlers
 
         def self.saver
             lambda do
+
                 path = "#{params['extension_id']}/#{params['owner_type']}"
                 model = path.underscore.camelize.constantize
 
@@ -13,7 +14,14 @@ module Lanes::API::Handlers
                     asset = if params['id']
                                 ::Lanes::Asset.find(params['id'])
                             else
-                                owner.send("build_#{params['owner_association']}")
+                                assoc = owner.class.reflections[
+                                    params['owner_association']
+                                ]
+                                if assoc.collection?
+                                    owner.send(params['owner_association']).build
+                                else
+                                    owner.send("build_#{params['owner_association']}")
+                                end
                             end
 
                     asset.update(file: params['file'])

data/lib/lanes/api/pub_sub.rb

@@ -1,3 +1,5 @@
+require_relative 'cable'
+
 module Lanes
     module API
 
@@ -16,8 +18,10 @@ module Lanes
             end
 
             def self.publish(channel, data)
-                ActionCable.server.broadcast PREFIX + channel,
-                                             data.merge(channel: channel)
+                ActionCable.server.broadcast(
+                    PREFIX + channel,
+                    data.merge(channel: channel)
+                )
             end
 
         end

data/lib/lanes/api/root.rb

@@ -33,11 +33,11 @@ module Lanes
                 set :show_exceptions, false
                 require_relative 'routing'
                 Extensions.load_controlling_config
-                Cable.configure
                 # late load in case an extension has provided an alternative implementation
                 unless API.const_defined?(:AuthenticationProvider)
                     require "lanes/api/null_authentication_provider"
                 end
+                require_relative './default_routes'
                 Lanes::Configuration.apply
             end
 

data/lib/lanes/api.rb

@@ -13,6 +13,3 @@ require_relative 'api/root'
 Lanes.config.get(:environment) do
     require_relative("api/test_specs") unless Lanes.env.production?
 end
-
-require_relative "api/handlers/asset.rb"
-require_relative 'api/default_routes'

data/lib/lanes/asset.rb

@@ -8,31 +8,6 @@ module Lanes
 
         validates :owner,  set: true
 
-#        after_update :remove_changed_file, if: lambda{ file_changed? }
-
-        # def serializable_hash(options = nil)
-        #     values = super
-        #     values.delete('file')
-        #     values.merge!(file.as_json[:file].stringify_keys)
-        #     values['original'] = { 'url' => values.delete('url') }
-        #     values
-        # end
-
-        # def store_uploaded_file(f)
-        #     ext = File.extname(f[:filename])
-        #     if ext.blank?
-        #         ext = '.' + FastImage.type(f[:tempfile]).to_s
-        #     end
-        #     self[:file] = ::Lanes::Strings.random + ext
-        #     file.store!(f)
-        # end
-
-        # protected
-
-        # def remove_changed_file
-        #     self.file_was.remove!
-        # end
-
     end
 
 end

data/lib/lanes/configuration.rb

@@ -55,7 +55,7 @@ module Lanes
                 config.redis_options = Lanes.config.redis
                 config.namespace = "#{identifier}::jobba"
             end
-
+            API::Cable.configure
             Resque.redis.namespace = "#{identifier}::resque"
             Resque.redis = Lanes.config.redis
 

data/lib/lanes/job.rb

@@ -1,4 +1,6 @@
 require 'jobba'
+require_relative 'api/pub_sub'
+
 
 module Jobba
     module RecordStatus
@@ -36,7 +38,10 @@ module Lanes
         }
 
         def deliver_progress_to_clients
-            API::PubSub.publish("/lanes/job-statuses/#{job_id}", update: Job.status_for_id(job_id))
+            ::Lanes::API::PubSub.publish(
+                "/lanes/job-statuses/#{job_id}",
+                update: Job.status_for_id(job_id)
+            )
         end
 
         def save_progress(output, progress=1.0)

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.6.0"
+    VERSION = "0.6.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lanes
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-30 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -640,6 +640,7 @@ files:
 - client/lanes/components/select-field/SelectField.cjsx
 - client/lanes/components/select-field/index.js
 - client/lanes/components/select-field/styles.scss
+- client/lanes/components/shared/AssetsListing.cjsx
 - client/lanes/components/shared/Checkbox.cjsx
 - client/lanes/components/shared/CountBadge.cjsx
 - client/lanes/components/shared/DateTime.cjsx