lanes 0.8.2 → 0.8.3

data/lib/lanes/version.rb

@@ -1,5 +1,5 @@
 module Lanes
 
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
 
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanes-framework",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Lanes",
   "main": "index.js",
   "repository": "https://github.com/argosity/lanes",

data/spec/server/api/controller_base_spec.rb

@@ -1,77 +1,85 @@
 require_relative "../spec_helper"
 require 'lanes/access/user'
 
-class ControllerBaseSpec < Lanes::TestCase
-
+describe "ControllerBase" do # < Lanes::TestCase
     include TestingModels
 
-    def test_record_retrieval
+
+    it "can retrieve" do
         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), {
+        expect(controller.send(:perform_retrieval)).to eq({
                          :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'
+    let(:person) do
+        stub_model Person, id: 1, name: 'joe'
     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}])
+    fit "can make a single update" do
+        Person.new
 
-        assert_equal( controller.send(:perform_multiple_updates), {
-                          :success=>true,
-                          :message=>"Update succeeded",
-                          :data=>[{"id"=>1, "bt_id"=>nil, "name"=>"Joe", "number"=>nil}]
-        })
+        # TestModel.create!(id: 1, name:'Joe')
+        # controller = Lanes::API::ControllerBase.new(TestModel,
+        #                                             Lanes::API::AuthenticationProvider.new({}),
+        #                                             {id: 1}, {name:'Bob'})
+        # expect(controller.send(:perform_single_update)).to(
+        #        eq({
+        #               :success=>true, :message=>"Update succeeded",
+        #               :data=>{"id"=>1, "bt_id"=>nil, "name"=>"Bob", "number"=>nil}
+        #           })
+        #        )
+        # expect(TestModel.where(id: 1).first.name).to eq('Bob')
     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_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_multiple_destroy
-        TestModel.create!(id: 1, name:'Joe')
-        TestModel.create!(id: 2, name:'Bob')
+    # 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
 
-        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
+
+    # 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/spec_helper.rb

@@ -1,15 +1,9 @@
 require "lanes/spec_helper"
 require_relative "minitest_assertions"
-require "active_record_mocks"
-
 require 'lanes/command'
-
-require 'mocha/mini_test'
-
+require "temping"
 require "shrine/storage/memory"
 
-# Shrine.storages = {
-# }
 require "shrine"
 require "shrine/storage/file_system"
 
@@ -18,44 +12,41 @@ Lanes::Concerns::AssetUploader.storages = {
     store: Shrine::Storage::Memory.new,
 }
 
+RSpec.configure do |config|
+  config.after do
+    Temping.teardown
+  end
+end
 
 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
+    # around(:each) do |example|
+    #     self.with_testing_models do
+    #         example.run
+    #     end
+    # end
+    # def around(&block)
+    #     self.with_testing_models(&block)
+    # end
 
-        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
+    def with_testing_models
 
-            m.create_table do |t|
-                t.model_name :TestModel
-                t.parent_class "Lanes::Model"
-                t.belongs_to :bt, class_name: 'Tmbt'
-                t.has_many   :hm, class_name: 'Tmhm'
-                t.layout do |l|
-                    l.integer :bt_id
-                    l.string :name, :number
-                end
+            # [:test_models, :tmbts, :tmhms].each do | table |
+            #     if ActiveRecord::Base.connection.data_source_exists? table
+            #         ActiveRecord::Base.connection.drop_table table
+            #     end
+            # end
+        Temping.create :test_model do
+
+            t.parent_class "Lanes::Model"
+            t.belongs_to :bt, class_name: 'Tmbt'
+            t.has_many   :hm, class_name: 'Tmhm'
+            t.layout do |l|
+                l.integer :bt_id
+                l.string :name, :number
             end
-            TestModel.export_associations( :bt, :hm, writable: true )
+        end
+        TestModel.export_associations( :bt, :hm, writable: true )
 
             m.create_table do |t|
                 t.model_name :Tmbt
@@ -78,17 +69,18 @@ module TestingModels
             yield
 
             TestModel.blacklisted_attributes.clear if TestModel.blacklisted_attributes
-
+            Temping.teardown
         end
     end
 
 
 end
 
-class Lanes::TestCase
 
-    def fixtures_path
-        Pathname.new(__FILE__).dirname.join("..","fixtures").expand_path
-    end
+# class Lanes::TestCase
 
-end
+#     def fixtures_path
+#         Pathname.new(__FILE__).dirname.join("..","fixtures").expand_path
+#     end
+
+# end

data/templates/client/models/model.js

@@ -0,0 +1,17 @@
+import {
+    BaseModel, identifiedBy, identifier, belongsTo, hasMany, field, computed
+} from './base';
+
+@identifiedBy('<%= identifier %>/<%= file_name %>')
+export default class <%= class_name %> extends BaseModel {
+
+<% fields.each do |field| -%>
+    @<%= sprintf("%-11s%s;", field.decorator, field.column_name ) %>
+<% end -%>
+
+<% if reference_fields.any? -%>
+<% reference_fields.each do |field| -%>
+    @<%= field.belongs_to? ? 'belongsTo' : 'hasMany' -%>({ model: '<%= identifier %>/<%= field.name %>' }) <%= field.name %>;
+<% end -%>
+<% end -%>
+}

data/templates/config/database.yml

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

data/templates/config/jest.config.json

@@ -0,0 +1,14 @@
+{
+    "rootDir": "/Users/nas/code/show-maker",
+    "verbose": true,
+    "notify": false,
+    "testMatch": [ "**/?(*.)(spec|test).js?(x)" ],
+    "moduleFileExtensions": [ "js", "jsx", "json" ],
+    "setupTestFrameworkScriptFile": "<rootDir>/spec/client/setup.js",
+    "moduleNameMapper": {
+        "\\.(css|less|scss)$": "identity-obj-proxy"
+    },
+    "transform": {
+        "^.+\\.jsx?$": "<rootDir>/config/jest/babel-transform.js"
+    }
+}

data/templates/config/jest/babel-transform.js

@@ -0,0 +1,47 @@
+const babelOptions = {
+    plugins: [
+        'react-hot-loader/babel',
+        'babel-plugin-transform-decorators-legacy',
+        'babel-plugin-transform-class-properties',
+        'babel-plugin-transform-function-bind',
+        'babel-plugin-transform-react-jsx',
+        'babel-plugin-transform-runtime',
+    ].map(require.resolve),
+    presets: [
+        require.resolve('babel-preset-es2015'),
+        require.resolve('babel-preset-react'),
+        require.resolve('babel-preset-stage-1'),
+    ],
+};
+
+const crypto = require('crypto');
+const fs = require('fs');
+const path = require('path');
+const jestPreset = require('babel-preset-jest');
+const babel = require('babel-core');
+
+const createTransformer = (options) => {
+    options = Object.assign({}, options, {
+        plugins: (options && options.plugins) || [],
+        presets: ((options && options.presets) || []).concat([jestPreset]),
+        retainLines: true,
+    });
+    delete options.cacheDirectory;
+    delete options.filename;
+
+    return {
+        canInstrument: false,
+        getCacheKey(fileData) {
+            return crypto.createHash('md5').update(fileData).digest('hex');
+        },
+        process(src, filename) {
+            if (!babel.util.canCompile(filename)) {
+                return src;
+            }
+            const theseOptions = Object.assign({ filename }, options);
+            return babel.transform(src, theseOptions).code;
+        },
+    };
+};
+
+module.exports = createTransformer(babelOptions);

data/templates/config/routes.rb

@@ -1,4 +1,5 @@
 Lanes::API.routes.draw do
-    # Set default view for the site root.  Adjust to fit your needs
-    root_view :lanes_root_view
+
+
+
 end

data/templates/config/webpack.config.js

@@ -78,7 +78,7 @@ const config = {
         historyApiFallback: true,
         proxy: [{
             context: '/api',
-            target: 'http://localhost:4567',
+            target: 'http://localhost:9292',
         }],
         stats: {
             colors: true,

data/templates/js/jest.config.json

@@ -1,19 +1,11 @@
 {
-    "preset": "<%= lanes_root_path %>/lib/js/jest.config.json",
+    "preset": "<%= extension_path %>/config/jest.config.json",
     "roots": [
         "<%= extension_path %>/client",
         "<%= extension_path %>/spec"
     ],
-    "setupTestFrameworkScriptFile": "<%= lanes_root_path %>/lib/js/jest/setup.js",
-    "transform": {
-        "^.+\\.jsx?$": "babel-jest"
-    },
     "modulePaths": [
         <%= module_paths.map{|mod| "\"#{mod}\"" }.join(", ") %>,
         "<%= lanes_root_path %>/lib/js/jest/stubs"
-    ],
-    "moduleNameMapper": {
-        "\\.(css|less|scss)$": "<rootDir>/lib/js/jest/styleMock.js",
-        "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/lib/js/jest/fileMock.js"
-    }
+    ]
 }

data/templates/spec/client/models/model.spec.js

@@ -0,0 +1,10 @@
+import <%= class_name %> from '<%= identifier %>/models/<%= file_name %>';
+
+describe('Model <%= class_name %>', () => {
+
+    it('can be instantiated', () => {
+        model = new <%= class_name %>();
+        expect(model).toBeInstanceOf(<%= class_name %>);
+    });
+
+});

data/templates/spec/client/setup.js

@@ -1,2 +1,11 @@
 // Code included here will be ran to setup your specs.
 // it's a usefull spot to setup globals or custom matchers
+const matchers = require('lanes/jest/matchers');
+const { shallow, mount } = require('enzyme');
+
+global.expect.extend(matchers);
+
+global.shallow = shallow;
+global.mount   = mount;
+global.fetch   = require('lanes/jest/mocks/fetch');
+global.React   = require('React');

data/templates/spec/server/spec_helper.rb

@@ -1,16 +1,8 @@
-require_relative '../../lib/<%= namespace %>'
+require_relative '../../lib/<%= identifier %>'
 require 'lanes/spec_helper'
 
-module <%= namespace %>
 
-    # Add more helper methods to be used by all tests here...
-
-    class TestCase < Lanes::TestCase
-        include <%= namespace %>
-    end
-
-    class ApiTestCase < Lanes::ApiTestCase
-        include <%= namespace %>
-    end
+# Configure RSpec to your liking
+RSpec.configure do |config|
 
 end