aerogel-core 1.3.0 → 1.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b6c95d4a960593785baf5d48ffdf798bcaf5da
-  data.tar.gz: 2c964b75f82fb8b0c141c93ca81ee3c9909a270f
+  metadata.gz: f2aa3cd909e476af3c30504c867493ffd5cee0f3
+  data.tar.gz: bd4abadb05d22159b7374d1ba705683745eac39c
 SHA512:
-  metadata.gz: d544fb26f5f875bd4a27bffb261cadbd8638141d98188d47e15bd4ce3aaea77bc96eb2ca660087f9a71e266d425a2c13664c2d6361b7a833dfb177efab7d0de3
-  data.tar.gz: 9dd900eb31268b5f3a523f1cb5326b6631dd2dd1aacc597404920cc172b9338e53dca948f867184f1ec975a1737a3a1e3986fa3974762a93a7cf865f65033c6b
+  metadata.gz: 77d0175b72a8c6e6b072708c2c9aebffdd812243e677e86cbff40618df166e862fad185642bc3c853249d461baaa55b869aecf736445d84180fd86b742783716
+  data.tar.gz: 8bd415aa95e4de394c1fb0b9087b3991764ee53968f0baa1de9402669743a164e8f77ea5f34f8e98928e83a9aaf5d935edbab5b37f638b17ba2a80bb38e4860e

data/aerogel-core.gemspec

@@ -5,7 +5,7 @@ require 'aerogel/core/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "aerogel-core"
-  spec.version       = Aerogel::VERSION
+  spec.version       = Aerogel::Core::VERSION
   spec.authors       = ["Alex Kukushkin"]
   spec.email         = ["alex@kukushk.in"]
   spec.description   = %q{Aerogel core module}
@@ -22,14 +22,20 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sinatra-contrib'
   spec.add_dependency 'sinatra-asset-pipeline'
   spec.add_dependency 'rack-flash3'
+  spec.add_dependency 'sinatra-redirect-with-flash'
+  # spec.add_dependency 'active_support' #, "~> 4.0"
   spec.add_dependency 'sass'
   spec.add_dependency 'coffee-script'
   spec.add_dependency 'uglifier'
   spec.add_dependency 'yui-compressor'
   spec.add_dependency 'aerogel-configurator', "~> 1.3"
-  spec.add_dependency 'mongoid'
+  spec.add_dependency 'mongoid', "~> 3.1"
+  spec.add_dependency 'mongoid-tree'
+  spec.add_dependency 'i18n'
+  spec.add_dependency 'lru_redux'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 end
 

data/app/helpers/assets.rb

@@ -1,11 +1,25 @@
-# Include styles and javascript tags for assets grouped by scope.
+# Appends to and retrieves from declared assets stack.
 #
-# Intended use is either:
-#   <%= assets %> # for application assets
-# or:
-#   <% assets 'controller/name' %> # for controller specific assets
+# To include application assets and retrieve assets tags:
+# <%= assets %>
 #
-def assets( filename = :application )
-  (stylesheet_tag filename.to_s) +
-  (javascript_tag filename.to_s)
+# To include/display controller's assets:
+# <%= assets 'controller/name' %>
+#
+# To append to assets stack on a per-view basis:
+# # in layout:
+# <%= assets 'controller/name' %>
+#
+# # in view:
+#   <% assets 'controller/name/view' %> # note that helper output is ignored here, view asset tags
+#                                       # are rendered in layout
+#
+def assets( filename = nil )
+  @assets_stack ||= []
+  filename = :application if @assets_stack.blank? && filename.blank?
+  @assets_stack.unshift filename if filename.present?
+  @assets_stack.map do |assets_filename|
+    (stylesheet_tag assets_filename.to_s) +
+    (javascript_tag assets_filename.to_s)
+  end.join("\n")
 end

data/app/helpers/core.rb

@@ -9,3 +9,85 @@ def logger( name = nil )
     env['rack.logger.'+name.to_s] or raise("Logger with name '#{name}' is not registered")
   end
 end
+
+# Returns current_url
+# To return current url in a different locale:
+#   current_url locale: :ru
+#
+def current_url( opts = {} )
+  url = URI.unescape( request.path_info )
+  opts.present? ? url_to( url, opts ) : url
+end
+
+# Returns current locale
+#
+def current_locale
+  I18n.locale
+end
+
+# Returns current hostname.
+# If hostname is set in application configuration files, it has precedence.
+# Otherwise, hostname is inferred from the +request.host+, stripped from potential
+# locale name.
+#
+def current_hostname
+  return config.hostname! if config.hostname?
+  hostname_parts = request.host.split '.'
+  hostname_parts.shift if I18n.available_locales.include?( hostname_parts.first.to_sym )
+  hostname_parts.join "."
+end
+
+# Constructs an URL to a resource.
+#
+# Options passed in +opts+ will be appended to URL as a query string,
+# except some reserved options which have special meaning:
+#   :locale => constructs URL with a certain locale
+#   :scheme => constructs URL with a certain protocol
+#   :fqdn => constructs full qualified URL, including hostname and protocol
+#
+# Example:
+#   url_to "/bar", locale: :de, page: 2, order: :name # => "http://de.example.org/bar?page=2&order=name"
+#
+def url_to( url, opts = {} )
+  hostname = nil
+  if opts[:fqdn] || opts[:scheme]
+    opts[:locale] ||= current_locale
+  end
+  if opts[:locale]
+    unless I18n.available_locales.include? opts[:locale]
+      raise ArgumentError.new("Unavailable locale '#{opts[:locale]}' passed to #url_to helper")
+    end
+    if opts[:locale] == I18n.default_locale
+      hostname = current_hostname
+    else
+      hostname = "#{opts[:locale]}.#{current_hostname}"
+    end
+  end
+  query_string = opts.except( :locale, :fqdn, :scheme ).map{|k,v| "#{k}=#{h v}"}.join "&"
+  if query_string.present?
+    if url =~ /\?/
+      query_string = "&#{query_string}"
+    else
+      query_string = "?#{query_string}"
+    end
+  end
+  scheme = opts[:scheme] || request.scheme || 'http'
+  scheme_hostname = hostname.nil? ? '' : "#{scheme}://#{hostname}"
+  "#{scheme_hostname}#{url}#{query_string}"
+end
+
+# xhr-conscious redirect.
+#
+def redirect(uri, *args)
+  if request.xhr?
+    if Hash === args.first
+      opts = args.first
+      [:error, :notice, :warning].each do |flash_key|
+        flash[flash_key] = opts[flash_key] if opts[flash_key].present?
+      end
+    end
+    halt 200, {'Content-Type' => 'text/javascript'}, "window.location.href=\"#{uri}\""
+  else
+    super( uri, *args )
+  end
+end

data/app/helpers/i18n.rb

@@ -0,0 +1,11 @@
+# +t+ helper, alias for chainable helper Aerogel::I18n.t
+#
+def t( *args )
+  Aerogel::I18n.t( *args )
+end
+
+# +l+ helper, alias for Aerogel::I18n.l
+#
+def l( *args )
+  Aerogel::I18n.l( *args )
+end

data/app/helpers/icon.rb

@@ -0,0 +1,12 @@
+# Renders icon from icon font.
+# First part of the +name+ defines icon family.
+#
+# Example:
+#   <%= icon 'fa-caret-right' %> # => icon 'caret-right' from Font Awesome (fa) family
+#   <%= icon 'glyphicon-tick' %> #=> icon 'tick' from Boostrap glyphicons
+#
+def icon( name, opts = {} )
+  icon_family = name.split('-').first
+  icon_class = "#{icon_family} #{name} #{opts[:class]}"
+  tag :i, "", opts.merge( class: icon_class )
+end

data/app/helpers/render.rb

@@ -1,24 +1,96 @@
-# module Aerogel::Helpers
 
-  # Escapes html string.
-  #
-  def h( str )
-    Rack::Utils.escape_html(str)
+# Escapes html string.
+#
+def h( str )
+  Rack::Utils.escape_html(str)
+end
+
+# Displays text only first time the helper is called in this request
+# Usage:
+#   render_once "hello, world"
+# Or:
+#   render_once :hello_message, "hello, world"
+#
+def render_once( *args )
+  @render_once_hash ||= {}
+  if Symbol === args.first
+    key = args.shift
+    text = args.shift
+  else
+    key = args.shift
+    text = key
+  end
+  return '' if @render_once_hash.key? key
+  @render_once_hash[key] = true
+  text
+end
+
+# Renders erb template.
+#
+def view( name, opts = {} )
+  ts = Time.now
+  default_opts = {}
+  default_opts[:layout] = :"layouts/#{layout}.html" if layout.present?
+  #if settings.development?
+    erb( "#{name}.html".to_sym, default_opts.merge(opts) )+( "<!-- %s: %.3fs -->" % [name, Time.now - ts] )
+  #else
+  #  erb( "#{name}.html".to_sym, default_opts.merge(opts) )
+  #end
+end
+
+# Renders partial erb template.
+#
+def partial( name, opts = {} )
+  if opts.key?( :cacheable ) && config.aerogel.cache.enabled?
+    Aerogel::Cache.cacheable current_locale, name, opts[:cacheable] do |key|
+      __uncached_partial( name, opts )+"<!-- cache #{key} @ #{Time.now} -->"
+    end
+  else
+    __uncached_partial( name, opts )
   end
+end
+
+def __uncached_partial( name, opts = {} )
+  name_parts = name.to_s.split('/')
+  partial_name = name_parts[-1]
+  name_parts[-1] = '_'+partial_name+".html"
+  template_name = name_parts.join('/').to_sym
+  opts[:layout] = false
 
-  # Renders erb template.
-  #
-  def view( name, *args )
-    erb( "#{name}.html".to_sym, *args )
+  # render single template
+  unless opts.key? :collection
+    return erb template_name, opts
   end
 
-  # Renders partial erb template.
-  #
-  def partial( name, opts = {} )
-    name_parts = name.to_s.split('/')
-    name_parts[-1] = '_'+name_parts[-1]+".html"
-    opts[:layout] = false
-    erb name_parts.join('/').to_sym, opts
+  # render collection
+  out = ""
+  opts[:locals] ||= {}
+  opts[:collection].each do |object|
+    opts[:locals][partial_name.to_sym] = object
+    out += opts[:delimiter] if opts[:delimiter].present? && out.present?
+    out += erb template_name, opts.except( :collection, :delimiter, :cacheable )
   end
+  out
+end
+
+# Sets/gets page title.
+#
+# Example:
+#   page_title "Home page" # sets page title
+#   page_title # => "Home page"
+#
+# Or in views:
+#  <% page_title "Home page" %> # sets page title
+#  <%= page_title %> # gets page title
+#
+def page_title( value = nil )
+  @page_title = value unless value.nil?
+  @page_title
+end
 
-# end # module Aerogel::Helpers
+# Sets/gets current layout.
+#
+def layout( value = nil )
+  @layout = value unless value.nil?
+  @layout
+end

data/app/helpers/tags.rb

@@ -8,7 +8,7 @@ def tag( name, *args, &block )
   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)}\""}
+  t_attrs = attrs.map{|k,v| v.nil? ? " #{k}" : " #{k}=\"#{h(v)}\""}
   if content
     output = "<#{name}#{t_attrs.join}>"+content+"</#{name}>"
   else
@@ -24,6 +24,21 @@ end
 
 # Creates <a href=''..>...</a> tag.
 #
-def link_to( url, text = url, opts = {} )
-  tag :a, text, opts.merge( href: url )
+def link_to( url, *args, &block )
+  opts = (String === args.first) ? args[1] : args[0]
+  opts = {
+    href: url
+  }.deep_merge( opts || {} )
+  if String === args.first
+    args[1] = opts
+  else
+    args[0] = opts
+  end
+  tag :a, *args, &block
+end
+
+# Creates a <button ...>...</button> tag.
+#
+def button_to( url, text = url, opts = {} )
+  tag :button, text, opts.merge( url: url )
 end

data/app/routes/aerogel.rb

@@ -0,0 +1,30 @@
+# Diagnostic routes for aerogel application
+#
+
+namespace "/aerogel" do
+
+  # Displays aerogel status info
+  #
+  get "/status" do
+    ruby_version = "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+    modules_loaded = Aerogel.registered_paths.map{|p| p[:module_name]}.sort
+    [
+      "ruby:#{ruby_version}, aerogel-core v#{Aerogel::Core::VERSION}-#{settings.environment}",
+      "modules loaded: #{modules_loaded.join(", ")}",
+      "application path: #{Aerogel.application_path}",
+      "reloader: #{ config.aerogel.reloader? ? 'enabled' : 'disabled' }",
+      "cache: #{ config.aerogel.cache.enabled? ? 'enabled' : 'disabled' }"
+    ].join("<br/>\n")
+  end
+
+
+  # Displays cache info
+  #
+  get "/cache" do
+    [
+      ( config.aerogel.cache.enabled? ? "enabled" : "disabled" ),
+      "objects: #{Aerogel::Cache.keys.size} of #{config.aerogel.cache.max_size}"
+    ].join("<br/>\n")
+  end
+
+end

data/app/routes/core.rb

@@ -1,9 +1,24 @@
+# serve static files
+get "/*" do |filename|
+  pass if filename.blank?
+  path = Aerogel.get_resource( :public, filename )
+  pass unless path
+  pass unless File.file? path
+  send_file path
+end
+
+# serve default root
 get "/" do
   view :index
 end
 
+# serve default root actions
 get "/:action" do
-  view params['action'] # rescue raise Sinatra::NotFound.new
+  begin
+    view params['action']
+  rescue Errno::ENOENT
+    pass
+  end
 end
 
 not_found do

data/app/routes/i18n.rb

@@ -0,0 +1,14 @@
+if config.locales.guess_from_hostname?
+
+  before do
+    default_locale = I18n.default_locale
+    request_locale = request.host.split(".").first.to_sym
+    locale = I18n.available_locales.include?( request_locale ) ? request_locale : default_locale
+    if locale == default_locale && config.hostname? && request.host != config.hostname
+      redirect current_url( locale: default_locale )
+      # flash[:debug] = "redirecto to canonical: #{current_url( locale: default_locale )}"
+    end
+    I18n.locale = locale
+  end
+
+end # config.locales.guess_from_hostname?

data/config/application.conf

@@ -0,0 +1,8 @@
+
+locales {
+  guess_from_hostname true
+}
+
+aerogel {
+  reloader false
+}

data/config/development/aerogel.conf

@@ -0,0 +1,9 @@
+aerogel {
+  reloader true
+
+  cache {
+    enabled false
+    max_size 1_000
+  }
+
+}

data/config/production/aerogel.conf

@@ -0,0 +1,10 @@
+aerogel {
+
+  reloader false
+
+  cache {
+    enabled true
+    max_size 1_000
+  }
+
+}