alfa 0.0.4.pre → 0.0.5.pre

data/test/test_support.rb

@@ -6,15 +6,27 @@ class DB1 < Alfa::Database::MySQL; end
 class DB2 < Alfa::Database::MySQL; end
 
 class AlfaSupportTest < Test::Unit::TestCase
-  def test_capitalize_name
-    assert_equal('Foo', Alfa::Support.capitalize_name(:foo))
-    assert_equal('Foo', Alfa::Support.capitalize_name('foo'))
-    assert_equal('Foo', Alfa::Support.capitalize_name('FOO'))
-    assert_equal('Foo', Alfa::Support.capitalize_name('Foo'))
-    assert_equal('FooBar', Alfa::Support.capitalize_name(:foo_bar))
-    assert_equal('FooBar', Alfa::Support.capitalize_name('foo_bar'))
-    assert_equal('FooBar', Alfa::Support.capitalize_name(:foo__bar))
-    assert_equal('BarBaz', Alfa::Support.capitalize_name('foo/bar_baz'))
+  def test_camelcase_name
+    assert_equal('Foo', Alfa::Support.camelcase_name(:foo))
+    assert_equal('Foo', Alfa::Support.camelcase_name('foo'))
+    assert_equal('Foo', Alfa::Support.camelcase_name('FOO'))
+    assert_equal('Foo', Alfa::Support.camelcase_name('Foo'))
+    assert_equal('FooBar', Alfa::Support.camelcase_name(:foo_bar))
+    assert_equal('FooBar', Alfa::Support.camelcase_name('foo_bar'))
+    assert_equal('FooBar', Alfa::Support.camelcase_name(:foo__bar))
+    assert_equal('BarBaz', Alfa::Support.camelcase_name('foo/bar_baz'))
+  end
+
+  def test_underscore
+    assert_equal('foo', Alfa::Support.underscore_name('Foo'))
+    assert_equal('foo_bar', Alfa::Support.underscore_name('FooBar'))
+    assert_equal('a_b_bar', Alfa::Support.underscore_name('ABBar'))
+    assert_equal('foobar', Alfa::Support.underscore_name('foobar'))
+    assert_equal('foo_bar', Alfa::Support.underscore_name('Foo_Bar'))
+    assert_equal('foo_bar', Alfa::Support.underscore_name('Foo__Bar'))
+    assert_equal('foo_bar', Alfa::Support.underscore_name('foo_bar'))
+    assert_equal('foo_bar', Alfa::Support.underscore_name(:foo_bar))
+    assert_equal('bar_baz', Alfa::Support.underscore_name('Foo/Bar_Baz'))
   end
 
   def test_inheritance
@@ -24,15 +36,56 @@ class AlfaSupportTest < Test::Unit::TestCase
     assert_equal('otherhost', DB2.host)
   end
 
-  def test_parse_arguments
-    assert_equal([[], {}], Alfa::Support.parse_arguments())
-    assert_equal([[1, 2], {}], Alfa::Support.parse_arguments(1, 2))
-    assert_equal([[1, 2], {3=>4}], Alfa::Support.parse_arguments(1, 2, 3=>4))
-    assert_equal([[1, 2], {3=>4}], Alfa::Support.parse_arguments(1, 2, {3=>4}))
-    assert_equal([[], {3=>4}], Alfa::Support.parse_arguments(3=>4))
-    assert_equal([[1, 2], {3=>4, 5=>6}], Alfa::Support.parse_arguments(1, 2, 3=>4, 5=>6))
-    assert_equal([[], {3=>4, 5=>6}], Alfa::Support.parse_arguments(3=>4, 5=>6))
-    assert_equal([[[]], {}], Alfa::Support.parse_arguments([]))
-    assert_equal([[], {}], Alfa::Support.parse_arguments({}))
+  def test_args_kwargs
+    assert_equal([[], {}], Alfa::Support.args_kwargs())
+    assert_equal([[1, 2], {}], Alfa::Support.args_kwargs(1, 2))
+    assert_equal([[1, 2], {3=>4}], Alfa::Support.args_kwargs(1, 2, 3=>4))
+    assert_equal([[1, 2], {3=>4}], Alfa::Support.args_kwargs(1, 2, {3=>4}))
+    assert_equal([[], {3=>4}], Alfa::Support.args_kwargs(3=>4))
+    assert_equal([[1, 2], {3=>4, 5=>6}], Alfa::Support.args_kwargs(1, 2, 3=>4, 5=>6))
+    assert_equal([[], {3=>4, 5=>6}], Alfa::Support.args_kwargs(3=>4, 5=>6))
+    assert_equal([[[]], {}], Alfa::Support.args_kwargs([]))
+    assert_equal([[], {}], Alfa::Support.args_kwargs({}))
+  end
+
+  def test_string_strtr
+    s = "AA BB"
+    assert_equal("BB AA", s.strtr("AA" => "BB", "BB" => "AA"))
+    assert_equal("AA BB", s)
+    s = "AA BB"
+    assert_equal("BB AA", s.strtr([["AA", "BB"], ["BB", "AA"]]))
+    assert_equal("AA BB", s)
+  end
+
+  def test_string_strtr!
+    s = "AA BB"
+    assert_equal("BB AA", s.strtr!("AA" => "BB", "BB" => "AA"))
+    assert_equal("BB AA", s)
+    s = "AA BB"
+    assert_equal("BB AA", s.strtr!([["AA", "BB"], ["BB", "AA"]]))
+    assert_equal("BB AA", s)
+  end
+
+  def test_hash_delete!
+    h = {:a=>1, :b=>2}
+    h.delete!(:b)
+    assert_equal({:a=>1}, h)
+    h = {:a=>1, :b=>2, :c=>3}
+    h.delete!(:b, :c)
+    assert_equal({:a=>1}, h)
+    h = {:a=>1, :b=>2, :c=>3}
+    h.delete!(:b)
+    assert_equal({:a=>1, :c=>3}, h)
+  end
+
+  def test_hash_except
+    h = {:a=>1, :b=>2}
+    assert_equal({:a=>1}, h.except(:b))
+    assert_equal({:a=>1, :b=>2}, h)
+    h = {:a=>1, :b=>2, :c=>3}
+    assert_equal({:a=>1}, h.except(:b, :c))
+    assert_equal({:a=>1, :b=>2, :c=>3}, h)
+    assert_equal({:a=>1, :c=>3}, h.except(:b))
+    assert_equal({:a=>1, :b=>2, :c=>3}, h)
   end
 end

data/test/test_web_application.rb

@@ -10,15 +10,22 @@ class TestAlfaWebApplication < Test::Unit::TestCase
 
 
   def test_02
-    Alfa::WebApplication.config[:project_root] = File.expand_path('../data/test_web_application', __FILE__)
-    assert_raise Alfa::Exceptions::E002, "WebApplication requires config.document_root" do
+    prepare_web_application
+    assert_raise Alfa::Exceptions::E002, "config[:document_root] should be defined" do
       Alfa::WebApplication.config.delete(:document_root)
       Alfa::WebApplication.init!
     end
-    assert_raise Alfa::Exceptions::E002, "WebApplication's document_root should not be nil" do
-      Alfa::WebApplication.config[:document_root] = nil
+    prepare_web_application
+    assert_raise Alfa::Exceptions::E002, "config[:templates_priority] should be defined" do
+      Alfa::WebApplication.config.delete(:templates_priority)
+      Alfa::WebApplication.init!
+    end
+    prepare_web_application
+    assert_raise Alfa::Exceptions::E001, "config[:groups] should be a hash" do
+      Alfa::WebApplication.config.delete(:groups)
       Alfa::WebApplication.init!
     end
+    prepare_web_application
     assert_nothing_raised Exception do
       Alfa::WebApplication.config[:document_root] = File.expand_path('../data/test_web_application/public', __FILE__)
       Alfa::WebApplication.init!
@@ -26,10 +33,17 @@ class TestAlfaWebApplication < Test::Unit::TestCase
   end
 
 
-  def test_03
+  def prepare_web_application
     Alfa::WebApplication.config[:project_root] = File.expand_path('../data/test_web_application', __FILE__)
     Alfa::WebApplication.config[:document_root] = File.expand_path('../data/test_web_application/public', __FILE__)
+    Alfa::WebApplication.config[:templates_priority] = [:haml]
+    Alfa::WebApplication.config[:groups] = {public: []}
     Alfa::WebApplication.init!
+  end
+
+
+  def test_03
+    prepare_web_application
     #puts Alfa::Router.instance_variable_get(:@routes).inspect
     assert_equal(200, Alfa::WebApplication.call({'PATH_INFO' => '/'})[0])
     assert_equal(404, Alfa::WebApplication.call({'PATH_INFO' => '/404'})[0])
@@ -37,4 +51,57 @@ class TestAlfaWebApplication < Test::Unit::TestCase
     assert_equal(404, Alfa::WebApplication.call({'PATH_INFO' => '/methods'})[0])
     assert_equal(404, Alfa::WebApplication.call({'PATH_INFO' => '/inspect'})[0])
   end
+
+  # Controllers isolation (admin/DefaultController, frontend/DefaultController):
+  # same name variables should be independent
+  def test_04
+    prepare_web_application
+    #puts Alfa::Router.instance_variable_get(:@routes).inspect
+    assert_equal("Frontend\n", Alfa::WebApplication.call({'PATH_INFO'=>'/test_04'})[2].join)
+    assert_equal("Admin\n", Alfa::WebApplication.call({'PATH_INFO'=>'/admin/test_04'})[2].join)
+    assert_equal("Frontend\n", Alfa::WebApplication.call({'PATH_INFO'=>'/test_04'})[2].join) # call controller after calling same name controller should not interleave controller variables
+    assert_equal("Admin\n", Alfa::WebApplication.call({'PATH_INFO'=>'/admin/test_04'})[2].join)
+  end
+
+  # Controllers isolation (admin/DefaultController, frontend/DefaultController):
+  # action, defined in first controller and not defined in second controller should not be called with second controller
+  def test_05
+    prepare_web_application
+    assert_equal(200, Alfa::WebApplication.call({'PATH_INFO'=>'/frontend_only'})[0]) # defined in frontend/DefaultController
+    assert_equal(404, Alfa::WebApplication.call({'PATH_INFO'=>'/admin/frontend_only'})[0]) # not defined in admin/DefaultController
+  end
+
+  # Threads isolation (thread safe)
+  # Controller's variables should be set independently on simultaneous calls
+  def test_08
+    prepare_web_application
+    r1 = Alfa::WebApplication.call({'PATH_INFO'=>'/test_08'}) do |controller1, template1|
+      r2 = Alfa::WebApplication.call({'PATH_INFO'=>'/admin/test_08'}) do |controller2, template2|
+        assert_not_equal(controller1.hash, controller2.hash)
+        assert_not_equal(controller1.request.hash, controller2.request.hash)
+        assert_not_equal(controller1.session.hash, controller2.session.hash)
+        assert_equal(:bar, controller1.session[:foo])
+        assert_equal(:baz, controller2.session[:foo])
+      end
+      assert_equal("/admin/test_08\n/admin/test_08", r2[2].join.strip)
+    end
+    assert_equal("/test_08\n/test_08", r1[2].join.strip)
+
+    prepare_web_application
+    c1 = c2 = foo1 = foo2 = r1 = r2 = nil
+    r1 = Alfa::WebApplication.call({'PATH_INFO'=>'/test_08a'}) do |controller1, template1|
+      r2 = Alfa::WebApplication.call({'PATH_INFO'=>'/admin/test_08a'}) do |controller2, template2|
+        c1 = controller1
+        c2 = controller2
+        assert_not_equal(controller1.hash, controller2.hash)
+        assert_not_equal(controller1.request.hash, controller2.request.hash)
+        foo1 = controller1.session[:foo]
+        foo2 = controller2.session[:foo]
+      end
+    end
+    assert_equal(c2.hash.to_s, r2[2].join.strip)
+    assert_equal(c1.hash.to_s, r1[2].join.strip)
+    assert_equal(:far, foo1)
+    assert_equal(:faz, foo2)
+  end
 end

data/version.rb

@@ -0,0 +1 @@
+ALFA_VERSION = '0.0.5.pre'

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: alfa
 version: !ruby/object:Gem::Version
-  version: 0.0.4.pre
-  prerelease: 6
+  version: 0.0.5.pre
 platform: ruby
 authors:
 - Valentin Syrovatskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ruty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,83 +69,80 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.42'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.42'
+- !ruby/object:Gem::Dependency
+  name: rack-session-sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: template-inheritance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: ''
 email: vsyrovat@gmail.com
-executables: []
+executables:
+- alfa
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/alfa/commands/new.rb
-- lib/alfa/database/mysql.rb
-- lib/alfa/models/base.rb
-- lib/alfa/models/base_sql.rb
-- lib/alfa/models/dummy.rb
-- lib/alfa/models/mysql.rb
-- lib/alfa/controller.rb
-- lib/alfa/database.rb
-- lib/alfa/models.rb
-- lib/alfa/query_logger.rb
-- lib/alfa/application.rb
-- lib/alfa/cli_application.rb
-- lib/alfa/config.rb
-- lib/alfa/exceptions.rb
-- lib/alfa/logger.rb
-- lib/alfa/router.rb
-- lib/alfa/support.rb
-- lib/alfa/tasks.rb
-- lib/alfa/tfile.rb
-- lib/alfa/web_application.rb
-- lib/ruty/tags/resources.rb
-- lib/ruty/bugfix.rb
-- lib/ruty/upgrade.rb
-- lib/alfa.rb
-- test/test_alfa.rb
-- test/test_tfile.rb
-- test/test_controller.rb
-- test/test_logger.rb
-- test/test_router.rb
-- test/test_support.rb
-- test/test_web_application.rb
-- test/data/test_router/1/apps/backend/routes.rb
-- test/data/test_router/1/apps/frontend/routes.rb
-- test/data/test_router/1/config/routes.rb
-- test/data/test_router/2/apps/backend/routes.rb
-- test/data/test_router/2/apps/frontend/routes.rb
-- test/data/test_router/2/config/routes.rb
-- test/data/test_web_application/apps/frontend/controllers/kfk.rb
-- test/data/test_web_application/apps/frontend/routes.rb
-- test/data/test_web_application/config/routes.rb
-- test/test_application.rb
-- test/test_config.rb
 - assets/css/960gs/960.css
 - assets/css/960gs/960_12_col.css
 - assets/css/960gs/960_12_col_rtl.css
@@ -180,6 +168,8 @@ files:
 - assets/css/960gs/reset_rtl.css
 - assets/css/960gs/text.css
 - assets/css/960gs/text_rtl.css
+- assets/js/jquery/jquery-1.11.0.js
+- assets/js/jquery/jquery-1.11.0.min.js
 - assets/js/jquery/jquery-1.3.2.js
 - assets/js/jquery/jquery-1.3.2.min.js
 - assets/js/jquery/jquery-1.4.2.js
@@ -365,28 +355,107 @@ files:
 - assets/js/jquery/ui/themes/smoothness/jquery.ui.tabs.css
 - assets/js/jquery/ui/themes/smoothness/jquery.ui.theme.css
 - bin/alfa
+- dummy/project/Gemfile.source
+- dummy/project/Rakefile
+- dummy/project/apps/admin/controllers/default.rb
+- dummy/project/apps/admin/layouts/base.tpl
+- dummy/project/apps/admin/layouts/index.tpl.source
+- dummy/project/apps/admin/routes.rb
+- dummy/project/apps/admin/templates/default/index.tpl
+- dummy/project/apps/frontend/controllers/default.rb
+- dummy/project/apps/frontend/layouts/base.tpl
+- dummy/project/apps/frontend/layouts/index.tpl.source
+- dummy/project/apps/frontend/routes.rb
+- dummy/project/apps/frontend/templates/default/index.tpl
+- dummy/project/config.ru
+- dummy/project/config/cli_application.rb
+- dummy/project/config/config.rb
+- dummy/project/config/db.rb
+- dummy/project/config/env.rb
+- dummy/project/config/groups.rb
+- dummy/project/config/passwords/db.sample.yml
+- dummy/project/config/routes.rb
+- dummy/project/config/setup_load_paths.rb
+- dummy/project/config/web_application.rb
+- dummy/project/db/main/schema.yml
+- dummy/project/public/favicon.ico
+- dummy/project/public/robots.txt
+- lib/alfa.rb
+- lib/alfa/application.rb
+- lib/alfa/cli_application.rb
+- lib/alfa/commands/new.rb
+- lib/alfa/config.rb
+- lib/alfa/controller.rb
+- lib/alfa/database.rb
+- lib/alfa/database/mysql.rb
+- lib/alfa/exceptions.rb
+- lib/alfa/logger.rb
+- lib/alfa/models.rb
+- lib/alfa/models/base.rb
+- lib/alfa/models/base_sql.rb
+- lib/alfa/models/dummy.rb
+- lib/alfa/models/mysql.rb
+- lib/alfa/query_logger.rb
+- lib/alfa/router.rb
+- lib/alfa/ruty.rb
+- lib/alfa/support.rb
+- lib/alfa/tasks.rb
+- lib/alfa/template-inheritance.rb
+- lib/alfa/tfile.rb
+- lib/alfa/user.rb
+- lib/alfa/web_application.rb
+- lib/haml/alfa_patch.rb
+- lib/rack/file_alfa.rb
+- lib/ruty/bugfix.rb
+- lib/ruty/tags/href.rb
+- lib/ruty/tags/resources.rb
+- lib/ruty/upgrade.rb
+- lib/template-inheritance/alfa_bugfix.rb
+- lib/template-inheritance/alfa_helpers.rb
+- lib/tilt/alfa_patch.rb
+- test/data/test_router/1/apps/backend/routes.rb
+- test/data/test_router/1/apps/frontend/routes.rb
+- test/data/test_router/1/config/routes.rb
+- test/data/test_router/2/apps/backend/routes.rb
+- test/data/test_router/2/apps/frontend/routes.rb
+- test/data/test_router/2/config/routes.rb
+- test/data/test_web_application/apps/admin/controllers/default.rb
+- test/data/test_web_application/apps/admin/routes.rb
+- test/data/test_web_application/apps/frontend/controllers/default.rb
+- test/data/test_web_application/apps/frontend/routes.rb
+- test/data/test_web_application/config/routes.rb
+- test/test_alfa.rb
+- test/test_application.rb
+- test/test_config.rb
+- test/test_controller.rb
+- test/test_logger.rb
+- test/test_router.rb
+- test/test_support.rb
+- test/test_tfile.rb
+- test/test_web_application.rb
+- version.rb
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Alfa CMF
 test_files: []
+has_rdoc: 

data/test/data/test_web_application/apps/frontend/controllers/kfk.rb

@@ -1,9 +0,0 @@
-class KfkController < Alfa::Controller
-  def index
-
-  end
-
-  def bar
-
-  end
-end