lanes 0.4.0 → 0.5.0

data/lib/lanes/extension.rb

@@ -97,7 +97,7 @@ module Lanes
                   root_view:  Lanes.config.root_view,
                   csrf_token: view.session[:csrf],
                   environment: Lanes.config.environment,
-                  system_settings: Lanes::SystemSettings.config.as_json,
+                  system_settings: Lanes::SystemSettings.config.as_json(include: 'logo'),
                   assets_path_prefix: Lanes.config.assets_path_prefix,
                   controlling_extension: controlling.identifier,
                   initial_workspace_screen_id: Lanes.config.initial_workspace_screen_id

data/lib/lanes/logger.rb

@@ -26,22 +26,7 @@ module Lanes
 
     class << self
         def logger
-            @logger ||= (
-                if defined?(::Rails)
-                    Rails.logger
-                else
-                    if Lanes.env.production?
-                        dest = if FileTest.writable?("log/production.log")
-                                   "log/production.log"
-                               else
-                                   STDOUT
-                               end
-                        ::Logger.new(dest)
-                    else
-                        ::Logger.new MultiDestinationLogger.new
-                    end
-                end
-            )
+            @logger ||= _create_logger
         end
 
         def logger=( logger )
@@ -64,10 +49,35 @@ module Lanes
             logger.debug '⚡ '*40
         end
 
+        private
+
+        def _create_logger
+            if defined?(::Rails)
+                Rails.logger
+            else
+                if Lanes.env.production?
+                    dest = if FileTest.writable?("log/production.log")
+                               "log/production.log"
+                           else
+                               STDOUT
+                           end
+                    logger = ::Logger.new(dest)
+                    logger.level = ::Logger::WARN
+                    logger
+                else
+                    logger = ::Logger.new MultiDestinationLogger.new
+                    logger.level = ::Logger::DEBUG
+                    logger
+                end
+            end
+        end
+
+
     end
 
     Lanes.config.get(:environment) do | env |
         self.logger=nil # it'll be re-opened on next write
     end
 
+
 end

data/lib/lanes/system_settings.rb

@@ -2,7 +2,7 @@ module Lanes
 
     class SystemSettings < Lanes::Model
 
-        mount_uploader :logo, Lanes::Concerns::ImageUploader
+        has_one :logo, as: :owner, :class_name=>'Lanes::Asset', :dependent => :destroy
 
         class ExtensionSettings < OpenStruct
             def initialize(ext_id, settings)
@@ -14,11 +14,15 @@ module Lanes
             end
             def apply!
                 CarrierWave.configure do |config|
-                    config.storage = Lanes.config.storage_type
-                    config.root = Lanes::Extensions.controlling
-                                    .root_path.join('public/files').to_s
-                    config.asset_host = Lanes.config.api_path + '/file'
-                    config.fog_credentials = self.fog_credentials
+                    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
@@ -61,7 +65,6 @@ module Lanes
             def clear_cache!(msg)
                 Lanes.logger.debug "SystemSettings cache reset"
                 Lanes::SystemSettings.instance_variable_set(:@config, nil)
-                Lanes::Configuration.apply
             end
         end
 
@@ -69,7 +72,9 @@ module Lanes
             Lanes.redis_connection(cache:false).subscribe(
                 'lanes-system-configuration-update') do |on|
                 on.message do |channel, msg|
-                    Lanes::SystemSettings.clear_cache!(msg)
+                    ActiveRecord::Base.connection_pool.with_connection do
+                        Lanes::SystemSettings.clear_cache!(msg)
+                    end
                 end
             end
         end

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
 
 end

data/lib/lanes.rb

@@ -15,6 +15,7 @@ require_relative "lanes/concerns/all"
 require_relative "lanes/validators/all"
 require_relative "lanes/model"
 require_relative "lanes/system_settings"
+require_relative "lanes/asset"
 require_relative "lanes/components"
 require_relative "lanes/extension"
 require_relative "lanes/screen"

data/npm-build/base.js

@@ -23,7 +23,7 @@ Lanes.log = require('loglevel');
 Lanes.Vendor.ld = require('lodash');
 var spf = require('sprintf-js');
 
-Lanes.Vendor.React.__spread = Lanes.Vendor.ld.assign;
+
 
 Lanes.Vendor.ld.mixin(require('lodash-inflection'));
 

data/npm-build/package.json

@@ -6,18 +6,18 @@
   "version": "0.1.0",
   "main": "vendor.js",
   "dependencies": {
-    "ampersand-collection": "~1.6",
-    "ampersand-collection-lodash-mixin": "~1.0",
+    "ampersand-collection": "~2.0",
+    "ampersand-collection-lodash-mixin": "~4.0",
     "ampersand-dom": "~1.5",
-    "ampersand-rest-collection": "~5.0",
+    "ampersand-rest-collection": "~6.0",
     "ampersand-state": "~5.0",
     "ampersand-events": "~2.0",
-    "ampersand-filtered-subcollection": "~2.0",
+    "ampersand-filtered-subcollection": "~3.0",
     "big.js": "~3.1",
     "classnames": "~2.2",
     "dayz": "0.6.3",
     "get-object-path": "~0.0.3",
-    "history": "^2.0.1",
+    "history": "^2.1.0",
     "lodash": "^4.6.1",
     "lodash-inflection": "^1.3.2",
     "loglevel": "1.4.0",
@@ -26,13 +26,13 @@
     "object-assign": "^4.0.1",
     "react": "*",
     "react-addons-test-utils": "^15.0",
-    "react-bootstrap": "^0.28.5",
+    "react-bootstrap": "^0.29.4",
     "react-component-resizable": "git://github.com/justinanastos/react-component-resizable#8c995a6a624fee7f9651e18c6177f79d41244898",
     "react-deep-force-update": "^2.0.1",
     "react-dom": "^15.0",
-    "react-list": "^0.7.16",
+    "react-list": "^0.7.18",
     "react-toggle": "^2.1.0",
-    "react-widgets": "^3.3.0",
+    "react-widgets": "^3.3.1",
     "rsvp": "~3.2",
     "sorty": "^1.2.2",
     "sprintf-js": "^1.0.3",
@@ -51,7 +51,7 @@
     "less": "^2.6.1",
     "less-loader": "^2.2.3",
     "url-loader": "^0.5.7",
-    "webpack": "^1.12.14"
+    "webpack": "^1.13.0"
   },
   "jshintConfig": {
     "asi": false,

data/spec/command-reference-files/initial/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # For development while Lanes is evolving track master branch
 gem "lanes",   github: 'argosity/lanes',   branch: 'master'
 
-# gem "lanes", '0.3.0'
+# gem "lanes", '0.4.0'
 
 gem "rake"
 gem 'puma'

data/spec/lanes/components/grid/PopoverEditorSpec.coffee

@@ -0,0 +1,48 @@
+#= require lanes/components/grid
+
+COLLECTION_DATA = [
+    {id:1, code:'TEST1', name: 'Nathan Stitt', notes: 'swell guy'}
+    {id:2, code:'TEST2', name: 'Nathan Stitt', notes: 'Dupe of id #1'}
+]
+
+ROW_DATA = _.map COLLECTION_DATA, (r) -> _.values(r)
+
+Model = Lanes.Test.defineModel(
+    props: {id: 'integer', code: 'string', name: 'string', notes: 'string'}
+)
+
+LAST_ROW_SELECTOR = '.grid-body .r:last-child'
+ADD_ROW_SELECTOR = 'button.add-row'
+
+describe "Lanes.Components.Grid.PopoverEditor", ->
+
+    beforeEach (done) ->
+        @query = new Lanes.Models.Query(
+            fields: [ 'id', 'code', 'name', 'notes' ], src: Model
+        )
+        Lanes.Test.syncSucceedWith(ROW_DATA)
+        @query.ensureLoaded().then(done)
+        @grid = LT.renderComponent(LC.Grid, props: {
+            editor: Lanes.Components.Grid.PopoverEditor
+            query: @query, allowCreate: true
+        })
+
+    it "edits", (done) ->
+        _.dom(@grid).qs(LAST_ROW_SELECTOR).click(clientX: 5)
+        editor = Lanes.Test.Utils.findRenderedComponentWithType(
+            @grid, Lanes.Components.Grid.PopoverEditor
+        )
+        _.dom(editor).qs('.field:nth-of-type(3) input').setValue('BOB')
+        _.dom(editor).qs('.btn.save').click()
+        expect( @query.results.rowAt(1)[2] ).toEqual('BOB')
+        done()
+
+    it 'adds row', (done) ->
+        _.dom(@grid).qs(ADD_ROW_SELECTOR).click()
+        editor = Lanes.Test.Utils.findRenderedComponentWithType(
+            @grid, Lanes.Components.Grid.PopoverEditor
+        )
+        _.dom(editor).qs('.field:nth-of-type(3) input').setValue('BOB')
+        _.dom(editor).qs('.btn.save').click()
+        expect( @query.results.rowAt(0)[2] ).toEqual('BOB')
+        done()

data/spec/server/asset_spec.rb

@@ -0,0 +1,34 @@
+require_relative "spec_helper"
+require "lanes/cli"
+require "find"
+
+class Lanes::AssetTest < Lanes::TestCase
+
+    include TestingModels
+
+    def setup
+        TestModel.has_one :asset, as: :owner, :class_name=>'Lanes::Asset'
+        @model = TestModel.new
+    end
+
+    def test_saveing_image
+        @model.build_asset(file: fixtures_path.join('logo.png').open)
+        assert @model.save
+        assert_equal @model.asset.as_json['metadata'], {
+            'content_type' => 'image/png',
+            'width'        => 500,
+            'height'       => 223,
+            'size'         => 49172
+        }
+    end
+
+    def test_saving_blob
+        @model.build_asset(file: fixtures_path.join('system_settings.yml').open)
+        assert @model.save
+        assert_equal @model.asset.as_json['metadata'], {
+            'content_type' => 'text/x-yaml',
+            'size'         => 1
+        }
+    end
+
+end

data/spec/server/spec_helper.rb

@@ -11,7 +11,15 @@ module TestingModels
     include ActiveRecordMocks::IncludeMe
 
     def around(&block)
-        self.with_testing_models(&block)
+        cw_root = CarrierWave.root
+        begin
+            Dir.mktmpdir('lanes-cw-root') do | dir |
+                CarrierWave.root = dir
+                self.with_testing_models(&block)
+            end
+        ensure
+            CarrierWave.root = cw_root
+        end
     end
 
     def with_testing_models
@@ -59,6 +67,10 @@ module TestingModels
 
 end
 
-class TestCase < ActiveSupport::TestCase
+class Lanes::TestCase
+
+    def fixtures_path
+        Pathname.new(__FILE__).dirname.join("..","fixtures").expand_path
+    end
 
 end