lanes 0.1.9.5 → 0.3.0

data/lib/lanes/api/updates.rb

@@ -20,8 +20,7 @@ module Lanes
                 @relaying_messages = true
                 Lanes::Model.observe(:save) do |model|
                     if model.changes.any?
-                        path = "/#{model.class.api_path}/#{model.id}"
-
+                        path = "/#{model.class.api_path(with_module: true)}/#{model.id}"
                         Lanes::API::PubSub.publish(path, {
                             by: self.user_info_for_change(model),
                             update: model.changes

data/lib/lanes/command.rb

@@ -19,7 +19,6 @@ module Lanes
             #
             # @return [Extension] extension that was loaded, nil if none was found
             def load_current_extension(raise_on_fail:false)
-                previous = Extensions.all
                 ext = Dir.glob("./lib/*/extension.rb").first
                 if ext
                     begin

data/lib/lanes/command/app.rb

@@ -4,9 +4,9 @@ module Lanes
         class App < NamedCommand
 
             class_options :force => :boolean
-
-            class_option  :directory, :type=>:string
-
+            class_option  :directory, type: :string
+            class_option  :title,     type: :string
+            attr_reader   :title
 
             def load_namespace # override
                 @namespace  = name.underscore.camelize
@@ -15,6 +15,7 @@ module Lanes
 
             def set_variables
                 super
+                @title = options[:title] || @namespace
                 self.destination_root = options[:directory] || name
             end
 
@@ -54,8 +55,8 @@ module Lanes
             def create_spec_helpers
                 template "spec/client/helpers/ClientHelpers.coffee",
                          "#{spec_dir}/helpers/#{namespace}Helpers.coffee"
-                template "spec/server/spec_helpers.rb",
-                         "spec/server/spec_helpers.rb"
+                template "spec/server/spec_helper.rb",
+                         "spec/server/spec_helper.rb"
             end
 
             def create_screen_base

data/lib/lanes/command/console.rb

@@ -11,6 +11,7 @@ module Lanes
                 require 'pp'
                 DB.establish_connection
                 ActiveRecord::Base.logger = Logger.new STDOUT
+                Configuration.apply
                 ARGV.clear
                 IRB.start
             end

data/lib/lanes/command/generate.rb

@@ -3,6 +3,9 @@ module Lanes
 
         class Generate < Thor
 
+            long_desc Command.usage_from_file("generate_model")
+            method_options( GenerateMigration::OPTIONS )
+            register Command::GenerateMigration, 'migration', 'migration [NAME] ...FIELDS', 'Creates a new migration'
             long_desc Command.usage_from_file("generate_model")
             method_options( GenerateModel::OPTIONS )
             register Command::GenerateModel, 'model', 'model [NAME] ...FIELDS', 'Creates a new model'

data/lib/lanes/command/generate_migration.rb

@@ -0,0 +1,33 @@
+require_relative 'model_attribute'
+
+module Lanes
+    module Command
+
+        class GenerateMigration < NamedCommand
+
+            include MigrationSupport
+
+            OPTIONS ||= {
+                timestamps: true
+            }
+
+            class_options OPTIONS
+
+            argument :fields, type: :array, default: []
+
+            attr_reader :file_name, :table_name
+
+            def set_variables
+                super
+                @file_name  = name.underscore
+                prefix = extension.db_table_prefix
+                @table_name = prefix ? "#{prefix}_#{name.tableize}" : name.tableize
+            end
+
+            def generate_module
+                create_migration
+            end
+        end
+
+    end
+end

data/lib/lanes/command/generate_model.rb

@@ -4,6 +4,8 @@ module Lanes
     module Command
 
         class GenerateModel < NamedCommand
+            include MigrationSupport
+
             RESERVED_YAML_KEYWORDS = %w(y yes n no true false on off null)
             OPTIONS ||= {
                 timestamps: true,
@@ -23,11 +25,8 @@ module Lanes
                 @table_name = prefix ? "#{prefix}_#{name.tableize}" : name.tableize
             end
 
-            def create_migration
-                migration = exising_migration ||
-                  migration_timestamp + "_create_#{table_name}.rb"
-                self.fields = fields.map{ |field| ModelAttribute.parse(field) }
-                template "db/create_table_migration.rb", "db/migrate/#{migration}"
+            def generate_migration
+                create_migration
             end
 
             def create_model
@@ -59,19 +58,6 @@ module Lanes
 
           private
 
-            def fields_with_index
-                fields.select { |a| !a.reference? && a.has_index? }
-            end
-
-            def exising_migration
-                migrations = Pathname.glob("#{destination_root}/db/migrate/[0-9]*_create_#{table_name}.rb")
-                migrations.any? ? migrations.first.basename.to_s : nil
-            end
-
-            def migration_timestamp
-                ENV['MIGRATION_TIMESTAMP'] || Time.now.utc.strftime("%Y%m%d%H%M%S")
-            end
-
             def computed_namespace
                 # find a file and directory with the same basename
                 entries = Dir.glob(self.destination_root + "/lib/*")
@@ -91,14 +77,6 @@ module Lanes
                 end
             end
 
-            # def client_parent
-            #     if options[:parent] == 'Lanes::Model'
-            #         "Lanes.Models.Base"
-            #     else
-            #         "#{namespace.camelize}.Models.#{options[:parent]}"
-            #     end
-            # end
-
             def max_field_length
                 @max_field_length ||= fields.map{|field|
                     field.name.length + ( field.reference? ? 3 : 0 )

data/lib/lanes/command/migration_support.rb

@@ -0,0 +1,29 @@
+require_relative 'model_attribute'
+
+module Lanes
+    module Command
+        module MigrationSupport
+            def create_migration
+                migration = existing_migration ||
+                  migration_timestamp + "_create_#{table_name}.rb"
+                self.fields = fields.map{ |field| ModelAttribute.parse(field) }
+                template "db/create_table_migration.rb", "db/migrate/#{migration}"
+            end
+
+          private
+
+            def existing_migration
+                migrations = Pathname.glob("#{destination_root}/db/migrate/[0-9]*_create_#{table_name}.rb")
+                migrations.any? ? migrations.first.basename.to_s : nil
+            end
+
+            def migration_timestamp
+                ENV['MIGRATION_TIMESTAMP'] || Time.now.utc.strftime("%Y%m%d%H%M%S")
+            end
+
+            def fields_with_index
+                fields.select { |a| !a.reference? && a.has_index? }
+            end
+        end
+    end
+end

data/lib/lanes/command/update_model.rb

@@ -7,6 +7,11 @@ module Lanes
 
             attr_reader :namespaced_name
 
+            def set_variables
+                super
+                @file_name  = name.underscore
+            end
+
             def read_class
                 if name=~/::/
                     (@namespace,@name) = name.split("::")
@@ -14,7 +19,7 @@ module Lanes
                     ext = Command.load_current_extension(raise_on_fail:true)
                     @namespace = ext.identifier
                 end
-                class_name = name.camelize
+
                 namespaced_name = "#{namespace.classify}::#{class_name}"
                 @klass = namespaced_name.safe_constantize
                 if !@klass
@@ -80,9 +85,13 @@ module Lanes
                 else
                     type = { type: type_for_column(column), required: true }
                     if column.default
-                        type[:default] = column.default
+                        type[:default] = case column.default
+                                         when 'true' then true
+                                         when 'false' then false
+                                         else column.default
+                                         end
                     end
-                    type.to_json
+                    type.to_json.gsub(%r{,"}, ', "')
                 end
             end
 
@@ -104,10 +113,10 @@ module Lanes
                     when :datetime then 'date'
                     when :integer  then 'integer'
                     when :float    then 'number'
-                    when :text     then 'string'
-                    when :string   then 'string'
                     when :boolean  then 'boolean'
                     when :decimal  then 'bigdec'
+                    when :text, :string then 'string'
+                    when :jsonb, :json, :hstore then 'object'
                     else 'any'
                     end
                 end

data/lib/lanes/concerns/all.rb

@@ -10,3 +10,5 @@ require_relative "pub_sub"
 require_relative "code_identifier"
 require_relative "queries"
 require_relative "sanitize_fields"
+require_relative "image_uploader.rb"
+require_relative "sorting_expressions"

data/lib/lanes/concerns/api_path.rb

@@ -6,12 +6,14 @@ module Lanes::Concerns
 
         module ClassMethods
 
-            def api_path
-                self.to_s.demodulize.pluralize.underscore.dasherize
+            def api_path(with_module: false)
+                path = with_module ? to_s : to_s.demodulize
+                path.pluralize.underscore.dasherize
             end
 
             def from_api_path(path)
                 name = path.underscore.camelize.singularize
+
                 name = "Lanes::#{name}" unless name=~/^Lanes/
                 name.safe_constantize
             end

data/lib/lanes/concerns/association_extensions.rb

@@ -63,7 +63,7 @@ module Lanes::Concerns
                 end
                 begin
                     klass = association.klass # This will throw if the class hasn't been loaded yet
-                    targets.each{ | name, proc | klass._add_event_listener( name, &proc ) }
+                    targets.each{ | name, proc | klass.send :_add_event_listener, name, &proc }
                 rescue NameError
                     pending = Lanes::Concerns::PubSub::PendingListeners.add(association.class_name)
                     targets.each do | name, proc |

data/lib/lanes/concerns/attr_accessor_with_default.rb

@@ -52,7 +52,9 @@ module Lanes::Concerns
                         if instance_variable_defined?(instance_var)
                             instance_variable_get(instance_var)
                         else
-                            instance_variable_set(instance_var, default.is_a?(Proc) ? default.call : default )
+                            instance_variable_set(instance_var,
+                                                  default.is_a?(Proc) ?
+                                                      instance_exec(&default) : default )
                         end
                     end
                 end

data/lib/lanes/concerns/code_identifier.rb

@@ -26,7 +26,7 @@ module Lanes
                         before_validation(:on=>:create) do
                             source = self[from]
                             unless source.blank?
-                                self.code ||= Lanes::Strings.code_identifier( source, length:max_length )
+                                self.code ||= Lanes::Strings.code_identifier( source, length:max_length, padding: '' )
                             end
                         end
                     end

data/lib/lanes/concerns/image_uploader.rb

@@ -0,0 +1,42 @@
+require 'mini_magick'
+require 'carrierwave'
+require 'fastimage'
+
+module Lanes::Concerns
+
+    class ImageUploader < CarrierWave::Uploader::Base
+
+        include CarrierWave::MiniMagick
+
+        version :medium do
+            process :resize_to_fit => [800, 800]
+        end
+
+        version :thumb do
+            process :resize_to_fit => [200,200]
+        end
+
+        def cache_dir
+            '/tmp'
+        end
+
+        def store_dir
+            "images/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+        end
+
+        def filename
+            if original_filename.present?
+                ext = FastImage.type(file.file)
+                "#{secure_token}.#{ext}"
+            end
+        end
+
+        protected
+
+        def secure_token
+            var = :"@#{mounted_as}_secure_token"
+            model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(6))
+        end
+    end
+
+end

data/lib/lanes/concerns/pub_sub.rb

@@ -113,7 +113,6 @@ module Lanes::Concerns
         def fire_pubsub_event(name, *arguments)
             return if self.class._event_listeners.nil? ||
                       !self.class._event_listeners.has_key?(name.to_sym)
-            arguments = arguments.dup.unshift(self)
             self.class._event_listeners[ name.to_sym ].each{ | block |
                 block.call(*arguments)
             }

data/lib/lanes/concerns/queries.rb

@@ -9,9 +9,9 @@ module Lanes
             module ClassMethods
 
                 def compose_query_using_detail_view( view: nil, join_to: nil )
-                    view = Lanes.config.table_prefix + view.to_s
+                    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.*")
+                        .select("#{table_name}.*, details.*")
                 end
 
             end

data/lib/lanes/concerns/set_attribute_data.rb

@@ -95,28 +95,19 @@ module Lanes::Concerns
                         target = send(name) || association.build
                         result[name] = target.set_attribute_data(value, user)
                     elsif value.is_a?(Array) && :has_many == association.reflection.macro
-                        result[name] = _set_attribute_data_from_collection(association, value, user)
+                        result[name] = _set_attribute_data_from_collection(association, name, value, user)
                     end
                 end
             end
         end
 
-        def _set_attribute_data_from_collection(association, value, user)
-
-            records = if association.loaded?
-                                   association.target
-                               else
-                                   attribute_ids = value.map {|a| a['id'] || a[:id] }.compact
-                                   attribute_ids.empty? ? [] : association.scope.where(
-                                     association.klass.primary_key => attribute_ids
-                                   )
-                               end
-
+        def _set_attribute_data_from_collection(association, name, value, user)
+            records = public_send(name, value)
             value.map do | association_data |
                 record = if association_data['id'].blank?
                              association.build
                          else
-                             records.detect{ |r| r.id.to_s == value['id'].to_s }
+                             records.detect{ |r| r.id.to_s == association_data['id'].to_s }
                          end
                 record.set_attribute_data(association_data, user) if record
             end

data/lib/lanes/concerns/sorting_expressions.rb

@@ -0,0 +1,34 @@
+module Lanes::Concerns
+
+    # @see ClassMethods
+    module SortingExpressions
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+            # Add a proc that will be called to add a sort expression to a query.
+            # The proc should accept an arel query object and a single direction parameter,
+            # which will be a symbol value of :asc or :desc
+            # It must return a arel query with the sort applied
+            # @param name [String] The name of the expression
+            def export_sort( name, &block )
+                @sorting_expressions ||= {}
+                @sorting_expressions[name.to_s] = block
+            end
+
+            def has_sorting_expression?(name)
+                @sorting_expressions && @sorting_expressions[name]
+            end
+
+            def append_sort_to_query(query, field, dir)
+                dir = :asc unless dir == :desc
+                if @sorting_expressions && (block = @sorting_expressions[field])
+                    block.call(query, dir)
+                else
+                    query.order(field.gsub(/[^\w|^\.]/,'') + ' ' +
+                                  ( ( :asc == dir ) ? 'ASC' : 'DESC' ) )
+                end
+            end
+
+        end
+    end
+end

data/lib/lanes/configuration.rb

@@ -1,6 +1,12 @@
 require_relative "concerns/attr_accessor_with_default"
 require 'securerandom'
 require 'pathname'
+require 'carrierwave'
+require 'active_job'
+require 'jobba'
+require 'fog'
+require 'message_bus'
+
 module Lanes
 
     class Configuration
@@ -40,6 +46,39 @@ module Lanes
             value
         end
 
+        def self.apply
+            identifier = Lanes::Extensions.controlling.identifier
+            ActiveJob::Base.queue_adapter = Lanes.env.test? ? :test : :resque
+            Lanes::Job::FailureLogger.configure
+
+            DB.establish_connection
+
+            Jobba.configure do |config|
+                config.redis_options = Lanes.config.redis
+                config.namespace = "#{identifier}::jobba"
+            end
+
+
+            Resque.redis.namespace = "#{identifier}::resque"
+            Resque.redis = Lanes.config.redis
+            MessageBus.redis_config = Lanes.config.redis
+            MessageBus.logger = Lanes.logger
+            CarrierWave.configure do |config|
+                settings = Lanes::SystemSettings.for_ext('lanes')
+                config.storage = settings.file_storage ? settings.file_storage.to_sym : :file
+                config.root = lambda {
+                    Lanes::SystemSettings.for_ext('lanes').storage_dir ||
+                        Lanes::Extensions.controlling.root_path.join('public/assets').to_s
+                }
+                config.asset_host = Lanes.config.api_path + 'file'
+                config.fog_credentials = settings.fog_credentials
+                config.ignore_integrity_errors = false
+                config.ignore_processing_errors = false
+                config.ignore_download_errors = false
+            end
+            Extensions.each{|ext| ext.apply_configuration }
+        end
+
     end
 
     class DefaultConfiguration < Configuration
@@ -48,9 +87,6 @@ module Lanes
         # we don't care about AttrReaderWithDefault sharing values between instances
         # Therefore all the values are given directly and not enclosed in Procs/lambdas.
 
-        # Database tables will have this prefix applied to them
-        config_option :table_prefix, ''
-
         # The configuration environment to use, test, development, production
         config_option :environment, (ENV['LANES_ENV'] || ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development').to_sym
 
@@ -58,17 +94,14 @@ module Lanes
         config_option :session_secret_key_base,  '1234', silent: true
 
         # Configuration for Redis
-        config_option :redis, ENV.has_key?('REDISTOGO_URL') ?
-           {url: ENV["REDISTOGO_URL"]} : {path: "/tmp/redis.sock"}
-
-        # Title of application
-        config_option :app_title, "Lanes Test"
+        config_option :redis, ENV.has_key?('REDIS_URL') ?
+           {url: ENV["REDIS_URL"]} : {path: "/tmp/redis.sock"}
 
         # url prefix to use for assets
         config_option :assets_path_prefix, "/assets"
 
         # prefix to use for all urls
-        config_option :mounted_at, ''
+        config_option :mounted_at, '/'
 
         # The initial view class to display
         config_option :root_view, 'Lanes.Workspace.Layout'
@@ -78,6 +111,12 @@ module Lanes
 
         # types of assets to include into compiled package
         config_option :static_asset_types, ['images','fonts']
+
+        config_option :configuration_id, (ENV['LANES_CONFIG_ID'] || 1)
+
+        def api_path
+            mounted_at + 'api/'
+        end
     end
 
     class << self