lanes 0.5.6 → 0.6.0

data/lib/lanes/api/pub_sub.rb

@@ -1,41 +1,23 @@
-require 'message_bus'
-
 module Lanes
     module API
 
-        class PubSub
-
-            def self.publish(channel, data)
-                Lanes.logger.debug "publishing on: #{channel}"
-                ::MessageBus.publish channel, data
+        class PubSub < Cable::Channel
+            PREFIX = 'ps:'
+            def on(data)
+                channel = PREFIX + data['channel']
+                stream_from channel
             end
 
-            def self.initialize(api=nil)
-                #return unless Extensions.require_pub_sub?
-                Lanes.config.get(:environment) do | env |
-                    MessageBus.logger = Lanes.logger
-                end
-
-                require "oj"
-                require_relative "updates"
-                require 'message_bus'
-                api.use MessageBus::Rack::Middleware if api
-
-                if defined?(::PhusionPassenger)
-                    PhusionPassenger.on_event(:starting_worker_process) do |forked|
-                        MessageBus.after_fork if forked
-                    end
-                end
-
-                Updates.relay!
-
-                ::Lanes::API.routes.draw do
-                    post '/file-change.json' do
-                        ::Lanes::API::PubSub.publish("/file-change", data)
-                        "OK"
-                    end
-                end
+            def off(data)
+                channel = PREFIX + data['channel']
+                cb = pubsub.instance_variable_get('@listener')
+                       .instance_variable_get('@subscribers')[channel].first
+                pubsub.unsubscribe(channel, cb)
+            end
 
+            def self.publish(channel, data)
+                ActionCable.server.broadcast PREFIX + channel,
+                                             data.merge(channel: channel)
             end
 
         end

data/lib/lanes/api/request_wrapper.rb

@@ -77,7 +77,7 @@ module Lanes
                 log_request
                 if options[:with_transaction]
                     Lanes::Model.transaction do
-                        response = yield
+                        response = yield || {success: false}
                         # This is quite possibly a horrible idea.
                         # It enables test specs to reset the db state after a request
                         if !Lanes.env.production? && request.env['HTTP_X_ROLLBACK_AFTER_REQUEST']

data/lib/lanes/api/root.rb

@@ -2,9 +2,6 @@ require 'sinatra'
 require 'oj'
 require 'rack/protection'
 require 'rack/cors'
-require_relative 'sprockets_extension'
-require_relative 'helper_methods'
-require_relative 'pub_sub'
 
 module Lanes
     module API
@@ -18,8 +15,9 @@ module Lanes
             helpers RequestWrapper
             helpers HelperMethods
             helpers FormattedReply
-            use Rack::Session::Cookie, :key => 'lanes.session', :secret => Lanes.config.session_secret_key_base
-            use ActiveRecord::ConnectionAdapters::ConnectionManagement
+            use Rack::Session::Cookie,
+                :key => 'lanes.session',
+                :secret => Lanes.config.session_secret_key_base
             not_found do
                 Oj.dump({ message: "endpoint not found", success: false  })
             end
@@ -34,9 +32,8 @@ module Lanes
                 set :views, Pathname.new(__FILE__).dirname.join("../../../views")
                 set :show_exceptions, false
                 require_relative 'routing'
-
-                PubSub.initialize(self)
                 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"

data/lib/lanes/api/routing.rb

@@ -22,8 +22,6 @@ module Lanes
             end
 
             def enable_cors(path_suffix, options = {origins: '*', methods: [:get]})
-                puts path_suffix
-                puts options
                 API::Root::CORS_PATHS[make_path(path_suffix)] = options
             end
 
@@ -85,7 +83,9 @@ module Lanes
             private
 
             def make_path(path)
-                Lanes.config.api_path + '/' + @ext_id + '/' + path
+                path = Lanes.config.api_path + '/' + @ext_id + '/' + path
+                Lanes.logger.debug("[route]: #{path}")
+                path
             end
         end
 

data/lib/lanes/api/sprockets_extension.rb

@@ -85,7 +85,7 @@ module Lanes
                     app.configure :test, :development do
                         app.get "#{Lanes.config.assets_path_prefix}/*" do |path|
                             env_sprockets = request.env.dup
-                            env_sprockets['PATH_INFO'] = path
+                            env_sprockets['PATH_INFO'] = path.gsub(/\?\d+$/, '')
                             settings.sprockets.call env_sprockets
                         end
                     end

data/lib/lanes/api.rb

@@ -4,6 +4,10 @@ require_relative 'api/error_formatter'
 require_relative 'api/formatted_reply'
 require_relative 'api/controller_base'
 require_relative 'api/generic_controller'
+require_relative 'api/cable'
+require_relative 'api/sprockets_extension'
+require_relative 'api/helper_methods'
+require_relative 'api/pub_sub'
 require_relative 'api/root'
 
 Lanes.config.get(:environment) do

data/lib/lanes/asset.rb

@@ -2,36 +2,36 @@ module Lanes
 
     class Asset < Lanes::Model
 
-        mount_uploader :file, Lanes::Concerns::AssetUploader
+        include Lanes::Concerns::AssetUploader[:file]
 
         belongs_to :owner, polymorphic: true
 
         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
+#        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
 

data/lib/lanes/concerns/asset_uploader.rb

@@ -1,58 +1,36 @@
-require 'mini_magick'
-require 'carrierwave'
-require 'fastimage'
+require 'shrine'
+require 'image_processing/mini_magick'
 
 module Lanes::Concerns
 
-    class AssetUploader < CarrierWave::Uploader::Base
-
-        include CarrierWave::MiniMagick
-
-        process :store_attributes
-
-        version :medium,  :if => :image? do
-            process :resize_to_fit => [800, 800]
-        end
-
-        version :thumbnail,  :if => :image? do
-            process :resize_to_fit => [200,200]
-        end
-
-        def cache_dir
-            '/tmp'
-        end
-
-        def filename
-            if original_filename && model && model.read_attribute(mounted_as).present?
-                model.read_attribute(mounted_as)
-            end
-        end
-
-        def store_dir
-            token = secure_token
-            "#{token[0, 2]}/#{token[2, 2]}"
-        end
-
-        protected
-
-        def store_attributes
-            if file && model
-                model.metadata['size'] = file.size
-                model.metadata['content_type'] = file.content_type
-                if image?(file)
-                    img = ::MiniMagick::Image.open(file.file)
-                    model.metadata['width'] = img.width
-                    model.metadata['height'] = img.height
+    class AssetUploader < Shrine
+        module LocationHash
+            module InstanceMethods
+                CHAR_CHOICES = [*('a'..'z'),*('0'..'9')]
+                def generate_location(io, context)
+                    basename, _ = super.split("/")
+                    path = Array.new(3){ CHAR_CHOICES.shuffle[0,4].join }
+                    path.push(basename).join('/')
                 end
             end
         end
+        ::Shrine::Plugins.register_plugin(:location_hash, LocationHash)
 
-        def image?(new_file)
-            new_file.content_type.include? 'image'
-        end
+        include ImageProcessing::MiniMagick
+
+        plugin :activerecord
+        plugin :rack_file
+        plugin :processing
+        plugin :store_dimensions
+        plugin :determine_mime_type
+        plugin :versions
+        plugin :location_hash
 
-        def secure_token
-            model[mounted_as] ||= ::Lanes::Strings.random
+        process(:store) do |io, context|
+            size_800 = resize_to_limit(io.download, 800, 800)
+            size_500 = resize_to_limit(size_800,    500, 500)
+            size_300 = resize_to_limit(size_500,    300, 300)
+            {original: size_800, medium: size_500, thumbnail: size_300}
         end
 
     end

data/lib/lanes/concerns/export_scope.rb

@@ -20,12 +20,12 @@ module Lanes::Concerns
         #
         #  * Safely escape data *(should __ALWAYS__ do this anyway, but it bears mentioning again)*
         #  * Be relatively simple and complete quickly.
-        #  * Provide value to the client that it cannot obtain by using normal query methods
-        module ClassMethods
+        #  * Provide value to the client that it cannot obtain by using normal query method
+        class_methods do
             def scope(name, body, options = {}, &block)
                 super(name, body, &block)
                 if (export = options[:export])
-                    export_scope(name, body, limit: (export == true ? nil : export[:limit]))
+                    export_scope(name, limit: (export == true ? nil : export[:limit]))
                 end
             end
 
@@ -35,14 +35,12 @@ module Lanes::Concerns
             # @param limit [Symbol referring to a Class method name, lambda]
             # If given, this will be queried by the API to determining if a given user may call the scope
             # @return nil
-            def export_scope(name, query, limit: nil)
+            def export_scope(name, limit: nil)
                 include ExportedLimitEvaluator
 
                 self.exported_scopes ||= Hash.new
                 self.exported_scopes[name.to_sym] = {
-                    scope: scope(name, query),
-                    name: name,
-                    limit: limit
+                    name: name, limit: limit
                 }
                 nil
             end

data/lib/lanes/concerns/queries.rb

@@ -9,9 +9,13 @@ module Lanes
             module ClassMethods
 
                 def compose_query_using_detail_view( view: nil, join_to: nil )
-                    join_to = "#{table_name.singularize}_#{primary_key}" unless join_to
-                    joins("join #{view} as details on details.#{join_to} = #{table_name}.#{primary_key}")
-                        .select("#{table_name}.*, details.*")
+                    join_to ||= self.name.demodulize.tableize.singularize + '_' + primary_key
+                    q = joins("join #{view} as details on details.#{join_to} = #{table_name}.#{primary_key}")
+                          .select("details.*")
+                    if current_scope.nil? || current_scope.select_values.exclude?("#{table_name}.*")
+                        q = q.select("#{table_name}.*")
+                    end
+                    q
                 end
 
             end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -76,11 +76,10 @@ module Lanes::Concerns
         # @param user [User] who is performing request
         # @returns
         def set_attribute_data(data, user)
-
             return {} unless self.can_write_attributes?(data, user)
-
             data.each_with_object(Hash.new) do | (key, value), result |
                 # First we set all the attributes that are allowed
+
                 if self.setting_attribute_is_allowed?(key.to_sym, user)
                     result[key] = value
                     public_send("#{key}=", value)
@@ -101,15 +100,22 @@ module Lanes::Concerns
             end
         end
 
-        def _set_attribute_data_from_collection(association, name, value, user)
-            records = public_send(name, value)
-            value.map do | association_data |
+        def _set_attribute_data_from_collection(association, name, record_data, user)
+            records = public_send(name)
+            record_data.map do | association_data |
+
                 record = if association_data['id'].blank?
                              association.build
                          else
                              records.detect{ |r| r.id.to_s == association_data['id'].to_s }
                          end
-                record.set_attribute_data(association_data, user) if record
+                next unless record
+
+                if association_data['_delete'] == true
+                    record.mark_for_destruction
+                else
+                    record.set_attribute_data(association_data, user)
+                end
             end
         end
 

data/lib/lanes/configuration.rb

@@ -1,10 +1,9 @@
 require_relative "concerns/attr_accessor_with_default"
 require 'securerandom'
 require 'pathname'
-require 'carrierwave'
+require 'shrine'
 require 'active_job'
 require 'jobba'
-require 'message_bus'
 
 module Lanes
 
@@ -59,8 +58,7 @@ module Lanes
 
             Resque.redis.namespace = "#{identifier}::resque"
             Resque.redis = Lanes.config.redis
-            MessageBus.redis_config = Lanes.config.redis
-            MessageBus.logger = Lanes.logger
+
             Lanes::SystemSettings.for_ext('lanes').apply!
             Extensions.each{|ext| ext.apply_configuration }
         end
@@ -102,9 +100,8 @@ module Lanes
         # For testing or other uses it can be changed here
         config_option :configuration_id, (ENV['LANES_CONFIG_ID'] || 1)
 
-        # Storage engine to use, default to file, may also be set to
-        # 'fog' or any other value that CarrierWave accepts
-        config_option :storage_type, :file
+        # Configuration for action cable
+        config_option :cable, { 'adapter' => 'redis' }
 
         def api_path
             mounted_at + 'api'

data/lib/lanes/db.rb

@@ -14,7 +14,6 @@ module Lanes
                 ::ActiveRecord::Base.configurations = config
                 ::ActiveRecord::Base.establish_connection(::ActiveRecord::Base.configurations[env.to_s])
             end
-            ActiveRecord::Base.logger = Lanes.logger
         end
 
         def load_seed
@@ -52,4 +51,7 @@ module Lanes
             ::ActiveRecord::Base.logger = old_logger
         end
     end
+
+    ActiveRecord::Base.logger = Lanes.logger
+
 end

data/lib/lanes/guard_tasks.rb

@@ -29,6 +29,7 @@ module Lanes
             yield matchers
 
             jasmine_options = options.merge({
+               keep_failed: false,
                port: 8888, server_mount: '/spec',
                server_env: 'development',
                server: :puma, spec_dir: "spec/#{app_name}",
@@ -49,7 +50,7 @@ module Lanes
 
             dsl.guard :jasmine, jasmine_options do
                 dsl.watch(coffee_files){ |m| "spec/#{m[0]}Spec.#{m[2]}" }
-                dsl.watch(%r{^spec/.*(?:_s|S)pec\.(?:js|coffee|cjsx)$}){|m| p m; m}
+                dsl.watch(%r{^spec/.*(?:_s|S)pec\.(?:js|coffee|cjsx)$}){|m| p m[0]; m[0]}
                 matchers.client_matches.call if matchers.client_matches
             end
 

data/lib/lanes/hot_reload_plugin.rb

@@ -5,8 +5,9 @@ module ::Guard
 
         def initialize(options = {})
             super
+            api = Lanes.config.api_path
             @uri = URI.parse(
-                "http://localhost:#{options[:port]}/file-change.json"
+                "http://localhost:#{options[:port]}#{api}/dev-file-change.json"
             )
         end
 

data/lib/lanes/job.rb

@@ -1,5 +1,4 @@
 require 'jobba'
-require 'lanes/api/pub_sub'
 
 module Jobba
     module RecordStatus

data/lib/lanes/logger.rb

@@ -5,10 +5,10 @@ module Lanes
 
     class MultiDestinationLogger
         def initialize
-            @targets = [
-                STDOUT,
+            @targets = [STDOUT]
+            @targets.push(
                 File.open("log/#{Lanes.config.environment}.log", "a")
-            ]
+            ) if File.writable?("log")
             Lanes.config.get(:environment) do
                 @targets.each{|t| t.sync = ! Lanes.env.production? }
             end

data/lib/lanes/model.rb

@@ -1,10 +1,7 @@
 require_relative 'concerns/all'
-require 'carrierwave/orm/activerecord'
 
 module Lanes
 
-    ::ActiveRecord::Base.raise_in_transactional_callbacks = true
-
     class Model < ::ActiveRecord::Base
         self.abstract_class = true
 

data/lib/lanes/spec_helper.rb

@@ -41,7 +41,7 @@ module Lanes
         include ActiveRecord::TestFixtures
         self.fixture_path = Lanes::Extensions.controlling.root_path.join('spec','fixtures')
 
-        self.use_transactional_fixtures = true
+        self.use_transactional_tests = true
         fixtures :all
 
         def admin

data/lib/lanes/system_settings.rb

@@ -13,20 +13,14 @@ module Lanes
                 SystemSettings.persist!(@extension_id, self.to_h)
             end
             def apply!
-                CarrierWave.configure do |config|
-                    config.storage = Lanes.config.storage_type.to_sym
-                    config.root = lambda {
-                        Lanes::Extensions.controlling
-                            .root_path.join('public/files').to_s
-                    }
-                    config.asset_host = Lanes.config.api_path + '/asset'
-                    if self.fog_credentials and Object.const_defined?(:Fog)
-                        config.fog_credentials = self.fog_credentials
-                    end
-                    config.ignore_integrity_errors = false
-                    config.ignore_processing_errors = false
-                    config.ignore_download_errors = false
-                end
+                require 'shrine/storage/file_system'
+                ext = Extensions.controlling
+                Lanes::Concerns::AssetUploader.storages = {
+                    cache: Shrine::Storage::FileSystem.new(ext.root_path,
+                                                           prefix: "tmp/cache"),
+                    store: Shrine::Storage::FileSystem.new(ext.root_path,
+                                                           prefix: "public/files")
+                }
             end
         end
 

data/lib/lanes/version.rb

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

data/npm-build/data.js

@@ -19,6 +19,7 @@ Lanes.Vendor.Ampersand.RestCollection = require("ampersand-rest-collection");
 Lanes.Vendor.Ampersand.LDCollection   = require('ampersand-collection-lodash-mixin');
 Lanes.Vendor.Ampersand.Collection     = require("ampersand-collection");
 Lanes.Vendor.Events                   = require('ampersand-events');
+Lanes.Vendor.ReactModelMixin          = require("react-model-binding");
 
 Lanes.log           = require('loglevel');
 Lanes.Vendor.dom    = require('ampersand-dom');

data/npm-build/package.json

@@ -10,36 +10,38 @@
     "ampersand-collection": "~2.0",
     "ampersand-collection-lodash-mixin": "~4.0",
     "ampersand-dom": "~1.5",
-    "ampersand-rest-collection": "~6.0",
-    "ampersand-state": "~5.0",
     "ampersand-events": "~2.0",
     "ampersand-filtered-subcollection": "~3.0",
+    "ampersand-rest-collection": "~6.0",
+    "ampersand-state": "~5.0",
     "big.js": "~3.1",
     "classnames": "~2.2",
     "dayz": "0.6.5",
     "get-object-path": "~0.0.3",
-    "history": "^2.1.0",
+    "history": "^3.0.0",
     "lodash": "*",
-    "lodash-inflection": "^1.3.2",
-    "loglevel": "1.4.0",
-    "moment": "^2.12.0",
+    "lodash-inflection": "^1.4",
+    "loglevel": "1.4.1",
+    "moment": "^2.14.1",
     "moment-range": "^2.2.0",
-    "object-assign": "^4.0.1",
+    "object-assign": "^4.1.0",
     "react": "*",
-    "react-lite": "0.15.14",
-    "react-addons-test-utils": "^15.0",
-    "react-bootstrap": "^0.29.4",
-    "react-component-resizable": "git://github.com/justinanastos/react-component-resizable#8c995a6a624fee7f9651e18c6177f79d41244898",
+    "react-addons-test-utils": "^15.2",
+    "react-bootstrap": "^0.30.2",
+    "react-component-resizable": "git://github.com/arcanis/react-component-resizable#patch-1",
     "react-deep-force-update": "^2.0.1",
-    "react-dom": "^15.0",
-    "react-list": "^0.7.18",
-    "react-toggle": "^2.1.0",
-    "react-widgets": "^3.3.1",
+    "react-dom": "^15.2",
+    "react-list": "^0.7.20",
+    "react-lite": "0.15.14",
+    "react-model-binding": "0.4.0",
+    "react-proxy": "^2.0.8",
+    "react-toggle": "^2.1.1",
+    "react-widgets": "^3.4.3",
     "rsvp": "~3.2",
     "sorty": "^1.2.2",
     "sprintf-js": "^1.0.3",
     "underscore.string": "^3.3.4",
-    "xhr": "^2.2.0"
+    "xhr": "^2.2.2"
   },
   "peerDependencies": {
     "react-overlays": "*"
@@ -49,11 +51,11 @@
     "raw-loader": "^0.5.1",
     "css-loader": "^0.23.1",
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.5",
-    "less": "^2.6.1",
+    "file-loader": "^0.9.0",
+    "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "url-loader": "^0.5.7",
-    "webpack": "^1.13.0"
+    "webpack": "^1.13.1"
   },
   "jshintConfig": {
     "asi": false,

data/npm-build/ui.js

@@ -6,3 +6,6 @@ Lanes.Vendor.BrowserHistory           = require("history");
 Lanes.Vendor.ComponentResize          = require('react-component-resizable');
 Lanes.Vendor.List                     = require('react-list')
 Lanes.Vendor.Overlay = require('react-overlays');
+
+Lanes.Vendor.ReactProxy = require('react-proxy')['default'];
+Lanes.Vendor.deepForceUpdate = require('react-deep-force-update')['default'];

data/npm-build/update-dayz

@@ -8,7 +8,7 @@ npm run build
 
 cd -
 
-cp -r ~/code/dayz/lib/* ./node_modules/dayz/lib/
-cp -r ~/code/dayz/style/* ./node_modules/dayz/style/
+cp -rv ~/code/dayz/lib/* ./node_modules/dayz/lib/
+cp -rv ~/code/dayz/style/* ./node_modules/dayz/style/
 
 ./build

data/npm-build/update-model-bindings.js

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+cp -rv ~/code/react-event-binding/*.js ./node_modules/react-model-binding/