alfa 0.0.5.pre → 0.0.6.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c85a3bddfc3872bab4b7d4203197f45bc85e14d
-  data.tar.gz: 50a67c2c30eadbbde07ac7a96424394ffc5255d2
+  metadata.gz: 42b04d75d9c3ed910907e1c46163b85226939122
+  data.tar.gz: ffbf8a3228d0271f6c8a631ad3f626484c7ec4ba
 SHA512:
-  metadata.gz: 627b62bacbbb4983841a977c990deea9155c6da7d47bfdbb6a086ec6953d26b73ce943fc898f37e02e1ef0f248af0463b4c0e717007e97fa61f1c4321d312425
-  data.tar.gz: b797cfc9ff3ad128893df8a84e812a0bf559e442f04feede620235ceaa41785e1738d0d8ee167bd0abaf7242821bbee1b5c5aa2f10ffa5b6af45f3b71142da3f
+  metadata.gz: 0625ca1aba2e5eb757cbd0d613fa4b2712c4c6c130093cf39c43e9b9c21fd8948bfaca6f6a8bbe2d3cc8876dbf8d637afc61f29835eeed22d3bcf309d5737f0f
+  data.tar.gz: e4195b642f031804e08eca399335b95b48604d7a98d0c64eca640c322f4eb3bf3fada7e3a36a3d81c438bf928a932c077c3413b7e1a6ebe6e58b7cb5de6332cb

data/dummy/project/.gitignore

@@ -0,0 +1,16 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+/.bundle/
+/tmp/
+/log/*.log
+/public/~assets/
+
+# IDE settings (Eclipse)
+/.project
+/.classpath
+
+# IDE settings (JetBrains RubyMine)
+*.iml
+*.ipr
+*.iws
+/.idea/

data/dummy/project/.ruby-version

@@ -0,0 +1 @@
+2.1.1

data/dummy/project/Gemfile.source

@@ -2,5 +2,10 @@ source 'https://rubygems.org'
 
 gem 'alfa', '#{ALFA_VERSION}'
 
-# Using mysql2 as database adapter
-gem 'mysql2', '~> 0.3'  # 0.3.11
+# Use mysql2 as database adapter
+gem 'mysql2', '~> 0.3', '>= 0.3.15'
+
+# Uncomment following gems if necessary:
+#
+# gem 'thin'
+# gem 'redcarpet'

data/dummy/project/apps/admin/layouts/base.haml

@@ -0,0 +1,10 @@
+!!! 5
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title<
+      = block(:title)
+    != styles
+  %body
+    != block(:body)
+    != scripts

data/dummy/project/apps/admin/layouts/index.haml.source

@@ -0,0 +1,7 @@
+- extends './base.haml'
+
+- block(:title) do
+  #{PROJECT_NAME} admin
+
+- block(:body) do
+  != @body

data/dummy/project/apps/admin/templates/default/index.haml

@@ -0,0 +1 @@
+apps/admin/default#index

data/dummy/project/apps/frontend/layouts/base.haml

@@ -0,0 +1,10 @@
+!!! 5
+%html
+  %head
+    %meta{charset: 'utf-8'}
+    %title<
+      = block(:title)
+    != styles
+  %body
+    != block(:body)
+    != scripts

data/dummy/project/apps/frontend/layouts/index.haml.source

@@ -0,0 +1,7 @@
+- extends './base.haml'
+
+- block(:title) do
+  #{PROJECT_NAME}
+
+- block(:body) do
+  != @body

data/dummy/project/config/db.rb

@@ -1,6 +1,19 @@
 require 'alfa/database'
 require 'yaml'
 
+# Read more about the timestamps plugin:
+# http://sequel.jeremyevans.net/rdoc-plugins/classes/Sequel/Plugins/Timestamps.html
+Sequel::Model.plugin :timestamps, update_on_create: true
+
+# Read more about prepared statements and the plugin:
+# http://sequel.jeremyevans.net/rdoc/files/doc/prepared_statements_rdoc.html
+# http://sequel.jeremyevans.net/rdoc-plugins/classes/Sequel/Plugins/PreparedStatements.html
+# Sequel::Model.plugin :prepared_statements
+
+# Read more about available plugins:
+# http://sequel.jeremyevans.net/rdoc-plugins/classes/Sequel/Plugins.html
+
+
 # Main database for application private use
 module DB
   Main = Sequel.connect(YAML.load(File.open(File.expand_path('../passwords/db-main.yml', __FILE__))).symbolize_keys[:dsn], :encoding=>'utf8')
@@ -9,3 +22,5 @@ end
 Dir[File.join(PROJECT_ROOT, 'db/main/models/*.rb')].each do |f|
   require f
 end
+
+Sequel.extension :blank

data/dummy/project/config/passwords/.gitignore.source

@@ -0,0 +1,3 @@
+*
+!.gitignore
+!*.sample.yml

data/dummy/project/config/passwords/db-main.yml.source

@@ -0,0 +1,8 @@
+---
+# dns format ([...] can be omitted):
+# adapter://user:[password]@host[:port]/database
+dsn: "mysql2://user:password@localhost:3306/#{PROJECT_NAME}"
+host: "localhost"
+user: "user"
+password: "password"
+dbname: "#{PROJECT_NAME}"

data/dummy/project/config/passwords/secrets.sample.yml

@@ -0,0 +1,2 @@
+---
+session_secret: "YOUR_SECRET_STRING"

data/dummy/project/config/passwords/secrets.yml.source

@@ -0,0 +1,2 @@
+---
+session_secret: "#{SESSION_SECRET}"

data/dummy/project/config/web_application.rb

@@ -9,6 +9,7 @@ module Project
     config[:run_mode] = :development # :development or :production or :test
     config[:log][:file] = File.join(PROJECT_ROOT, 'log/web.log')
     config[:serve_static] = true
+    config[:session][:secret] = YAML.load(File.open(File.expand_path('../passwords/secrets.yml', __FILE__))).symbolize_keys[:session_secret]
   end
 
   WebApplication.init!

data/dummy/project/public/.htaccess

@@ -0,0 +1,13 @@
+Options -Indexes
+
+<IfModule mod_expires.c>
+    ExpiresActive on
+    ExpiresByType image/gif A604800
+    ExpiresByType image/png A604800
+    ExpiresByType image/jpg A604800
+    ExpiresByType image/jpeg A604800
+    ExpiresByType image/x-icon A604800
+    ExpiresByType image/vnd.microsoft.icon A604800
+    ExpiresByType text/css A604800
+    ExpiresByType application/javascript A604800
+</IfModule>

data/lib/alfa/application.rb

@@ -1,6 +1,7 @@
 require 'alfa/logger'
 require 'alfa/config'
 require 'alfa/exceptions'
+require 'alfa/user'
 
 Encoding.default_external = 'utf-8'
 Encoding.default_internal = 'utf-8'
@@ -36,7 +37,7 @@ module Alfa
         @logger.info "  DOCUMENT_ROOT: #{@config[:document_root]}\n"
         @log_file.flush
         ObjectSpace.define_finalizer(@logger, Proc.new {@logger.info "Application (pid=#{$$}) stopped at #{DateTime.now}\n\n"})
-        @config[:db].each_value { |db| db[:instance].loggers = [@logger] }
+        @config[:db].each_value { |db| db[:instance].logger = @logger }
       else
         @logger = Alfa::NullLogger.new
       end
@@ -47,11 +48,30 @@ module Alfa
     def self.load_tasks
       VARS[:rakeapp_instance] = self
       require 'alfa/tasks'
+      Dir[File.join(@config[:project_root], 'tasks', '*.rake')].each do |f|
+        Kernel.load f
+      end
     end
 
 
     def self.verify_config
       raise Exceptions::E001.new('config[:project_root] should be defined') unless @config[:project_root]
     end
+
+
+    def self.try_register(login, password)
+      @config[:db][:main][:instance].transaction do
+        unless User.first(:login=>login)
+          @logger.portion do |l|
+            salt = SecureRandom.hex(5)
+            passhash = Digest::MD5.hexdigest("#{salt}#{password}")
+            User.create(:login=>login, :salt=>salt, :passhash=>passhash)
+            l.info("created new user login=#{login}, password=***, salt=#{salt}, passhash=#{passhash}")
+          end
+          return true, "Registration done"
+        end
+        return false, "User with login #{login} already exists"
+      end
+    end
   end
 end

data/lib/alfa/commands/new.rb

@@ -1,12 +1,15 @@
 require File.expand_path('../../../../version', __FILE__)
 require 'fileutils'
 require 'alfa/support'
+require 'securerandom'
 
 PROJECT_NAME = $*[1]
+SESSION_SECRET = SecureRandom.base64(24)
 
 sr = {
   '#{ALFA_VERSION}' => ALFA_VERSION,
   '#{PROJECT_NAME}' => PROJECT_NAME,
+  '#{SESSION_SECRET}' => SESSION_SECRET
 }
 
 target_dir = File.join(Dir.pwd, PROJECT_NAME)
@@ -38,12 +41,14 @@ ensure
   puts ""
 end
 
-begin
-  print "Bundle install... "
-  FileUtils.cd PROJECT_NAME
-  `bundle install`
-  print "done"
-ensure
-  FileUtils.cd '..'
-  puts ""
-end
+puts "Run 'cd #{PROJECT_NAME} && bundle install' manually"
+
+# begin
+#   print "Bundle install... "
+#   FileUtils.cd PROJECT_NAME
+#   `bundle install`
+#   print "done"
+# ensure
+#   FileUtils.cd '..'
+#   puts ""
+# end

data/lib/alfa/config.rb

@@ -4,17 +4,18 @@ module Alfa
     def initialize
       self[:db] = {}
       self[:log] = {}
+      self[:session] = {key: 'session', secret: nil}
     end
 
     def []=(key, value)
-      if [:db, :log].include? key
+      if [:db, :log, :session].include? key
         raise "key :#{key} should include Enumerable" unless value.class.included_modules.include? Enumerable
       end
       super
     end
 
     def store(key, value)
-      if [:db, :log].include? key
+      if [:db, :log, :session].include? key
         raise "key :#{key} should include Enumerable" unless value.class.included_modules.include? Enumerable
       end
       super

data/lib/alfa/controller.rb

@@ -1,124 +1,39 @@
-require 'alfa/support'
-require 'alfa/exceptions'
+require 'alfa/wrapper'
 
 module Alfa
   class Controller
-    attr_accessor :application, :request, :config, :app_sym, :c_sym
+    include Alfa::WrapperMethods
 
-    def _instance_variables_hash
-      Hash[instance_variables.map { |name| [name.to_sym, instance_variable_get(name)] } ]
-    end
-
-    def _clear_instance_variables
-      instance_variables.each {|name| remove_instance_variable(name)}
-    end
-
-    def href(*o)
-      kwargs = _extract_href_params(*o)
-      @application.routes.href(kwargs)
-    end
-
-    alias :href_to :href
-
-    def _extract_href_params(*o)
-      args, kwargs = Support.args_kwargs(*o)
-      if args.any?
-        if args.first.is_a?(Symbol)
-          kwargs[:action] = args.first
-        else
-          kwargs.merge! _string_to_aca(args.first.to_s)
-        end
-      end
-      kwargs = {:app=>@app_sym}.merge kwargs
-      kwargs = {:controller=>@c_sym}.merge kwargs if kwargs[:action]
-      kwargs
-    end
-
-    # Convert string to App-Controller-Action hash
-    # 'app*controller#action'
-    def _string_to_aca(str)
-      res = {}
-      s1 = str.split('@')
-      raise Exceptions::E004.new("E004: Bad href argument #{str}: it should contain at most one @ symbol") if s1.length > 2
-      res[:app] = s1.last.to_sym if s1.length > 1
-      s2 = s1.first.split('#')
-      raise Exceptions::E004.new("E004: Bad href argument #{str}: it should contain at most one # symbol") if s2.length > 2
-      res[:controller] = s2.first.to_sym if s2.length > 1
-      res[:action] = s2.last.to_sym if s2.length > 0
-      res
-    end
+    attr_accessor :application, :request, :config, :app_sym, :c_sym, :params, :resourcer, :route
 
-
-    def session
-      @request.session
+    def initialize(route: nil)
+      @route = route
     end
 
-    # Return current user
-    def user
-      @user ||= (
-        if @request.session[:user_id] && (u = @application.config[:db][:main][:instance][:users].first(id: @request.session[:user_id]))
-          User.new(u)
-        else
-          GuestUser
-        end
-      )
+    def self.__options
+      @__options ||= {}
     end
 
-
-    def grant?(grant)
-      user.grant?(grant)
-    end
-
-
-    [300, 301, 302, 303].each do |code|
-      define_method ("redirect_#{code}".to_sym) do |url|
-        @application.redirect(url, code)
-      end
+    def render(type)
+      self.class.options(caller_locations(1, 1)[0].label.to_sym, {render: type})
     end
 
-    alias :redirect :redirect_302
-
-
-    def try_login(username, password)
-      u = @application.config[:db][:main][:instance][:users].first(login: username)
-      raise "No such login: #{username}" unless u
-      if u[:passhash] == Digest::MD5.hexdigest("#{u[:salt]}#{password}")
-        # success
-        session[:user_id] = u[:id]
-        return true
-      else
-        # fail
-        session[:user_id] = nil
-        raise 'login fail'
-        return false
-      end
+    def self.options(method, opts)
+      __options[method.to_sym] = __options[method.to_sym] ? __options[method.to_sym].merge(opts) : opts
     end
 
-
-    def try_register(username, password)
-      @config[:db][:main][:instance].transaction do
-        unless @config[:db][:main][:instance][:users].first(:login=>username)
-          @logger.portion do |l|
-            salt = SecureRandom.hex(5)
-            passhash = Digest::MD5.hexdigest("#{salt}#{password}")
-            @config[:db][:main][:instance][:users].insert(:login=>username, :salt=>salt, :passhash=>passhash)
-            l.info("create new user login=#{username}, password=#{password}, salt=#{salt}, passhash=#{passhash}")
-          end
-          return true, "Registration done"
-        end
-        return false, "User with login #{username} already exists"
-      end
+    def set_options(opts = {})
+      self.class.options(caller_locations(1, 1)[0].label.to_sym, opts)
     end
 
-
-    def try_logout
-      session[:user_id] = nil
-      @user = GuestUser
+    def self.get_content_type(method)
+      o = __options[method]
+      o.is_a?(Hash) ? o[:content_type] : nil
     end
 
-    # Store flash message to session
-    def flash(message)
-
+    def self.get_render(method)
+      o = __options[method]
+      o.is_a?(Hash) ? o[:render] : nil
     end
   end
 end

data/lib/alfa/database.rb

@@ -1,2 +1,3 @@
-#require 'alfa/database/mysql'
 require 'sequel'
+
+Sequel.default_timezone = :utc

data/lib/alfa/exceptions.rb

@@ -3,6 +3,8 @@ module Alfa
     # Route not found
     class Route404 < StandardError; end
 
+    class Route403 < StandardError; end
+
     class HttpRedirect < StandardError
       attr_reader :url, :code
       def initialize(url, code)
@@ -10,6 +12,9 @@ module Alfa
       end
     end
 
+
+    class NoSuchController < StandardError; end
+
     # Application's config.project_root required
     class E001 < StandardError; end
 

data/lib/alfa/logger.rb

@@ -5,7 +5,7 @@ require 'alfa/support'
 module Alfa
   class NullLogger
     def portion(*args, &block)
-      l = WeakRef.new(self.class.new)
+      l = self.class.new
       yield(l)
     end
 
@@ -22,8 +22,8 @@ module Alfa
 
   class Logger < ::Logger
 
-    def initialize(logdev, shift_age = 0, shift_size = 1048576)
-      super
+    def initialize(logdev)
+      super(nil)
       @logdev = logdev
       @formatter = Formatter.new
     end
@@ -32,6 +32,7 @@ module Alfa
       io = VirtualIO.new
       l = Logger.new(io)
       l.formatter = @formatter
+      l.level = @level
       yield(l)
       self << io.join
       flush if kwargs[:sync]

data/lib/alfa/resourcer.rb

@@ -0,0 +1,29 @@
+module Alfa
+  class Resourcer
+    def initialize
+      @resources = {
+        action: {styles: [], scripts:[], added_scripts: []},
+        layout: {styles: [], scripts:[], added_scripts: []},
+        snippet: {styles: [], scripts:[], added_scripts: []},
+      }
+    end
+
+    def [](name)
+      @resources[@cursor][name]
+    end
+
+    # @param l Symbol
+    def level=(l)
+      raise "level should be on of #{@resources.keys}" unless @resources.keys.include?(l)
+      @cursor = l
+    end
+
+    def styles
+      @resources[:layout][:styles].concat(@resources[:action][:styles]).concat(@resources[:snippet][:styles])
+    end
+
+    def scripts
+      @resources[:layout][:scripts].concat(@resources[:action][:scripts]).concat(@resources[:snippet][:scripts])
+    end
+  end
+end

data/lib/alfa/router.rb

@@ -6,6 +6,8 @@ module Alfa
 
     class << self
       attr_accessor :apps_dir
+      attr_reader :apps
+      attr_reader :mounts
     end
 
     # initialize class variables
@@ -36,6 +38,9 @@ module Alfa
 
     def self.reset
       @routes.clear
+      @cursor = @routes
+      @cursors_stack = []
+      @mounts.clear
       @apps_dir = nil
     end
 
@@ -70,6 +75,7 @@ module Alfa
         path, a = path.first.to_a
         app = a.to_sym
       end
+      path = "#{path}/" unless path[-1] == '/'
       @mounts << {:path => path, :app => app, :options => options}
       if @apps_dir
         self.context :app => app do
@@ -122,9 +128,19 @@ module Alfa
         fail_flag = false
         rule_segments.zip(url_segments).each do |rule_segment, url_segment|
           skip_flag = true if rule_segment == '**'
-          if rule_segment =~ /^:[a-z]+\w*$/i && url_segment =~ /^[a-z0-9_]+$/
-            pares[rule_segment[1..-1].to_sym] = url_segment.to_sym
-          elsif (rule_segment == url_segment) || (rule_segment == '*' && url_segment =~ /^[a-z0-9_]+$/) || (rule_segment == nil && skip_flag) || rule_segment == '**'
+          if rule_segment =~ /\A:[a-z]+\w*\z/i && url_segment =~ /\A[a-z0-9_]+\z/
+            key = rule_segment[1..-1].to_sym
+            url_segment = url_segment.to_sym if [:controller, :action].include?(key)
+            pares[key] = url_segment
+          elsif rule_segment.to_s[-1..-1] == '?'
+            key = rule_segment[1..-2].to_sym
+            if [:action].include?(key)
+              url_segment = url_segment.nil? ? :index : url_segment.to_sym
+            else
+              url_segment = nil
+            end
+            pares[key] = url_segment
+          elsif (rule_segment == url_segment) || (rule_segment == '*' && url_segment =~ /\A[a-z0-9_]+\z/) || (rule_segment == nil && skip_flag) || rule_segment == '**'
           else
             fail_flag = true
             break
@@ -147,15 +163,17 @@ module Alfa
     # @return route, params
     # route is route that given in routes.rb
     # params is detected params
-    def self.find_route url
+    def self.find_route(url, exclude: [])
       @routes.each do |route|
         if route[:context].is_a? Hash # container
           if self.app_match?(route[:context][:app][:path], url)
             url = url[(route[:context][:app][:path].length-1)..-1]
             route[:routes].each do |r|
-              is_success, params = self.route_match?(r[:rule], url)
-              r[:options][:app] = route[:context][:app][:app]
-              return r, params if is_success
+              unless exclude.include?(r[:rule])
+                is_success, params = self.route_match?(r[:rule], url)
+                r[:options][:app] = route[:context][:app][:app]
+                return r, params if is_success
+              end
             end
             raise Alfa::Exceptions::Route404
           end
@@ -176,13 +194,15 @@ module Alfa
         if route[:context].is_a?(Hash) # container
           if route[:context][:app][:app] == kwargs[:app]
             route[:routes].each do |r|
-              r[:placeholders] = r[:rule].scan(/:([a-z_][a-z0-9_]*)/).map{|m| m[0].to_sym}.sort unless r[:placeholders]
-              if (r[:placeholders] - kwargs.keys).empty? &&
-                  (kwargs.keys & r[:options].keys).all?{|key| kwargs[key] == r[:options][key]} &&
-                  (kwargs.keys - [:app] - r[:placeholders] - r[:options].keys).empty?
-                result = File.join(route[:context][:app][:path], r[:rule].strtr(kwargs.map{|key, value| [":#{key}", value.to_s]}))
-                result += "?#{::Rack::Utils.build_query(params)}" if params.any?
-                return result
+              unless r[:rule].is_a?(Fixnum)
+                r[:placeholders] = r[:rule].scan(/:([a-z_][a-z0-9_]*)/).map{|m| m[0].to_sym}.sort unless r[:placeholders]
+                if (r[:placeholders] - kwargs.keys).empty? &&
+                    (kwargs.keys & r[:options].keys).all?{|key| kwargs[key] == r[:options][key]} &&
+                    (kwargs.keys - [:app] - r[:placeholders] - r[:options].keys).empty?
+                  result = File.join(route[:context][:app][:path], r[:rule].strtr(kwargs.map{|key, value| [":#{key}", value.to_s]}))
+                  result += "?#{::Rack::Utils.build_query(params)}" if params.any?
+                  return result
+                end
               end
             end
           end

data/lib/alfa/snippeter.rb

@@ -0,0 +1,42 @@
+module Alfa
+  class Snippeter
+    @snippets = {}
+    @config = {}
+    @cursor = nil
+
+    class << self
+      attr_accessor :config
+      attr_writer :mounts
+    end
+
+    # @param Symbol app
+    def self.load
+      @mounts.each do |m|
+        app = m[:app]
+        path = File.join(@config[:project_root], 'apps', app.to_s, 'snippets.rb')
+        @cursor = app
+        @snippets[@cursor] ||= {}
+        if File.exist?(path)
+          load_in_instance_context path
+        end
+      end
+    end
+
+    # @param Symbol name
+    # @param Proc &block
+    def self.snippet(name, &block)
+      raise 'Snippet name should be a Symbol' unless name.is_a?(Symbol)
+      raise 'Snippets requires scope' unless @cursor
+      @snippets[@cursor][name] = block
+    end
+
+
+    def self.[](name)
+      if @config[:run_mode] == :development
+        @snippets.clear
+        self.load
+      end
+      @snippets[name]
+    end
+  end
+end