lanes 0.1.9.5 → 0.3.0

data/config/routes.rb

@@ -1,7 +1,13 @@
-require 'lanes/access/user'
+Lanes::API.routes.for_extension 'lanes' do
 
-module Lanes
-    API.routes.draw do
-        resources User
+    root_view :lanes_root_view
+
+    get 'job-statuses/:id.json' do
+        wrap_reply do
+            status = Lanes::Job.status_for_id(params[:id])
+            raise ActiveRecord::RecordNotFound unless status
+            std_api_reply :update, status, success: true
+        end
     end
+
 end

data/config/screens.rb

@@ -0,0 +1,25 @@
+Lanes::Screen.for_extension 'lanes' do | screens |
+
+    screens.define "user-preferences" do | screen |
+        screen.title       = "User Preferences"
+        screen.description = "Modify User Profile"
+        screen.icon        = "user-secret"
+        screen.group_id    = "system-settings"
+        screen.model_class = "User"
+        screen.view_class  = "UserPreferences"
+        screen.js  = ''
+        screen.css = ''
+    end
+
+    screens.define "system-settings" do | screen |
+        screen.title       = "System Settings"
+        screen.description = "Update System Settings"
+        screen.icon        = "cogs"
+        screen.group_id    = "system-settings"
+        screen.model_class = "User"
+        screen.view_class  = "SystemSettings"
+        screen.js  = ''
+        screen.css = ''
+    end
+
+end

data/db/migrate/01_create_system_settings.rb

@@ -0,0 +1,10 @@
+class CreateSystemSettings < ActiveRecord::Migration
+    def change
+
+        create_table "system_settings" do |t|
+            t.string "logo"
+            t.jsonb  "settings", null: false, default: {}
+        end
+
+    end
+end

data/docs/todo-example-part-1.md

@@ -15,7 +15,7 @@ lanes new todo
 
 This will create a new directory with a skeleton Lanes application.  Read more about the directories and what their purposes are at {% doc_link command heading:'lanes new' %}.
 
-[Our example app at this point](https://github.com/argosity/lanes-todo-demo/tree/a0909c52d63d3c8e577bdb4338c91ba74e4b1dfa)
+[Our example app at this point](https://github.com/argosity/lanes-todo-demo/tree/c5ee64a5e932055470bf2d13d417f118b89114d6)
 
 # Setup
 
@@ -23,40 +23,40 @@ A sample database configuration file is located in `config/database.yml` which w
 
 Fire up the lanes testing server: `lanes serve`.  The test server will start the app and you can view it at: `http://localhost:8888/`.   You should see a simple "Todo" message.  You can also view the Jasmine specs at `http://localhost:8888/spec`
 
-We'll copy the styles from the [TodoMVC template](https://github.com/tastejs/todomvc/tree/master/template).
+Next we'll create a data model `lanes generate model task title:string{80} completed:boolean` [commit](https://github.com/argosity/lanes-todo-demo/commit/e22d058d49c482f9be0167068adab1e37be868bc)
+
+Since a task should default to being non-completed, we'll edit the migration to default that field to `false` and add a validation to the model [commit](https://github.com/argosity/lanes-todo-demo/commit/4fda061c13d399062850173eff7bb616563a82bf)
 
-Looking at the Todo app, it has four distinct areas. A `sidebar`, `header`, `footer` and `listing` views. We can create views for them by executing `lanes generate view <name>`, where '< name >' is the view to create. [commit](https://github.com/argosity/lanes-todo-demo/commit/6d34c981637f75a182bf708290a146fdc72c77f2)
+Lanes uses the concept of **Screens** to dynamically load a React component and all it's dependencies.  In this case, the Todo app will have only one screen which we can create by running: `lanes generate screen main` [commit](https://github.com/argosity/lanes-todo-demo/commit/f8614fd7d2e29987639ed7c6141e35c5e51e035f)
 
-First we take the TodoMVC html template and break it apart into sections and copy them to each view.  We're then able to plug each view's reference into the Screen as subviews. [commit](https://github.com/argosity/lanes-todo-demo/commit/33d3d56b7a03e403276e894cc9233d4d2aa353e8)
+Looking at the Todo app, it has four distinct areas. A `sidebar`, `header`, `footer` and `listing` components. We can create views for them by executing `lanes generate component <name>`, where '< name >' is the view to create. [commit](https://github.com/argosity/lanes-todo-demo/commit/cdd63af42efada9d3c9a05658337e44141a0500a)
 
-Next we'll create a data model `lanes generate model task title:string{80} completed:boolean` [commit](https://github.com/argosity/lanes-todo-demo/commit/c157f43fbf13a431e9ea08c67d65026c1b96e6dd)
+We'll copy the styles from the [TodoMVC template](https://github.com/tastejs/todomvc/tree/master/template).
 
-Since a task should default to being non-completed, we'll edit the migration to default that field to `false` and add a validation to the model [commit](https://github.com/argosity/lanes-todo-demo/commit/6ab50c30eee4b11a4406eacc53b1f5e63de76b45)
+First we take the TodoMVC html template and break it apart into sections and copy them to each view.  We're then able to plug each component's into the Screen. [commit](https://github.com/argosity/lanes-todo-demo/commit/cb2651fc3c7bfc0d2f093023056241b93c9b0597)
 
 Run migration: `lanes db migrate`
 
-We'll also create a TaskSummary model that is in charge of summarizing the state of the tasks.  It will listen to the tasks collection and perform calculations when events occur. [commit](https://github.com/argosity/lanes-todo-demo/commit/c3372a0d76b5aafb4921b98c10f91d34c86ab86f)
+We'll also create a TaskSummary model that is in charge of summarizing the state of the tasks.  It will listen to the tasks collection and perform calculations when events occur. [commit](https://github.com/argosity/lanes-todo-demo/commit/61a9cb6a6101816becf7f0aa556dd6506f9ffed4)
 
 # Data and events
 
-## Header View
-It's responsible for interaction with the "What needs to be done?" input.  When text is present and the "enter" key is pressed, it should save a record and add it to the collection.  We're able to do so in [just a few lines of code](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/views/Header.coffee#L22-L25)
+## Header
+It's responsible for interaction with the "What needs to be done?" input.  When text is present and the "enter" key is pressed, it should save a record and add it to the collection.  We're able to do so in [just a few lines of code](https://github.com/argosity/lanes-todo-demo/commit/bbdf8c8a95ddea8285615d4a7898d9054b22c4b4)
 
-We can easily test that it performs as it should by [adding a few specs](https://github.com/argosity/lanes-todo-demo/blob/master/spec/todo/views/HeaderSpec.coffee). 
+## Listing
+This component is a bit more complex.  It's split into two components, a parent which handles toggling all todo's between being complete and pending, and a collection of task components that model each individual task. [Listing](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/components/Listing.cjsx)
 
-## Listing View
-This view is a bit more complex.  It has a parent view which handles toggling all todo's between being complete and pending, and a collection of subviews that model each individual task. [ListingView](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/views/Listing.coffee)
+Each Task component is responsible for handling it's own editing state and saving value to it's model. [TaskComponent](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/components/Task.cjsx)
 
-Each TaskView is responsible for handling it's own editing state and saving value to it's model.
+## Footer
+The only action this component takes is to delete any tasks that are marked as complete when the "Clear Completed" button is clicked.  It also displays quite a few values from our TasksSummary.  Lane's data-bindings make these easy to wire up. [Footer](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/components/Footer.cjsx)
 
-## Footer View
-The only action this view takes is to delete any tasks that are marked as complete when the "Clear Completed" button is clicked.  It also displays quite a few values from our TasksSummary.  Lane's declarative bindings make these easy to wire up. [FooterView](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/views/Footer.coffee)
-
-You might notice that Lanes makes it super easy to batch update or delete a collection.  The footer simply calls destroyAll on the "completed" sub-collection provided by the TaskSummary.  Since that sub-collection filters the main collection to only contain "completed" tasks, it's safe to just destroy all the model's in one go.  It's so easy in fact that the FooterView demonstrates an alternative use of events.  The function is directly given to the "events" property, rather than a method reference. [Save Call](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/views/Footer.coffee#L27)
+You might notice that Lanes makes it super easy to batch update or delete a collection.  The footer simply calls destroyAll on the "completed" sub-collection provided by the TaskSummary.  Since that sub-collection filters the main collection to only contain "completed" tasks, it's safe to just destroy all the model's in one go.
 
 # Routing
 
-For a simple app like the this one, it's easiest to just allow the URL change to trigger what the filtered collection is displaying.  We set that up when the screen is initialized. [Routing](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/Router.coffee)
+For a simple app like the this one, it's easiest to just allow the URL change to trigger what the filtered collection is displaying. [Routing](https://github.com/argosity/lanes-todo-demo/blob/master/client/todo/Routes.cjsx)
 
 # Deploying
 
@@ -67,5 +67,3 @@ Simply commit the source and add a remote per Heroku's instructions: [https://de
 When you `git push heroku`, Heroku will notice that Lanes uses sprockets and will automatically run `rake assets:precompile`, and then run the application using the puma webserver.
 
 On first deploy and when your db schema has changed, you will have to provision and migrate the database on Heroku by running: `heroku run rake db:migrate`
-
-

data/lanes.gemspec

@@ -25,19 +25,23 @@ Gem::Specification.new do |spec|
     spec.required_ruby_version = ">= 2.0"
 
     spec.add_dependency "activerecord",           "~> 4.2"
+    spec.add_dependency "activejob",              "~> 4.2"
+    spec.add_dependency "jobba",                  "~> 1.4"
+
+    spec.add_dependency "resque",                 "~> 1.25"
     spec.add_dependency "pg",                     "~> 0.17"
     spec.add_dependency "sinatra",                "~> 1.4"
     spec.add_dependency "bcrypt",                 "~> 3.1"
     spec.add_dependency "oj",                     "~> 2.1"
-    spec.add_dependency "message_bus",            "~> 1.0"
-    spec.add_dependency "rack_csrf",              "~> 2.5"
-    spec.add_dependency "sprockets",              "~> 2.0"
+    spec.add_dependency "message_bus",            "2.0.0.beta.6"
+    spec.add_dependency "rack-protection",        "~> 1.5"
+    spec.add_dependency "sprockets",              "~> 3.0"
     spec.add_dependency "coffee-script",          "~> 2.3"
     spec.add_dependency "coffee-react",           "~> 3.0"
     spec.add_dependency "execjs",                 "~> 2.2"
     spec.add_dependency "thor",                   "~> 0.19"
     spec.add_dependency "sass",                   "~> 3.4"
-    spec.add_dependency "sprockets-helpers",      "~> 1.1"
+    spec.add_dependency "sprockets-helpers",      "~> 1.2"
     spec.add_dependency "compass-import-once",    "~> 1.0"
     spec.add_dependency "guard",                  "~> 2.0"
     spec.add_dependency "hashie",                 "~> 3.3"
@@ -45,13 +49,18 @@ Gem::Specification.new do |spec|
     spec.add_dependency "minitest-around",        "~> 0.2"
     spec.add_dependency "mocha",                  "~> 1.1"
     spec.add_dependency "guard-minitest",         "~> 2.3"
-    spec.add_dependency "yui-compressor",         "~> 0.12"
-    spec.add_dependency "closure-compiler",       "~> 1.1"
+
+    spec.add_dependency "uglifier",               "~> 2.7"
     spec.add_dependency "guard-jasmine",          "~> 2.0"
     spec.add_dependency "rake",                   "~> 10.0"
     spec.add_dependency "jasmine-core",           "~> 2.0"
     spec.add_dependency "require_all",            "~> 1.3"
     spec.add_dependency "sanitize",               "~> 3.0"
+    spec.add_dependency "carrierwave",            "~> 0.10.0"
+    spec.add_dependency "fog",                    "~> 1.37.0"
+    spec.add_dependency "mini_magick",            "~> 4.3.6"
+    spec.add_dependency "fastimage",              "~> 1.8.1"
+
     spec.add_development_dependency "bundler",    "~> 1.5"
     spec.add_development_dependency "growl",      "~> 1.0"
     spec.add_development_dependency "diffy",      "~> 3.0"

data/lib/lanes.rb

@@ -3,18 +3,20 @@ require 'active_record'
 require_relative "lanes/version"
 require_relative "lanes/environment"
 require_relative "lanes/configuration"
+require_relative "lanes/redis"
 require_relative "lanes/logger"
 if defined?(::Rails)
     require_relative "lanes/rails_engine"
 end
 require_relative "lanes/db"
-
 require_relative "lanes/strings"
 require_relative "lanes/numbers"
 require_relative "lanes/concerns/all"
 require_relative "lanes/validators/all"
 require_relative "lanes/model"
-
+require_relative "lanes/system_settings"
 require_relative "lanes/components"
 require_relative "lanes/extension"
 require_relative "lanes/screen"
+require_relative "lanes/job"
+require_relative "lanes/job/failure_logger"

data/lib/lanes/access/config/routes.rb

@@ -1,7 +1,9 @@
 module Lanes
-    API.routes.draw do
+    Lanes::API.routes.for_extension 'lanes-access' do
 
-        post "/user-session.json" do
+        resources User
+
+        post "user-session.json" do
             wrap_reply do
                 user = User.where(login: data['login']).first
                 Lanes.logger.warn "Found User: #{user}"
@@ -15,7 +17,7 @@ module Lanes
             end
         end
 
-        delete "/user-session/:id.json" do
+        delete "user-session/:id.json" do
             session.destroy
             wrap_reply do
                 { success: true, message: "Logout succeeded", data: {} }

data/lib/lanes/access/config/screens.rb

@@ -5,6 +5,7 @@ Lanes::Screen.define_group "system-settings" do | group |
 end
 
 Lanes::Screen.for_extension 'access' do | screens |
+
     screens.define "user-management" do | screen |
         screen.title       = "User Management"
         screen.description = "Add/Remove/Modify User Accounts"

data/lib/lanes/access/db/migrate/20140615031600_create_lanes_users.rb

@@ -4,7 +4,7 @@ class CreateLanesUsers < ActiveRecord::Migration
             t.string :login, :name, :email,  null: false
             t.string :password_digest, null: false
             t.string  "role_names",   array: true, null:false, default: []
-            t.hstore "options",       null: false, default:  {}
+            t.jsonb   "options",      null: false, default:  {}
             t.timestamps null:false
         end
         add_index  :lanes_users, :role_names, using: 'gin'

data/lib/lanes/access/user.rb

@@ -16,7 +16,7 @@ module Lanes
 
         def workspace_data
             my_data = attributes.slice('id','login','name','email','created_at',
-              'created_by','updated_at','updated_by','role_names')
+              'created_by','updated_at','updated_by','role_names', 'options')
             { user: my_data, access: Access.for_user(self) }
         end
 

data/lib/lanes/api.rb

@@ -1,6 +1,7 @@
 require_relative '../lanes'
 require_relative 'api/request_wrapper'
 require_relative 'api/error_formatter'
+require_relative 'api/formatted_reply'
 require_relative 'api/controller'
 require_relative 'api/root'
 
@@ -8,5 +9,5 @@ Lanes.config.get(:environment) do
     require_relative("api/test_specs") unless Lanes.env.production?
 end
 
-
+require_relative "api/handlers/file.rb"
 require_relative 'api/default_routes'

data/lib/lanes/api/controller.rb

@@ -22,6 +22,7 @@ module Lanes
         class Controller
 
             attr_reader :model, :user, :params, :data
+            include FormattedReply
 
             def initialize(model, authentication, params, data={})
                 @user   = authentication.current_user
@@ -33,19 +34,18 @@ module Lanes
             def perform_retrieval
                 query   = build_query
                 options = build_reply_options
-                options[:total_count] = query.dup.count if should_include_total_count?
                 query   = add_modifiers_to_query(query)
-                Lanes.logger.warn "ID: #{params[:id]}"
+                options[:total_count] = query.dup.unscope(:select).count if should_include_total_count?
                 if params[:id]
                     query  = query.first!
                 end
-                build_reply(query, :retrieve, options)
+                std_api_reply(:retrieve, query, options)
             end
 
             def perform_creation
                 record  = model.from_attribute_data(data, user)
                 options = build_reply_options.merge(success: record.save)
-                build_reply(record, :create, options)
+                std_api_reply(:create, record, options)
             end
 
             def perform_update
@@ -64,12 +64,12 @@ module Lanes
                 end
             end
 
-          protected
+            protected
 
             def perform_single_destroy
                 record = model.find(params[:id])
                 record.destroy
-                build_reply(record, :destroy, {})
+                std_api_reply(:destroy, record, {})
             end
 
             def perform_multiple_destroy
@@ -81,7 +81,7 @@ module Lanes
                     end
                 end
                 options = build_reply_options.merge(success: success)
-                build_reply(records, :destroy, options)
+                std_api_reply(:destroy, records, options)
             end
 
             def perform_multiple_updates
@@ -95,13 +95,13 @@ module Lanes
                     end
                 end
                 options = build_reply_options.merge(success: success)
-                build_reply(records, :update, options)
+                std_api_reply(:update, records, options)
             end
 
             def perform_single_update(record)
                 record.set_attribute_data(data, user)
                 options = build_reply_options.merge(success: record.save)
-                build_reply(record, :update, options)
+                std_api_reply(:update, record, options)
             end
 
             # @return [Array<String>] The fields to include in query.  May represent either an attribute or a method
@@ -112,7 +112,7 @@ module Lanes
                 params[:df] == 'array'
             end
             def query_scopes
-                params[:w]
+                [*params[:w]]
             end
             def query_params
                 params[:q]
@@ -131,51 +131,6 @@ module Lanes
                 params[:s]
             end
 
-            # json methods
-            # constructs a Hash with success, messages, and data keys and
-            # populates them appropriately
-
-            def build_reply(query, type, options)
-                success = options[:success].nil? ? true : options[:success]
-                json = {}
-                if query.is_a?(ActiveRecord::Base) && query.errors.any?
-                    json[:errors] = {}
-                    success = false
-                    query.errors.each{ | attr, message |
-                        json[:errors][attr] = message
-                    }
-                end
-                if options[:total_count]
-                    json[:total] = options.delete(:total_count)
-                end
-                json.merge(
-                  success: success,
-                  message: options[:messsage] || json_status_str(query, type.to_s.capitalize, success),
-                  data:    success ? records_for_reply(query, type, options) : []
-                )
-            end
-
-
-            # @return Array<Array> returns either an array of fields
-            def records_for_reply(query, type, options)
-                return [] if :destroy == type
-                if reply_with_array?
-                    query.pluck( *requested_fields )
-                else
-                    query.as_json(options)
-                end
-            end
-
-            def json_status_str(record, type, success)
-                if success
-                    return type + " succeeded"
-                elsif record
-                    return type + " failed: " + record.errors.full_messages.join("; ")
-                else
-                    return "Record not found"
-                end
-            end
-
             # reply options
 
             # Should the result include the total number of available records
@@ -195,6 +150,7 @@ module Lanes
                 if requested_fields.any?
                     options[:methods] = requested_fields.select{|f| model.has_exported_method?(f,user) }
                 end
+                options[:format] = reply_with_array? ? 'array' : 'object'
                 options
             end
 
@@ -233,9 +189,6 @@ module Lanes
                 if params[:nested_attribute]
                     query = query.where(params[:nested_attribute])
                 end
-                if query_scopes.present?
-                    query = add_scope_to_query(query)
-                end
                 if query_params.present?
                     query = add_params_to_query(query)
                 end
@@ -243,9 +196,11 @@ module Lanes
             end
 
             def add_modifiers_to_query(query)
+                if query_scopes.present?
+                    query = add_scope_to_query(query)
+                end
                 query = query.limit(query_limit_size)
                 query = query.offset(query_offset.to_i) if query_offset.present?
-
                 if include_associations.any?
                     allowed_includes = include_associations.each_with_object([]) do |desired, results|
                         if desired.is_a?(Hash)
@@ -262,11 +217,12 @@ module Lanes
                 end
                 if sort_order.present?
                     sort_order.each do | fld, dir |
-                        query = query.order( fld.gsub(/[^\w|^\.]/,'') + ' ' + ( ( 'asc' == dir.downcase ) ? 'ASC' : 'DESC' ) )
+                        query = model.append_sort_to_query(
+                            query, fld, dir.downcase.to_sym
+                        )
                     end
                 end
                 query
-
             end
 
 
@@ -288,12 +244,13 @@ module Lanes
             def add_params_to_query(query)
                 query_params.each do | field, value |
                     next unless ( field = convert_field_to_arel(field) )
-                    condition = if value.is_a?(Hash) && value.has_key?('value')
-                                    api_op_string_to_arel_predicate(field, value['op'], value['value'])
-                                else
-                                    api_op_string_to_arel_predicate(field, nil, value)
-                                end
-                    query = query.where(condition)
+                    if value.is_a?(Hash) && value.has_key?('value')
+                        op = value['op']
+                        value = value['value']
+                    end
+                    query = query.where(
+                        field_to_predicate(field, value, op)
+                    )
                 end
                 query
             end
@@ -306,20 +263,24 @@ module Lanes
                     else
                         nil
                     end
-                else
+                elsif model.attribute_method?(field)
                     model.arel_table[field]
+                else
+                    Arel::Nodes::SqlLiteral.new(
+                        model.connection.quote_column_name(field)
+                    )
                 end
             end
 
             # complete list: https://github.com/rails/arel/blob/master/lib/arel/predications.rb
-            def api_op_string_to_arel_predicate( field, op, value )
+            def field_to_predicate( field, value, op = nil )
                 case op
-                when 'eq'   then field.eq(value)
+                when nil, 'eq' then field.eq(value)
+                when 'like' then field.matches( value )
                 when 'ne'   then field.not_eq(value)
                 when 'lt'   then field.lt(value)
                 when ( op=='in' && value=~/.*:.*/ ) then field.in( Range.new( *value.split(':') ) )
                 when 'gt'   then field.gt(value)
-                when 'like' then field.matches( value )
                 else
                     value =~ /%/ ? field.matches( value ) : field.eq( value )
                 end