lanes 0.5.6 → 0.6.0

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.4.0'
+# gem "lanes", '0.5.6'
 
 gem "rake"
 gem 'puma'

data/spec/command-reference-files/initial/config/database.yml

@@ -2,6 +2,7 @@ development:
   adapter: postgresql
   database: appy-app_dev
   host: /tmp
+  pool:  <%= ENV["DB_POOL"] || 12 %>
 
 test:
   adapter: postgresql

data/spec/command-reference-files/initial/config/lanes.rb

@@ -1,7 +1,7 @@
-# This file will be loaded if the current extension is the
-# one controlling Lanes.
+# This file will be loaded as part of Lanes startup.
 #
-# It will not be evaluated if another extension is loading this one
+# Extensions are called in load order, so be aware latter extensions may
+# override config options specified
 Lanes.configure do | config |
     # You can specify a different initial vew by setting it here
     # It must be set if the "Workspace" extension is disabled in

data/spec/command-reference-files/screen/spec/appy-app/screens/ready-set-go/ReadySetGoSpec.coffee

@@ -2,4 +2,4 @@ describe "AppyApp.Screens.ReadySetGo", ->
 
     it "can be rendered", ->
         screen = LT.renderComponent(AppyApp.Screens.ReadySetGo)
-        expect(_.dom(screen).text).toMatch("Hello")
+        expect(_.dom(screen).text).toBeTruthy()

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

@@ -15,10 +15,10 @@ renderGrid = (q, done) ->
     grid = LT.renderComponent(LC.Grid, props: query: q)
     expect(loaded).toHaveBeenCalled()
     _.defer ->
-        expect(_.dom(grid).qsa('.r').length)
-            .toEqual( q.results.length )
+        expect(_.dom(grid).qs('.r').el).not.toBeNull()
         done()
 
+
 describe "Lanes.Components.Grid", ->
 
     beforeEach (done) ->

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

@@ -1,11 +1,10 @@
 #= 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)
+DATA = {total:2, success:true, message:"Retrieve succeeded", data:[
+    [1, "TEST1", "Nathan Stitt", "swell guy"]
+    [2, "TEST2", "Nathan Stitt", "Dupe of id #1"]
+]}
 
 Model = Lanes.Test.defineModel(
     props: {id: 'integer', code: 'string', name: 'string', notes: 'string'}
@@ -17,15 +16,15 @@ ADD_ROW_SELECTOR = 'button.add-row'
 describe "Lanes.Components.Grid.PopoverEditor", ->
 
     beforeEach (done) ->
+        LT.syncRespondWith(DATA)
         @query = new Lanes.Models.Query(
-            fields: [ 'id', 'code', 'name', 'notes' ], src: Model
+            src: Model, fields: [ 'id', 'code', 'name', 'notes' ]
         )
-        Lanes.Test.syncSucceedWith(ROW_DATA)
-        @query.ensureLoaded().then(done)
-        @grid = LT.renderComponent(LC.Grid, props: {
-            editor: Lanes.Components.Grid.PopoverEditor
-            query: @query, allowCreate: true
-        })
+        @query.ensureLoaded().then =>
+            @grid = LT.renderComponent(LC.Grid, props: {
+                allowCreate: true, editor: Lanes.Components.Grid.PopoverEditor, query: @query
+            })
+            done()
 
     it "edits", (done) ->
         _.dom(@grid).qs(LAST_ROW_SELECTOR).click(clientX: 5)

data/spec/lanes/components/select-field/SelectFieldSpec.coffee

@@ -10,6 +10,8 @@ BRAND_DATA = {total:3, success:true, message:"Retrieve succeeded", data:[
     {id: 3, code: "DODGE", name: "Chrysler/Dodge"}
 ]}
 
+VALUE_CLASS = '.form-control-static'
+
 Car = Lanes.Test.defineModel(
     props: {id: 'integer', code: 'string', brand_id: 'integer'}
     session:
@@ -29,10 +31,10 @@ describe "Lanes.Components.SelectField", ->
     it "renders read only", (done) ->
         sf = LT.renderComponent(LC.SelectField,
              props:{model: @car, name: 'brand', labelField: 'name'})
-        expect(_.dom(sf).qs('.value').text).toBe('')
+        expect(_.dom(sf).qs(VALUE_CLASS).text).toBe('')
         @car.set(brand: @brands.at(0))
         _.defer ->
-            expect(_.dom(sf).qs('.value').text).toBe('General Motors')
+            expect(_.dom(sf).qs(VALUE_CLASS).text).toBe('General Motors')
             done()
 
     it "renders as edit", ->
@@ -83,7 +85,7 @@ describe "Lanes.Components.SelectField", ->
             model: @car, name: 'brand', labelField: 'name',
             choices: @brands.models
         })
-        expect(_.dom(sf).qs('.value').text).toEqual('Chrysler/Dodge')
+        expect(_.dom(sf).qs(VALUE_CLASS).text).toEqual('Chrysler/Dodge')
 
     it 'renders label for multiple values', ->
         @car.carTypes = [ @brands.at(0), @brands.at(2) ]
@@ -91,7 +93,7 @@ describe "Lanes.Components.SelectField", ->
             queryModel: Car, multiSelect: true, model: @car, name: 'carTypes'
             labelField: 'name', choices: @brands.models
         })
-        expect(_.dom(sf).qs('.value').text).toEqual('General Motors and Chrysler/Dodge')
+        expect(_.dom(sf).qs(VALUE_CLASS).text).toEqual('General Motors and Chrysler/Dodge')
 
 
     it "renders all choices", ->

data/spec/lanes/components/shared/NetworkActivityOverlaySpec.coffee

@@ -26,7 +26,7 @@ describe "Lanes.Components.NetworkActivityOverlay", ->
         model = new Model
         na = LT.renderComponent(LC.NetworkActivityOverlay, props:{
             errorTimeout: 2, model:model})
-        na.setDataState(hasError: true)
+        na.setModelState(hasError: true)
         expect(_.dom(na).qs('.message').text).toBe('Error')
         _.delay( ->
             expect(_.dom(na).el).toBe(null)

data/spec/lanes/models/PubSubSpec.coffee

@@ -8,13 +8,15 @@ describe "Lanes.Model.PubSub", ->
         @getModelConfig = ->
             Lanes.Models.PubSub.types.get('/s').records[1]
 
-    it "checks in/out a model when it binds to a view", ->
+    it "checks in/out a model when it binds to a view", (done) ->
         spyOn(Lanes.Models.PubSub, 'add').and.callThrough()
         spyOn(Lanes.Models.PubSub, 'remove')
         component = Lanes.Test.makeComponent({}, model: @model)
-        expect(Lanes.Models.PubSub.add).toHaveBeenCalledWith(@model)
-        component.data.destroy()
-        expect(Lanes.Models.PubSub.remove).toHaveBeenCalledWith(@model)
+        _.defer =>
+            expect(Lanes.Models.PubSub.add).toHaveBeenCalledWith(@model)
+            component.modelBindings.destroy()
+            expect(Lanes.Models.PubSub.remove).toHaveBeenCalledWith(@model)
+            done()
 
     it "can retrieve a model after checkin", ->
         record = new @Model(id: 11, foo: 'bar')
@@ -34,12 +36,10 @@ describe "Lanes.Model.PubSub", ->
             Lanes.Models.PubSub.remove(@model)
         ).not.toThrowError()
 
-
     it 'removes models', ->
         Lanes.Models.PubSub.add(@model)
         configs = Lanes.Models.PubSub.types.get('/s').records[1].models
         expect(configs.length).toEqual(1)
-
         Lanes.Models.PubSub.remove(@model)
         expect(configs[0].count).toEqual(1)
         Lanes.Models.PubSub.remove(@model)
@@ -66,8 +66,6 @@ describe "Lanes.Model.PubSub", ->
         expect(Lanes.Models.PubSub.mb.subscribe.calls.count()).toEqual(1)
         expect(Lanes.Models.PubSub.mb.unsubscribe.calls.count()).toEqual(0)
         Lanes.Models.PubSub.remove(newModel)
-
         Lanes.Models.PubSub.remove(newModel)
-
         expect(@getModelConfig()).toBeUndefined()
         expect(Lanes.Models.PubSub.mb.unsubscribe.calls.count()).toEqual(1)

data/spec/lanes/models/QuerySpec.coffee

@@ -0,0 +1,19 @@
+describe "Lanes.Models.Query", ->
+
+    beforeEach ->
+        @query =
+            new Lanes.Models.Query({
+                syncOptions: @syncOptions
+                src: Lanes.Models.User, fields: [
+                    {id:'id',   visible: false}
+                    {id:'email', fixedWidth: 130 },
+                    {id:'login', },
+                    {id:'name', flex: 1}
+                ]
+            })
+
+
+    it "can be cloned unsaved attributes", ->
+        newQuery = @query.clone()
+        expect(newQuery).toBeDefined()
+        expect(newQuery.fields.pluck('id')).toEqual(@query.fields.pluck('id'))

data/spec/lanes/react/mixins/DataSpec.coffee

@@ -1,21 +1,21 @@
 describe "Lanes.React.DataMixin", ->
 
-    it "fires setState for a model", ->
+    it "fires forceUpdate for a model", ->
         model = Lanes.Test.makeModel
             props:
                 id: 'integer'
                 foo: 'string'
         comp = Lanes.Test.makeComponent({}, model: model)
-        spyOn(comp, 'setState')
+        spyOn(comp, 'forceUpdate')
         model.foo = "bar"
-        expect(comp.setState).toHaveBeenCalledWith( model: model )
+        expect(comp.forceUpdate).toHaveBeenCalled()
 
-    it "fires setState for a collection", ->
+    it "fires forceUpdate for a collection", ->
         collection = Lanes.Test.makeCollection()
         comp = Lanes.Test.makeComponent({}, collection: collection)
-        spyOn(comp, 'setState')
+        spyOn(comp, 'forceUpdate')
         collection.add([{}])
-        expect(comp.setState).toHaveBeenCalledWith( collection: collection )
+        expect(comp.forceUpdate).toHaveBeenCalled()
 
     it "obeys global pubsub settings", ->
         spyOn(Lanes.Models.PubSub, 'add').and.callThrough()
@@ -39,17 +39,18 @@ describe "Lanes.React.DataMixin", ->
             props:
                 foo: 'string'
                 bar: 'string'
+
         comp = Lanes.Test.makeComponent({
-            bindDataEvents:
+            bindEvents:
                 model: 'change:bar'
         }, {
             model: model
         })
-        spyOn(comp, 'setState')
+        spyOn(comp, 'forceUpdate')
         model.foo = "bar"
-        expect(comp.setState).not.toHaveBeenCalled()
+        expect(comp.forceUpdate).not.toHaveBeenCalled()
         model.bar = "foo"
-        expect(comp.setState).toHaveBeenCalledWith( model: model )
+        expect(comp.forceUpdate).toHaveBeenCalled()
 
     it "can rebind events", ->
         Model = Lanes.Test.defineModel
@@ -60,13 +61,14 @@ describe "Lanes.React.DataMixin", ->
         comp = Lanes.Test.makeComponent({}, {
             model: m1
         })
-        spyOn(comp, 'setState')
+        spyOn(comp, 'forceUpdate')
         m1.foo = "bar"
-        expect(comp.setState).toHaveBeenCalled()
+        expect(comp.forceUpdate).toHaveBeenCalled()
+
+        comp.modelBindings.reset(model: m2)
+        comp.forceUpdate.calls.reset()
 
-        comp.data.rebind(model: m2)
-        comp.setState.calls.reset()
         m1.foo = "a different bar"
-        expect(comp.setState).not.toHaveBeenCalled()
+        expect(comp.forceUpdate).not.toHaveBeenCalled()
         m2.foo = "bar"
-        expect(comp.setState).toHaveBeenCalled()
+        expect(comp.forceUpdate).toHaveBeenCalled()

data/spec/server/api/coffeescript_processor_spec.rb

@@ -101,7 +101,7 @@ Foo = (function() {
 
 Bar.extend(Foo);
 
-})(window.Lanes,(window.Lanes ? window.Lanes['Foo'] : null),window.Lanes.Vendor.ld,window.Lanes.Components,window.Lanes.Vendor.React,window.Lanes.Vendor.ReactBootstrap,{namespace:window.Lanes['Foo'],extension:{name:'Foo',identifier:'foo'},path:[\"foo\",\"bar\",\"baz\"]},window);
+})((window.Lanes = (window.Lanes || {})),(window.Lanes ? window.Lanes['Foo'] : null),(window.Lanes.Vendor = (window.Lanes.Vendor || {})).ld,window.Lanes.Components,window.Lanes.Vendor.React,window.Lanes.Vendor.ReactBootstrap,{namespace:window.Lanes['Foo'],extension:{name:'Foo',identifier:'foo'},path:[\"foo\",\"bar\",\"baz\"]},window);
 EOS
 
 Scope = Struct.new(:logical_path)

data/spec/server/api/controller_base_spec.rb

@@ -0,0 +1,77 @@
+require_relative "../spec_helper"
+require 'lanes/access/user'
+
+class ControllerBaseSpec < Lanes::TestCase
+
+    include TestingModels
+
+    def test_record_retrieval
+        1.upto(10){|i| TestModel.create!(id: i, name:'test') }
+        controller = Lanes::API::ControllerBase.new(TestModel,
+                                                    Lanes::API::AuthenticationProvider.new({}),
+                                                    {id: 1})
+        assert_equal(controller.send(:perform_retrieval), {
+                         :success=>true, :message=>"Retrieve succeeded",
+                         :data=>{"id"=>1, "bt_id"=>nil, "name"=>"test", "number"=>nil}
+                     })
+    end
+
+    def test_single_update
+        TestModel.create!(id: 1, name:'Joe')
+        controller = Lanes::API::ControllerBase.new(TestModel,
+                                                    Lanes::API::AuthenticationProvider.new({}),
+                                                    {id: 1}, {name:'Bob'})
+        assert_equal(controller.send(:perform_single_update), {
+                         :success=>true, :message=>"Update succeeded",
+                         :data=>{"id"=>1, "bt_id"=>nil, "name"=>"Bob", "number"=>nil}
+                     })
+        assert_equal TestModel.where(id: 1).first.name, 'Bob'
+    end
+
+    def test_multiple_updates
+        TestModel.create!(id: 1, name:'Joe')
+        TestModel.create!(id: 2, name:'Bob')
+        def TestModel.access_limits_for_query(query, user, params)
+            query.where(name:'Joe')
+        end
+        controller = Lanes::API::ControllerBase.new(TestModel,
+                                                    Lanes::API::AuthenticationProvider.new({}),
+                                                    {},
+                                                    [{'id'=>1}, {'id'=>2}])
+
+        assert_equal( controller.send(:perform_multiple_updates), {
+                          :success=>true,
+                          :message=>"Update succeeded",
+                          :data=>[{"id"=>1, "bt_id"=>nil, "name"=>"Joe", "number"=>nil}]
+        })
+    end
+
+    def test_single_destroy
+        TestModel.create!(id: 1, name:'Joe')
+        controller = Lanes::API::ControllerBase.new(TestModel,
+                                                    Lanes::API::AuthenticationProvider.new({}),
+                                                    {id: 1}, {})
+        assert_equal( controller.send(:perform_single_destroy), {
+                          :success=>true, :message=>"Destroy succeeded", :data=>[]
+                      })
+        assert_empty TestModel.where(id: 1).to_a
+    end
+
+
+    def test_multiple_destroy
+        TestModel.create!(id: 1, name:'Joe')
+        TestModel.create!(id: 2, name:'Bob')
+
+        controller = Lanes::API::ControllerBase.new(TestModel,
+                                                    Lanes::API::AuthenticationProvider.new({}),
+                                                    {},
+                                                    [{'id'=>1}, {'id'=>2}])
+        assert_equal( controller.send(:perform_multiple_destroy), {
+                          :success=>true,
+                          :message=>"Destroy succeeded",
+                          :data=>[]
+                      })
+        assert_empty TestModel.all.to_a
+    end
+
+end

data/spec/server/api/pub_sub_spec.rb

@@ -0,0 +1,9 @@
+require "lanes/spec_helper"
+
+class PubSubTest < Lanes::TestCase
+
+    def test_pub_sub
+
+    end
+
+end

data/spec/server/asset_spec.rb

@@ -1,6 +1,6 @@
 require_relative "spec_helper"
-require "lanes/cli"
-require "find"
+# require "lanes/cli"
+# require "find"
 
 class Lanes::AssetTest < Lanes::TestCase
 
@@ -8,27 +8,32 @@ class Lanes::AssetTest < Lanes::TestCase
 
     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
+        tm = TestModel.new
+        @model = TestModel.new
+        asset = @model.build_asset# (file: fixtures_path.join('logo.png').open)
+        tf=Tempfile.new
+        tf.write fixtures_path.join('logo.png').read
+        tf.rewind
+        asset.file = {
+            type: "image/png", name: "file",
+            filename: "Screen Shot 2016-10-28 at 5.15.37 PM.png",
+            head: "Content-Disposition: form-data; name=\"file\"; filename=\"Screen Shot 2016-10-28 at 5.15.37 PM.png\"\r\nContent-Type: image/png\r\n",
+            tempfile: tf
         }
-    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
-        }
+
+        assert_equal(@model.asset.file_data.keys, ["original", "medium", "thumbnail"])
+        assert_equal(
+            @model.asset.file_data['original']['metadata'].without('filename'), {
+                "size"=>42228,
+                "mime_type"=>"image/png",
+                "width"=>500,
+                "height"=>223
+            }
+        )
     end
 
 end

data/spec/server/concerns/export_scope_spec.rb

@@ -5,9 +5,10 @@ class ExportScopeTest < Lanes::TestCase
 
     def test_scope_method_creation
         refute TestModel.respond_to?(:big_query)
-        TestModel.send( :export_scope, :big_query, ->{} )
+        TestModel.send( :scope, :big_query, ->{},  {export: true}  )
         assert TestModel.respond_to?(:big_query)
         assert TestModel.has_exported_scope?(:big_query,DummyUser.new)
     end
 
+
 end

data/spec/server/concerns/exported_limits_spec.rb

@@ -1,14 +1,21 @@
 require_relative "../spec_helper"
 
 class ExportedLimitsTest < Lanes::TestCase
+    module FakeScope
+        extend ActiveSupport::Concern
+        class_methods do
+            def scope(*args) # act like ActiveRecord model
+            end
+        end
+    end
 
-    class LimitsTestingModel
-
+    class Base
+        include FakeScope
         include Lanes::Concerns::ExportScope
         include Lanes::Concerns::ExportMethods
+    end
 
-        def self.scope(name, query)# act like ActiveRecord model
-        end
+    class LimitsTestingModel < Base
 
         def secret_method( name, query )
         end
@@ -20,9 +27,9 @@ class ExportedLimitsTest < Lanes::TestCase
             user == 'anon'
         }
 
-        export_scope :admin_data, lambda{ | param |
+        scope :admin_data, lambda { | param |
             param
-        }, limit: :only_admins
+        }, export: {limit: :only_admins}
 
         export_methods :secret_method, limit: :only_admins
 
@@ -34,11 +41,9 @@ class ExportedLimitsTest < Lanes::TestCase
     end
 
     def test_limits
-        assert LimitsTestingModel.has_exported_method?( 'test_method', 'anon' ), "anyone can retrieve no_limit data"
-
+       assert LimitsTestingModel.has_exported_method?( 'test_method', 'anon' ), "anyone can retrieve no_limit data"
         assert LimitsTestingModel.has_exported_scope?( 'admin_data', 'admin' ), "Admins can retrieve admin data"
         refute LimitsTestingModel.has_exported_scope?( 'admin_data', 'non-admin' ), "Non-Admin cannot retrieve admin data"
-
         assert LimitsTestingModel.has_exported_method?( 'secret_method', 'admin' ), "Public can retrieve public data"
         refute LimitsTestingModel.has_exported_method?( 'secret_method', 'unk' ), "User must be admin to retrieve public data"
     end

data/spec/server/concerns/set_attribute_data_spec.rb

@@ -55,4 +55,21 @@ class SetAttributeDataTest < Lanes::TestCase
         assert_equal 42, tm.instance_variable_get(:@setting)
     end
 
+    def test_deleting_has_many
+        tm = TestModel.create!
+        1.upto(3) { |x| tm.hm.create({description: "description-#{x}"}) }
+
+        assert_equal tm.hm(true).count, 3
+        tm.set_attribute_data({
+            hm: [
+              { 'id' => 1, 'description' => 'updated' },
+              { 'id' => 2, '_delete' => true }
+            ]
+        }, @user)
+        assert_saves tm
+        assert_equal tm.hm(true).count, 2
+        refute tm.hm.find_by(id: 2)
+        assert_equal tm.hm.find(1).description, 'updated'
+    end
+
 end

data/spec/server/spec_helper.rb

@@ -6,26 +6,44 @@ require 'lanes/command'
 require 'lanes/workspace/extension'
 require 'mocha/mini_test'
 
+require "shrine/storage/memory"
+
+# Shrine.storages = {
+# }
+require "shrine"
+require "shrine/storage/file_system"
+
+Lanes::Concerns::AssetUploader.storages = {
+    cache: Shrine::Storage::Memory.new,
+    store: Shrine::Storage::Memory.new,
+}
+
 
 module TestingModels
     include ActiveRecordMocks::IncludeMe
 
     def around(&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
+        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
-        with_mocked_tables do |m|
 
-            m.enable_extension "hstore"
+        with_mocked_tables do |m|
+            [:test_models, :tmbts, :tmhms].each do | table |
+                if ActiveRecord::Base.connection.data_source_exists? table
+                    ActiveRecord::Base.connection.drop_table table
+                end
+            end
 
             m.create_table do |t|
                 t.model_name :TestModel

data/templates/config/database.yml

@@ -2,6 +2,7 @@ development:
   adapter: postgresql
   database: <%= name %>_dev
   host: /tmp
+  pool:  <%= ENV["DB_POOL"] || 12 %>
 
 test:
   adapter: postgresql

data/templates/spec/client/Screen.coffee

@@ -2,4 +2,4 @@ describe "<%= screen_class %>", ->
 
     it "can be rendered", ->
         screen = LT.renderComponent(<%= screen_class %>)
-        expect(_.dom(screen).text).toMatch("Hello")
+        expect(_.dom(screen).text).toBeTruthy()

data/views/specs.erb

@@ -14,7 +14,10 @@
           <script src="<%= js_file %>" type="text/javascript"></script>
         <% end %>
         <script type="text/javascript">
-            Lanes.config.bootstrap( <%= client_bootstrap_data %> );
+          Lanes.config.bootstrap( <%=
+                                     client_bootstrap_data(mergedWith: {
+                                     api_path: 'http://localhost:8888' + Lanes.config.api_path
+                                     }) %> );
         </script>
 
     </head>