alfa 0.0.5.pre → 0.0.6.pre

data/test/test_ruby_core.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+
+class RubyCoreTest < Test::Unit::TestCase
+  # Inherited classes should use separate variables
+  def test_01
+    eval <<EOL
+class A
+  class << self
+    attr_accessor :foo
+  end
+end
+class B < A; end
+class C < B; end
+EOL
+    A.foo = 1
+    B.foo = 2
+    C.foo = 3
+    assert_equal(1, A.foo)
+    assert_equal(2, B.foo)
+    assert_equal(3, C.foo)
+  end
+
+  # Test for Regression of Hash#reject in Ruby 2.1.1
+  # https://www.ruby-lang.org/en/news/2014/03/10/regression-of-hash-reject-in-ruby-2-1-1/
+  # Should pass in Ruby 2.0.0 and 2.1.2+ (not in 2.1.1)
+  def test_02
+    eval <<EOL
+class SubHash < Hash; end
+EOL
+    assert_equal(SubHash, SubHash.new.reject{}.class)
+  end
+end

data/test/test_support.rb

@@ -1,9 +1,6 @@
 require 'test/unit'
 require 'alfa/support'
-require 'alfa/database/mysql'
-
-class DB1 < Alfa::Database::MySQL; end
-class DB2 < Alfa::Database::MySQL; end
+require 'alfa/support/nil_operations'
 
 class AlfaSupportTest < Test::Unit::TestCase
   def test_camelcase_name
@@ -15,6 +12,7 @@ class AlfaSupportTest < Test::Unit::TestCase
     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'))
+    assert_equal('Foo2Bar', Alfa::Support.camelcase_name('foo_2_bar'))
   end
 
   def test_underscore
@@ -27,13 +25,7 @@ class AlfaSupportTest < Test::Unit::TestCase
     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
-    DB1.host = 'localhost'
-    DB2.host = 'otherhost'
-    assert_equal('localhost', DB1.host)
-    assert_equal('otherhost', DB2.host)
+    assert_equal('foo_2_bar', Alfa::Support.underscore_name('Foo2Bar'))
   end
 
   def test_args_kwargs
@@ -88,4 +80,153 @@ class AlfaSupportTest < Test::Unit::TestCase
     assert_equal({:a=>1, :c=>3}, h.except(:b))
     assert_equal({:a=>1, :b=>2, :c=>3}, h)
   end
+
+  def test_nil_operations
+    # addition
+    assert_nil(NilKnown.new(nil))
+    assert_equal([nil, nil], nil.to_nkn.to_a)
+    assert_equal(1, NilKnown.new(1))
+    assert_equal([1, 1], 1.to_nkn.to_a)
+
+    a = NilKnown.new(1) + 1
+    assert_equal(2, a)
+    assert_equal(2, a.known)
+    a = NilKnown.new(1) + nil
+    assert_nil(a)
+    assert_equal(1, a.known)
+    a = NilKnown.new(nil) + 1
+    assert_nil(a)
+    assert_equal(1, a.known)
+    a = NilKnown.new(nil) + nil
+    assert_nil(a)
+    assert_nil(a.known)
+
+    a = NilKnown.new(1) + NilKnown.new(1)
+    assert_equal(2, a)
+    assert_equal(2, a.known)
+    a = NilKnown.new(1) + NilKnown.new(nil)
+    assert_nil(a)
+    assert_equal(1, a.known)
+    a = NilKnown.new(nil) + NilKnown.new(1)
+    assert_nil(a)
+    assert_equal(1, a.known)
+    a = NilKnown.new(nil) + NilKnown.new(nil)
+    assert_nil(a)
+    assert_nil(a.known)
+
+    a = 1.to_nkn
+    b = 2.to_nkn
+    c = a + b
+    assert_not_equal(c.hash, a.hash)
+    assert_not_equal(c.hash, b.hash)
+
+    assert_equal(1.1, NilKnown.new(1.1))
+
+    a = NilKnown.new(1.1) + 1.1
+    assert_equal(2.2, a)
+    assert_equal(2.2, a.known)
+    a = NilKnown.new(1.1) + nil
+    assert_nil(a)
+    assert_equal(1.1, a.known)
+    a = NilKnown.new(nil) + 1.1
+    assert_nil(a)
+    assert_equal(1.1, a.known)
+    a = NilKnown.new(nil) + nil
+    assert_nil(a)
+    assert_nil(a.known)
+
+    a = NilKnown.new(1.1) + NilKnown.new(1.1)
+    assert_equal(2.2, a)
+    assert_equal(2.2, a.known)
+    a = NilKnown.new(1.1) + NilKnown.new(nil)
+    assert_nil(a)
+    assert_equal(1.1, a.known)
+    a = NilKnown.new(nil) + NilKnown.new(1.1)
+    assert_nil(a)
+    assert_equal(1.1, a.known)
+    a = NilKnown.new(nil) + NilKnown.new(nil)
+    assert_nil(a)
+    assert_nil(a.known)
+
+    assert_raise ::ArgumentError do
+      NilKnown.new(1, 2)
+    end
+
+    assert_equal([nil, 102], (NilKnown.new(nil, 100) + 2).to_a)
+    assert_equal([nil, 202], (NilKnown.new(nil, 100) + NilKnown.new(nil, 102)).to_a)
+
+    # multiplication
+    assert_equal([nil, 0], (1.to_nkn * nil).to_a)
+    assert_equal([2, 2], (1.to_nkn * 2.to_nkn).to_a)
+    assert_equal([nil, 24], (4.to_nkn * NilKnown.new(nil, 6)).to_a)
+
+    # substraction
+    assert_equal([nil, 1], (1.to_nkn - nil).to_a)
+    assert_equal([nil, -1], (nil.to_nkn - 1).to_a)
+    assert_equal(nil, nil.to_nkn - nil)
+    assert_equal([0, 0], (1.to_nkn - 1).to_a)
+    assert_equal([1, 1], (2.to_nkn - 1).to_a)
+    assert_equal([-1, -1], (1.to_nkn - 2).to_a)
+
+    # division
+    assert_equal([nil, 0], nil.to_nkn.fdiv(1).to_a)
+    assert_equal([0, 0], 0.to_nkn.fdiv(1).to_a)
+    assert_equal([nil, Float::INFINITY], nil.to_nkn.fdiv(nil).to_a)
+    assert_equal([Float::INFINITY, Float::INFINITY], 1.to_nkn.fdiv(0).to_a)
+    assert_equal([nil, Float::INFINITY], 1.to_nkn.fdiv(nil).to_a)
+    assert_equal([1.5, 1.5], 3.to_nkn.fdiv(2).to_a)
+
+    assert_equal([nil, 0], nil.to_nkn.div(1).to_a)
+    assert_equal([0, 0], 0.to_nkn.div(1).to_a)
+    assert_raise(ZeroDivisionError){ nil.to_nkn.div(nil) }
+    assert_raise(ZeroDivisionError){ 1.to_nkn.div(0) }
+    assert_raise(ZeroDivisionError){ 1.1.to_nkn.div(0) }
+    assert_raise(ZeroDivisionError){ 1.to_nkn.div(nil) }
+    assert_equal([1, 1], 3.to_nkn.div(2).to_a)
+
+    assert_equal([nil, 0], (nil.to_nkn / 1).to_a)
+    assert_equal([0, 0], (0.to_nkn / 1).to_a)
+    assert_equal([nil, Float::INFINITY], (nil.to_nkn / nil).to_a)
+    assert_raise(ZeroDivisionError){ 1.to_nkn / 0 }
+    assert_raise(ZeroDivisionError){ 1.to_nkn / nil }
+    assert_equal([Float::INFINITY, Float::INFINITY], (1.1.to_nkn / 0).to_a)
+    assert_equal([1, 1], (3.to_nkn / 2).to_a)
+    assert_equal([1.5, 1.5], (3.0.to_nkn / 2.0).to_a)
+
+    # other
+    assert(1.to_nkn.is?)
+    assert(0.to_nkn.is?)
+    assert(!nil.to_nkn.is?)
+    assert(1.1.to_nkn.is?)
+    assert_equal(Float::INFINITY, NilKnown.new(nil, Float::INFINITY).known)
+  end
+
+  def test_hround
+    assert_equal('123', 123.hround(1))
+    assert_equal('123.5', 123.456.hround(1))
+    assert_equal('123.46', 123.456.hround(2))
+    assert_equal('123.2', 123.222.hround(1))
+    assert_equal('0.1', 0.123.hround(1))
+    assert_equal('-123', -123.hround(1))
+    assert_equal('-123.5', -123.456.hround(1))
+    assert_equal('-123.46', -123.456.hround(2))
+    assert_equal('-123.2', -123.222.hround(1))
+    assert_equal('-0.1', -0.123.hround(1))
+    assert_equal('123.5', BigDecimal.new('123.456').hround(1))
+    assert_equal('123.46', BigDecimal.new('123.456').hround(2))
+  end
+
+  def test_mround
+    assert_equal('123', 123.mround)
+    assert_equal('123.00', 123.mround(true))
+    assert_equal('123.46', 123.456.mround)
+    assert_equal('123.22', 123.222.mround)
+    assert_equal('0.12', 0.123.mround)
+    assert_equal('-123', -123.mround)
+    assert_equal('-123.00', -123.mround(true))
+    assert_equal('-123.46', -123.456.mround)
+    assert_equal('-123.22', -123.222.mround)
+    assert_equal('-0.12', -0.123.mround)
+    assert_equal('123.46', BigDecimal.new('123.456').mround)
+  end
 end

data/test/test_web_application.rb

@@ -50,6 +50,7 @@ class TestAlfaWebApplication < Test::Unit::TestCase
     assert_equal(200, Alfa::WebApplication.call({'PATH_INFO' => '/bar'})[0])
     assert_equal(404, Alfa::WebApplication.call({'PATH_INFO' => '/methods'})[0])
     assert_equal(404, Alfa::WebApplication.call({'PATH_INFO' => '/inspect'})[0])
+    assert_equal(200, Alfa::WebApplication.call({'PATH_INFO' => '/second'})[0])
   end
 
   # Controllers isolation (admin/DefaultController, frontend/DefaultController):
@@ -104,4 +105,10 @@ class TestAlfaWebApplication < Test::Unit::TestCase
     assert_equal(:far, foo1)
     assert_equal(:faz, foo2)
   end
+
+  # Test for serial routes such as /:action then /:controller or /:controller then /:action
+  def test_09
+    assert_equal("second#index@frontend\n", Alfa::WebApplication.call({'PATH_INFO'=>'/second'})[2].join)
+    assert_equal("second#index@admin\n", Alfa::WebApplication.call({'PATH_INFO'=>'/admin/second'})[2].join)
+  end
 end

data/version.rb

@@ -1 +1 @@
-ALFA_VERSION = '0.0.5.pre'
+ALFA_VERSION = '0.0.6.pre'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alfa
 version: !ruby/object:Gem::Version
-  version: 0.0.5.pre
+  version: 0.0.6.pre
 platform: ruby
 authors:
 - Valentin Syrovatskiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,34 +27,49 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 10.3.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: ruty
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +91,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,25 +101,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.42'
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.42'
+        version: '4.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: rack-session-sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
@@ -106,6 +139,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
@@ -355,31 +391,52 @@ 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/.gitignore
+- dummy/project/.ruby-version
+- dummy/project/CHANGELOG
 - dummy/project/Gemfile.source
+- dummy/project/README
 - dummy/project/Rakefile
 - dummy/project/apps/admin/controllers/default.rb
+- dummy/project/apps/admin/layouts/base.haml
 - dummy/project/apps/admin/layouts/base.tpl
+- dummy/project/apps/admin/layouts/index.haml.source
 - dummy/project/apps/admin/layouts/index.tpl.source
 - dummy/project/apps/admin/routes.rb
+- dummy/project/apps/admin/templates/default/index.haml
 - dummy/project/apps/admin/templates/default/index.tpl
 - dummy/project/apps/frontend/controllers/default.rb
+- dummy/project/apps/frontend/layouts/base.haml
 - dummy/project/apps/frontend/layouts/base.tpl
+- dummy/project/apps/frontend/layouts/index.haml.source
 - dummy/project/apps/frontend/layouts/index.tpl.source
 - dummy/project/apps/frontend/routes.rb
-- dummy/project/apps/frontend/templates/default/index.tpl
+- dummy/project/apps/frontend/templates/default/index.haml
 - 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/.gitignore.source
+- dummy/project/config/passwords/db-main.yml.source
 - dummy/project/config/passwords/db.sample.yml
+- dummy/project/config/passwords/secrets.sample.yml
+- dummy/project/config/passwords/secrets.yml.source
 - dummy/project/config/routes.rb
 - dummy/project/config/setup_load_paths.rb
 - dummy/project/config/web_application.rb
+- dummy/project/db/main/migrations/.keep
+- dummy/project/db/main/models/.keep
 - dummy/project/db/main/schema.yml
+- dummy/project/db/main/schema/.keep
+- dummy/project/db/main/seed.rb
+- dummy/project/log/.keep
+- dummy/project/public/.htaccess
 - dummy/project/public/favicon.ico
 - dummy/project/public/robots.txt
+- dummy/project/tasks/.keep
+- dummy/project/test/.keep
 - lib/alfa.rb
 - lib/alfa/application.rb
 - lib/alfa/cli_application.rb
@@ -387,29 +444,34 @@ files:
 - 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/resourcer.rb
 - lib/alfa/router.rb
 - lib/alfa/ruty.rb
+- lib/alfa/snippeter.rb
 - lib/alfa/support.rb
+- lib/alfa/support/common.rb
+- lib/alfa/support/nil_operations.rb
+- lib/alfa/support/time.rb
 - lib/alfa/tasks.rb
+- lib/alfa/tasks/assets.rake
+- lib/alfa/tasks/db.rake
+- lib/alfa/tasks/generators.rake
 - lib/alfa/template-inheritance.rb
 - lib/alfa/tfile.rb
 - lib/alfa/user.rb
 - lib/alfa/web_application.rb
+- lib/alfa/wrapper.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/sequel/extensions/igrep.rb
+- lib/sequel/extensions/with_pks.rb
 - lib/template-inheritance/alfa_bugfix.rb
 - lib/template-inheritance/alfa_helpers.rb
 - lib/tilt/alfa_patch.rb
@@ -420,9 +482,31 @@ files:
 - 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/controllers/second.rb
+- test/data/test_web_application/apps/admin/layouts/default.haml
+- test/data/test_web_application/apps/admin/layouts/default.tpl
 - test/data/test_web_application/apps/admin/routes.rb
+- test/data/test_web_application/apps/admin/templates/default/test_04.haml
+- test/data/test_web_application/apps/admin/templates/default/test_04.tpl
+- test/data/test_web_application/apps/admin/templates/default/test_08.haml
+- test/data/test_web_application/apps/admin/templates/default/test_08a.haml
+- test/data/test_web_application/apps/admin/templates/second/index.haml
 - test/data/test_web_application/apps/frontend/controllers/default.rb
+- test/data/test_web_application/apps/frontend/controllers/second.rb
+- test/data/test_web_application/apps/frontend/layouts/default.haml
+- test/data/test_web_application/apps/frontend/layouts/default.tpl
 - test/data/test_web_application/apps/frontend/routes.rb
+- test/data/test_web_application/apps/frontend/templates/default/bar.haml
+- test/data/test_web_application/apps/frontend/templates/default/bar.tpl
+- test/data/test_web_application/apps/frontend/templates/default/frontend_only.haml
+- test/data/test_web_application/apps/frontend/templates/default/frontend_only.tpl
+- test/data/test_web_application/apps/frontend/templates/default/index.haml
+- test/data/test_web_application/apps/frontend/templates/default/index.tpl
+- test/data/test_web_application/apps/frontend/templates/default/test_04.haml
+- test/data/test_web_application/apps/frontend/templates/default/test_04.tpl
+- test/data/test_web_application/apps/frontend/templates/default/test_08.haml
+- test/data/test_web_application/apps/frontend/templates/default/test_08a.haml
+- test/data/test_web_application/apps/frontend/templates/second/index.haml
 - test/data/test_web_application/config/routes.rb
 - test/test_alfa.rb
 - test/test_application.rb
@@ -430,6 +514,7 @@ files:
 - test/test_controller.rb
 - test/test_logger.rb
 - test/test_router.rb
+- test/test_ruby_core.rb
 - test/test_support.rb
 - test/test_tfile.rb
 - test/test_web_application.rb
@@ -458,4 +543,3 @@ signing_key:
 specification_version: 4
 summary: Alfa CMF
 test_files: []
-has_rdoc: 

data/lib/alfa/database/mysql.rb

@@ -1,107 +0,0 @@
-require 'alfa/support'
-require 'mysql2'
-require 'alfa/models/mysql'
-require 'alfa/query_logger'
-require 'yaml'
-
-module Alfa
-  module Database
-    class MySQL
-      include Alfa::ClassInheritance
-      inheritable_attributes :host, :port, :user, :password, :dbname, :client, :config, :schema_path, :encondig
-      @host = nil
-      @port = 3306
-      @user = nil
-      @password = nil
-      @dbname = nil
-      @client = nil
-      @config = nil
-      @schema_path = nil
-      @encoding = nil
-
-      def self.load_schema path
-        @schema_path = path
-        data = YAML::load File.open(File.join(path, 'schema.yml'))
-        data.symbolize_keys!
-        @encoding = data[:encoding] if data[:encoding]
-        raise "Unacceptible engine in #{path}/schema.yml, expected to be mysql of mysql2" unless ['mysql', 'mysql2'].include? data[:engine]
-        Dir[File.join(path, 'models/*.rb')].each do |file|
-          require file
-          Kernel::const_get(Alfa::Support.camelcase_name(File.basename(file, '.rb'))).register_database self
-        end
-
-      end
-
-      def self.load_config file
-        @config = file
-        data = YAML::load File.open(file)
-        data.symbolize_keys!
-        @host = data[:host] if data[:host]
-        @port = data[:port] if data[:port]
-        @user = data[:user] if data[:user]
-        @password = data[:password] if data[:password]
-        @dbname = data[:dbname] if data[:dbname]
-      end
-
-      def self.check_params
-        raise ":host must be defined for #{self.to_s}" unless @host
-        raise ":user must be defined for #{self.to_s}" unless @user
-        raise ":password must be defined for #{self.to_s}" unless @password
-        raise ":dbname must be defined for #{self.to_s}" unless @dbname
-        raise ":encoding must be defined for #{self.to_s}" unless @encoding
-      end
-
-      def self.query query
-        self.check_client
-        begin
-          Alfa::QueryLogger.log query, self do
-            @client.query(query)
-          end
-        rescue Mysql2::Error => e
-          raise "#{e.message} (query: \"#{query}\", error number: #{e.error_number}, sql state: #{e.sql_state})"
-        end
-      end
-
-      def self.check_client
-        unless @client
-          self.check_params
-          @client = Mysql2::Client.new(:host=>@host, :username=>@user)
-          @client.query_options.merge!(:symbolize_keys => true, :as => :hash, :database_timezone => :utc, :application_timezone => :utc)
-          Alfa::QueryLogger.log "SET NAMES utf8", self do
-            @client.query "SET NAMES " + @encoding
-          end
-          Alfa::QueryLogger.log "USE `#@dbname`", self do
-            @client.query "USE `#@dbname`"
-          end
-        end
-      end
-
-      def self.transaction &block
-        self.check_client
-        begin
-          self.query "START TRANSACTION"
-          yield
-        rescue StandardError => e
-          self.query "ROLLBACK"
-          raise e
-        else
-          self.query "COMMIT"
-        end
-      end
-
-      def self.escape arg
-        case arg.class
-          when Numeric
-            arg.to_s
-          when Array
-            arg.map {|a|
-              self.escape(a).to_s
-            }.join(',')
-          else
-            client.escape arg.to_s
-        end
-      end
-
-    end
-  end
-end

data/lib/alfa/models/base.rb

@@ -1,7 +0,0 @@
-module Alfa
-  module Models
-    class Base
-
-    end
-  end
-end

data/lib/alfa/models/base_sql.rb

@@ -1,9 +0,0 @@
-require 'alfa/models/base'
-
-module Alfa
-  module Models
-    class BaseSQL < Alfa::Models::Base
-
-    end
-  end
-end

data/lib/alfa/models/dummy.rb

@@ -1,7 +0,0 @@
-module Alfa
-  module Models
-    class Dummy
-
-    end
-  end
-end