sequel-rails 0.1.8 → 0.4.0.pre

data/.gitignore

@@ -27,3 +27,4 @@ vendor
 .bundle
 .rvmrc
 *.gem
+Gemfile.lock

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--backtrace

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+  - 1.9.3
+env:
+  - "TEST_ADAPTER=postgresql TEST_OWNER=postgres TEST_USERNAME=postgres"
+  - "TEST_ADAPTER=mysql TEST_USERNAME=root TEST_ENCODING=utf8"
+  - "TEST_ADAPTER=mysql2 TEST_USERNAME=root TEST_ENCODING=utf8"
+  - "TEST_ADAPTER=sqlite3 TEST_DATABASE=':memory:'"
+script: "rake spec"
+notifications:
+  email:
+    - jonathan.tron@metrilio.com

data/Gemfile

@@ -1,21 +1,18 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
-gem 'rake',                 '~> 0.8.7'
-gem 'jeweler',              '~> 1.4'
-gem 'yard',                 '~> 0.5'
-
-git 'git://github.com/rails/rails.git' do
-
-  gem 'activesupport',      '~> 3.0.0.beta3', :require => 'active_support'
-  gem 'actionpack',         '~> 3.0.0.beta3', :require => 'action_pack'
-  gem 'railties',           '~> 3.0.0.beta3', :require => 'rails'
+gemspec
 
+# MRI/Rubinius Adapter Dependencies
+platform :ruby do
+  gem "pg"
+  gem "mysql"
+  gem "mysql2"
+  gem "sqlite3"
 end
 
-gem 'sequel',              '~> 3.11.0'
-
-group :test do
-  gem 'rspec'
-  gem 'autotest'
-  gem 'rcov'
+# JRuby Adapter Dependencies
+platform :jruby do
+  gem "jdbc-sqlite3"
+  gem "jdbc-mysql"
+  gem "jdbc-postgres"
 end

data/History.md

@@ -0,0 +1,142 @@
+0.4.0.pre
+==========
+
+* Add [Travis-CI](http://travis-ci.org) configuration
+* Ensure file name for migration are valid
+* **BIG CHANGE** rename `Rails::Sequel` module as `SequelRails`, this becomes
+  the namespace for all sequel-rails related classes.
+* Split `Rails::Sequel::Storage` class in multiple adapter for each db
+* Only log queries if logger level is set to :debug (matching ActiveRecord 
+  default).
+* Correctly display time spent in models in controller logs.
+* Add simple `ActiveSupport::Notification` support to Sequel using logger 
+  facility. This is done by monkey patching `Sequel::Database#log_yield`, so
+  it does not yield directly if no loggers configured and instrument the yield
+  call. Note that this does not allow to know from which class the query comes
+  from. So it still does not display the `Sequel::Model` subclass like 
+  `ActiveRecord` does (eg: User load).
+* Add spec for Sequel::Railties::LogSubscriber
+* Add initial specs for railtie setup
+
+0.3.10
+======
+
+* Add post_install_message to notify users to switch to sequel-rails gem
+
+0.3.9
+=====
+
+* Correctly pass option to MySQL CLI and correctly escape them (Arron Washington)
+
+0.3.8
+=====
+
+* Fix bug in `db:force_close_open_connections` and make it work with
+  PostgreSQL 9.2.
+* Ensure `db:test:prepare` use `execute` instead of `invoke` so that tasks
+  already invoked are executed again. This make the following work as expected:
+    `rake db:create db:migrate db:test:prepare`
+
+0.3.7
+=====
+
+* Check migration directory exists before checking if migration are pending
+
+0.3.6
+=====
+
+* Ensure some tasks use the right db after setting `Rails.env`:
+  - `db:schema:load`
+  - `db:schema:dump`
+  - `db:force_close_open_connections`
+* Add check for pending migrations before running task depending on schema:
+  - `db:schema:load`
+  - `db:test:prepare`
+* Make database task more like what rails is doing:
+  - `db:load` do not create the db anymore
+  - `db:create` don't create the test db automatically
+  - `db:drop` don't drop the test db automatically
+  - `db:test:prepare` don't depend on `db:reset` which was loading `db:seed` (Sean Kirby)
+* Make `rake db:setup` load schema instead of running migrations (Markus Fenske)
+* Depends on `railties` instead of `rails` to not pull `active_record` 
+  as dependency (Markus Fenske)
+
+0.3.5
+=====
+
+* Fix `rake db:schema:load` (Markus Fenske)
+
+0.3.4
+=====
+
+* Make `rake db:schema:dump` generate a schema file which contains foreign_keys
+  and uses db types instead of ruby equivalents. This ensure loading the schema
+  file will result in a correct db
+
+* Map some Sequel specific exceptions to `ActiveRecord` equivalents, in 
+  `config.action_dispatch.rescue_responses`. This allows controllers to behave
+  more like `ActiveRecord` when Sequel raises exceptions. (Joshua Hansen)
+ 
+* New Sequel plugin added to all `Sequel::Model` which allows to use 
+  `Sequel::Model#find!` which will raise an exception if record does not exists.
+  This method is an alias to `Sequel::Model#[]` method. (Joshua Hansen)
+
+0.3.3
+=====
+
+* Fix generators and use better model and migration template (Joshua Hansen)
+
+0.3.2
+=====
+* Ignore environments without `database` key (like ActiveRecord do it), to allow
+  shared configurations in `database.yml`.
+* Fix db creation commands to let the `system` method escape the arguments
+* Fix error when using `mysql2` gem
+
+0.3.1
+=====
+* Make `db:schema:dump` Rake task depends on Rails `environment` task (Gabor Ratky)
+
+0.3.0
+=====
+* Update dependency to Rails (~> 3.2.0)
+
+0.2.3
+=====
+* Set `PGPASSWORD` environment variable before trying to create DB using `createdb`
+
+0.2.2
+=====
+* Ensure Sequel is disconnected before trying to drop a db
+
+0.2.1
+=====
+* Make dependency on Sequel more open (~> 3.28)
+
+0.2.0
+=====
+* Fix deprecation warning for config.generators
+* Update dependency to Rails 3.1.1
+* Update dependency to Sequel 3.28.0
+* Update dependency to RSpec 2.7.0
+
+0.1.4
+=====
+* Merged in changes to rake tasks and timestamp migrations
+
+0.1.3
+=====
+* update sequel dependency, configuration change
+
+0.1.2
+=====
+* fixed log_subscriber bug that 0.1.1 was -supposed- to fix.
+* fixed controller_runtime bug
+
+0.1.1
+=====
+* bug fixes, no additional functionality
+
+0.1.0
+=====
+* initial release

data/README.md

@@ -0,0 +1,124 @@
+sequel-rails
+============
+
+This gem provides the railtie that allows [sequel](http://github.com/jeremyevans/sequel) to hook into [rails3](http://github.com/rails/rails) and thus behave like a rails framework component. Just like activerecord does in rails, [sequel-rails](http://github.com/talentbox/sequel-rails) uses the railtie API to hook into rails. The two are actually hooked into rails almost identically.
+
+The code for this gem was initially taken from the excellent [dm-rails](http://github.com/datamapper/dm-rails) project.
+
+This was originally a fork of [brasten](https://github.com/brasten)'s [sequel-rails](https://github.com/brasten/sequel-rails) that has been updated to support newer versions of rails.
+
+Since January 2013, we've became the official maintainers of the gem after [brasten](https://github.com/brasten) proposed us.
+
+Using sequel-rails
+==================
+
+Using sequel with rails3 requires a couple minor changes.
+
+First, add the following to your Gemfile (after the `Rails` lines):
+
+```ruby
+# depending on you database
+gem "pg"        # for PostgreSQL
+gem "mysql2"    # for MySQL
+gem "sqlite3"   # for Sqlite
+
+gem "sequel-rails"
+```
+
+... be sure to run "bundle install" if needed!
+
+Secondly, you'll need to require the different Rails components separately in your `config/application.rb` file, and not require `ActiveRecord`.  The top of your `config/application.rb` will probably look something like:
+
+```ruby
+# require 'rails/all'
+
+# Instead of 'rails/all', require these:
+require "action_controller/railtie"
+# require "active_record/railtie" 
+require "action_mailer/railtie"
+require "sprockets/railtie"
+```
+
+After those changes, you should be good to go!
+
+Available sequel specific rake tasks
+====================================
+
+To get a list of all available rake tasks in your rails3 app, issue the usual in you app's root directory:
+
+```bash
+rake -T
+```
+
+or if you don't have hooks in place to run commands with bundle by default:
+
+```bash
+bundle exec rake -T
+```
+
+Once you do that, you will see the following rake tasks among others. These are the ones that sequel-rails added or replaced:
+
+```bash
+rake db:create[env]                   # Create the database defined in config/database.yml for the current Rails.env
+rake db:create:all                    # Create all the local databases defined in config/database.yml
+rake db:drop[env]                     # Create the database defined in config/database.yml for the current Rails.env
+rake db:drop:all                      # Drops all the local databases defined in config/database.yml
+rake db:force_close_open_connections  # Forcibly close any open connections to the test database 
+rake db:forward                       # Pushes the schema to the next version. Specify the number of steps with STEP=n
+rake db:migrate                       # Migrate the database to the latest version
+rake db:migrate:down                  # Runs the "down" for a given migration VERSION.
+rake db:migrate:redo                  # Rollbacks the database one migration and re migrate up.
+rake db:migrate:reset                 # Resets your database using your migrations for the current environment
+rake db:migrate:up                    # Runs the "up" for a given migration VERSION.
+rake db:reset                         # Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.
+rake db:rollback                      # Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x. Target specific version with VERSION=x.
+rake db:schema:dump                   # Create a db/schema.rb file that can be portably used against any DB supported by Sequel
+rake db:schema:load                   # Load a schema.rb file into the database
+rake db:seed                          # Load the seed data from db/seeds.rb
+rake db:setup                         # Create the database, load the schema, and initialize with the seed data 
+rake db:test:prepare                  # Prepare test database (ensure all migrations ran, drop and re-create database then load schema). This task can be run in the same invocation as other task (eg: rake db:migrate db:test:prepare).
+```
+
+Note on Patches/Pull Requests
+=============================
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add specs for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+The sequel-rails team
+=====================
+
+* Jonathan Tron (JonathanTron) - Current maintainer
+* Joseph Halter (JosephHalter) - Current maintainer
+
+Previous maintainer
+===================
+
+[Original project](https://github.com/brasten/sequel-rails):
+
+* Brasten Sager (brasten) - Project creator
+
+Contributors
+============
+
+Improvements has been made by those awesome contributors:
+
+* Benjamin Atkin (benatkin)
+* Gabor Ratky (rgabo)
+* Joshua Hansen (binarypaladin)
+* Arron Washington (radicaled)
+
+Credits
+=======
+
+The [dm-rails](http://github.com/datamapper/dm-rails) team wrote most of the original code, I just sequel-ized it, but since then most of it as been either adapter or rewritten.
+
+Copyright
+=========
+
+Copyright (c) 2010-2013 The sequel-rails team. See [LICENSE](http://github.com/brasten/sequel-rails/blob/master/LICENSE) for details.

data/Rakefile

@@ -1,33 +1,9 @@
-require 'rubygems'
-require 'rake'
-
 begin
-
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |gem|
-
-    gem.name        = 'sequel-rails'
-    gem.summary     = 'Use Sequel with Rails 3'
-    gem.description = 'Integrate Sequel with Rails 3'
-    gem.email       = 'brasten@gmail.com'
-    gem.homepage    = 'http://github.com/brasten/sequel-rails'
-    gem.authors     = [ 'Brasten Sager (brasten)' ]
-
-    gem.add_dependency 'sequel',           '~> 3.13'
-
-    gem.add_dependency 'activesupport',     '~> 3.0.0'
-    gem.add_dependency 'actionpack',        '~> 3.0.0'
-    gem.add_dependency 'railties',          '~> 3.0.0'
-
-    # gem.add_development_dependency 'yard',  '~> 0.5'
-
-  end
-
-  Jeweler::GemcutterTasks.new
-
-  FileList['tasks/**/*.rake'].each { |task| import task }
-
+  require 'bundler/setup'
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
+
+Bundler::GemHelper.install_tasks
+
+FileList['tasks/**/*.rake'].each { |task| import task }

data/config.ru

@@ -0,0 +1,7 @@
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+Combustion.initialize! "sequel_rails"
+run Combustion::Application

data/lib/generators/sequel.rb

@@ -1,6 +1,6 @@
-require 'rails/generators/named_base'
-require 'rails/generators/migration'
-require 'rails/generators/active_model'
+require "rails/generators/named_base"
+require "rails/generators/migration"
+require "rails/generators/active_model"
 
 module Sequel
   module Generators
@@ -9,9 +9,14 @@ module Sequel
 
       include ::Rails::Generators::Migration
 
+      def self.base_name
+        @_sequel_base_name ||= "sequel"
+      end
+
       def self.source_root
-        @_sequel_source_root ||=
-        File.expand_path("../#{base_name}/#{generator_name}/templates", __FILE__)
+        @_sequel_source_root ||= File.expand_path(
+          "../#{base_name}/#{generator_name}/templates", __FILE__
+        )
       end
 
       protected
@@ -38,7 +43,7 @@ module Sequel
       end
 
       def self.find(klass, params=nil)
-        "#{klass}.get(#{params})"
+        "#{klass}.find!(#{params})"
       end
 
       def self.build(klass, params=nil)
@@ -70,7 +75,6 @@ module Sequel
 end
 
 module Rails
-
   module Generators
     class GeneratedAttribute #:nodoc:
       def type_class
@@ -79,5 +83,4 @@ module Rails
       end
     end
   end
-
 end

data/lib/generators/sequel/migration/migration_generator.rb

@@ -1,30 +1,55 @@
-require 'generators/sequel'
+require "generators/sequel"
 
 module Sequel
-  module Generators
+  class IllegalMigrationNameError < StandardError
+    def initialize(name)
+      super("Illegal name for migration file: #{name}\n\t(only lower case letters, numbers, and '_' allowed)")
+    end
+  end
 
-    class MigrationGenerator < Base
+  module Generators
+    class MigrationGenerator < Base #:nodoc:
 
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :id, :type => :numeric, :desc => "The id to be used in this migration"
 
       def create_migration_file
         set_local_assigns!
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+        validate_file_name!
+        migration_template "migration.rb.erb", "db/migrate/#{file_name}.rb"
       end
 
-      protected
+      attr_reader :migration_action, :table_action, :column_action, :use_change
 
-      attr_reader :migration_action
+      protected
 
       def set_local_assigns!
-        if file_name =~ /^(add|remove|drop)_.*_(?:to|from)_(.*)/
-          @migration_action = $1 == 'add' ? 'add' : 'drop'
-          @table_name       = $2.pluralize
+        if file_name =~ /^(add|drop|remove)_.*_(?:to|from)_(.*)/
+          @table_action   = 'alter'
+          @table_name     = $2.pluralize
+          @column_action  = $1 == 'add' ? 'add' : 'drop'
+          @use_change     = @column_action == 'add' ? true : false
+        elsif file_name =~ /^(create|drop)_(.*)$/
+          @table_action   = $1
+          @table_name     = $2.pluralize
+          @column_action  = 'add'
+          @use_change     = @table_action == 'create' ? true : false
+        else
+          @table_action   = 'alter'
+          if file_name =~ /^(alter)_(.*)/
+            @table_name   = $2.pluralize
+          else
+            @table_name   = file_name.pluralize
+          end
+          @use_change     = false
+          @column_action  = 'add'
         end
       end
 
+      def validate_file_name!
+        unless file_name =~ /^[_a-z0-9]+$/
+          raise IllegalMigrationNameError.new(file_name)
+        end
+      end
     end
-
   end
 end