aerogel-core 1.1.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03745769b429a1a9f37d4cc55d91c33b134d18f3
-  data.tar.gz: f1e55f86299fe31ff72c98fdce5ea959c9981bdc
+  metadata.gz: b0b6c95d4a960593785baf5d48ffdf798bcaf5da
+  data.tar.gz: 2c964b75f82fb8b0c141c93ca81ee3c9909a270f
 SHA512:
-  metadata.gz: 38b100edb2a525b7f56351964d612e4f5a10655328d996fe7be1e938de34cd40a807c5864888ab0839dadfdd06ed48ba0f61ebd436c4ae1c27610e762be91dff
-  data.tar.gz: ce62b0f6e225916d387226dd3d9c0edf484c73800d84bbb03c40a70d167c7488668329250f4aa6ec4bcf6fa96ba32c8ca69d66e87cbf9257fe263b09fa2a2d24
+  metadata.gz: d544fb26f5f875bd4a27bffb261cadbd8638141d98188d47e15bd4ce3aaea77bc96eb2ca660087f9a71e266d425a2c13664c2d6361b7a833dfb177efab7d0de3
+  data.tar.gz: 9dd900eb31268b5f3a523f1cb5326b6631dd2dd1aacc597404920cc172b9338e53dca948f867184f1ec975a1737a3a1e3986fa3974762a93a7cf865f65033c6b

data/aerogel-core.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["alex@kukushk.in"]
   spec.description   = %q{Aerogel core module}
   spec.summary       = %q{Aerogel is a modular opinionated CMS}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/kukushkin/aerogel-core"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coffee-script'
   spec.add_dependency 'uglifier'
   spec.add_dependency 'yui-compressor'
-  spec.add_dependency 'aerogel-configurator'
+  spec.add_dependency 'aerogel-configurator', "~> 1.3"
   spec.add_dependency 'mongoid'
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/app/helpers/assets.rb

@@ -1,15 +1,11 @@
-module Aerogel::Helpers
-
-  # Include styles and javascript tags for assets grouped by scope.
-  #
-  # Intended use is either:
-  #   <%= assets %> # for application assets
-  # or:
-  #   <% assets 'controller/name' %> # for controller specific assets
-  #
-  def assets( filename = :application )
-    (stylesheet_tag filename.to_s) +
-    (javascript_tag filename.to_s)
-  end
-
-end # module Aerogel::Helpers
+# Include styles and javascript tags for assets grouped by scope.
+#
+# Intended use is either:
+#   <%= assets %> # for application assets
+# or:
+#   <% assets 'controller/name' %> # for controller specific assets
+#
+def assets( filename = :application )
+  (stylesheet_tag filename.to_s) +
+  (javascript_tag filename.to_s)
+end

data/app/helpers/config.rb

@@ -1,9 +1,5 @@
-module Aerogel::Helpers
-
-  # Quick access to config from views and routes
-  #
-  def config
-    settings.config
-  end
-
-end # module Aerogel::Helpers
+# Quick access to config from views and routes
+#
+def config
+  Aerogel.config
+end

data/app/helpers/core.rb

@@ -1,15 +1,11 @@
-module Aerogel::Helpers
+def find_template(views, name, engine, &block)
+  Array(views).each { |v| super(v, name, engine, &block) }
+end
 
-    def find_template(views, name, engine, &block)
-      Array(views).each { |v| super(v, name, engine, &block) }
-    end
-
-    def logger( name = nil )
-      if name.nil?
-        env['rack.logger']
-      else
-        env['rack.logger.'+name.to_s] or raise("Logger with name '#{name}' is not registered")
-      end
-    end
-
-end # module Aerogel::Helpers
+def logger( name = nil )
+  if name.nil?
+    env['rack.logger']
+  else
+    env['rack.logger.'+name.to_s] or raise("Logger with name '#{name}' is not registered")
+  end
+end

data/app/helpers/csrf.rb

@@ -1,19 +1,15 @@
-module Aerogel::Helpers
+def csrf_field_name
+  'authenticity_token'
+end
 
-  def csrf_field_name
-    'authenticity_token'
-  end
+def csrf_token
+  session[:csrf] ||= SecureRandom.hex(32) if defined?(session)
+end
 
-  def csrf_token
-    session[:csrf] ||= SecureRandom.hex(32) if defined?(session)
-  end
+def csrf_token_field
+  tag :input, type: 'hidden', name: csrf_field_name, value: csrf_token
+end
 
-  def csrf_token_field
-    input_hidden_tag csrf_field_name, csrf_token
-  end
-
-  def csrf_protected?
-    true
-  end
-
-end # module Aerogel::Helpers
+def csrf_protected?
+  true
+end

data/app/helpers/output_buffer.rb

@@ -1,26 +1,22 @@
-module Aerogel::Helpers
-
-  def output_concat( text )
-    if self.respond_to?(:is_haml?) && is_haml?
-      haml_concat(text)
-    elsif !Aerogel::Render::OutputBuffer.buffer.nil? # has_erb_buffer?
-      Aerogel::Render::OutputBuffer.buffer.concat text
-    else # theres no template to concat, return the text directly
-      text
-    end
+def output_concat( text )
+  if self.respond_to?(:is_haml?) && is_haml?
+    haml_concat(text)
+  elsif !Aerogel::Render::OutputBuffer.buffer.nil? # has_erb_buffer?
+    Aerogel::Render::OutputBuffer.buffer.concat text
+  else # theres no template to concat, return the text directly
+    text
   end
+end
 
-  def output_capture( inner_block = nil, &block )
-    inner_block = block if inner_block.nil?
-    if self.respond_to?(:is_haml?) && is_haml? && (block_is_haml?(inner_block) rescue false)
-      # haml
-      capture_haml(nil, &block)
-    elsif Aerogel::Render::OutputBuffer.block_is_erb? block
-      # erb
-      Aerogel::Render::OutputBuffer.capture( &block )
-    else
-      block.call
-    end
+def output_capture( inner_block = nil, &block )
+  inner_block = block if inner_block.nil?
+  if self.respond_to?(:is_haml?) && is_haml? && (block_is_haml?(inner_block) rescue false)
+    # haml
+    capture_haml(nil, &block)
+  elsif Aerogel::Render::OutputBuffer.block_is_erb? block
+    # erb
+    Aerogel::Render::OutputBuffer.capture( &block )
+  else
+    block.call
   end
-
-end # module Aerogel::Helpers
+end

data/app/helpers/render.rb

@@ -1,4 +1,4 @@
-module Aerogel::Helpers
+# module Aerogel::Helpers
 
   # Escapes html string.
   #
@@ -8,8 +8,8 @@ module Aerogel::Helpers
 
   # Renders erb template.
   #
-  def view( name )
-    erb "#{name}.html".to_sym
+  def view( name, *args )
+    erb( "#{name}.html".to_sym, *args )
   end
 
   # Renders partial erb template.
@@ -21,4 +21,4 @@ module Aerogel::Helpers
     erb name_parts.join('/').to_sym, opts
   end
 
-end # module Aerogel::Helpers
+# end # module Aerogel::Helpers

data/app/helpers/tags.rb

@@ -1,28 +1,29 @@
-module Aerogel::Helpers
-
-  # Creates tag.
-  #
-  def tag( name, *args, &block )
-    if block_given?
-      content = output_capture(&block)
-    elsif args.first.is_a? String
-      content = args.shift
-    end
-    attrs = args.shift || {}
+# Creates tag.
+#
+def tag( name, *args, &block )
+  if block_given?
+    content = output_capture(&block)
+  elsif args.first.is_a? String
+    content = args.shift
+  end
+  attrs = args.shift || {}
 #    t_attrs = attrs.map{|k,v| v.nil? ? " #{k}" : " #{k}=\"#{h(v)}\""}
-    t_attrs = attrs.map{|k,v| v.nil? ? " #{k}" : " #{k}=\"#{(v)}\""}
-    if content
-      output = "<#{name}#{t_attrs.join}>"+content+"</#{name}>"
-    else
-      output = "<#{name}#{t_attrs.join}/>"
-    end
-    if Aerogel::Render::OutputBuffer.block_is_template?(block)
-      output_concat(output)
-      return nil
-    else
-      return output
-    end
+  t_attrs = attrs.map{|k,v| v.nil? ? " #{k}" : " #{k}=\"#{(v)}\""}
+  if content
+    output = "<#{name}#{t_attrs.join}>"+content+"</#{name}>"
+  else
+    output = "<#{name}#{t_attrs.join}/>"
   end
+  if Aerogel::Render::OutputBuffer.block_is_template?(block)
+    output_concat(output)
+    return nil
+  else
+    return output
+  end
+end
 
-
-end # module Aerogel::Helpers
+# Creates <a href=''..>...</a> tag.
+#
+def link_to( url, text = url, opts = {} )
+  tag :a, text, opts.merge( href: url )
+end

data/app/routes/core.rb

@@ -1,15 +1,11 @@
-class Aerogel::Application
+get "/" do
+  view :index
+end
 
-  get "/" do
-    view :index
-  end
+get "/:action" do
+  view params['action'] # rescue raise Sinatra::NotFound.new
+end
 
-  get "/:action" do
-    view params['action'] rescue raise Sinatra::NotFound.new
-  end
-
-  not_found do
-    erb :"errors/404.html", layout: false
-  end
-
-end
+not_found do
+  erb :"errors/404.html", layout: false
+end

data/app/routes/static.rb

@@ -1,5 +1,3 @@
-class Aerogel::Application
-
 get "/*" do |filename|
   pass if filename.blank?
   path = Aerogel.get_resource( :public, filename )
@@ -7,5 +5,3 @@ get "/*" do |filename|
   pass unless path
   send_file path
 end
-
-end # class Aerogel::Application

data/lib/aerogel/core/application.rb

@@ -1,36 +1,38 @@
 require 'sinatra/base'
 
+require 'aerogel/core/reloader'
 require 'aerogel/core/config'
 require 'aerogel/core/helpers'
 require 'aerogel/core/routes'
 require 'aerogel/core/assets'
 require 'aerogel/core/db'
 require 'aerogel/core/render'
+require 'aerogel/core/errors'
 
 class Aerogel::Application < Sinatra::Base
 
   # Loads and configures application modules
   #
   def self.load
-    on_load
+    Aerogel.on_load_callbacks.each do |callback|
+      callback.call self
+    end
+    puts "** Aerogel application configured v#{Aerogel::version}-#{environment}"
     self
   end
 
-private
+end # class Aerogel::Application
 
+Aerogel.on_load do |app|
   # Loads application environment
   #
-  def self.on_load
-    # application path is registered last
-    Aerogel.register_path( Aerogel.application_path )
-
-    register Aerogel::Helpers
-    register Aerogel::Config
-    register Aerogel::Routes
-    register Aerogel::Assets
-    register Aerogel::Db
-    register Aerogel::Render
-    puts "** Aerogel application configured v#{Aerogel::version}-#{environment}"
-  end
+  # application path is registered last
+  Aerogel.register_path( Aerogel.application_path )
 
-end # class Aerogel::Application
+  app.register Aerogel::Config
+  app.register Aerogel::Helpers
+  app.register Aerogel::Routes
+  app.register Aerogel::Assets
+  app.register Aerogel::Db
+  app.register Aerogel::Render
+end

data/lib/aerogel/core/config.rb

@@ -1,34 +1,66 @@
 require 'aerogel/configurator'
 require 'rack-flash'
+require 'sinatra/multi_route'
 
-module Aerogel::Config
+module Aerogel
 
-  # Configures application.
+  # Returns Aerogel application's config object.
   #
-  def self.registered(app)
-    app.set :root, Aerogel.application_path
-    app.set :views, Aerogel.get_resource_paths( :views ).reverse
-    app.set :erb, layout: "layouts/application.html".to_sym
-
-    require 'sinatra/reloader' if app.development?
-    app.configure :development do
-      app.register Sinatra::Reloader
+  def self.config
+    @config ||= Configurator.new
+  end
+
+  module Config
+    # Configures application.
+    #
+    def self.registered(app)
+      app.set :root, Aerogel.application_path
+      app.set :views, Aerogel.get_resource_paths( :views ).reverse
+      app.set :erb, trim: '-', layout: "layouts/application.html".to_sym
+
+      reset!(app)
+      # Load configs
+      Aerogel.get_resource_list( :config, '*.conf', app.environment ).each do |config_filename|
+        Aerogel.config.load config_filename
+      end
+      # register reloader
+      setup_reloader(app) if Aerogel.config.aerogel.reloader?
+
+      # set :protection, true
+      # set :protect_from_csrf, true
+      app.set :sessions, true
+      # TODO: demand to configure session secret on application level
+      # set :session_secret, '$aer0G31'
+      app.use Rack::Protection::AuthenticityToken
+      app.use Rack::Flash, :sweep => true
+
+      app.register Sinatra::MultiRoute
     end
 
-    # Load configs
-    app.set :config, Configurator.new
-    Aerogel.get_resource_list( :config, '*.conf', app.environment ).each do |config_filename|
-      app.config.load config_filename
+  private
+
+    # Resets loaded config files.
+    #
+    def self.reset!(app)
+      Aerogel.config.clear!
+      Aerogel.config.aerogel.reloader = app.development?
+    end
+
+    # Sets up reloader for config files.
+    #
+    def self.setup_reloader(app)
+      app.use Aerogel::Reloader, ->{
+        Aerogel.get_resource_list( :config, '*.conf', app.environment )
+      } do |files|
+        # reset routes
+        reset!(app)
+        files.each do |filename|
+          Aerogel.config.load filename
+        end
+      end
     end
 
-    # set :protection, true
-    # set :protect_from_csrf, true
-    app.set :sessions, true
-    # TODO: demand to configure session secret on application level
-    # set :session_secret, '$aer0G31'
-    app.use Rack::Protection::AuthenticityToken
-    app.use Rack::Flash
+  end # module Config
 
-  end
-end # module Aerogel::Config
+end # module Aerogel
 

data/lib/aerogel/core/core.rb

@@ -93,5 +93,23 @@ module Aerogel
     true
   end
 
+  # Requires file, loads into context of a module/class.
+  #
+  def self.require_into( mod_class, filename )
+    mod_class.class_eval File.read(filename), filename
+  end
+
+  # Returns registered on-load callbacks.
+  #
+  def self.on_load_callbacks
+    @on_load_callbacks || []
+  end
+
+  # Registers on-load callback.
+  #
+  def self.on_load( &block )
+    @on_load_callbacks ||= []
+    @on_load_callbacks << block
+  end
 
 end # module Aerogel

data/lib/aerogel/core/db.rb

@@ -1,5 +1,6 @@
 require 'mongoid'
 require 'aerogel/configurator'
+require 'aerogel/core/db/model'
 
 module Aerogel::Db
 
@@ -12,14 +13,20 @@ module Aerogel::Db
   #
   def self.registered( app )
     self.environment = app.environment
-    raise "Database connection is not configured in your application's config/*" if app.config.db.nil?
+    raise "Database connection is not configured in your application's config/*" if Aerogel.config.db.nil?
     Mongoid.configure do |config|
       config.sessions = {
-        default: { hosts: app.config.db.hosts, database: app.config.db.name }
+        default: { hosts: Aerogel.config.db.hosts, database: Aerogel.config.db.name }
+      }
+      config.options = {
+        raise_not_found_error: false
       }
     end
     load_models
 
+    # register reloader
+    setup_reloader(app) if Aerogel.config.aerogel.reloader
+
     # disable [deprecated] warning in Mongoid method calls
     I18n.enforce_available_locales = false if defined? I18n
   end
@@ -48,14 +55,36 @@ private
   # Loads all models from the folder db/model/*
   #
   def self.load_models
-    self.models = []
-    Aerogel.get_resource_list( 'db/model', '*.rb', environment ).each do |model_filename|
-      require model_filename
+    reset!
+    Aerogel.get_resource_list( 'db/model', '*.rb' ).each do |model_filename|
+      load model_filename
       class_name = File.basename( model_filename, '.rb' ).camelize
       self.models << eval(class_name)
     end
   end
 
+  # Resets models.
+  #
+  def self.reset!(app = nil)
+    self.models ||= []
+    # reset model classes
+    self.models.each do |model|
+      Object.send(:remove_const, model.name.to_sym)
+    end
+    self.models = []
+  end
+
+  #
+  # Configures reloader for models.
+  #
+  def self.setup_reloader(app)
+    app.use Aerogel::Reloader, ->{ Aerogel.get_resource_list( "db/model", "*.rb" ) } do
+      reset!(app)
+      load_models
+    end
+  end
+
+
   # Create database indexes for all models
   #
   def self.create_indexes!

data/lib/aerogel/core/db/model.rb

@@ -0,0 +1,34 @@
+# Mixin module for all model classes.
+#
+module Model
+  extend ActiveSupport::Concern
+
+  included do
+    include Mongoid::Document
+
+    # Finds document by id.
+    # Raises error if document is not found.
+    #
+    def self.find!( *args )
+      raise_not_found_error_was = Mongoid.raise_not_found_error
+      begin
+        Mongoid.raise_not_found_error = true
+        self.find *args
+      ensure
+        Mongoid.raise_not_found_error = raise_not_found_error_was
+      end
+    end
+
+  end
+
+  module NonPersistent
+    extend ActiveSupport::Concern
+    included do
+      include Mongoid::Document
+      before_save do
+        raise "Attempt to save non-persistent model"
+      end
+    end
+  end # module NonPersistent
+
+end # module Model

data/lib/aerogel/core/errors.rb

@@ -0,0 +1,11 @@
+module Aerogel
+module Errors
+
+  class NotFoundError < StandardError
+
+  end # class NotFoundError
+
+end # module Errors
+end # module Aerogel
+
+include Aerogel::Errors

data/lib/aerogel/core/helpers.rb

@@ -1,10 +1,29 @@
-
+# Aerogel::Helpers are registered both as Sinatra extensions and Sinatra helpers,
+# so any helper is available both at application and request scope level.
+#
 module Aerogel::Helpers
 
   def self.registered(app)
     # load helpers
-    Aerogel.require_resources( :app, "helpers/**/*.rb" )
+    Aerogel.get_resource_list( :app, "helpers/**/*.rb" ).each do |filename|
+      Aerogel.require_into( Aerogel::Helpers, filename )
+    end
     app.helpers Aerogel::Helpers
+
+    # register reloader
+    setup_reloader(app) if Aerogel.config.aerogel.reloader?
+  end
+
+private
+
+  # Sets up reloader for helpers.
+  #
+  def self.setup_reloader(app)
+    app.use Aerogel::Reloader, ->{ Aerogel.get_resource_list( :app, "helpers/**/*.rb" ) } do |files|
+      files.each do |filename|
+        Aerogel.require_into( Aerogel::Helpers, filename )
+      end
+    end
   end
 
 end # module Aerogel::Helpers

data/lib/aerogel/core/reloader.rb

@@ -0,0 +1,72 @@
+# Middleware which checks and reloads modified files.
+#
+module Aerogel
+class Reloader
+  # Use as middleware:
+  #
+  #   # single file
+  #   use Aerogel::Reloader, "file1.rb" { load 'file1.rb' }
+  #
+  #   # list of files
+  #   use Aerogel::Reloader, ["file1.rb", "file2.rb"] do |files|
+  #     files.each{|f| load f }
+  #   end
+  #
+  #   # dynamic list of files
+  #   use Aerogel::Reloader, ->(){ Dir.glob["*.rb"] } do |files|
+  #     files.each{|f| load f}
+  #   end
+  #
+  def initialize( app, files, &blk )
+    @app = app
+    @files = files
+    @action = blk
+    @file_list = file_list( @files )
+    @signature = signature( @file_list )
+  end
+
+  def call( env )
+    check!
+    @app.call( env )
+  end
+
+private
+
+  # Checks if files are changed and reloads if so.
+  #
+  def check!
+    @file_list = file_list( @files )
+    new_signature = signature( @file_list )
+    if @signature != new_signature
+      # reload file list
+      puts "* Aerogel::Reloader reloading: #{@file_list}"
+      @action.call @file_list
+      @signature = new_signature
+    end
+  end
+
+  # Re-calculates file list
+  #
+  def file_list( files )
+    case files
+    when String
+      [files]
+    when Array
+      files
+    when Proc
+      files.call # result should respond to #each
+    else
+      []
+    end
+  end
+
+  def signature( file_list )
+    sig = []
+    file_list.each do |filename|
+      sig << File.mtime(filename).to_i
+    end
+    sig.sort
+  end
+
+end # class Reloader
+end # module Aerogel

data/lib/aerogel/core/render.rb

@@ -1,5 +1,6 @@
 require 'aerogel/core/render/output_buffer'
 require 'aerogel/core/render/block_helper'
+require 'aerogel/core/render/scope'
 
 
 module Aerogel::Render

data/lib/aerogel/core/render/scope.rb

@@ -0,0 +1,26 @@
+module Aerogel::Render
+
+# A render scope is to be incluced in other module or class.
+# Provides access to render methods and helpers.
+#
+module Scope
+
+
+  def self.included(mod)
+    mod.instance_eval do
+      include Sinatra::Templates
+      include Aerogel::Helpers
+    end
+  end
+
+  def template_cache
+    @template_cache ||= Tilt::Cache.new
+  end
+
+  def settings
+    Aerogel::Application
+  end
+
+end # module Scope
+
+end # module Aerogel::Render

data/lib/aerogel/core/routes.rb

@@ -1,7 +1,54 @@
+require 'aerogel/core/routes/namespace'
+require 'aerogel/core/routes/sinatra_ex'
+
 module Aerogel::Routes
+
   def self.registered(app)
+    reset!(app)
     # load routes
-    Aerogel::require_resources_reverse( :app, "routes/**/*.rb" )
+    Aerogel.get_resource_list( :app, "routes/**/*.rb" ).reverse.each do |filename|
+      Aerogel.require_into( Aerogel::Application, filename )
+    end
+
+    # register reloader
+    setup_reloader(app) if Aerogel.config.aerogel.reloader?
+  end
+
 
+  # Starts a new route namespace:
+  #
+  # get '/bar' do
+  #   # matches '/bar' route
+  # end
+  #
+  # namespace '/foo' do
+  #   get '/bar' do
+  #     # matches '/foo/bar' route
+  #   end
+  # end
+  #
+  def namespace( path, *args, &block )
+    Namespace.new self, path, &block
   end
+
+private
+
+  # Resets items defined in app/routes/*.
+  #
+  def self.reset!(app)
+    app.reset_routes!
+  end
+
+  # Sets up reloader for routes.
+  #
+  def self.setup_reloader(app)
+    app.use Aerogel::Reloader, ->{ Aerogel.get_resource_list( :app, "routes/**/*.rb" ) } do |files|
+      # reset routes
+      reset!(app)
+      files.reverse.each do |filename|
+        Aerogel.require_into( Aerogel::Application, filename )
+      end
+    end
+  end
+
 end # module Aerogel::Routes

data/lib/aerogel/core/routes/namespace.rb

@@ -0,0 +1,37 @@
+
+module Aerogel::Routes
+class Namespace
+
+  def initialize( base, path, &block )
+    @base = base
+    @prefix_path = path
+    instance_eval &block
+  end
+
+  def method_missing( method, *args, &block )
+    @base.send method, *args, &block
+  end
+
+  def prefixed( method, *args, &block )
+    options = Hash === args.last ? args.pop : {}
+    routes = [*(args.pop || '')]
+    routes, args = routes+args, [] unless method == :route
+    routes.map!{|r| @prefix_path+r }
+    routes = [routes] if method == :route
+    p_args = []
+    p_args += args unless args.empty?
+    p_args += routes # unless routes.empty?
+    p_args += options unless options.empty?
+    @base.send method, *p_args, &block
+  end
+
+  def self.prefix( *methods )
+    methods.each do |method|
+      define_method(method) {|*args, &block| prefixed( method, *args, &block ) }
+    end
+  end
+
+  prefix :get, :post, :put, :delete, :before, :after, :namespace, :route
+
+end # class Namespace
+end # module Aerogel::Routes

data/lib/aerogel/core/routes/sinatra_ex.rb

@@ -0,0 +1,11 @@
+# A helper method to reset Sinatra routes.
+#
+class Sinatra::Base
+  class << self
+    def reset_routes!
+      @routes = {}
+      @filters = {:before => [], :after => []}
+      @errors = {}
+    end
+  end
+end # class Sinatra::Base

data/lib/aerogel/core/version.rb

@@ -1,3 +1,3 @@
 module Aerogel
-  VERSION = '1.1.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: aerogel-core
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-asset-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yui-compressor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aerogel-configurator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Aerogel core module
@@ -185,7 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -206,7 +206,6 @@ files:
 - config/database.conf.template
 - config/development/.keep
 - config/production/.keep
-- db/model/model.rb.template
 - db/seed/development/.keep
 - db/seed/production/.keep
 - db/seed/seed.template
@@ -216,11 +215,17 @@ files:
 - lib/aerogel/core/config.rb
 - lib/aerogel/core/core.rb
 - lib/aerogel/core/db.rb
+- lib/aerogel/core/db/model.rb
+- lib/aerogel/core/errors.rb
 - lib/aerogel/core/helpers.rb
+- lib/aerogel/core/reloader.rb
 - lib/aerogel/core/render.rb
 - lib/aerogel/core/render/block_helper.rb
 - lib/aerogel/core/render/output_buffer.rb
+- lib/aerogel/core/render/scope.rb
 - lib/aerogel/core/routes.rb
+- lib/aerogel/core/routes/namespace.rb
+- lib/aerogel/core/routes/sinatra_ex.rb
 - lib/aerogel/core/version.rb
 - lib/aerogel/rake.rb
 - public/favicon.ico
@@ -232,7 +237,7 @@ files:
 - views/index.html.erb
 - views/layouts/application.html.erb
 - views/lorem.html.erb
-homepage: ''
+homepage: https://github.com/kukushkin/aerogel-core
 licenses:
 - MIT
 metadata: {}
@@ -242,17 +247,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Aerogel is a modular opinionated CMS

data/db/model/model.rb.template

@@ -1,11 +0,0 @@
-
-class Setting
-  include Mongoid::Document
-  field :name, type: String
-  field :value, type: String
-
-  validates_presence_of :name
-  validates_uniqueness_of :name
-
-  index( name: 1 )
-end