rails_sequel 0.0.2 → 0.2.1

data/.document

@@ -0,0 +1,5 @@
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -0,0 +1,7 @@
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+previous_failures.txt
+*.gem

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Piotr Usewicz
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -7,27 +7,27 @@ Installation
 ### Using Rails plugin script:
 
     script/plugin install git://github.com/pusewicz/rails_sequel.git
-    
+
 ### Using Rails 2.1 Gem dependencies
-  
+
   Install the gem
-  
+
     gem sources -a http://gems.github.com
     gem install pusewicz-rails_sequel
-  
+
   Load the gem in `environment.rb`
-  
+
     Rails::Initializer.run do |config|
-      config.gem 'pusewicz-rails_sequel', :version => '~> 0.0.2', :lib => 'rails_sequel', :source => 'http://gems.github.com'
+      config.gem 'pusewicz-rails_sequel', :lib => 'rails_sequel', :source => 'http://gems.github.com'
     end
-    
+
 Optional
 --------
 
   Remove ActiveRecord framework in `environment.rb` file:
-  
+
     config.frameworks -= [ :active_record ]
-    
+
 Community
 =========
 

data/Rakefile

@@ -0,0 +1,54 @@
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "rails_sequel"
+    gem.summary = "Sequel plugin for Ruby on Rails"
+    gem.description = "rails_sequel allows you to quickly use Sequel Toolkit as your ORM in Ruby on Rails"
+    gem.email = "piotr@layer22.com"
+    gem.homepage = "http://github.com/pusewicz/rails_sequel"
+    gem.authors = ["Piotr Usewicz"]
+
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = %w("--color")
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+  spec.rcov_opts = if PLATFORM =~ /darwin/
+    ['--exclude "gems/*,spec_helper.rb"']
+  else
+    ['--exclude "rubygems/*,spec_helper.rb"']
+  end
+end
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rails_sequel #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION.yml

@@ -0,0 +1,4 @@
+--- 
+:patch: 1
+:major: 0
+:minor: 2

data/init.rb

@@ -1 +1 @@
-require File.expand_path(File.dirname(__FILE__) + '/lib/rails_sequel')
+require 'rails_sequel'

data/lib/rails_sequel.rb

@@ -1,8 +1,8 @@
 gem 'sequel'
 require 'sequel'
 
-require File.expand_path(File.dirname(__FILE__) + '/rails_sequel/rails_sequel')
-require File.expand_path(File.dirname(__FILE__) + '/rails_sequel/version')
-require File.expand_path(File.dirname(__FILE__) + '/rails_sequel/sequel_ext')
+require 'rails_sequel/rails_sequel'
+require 'rails_sequel/version'
+require 'rails_sequel/sequel_ext'
 
-Rails::SequelConnection.connect
+RailsSequel.connect

data/lib/rails_sequel/rails_sequel.rb

@@ -1,27 +1,55 @@
-module Rails
-  module SequelConnection
-    # Load configuration for current environment
-    CONFIG = YAML::load(ERB.new(IO.read(Rails.root + "/config/database.yml")).result)[Rails.env].with_indifferent_access unless defined?(CONFIG)
-    
-    # Connects to database using constructed Database Connection URI
-    def self.connect
-      Sequel.connect uri, :loggers => [Rails.logger]
+module RailsSequel
+
+  # Connects to database using constructed Database Connection URI
+  def self.connect
+    connection = Sequel.connect(options = self.prepare_options)
+    if options[:adapter] == 'mysql'
+      connection.execute("SET SQL_AUTO_IS_NULL=0")
     end
-    
-    # Returns loaded database.yml configuration for current environment
-    def self.config
-      CONFIG
+    connection
+  end
+
+  # Returns loaded database.yml configuration for current environment
+  def self.config
+    @config ||= YAML::load(ERB.new(IO.read(File.join(Rails.root, "config", "database.yml"))).result)[Rails.env].with_indifferent_access
+  end
+
+  # Resets config
+  def self.reset_config!
+    @config = nil
+  end
+
+  # Constructs Database Connection URI
+  def self.prepare_options
+    options = {}
+
+    # Use SQLite by default
+    options[:adapter]   = config[:adapter] || "sqlite"
+
+    # Use localhost as default host
+    options[:host]      = config[:host] || config[:hostname] || "localhost"
+
+    # Default user is an empty string. Both username and user keys are supported.
+    options[:user]      = config[:username] || config[:user] || ""
+    options[:password]  = config[:password] || ""
+
+    # Both encoding and charset options are supported, default is utf8
+    options[:encoding]  = config[:encoding] || config[:charset] || "utf8"
+
+    # Default database is hey_dude_configure_your_database
+    options[:database]  = config[:database] || "hey_dude_configure_your_database"
+
+    # MSSQL support
+    [:db_type, :socket, :charset, :encoding].each do |var|
+      options[var]      = config[var] if config[var]
     end
-    
-    # Constructs Database Connection URI
-    def self.uri
-      uri = config[:adapter] << "://"
-      uri << config[:username] if config[:username]
-      uri << ':' << config[:password] if config[:password]
-      uri << '@' if config[:username] || config[:password]
-      uri << ':' << config[:port] if config[:port]
-      uri << (config[:host] || 'localhost')
-      uri << '/' << config[:database]
+
+    # JDBC support
+    [:url, :uri].each do |var|
+      options[var]      = config[var] if config[var]
     end
+
+    options[:loggers]   = [Rails.logger]
+    options
   end
 end

data/lib/rails_sequel/sequel_ext.rb

@@ -1,10 +1,10 @@
 class Sequel::Model
-  
+
   # Allows Rails resource path helpers to work correctly
   def to_param
     pk.to_s
   end
-  
+
   # Make new? play nice with Rails
   def new_record?
     new?

data/lib/rails_sequel/version.rb

@@ -1,15 +1,8 @@
-module Rails
-  module SequelConnection
-    module Version
-      MAJOR = 0
-      MINOR = 0
-      TINY  = 2
-
-      STRING = [MAJOR, MINOR, TINY].join('.')
-    end
-    
-    def self.version
-      Version::STRING
-    end
+module RailsSequel
+  # Returns current plugin version
+  def self.version
+    return @version if @version
+    config = YAML.load(File.read(File.join(File.dirname(__FILE__), '../../VERSION.yml')))
+    @version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
   end
 end

data/rails_sequel.gemspec

@@ -0,0 +1,61 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rails_sequel}
+  s.version = "0.2.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Piotr Usewicz"]
+  s.date = %q{2009-10-09}
+  s.description = %q{rails_sequel allows you to quickly use Sequel Toolkit as your ORM in Ruby on Rails}
+  s.email = %q{piotr@layer22.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION.yml",
+     "init.rb",
+     "lib/rails_sequel.rb",
+     "lib/rails_sequel/rails_sequel.rb",
+     "lib/rails_sequel/sequel_ext.rb",
+     "lib/rails_sequel/version.rb",
+     "rails_sequel.gemspec",
+     "spec/config/database.yml",
+     "spec/rails_sequel_spec.rb",
+     "spec/sequel_ext_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/version_spec.rb",
+     "tasks/sequel.rake"
+  ]
+  s.homepage = %q{http://github.com/pusewicz/rails_sequel}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Sequel plugin for Ruby on Rails}
+  s.test_files = [
+    "spec/rails_sequel_spec.rb",
+     "spec/sequel_ext_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/version_spec.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/spec/config/database.yml

@@ -0,0 +1,21 @@
+test:
+  adapter: sqlite
+  database: db/test.sqlite3
+  
+mysql:
+  adapter: mysql
+  database: henry
+  hostname: john
+  username: piotr
+  password: usewicz
+  charset: brilliant
+  encoding: ascii
+  socket: /var/run/my.socket
+
+mssql:
+  db_type: sometype
+  
+test_mysql:
+  adapter: mysql
+  database: mysql
+  user: root

data/spec/rails_sequel_spec.rb

@@ -0,0 +1,74 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'rails_sequel'
+
+describe RailsSequel do
+  it "can reset config" do
+    RailsSequel.config.should_not be_nil
+    RailsSequel.config.should == RailsSequel.instance_variable_get(:@config)
+    RailsSequel.reset_config!
+    RailsSequel.instance_variable_get(:@config).should be_nil
+  end
+end
+
+describe RailsSequel, '#config' do  
+  before(:each) do
+    RailsSequel.reset_config!
+  end
+  
+  it "reads values for current environment" do
+    RailsSequel.config.should == {
+      "adapter" => 'sqlite',
+      "database" => 'db/test.sqlite3'
+    }
+  end
+  
+  describe "MySQL" do
+    it "recognizes database options" do
+      Rails.stub!(:env).and_return("mysql")
+      RailsSequel.config.should == {
+        "adapter" => "mysql",
+        "database" => "henry",
+        "hostname" => "john",
+        "username" => "piotr",
+        "password" => "usewicz",
+        "charset" =>"brilliant",
+        "encoding" => "ascii",
+        "socket" => "/var/run/my.socket"
+      }
+    end
+  end
+  
+  describe "MSSQL" do
+    it "recognizes database options" do
+      Rails.stub!(:env).and_return("mssql")
+      RailsSequel.config.should == {
+        "db_type" => "sometype"
+      }
+    end
+  end
+end
+
+describe RailsSequel, "#connect" do
+  before(:each) do
+    RailsSequel.reset_config!
+  end
+  
+  it "returns connection" do
+    Sequel.stub!(:connect).and_return(MODEL_DB)
+    RailsSequel.connect.should == MODEL_DB
+  end
+  
+  it "connects with configuration loaded from file" do
+    options = RailsSequel.prepare_options
+    RailsSequel.should_receive(:prepare_options).and_return(options)
+    Sequel.should_receive(:connect).with(options)
+    RailsSequel.connect
+  end
+  
+  it "sets SQL_AUTO_IS_NULL if adapter is MySQL" do
+    Rails.stub!(:env).and_return('test_mysql')
+    Sequel.stub!(:connect).and_return(MODEL_DB)
+    RailsSequel.connect
+    MODEL_DB.sqls.should include("SET SQL_AUTO_IS_NULL=0")
+  end
+end

data/spec/sequel_ext_spec.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'rails_sequel/sequel_ext'
+
+class TestModel < Sequel::Model
+end
+
+describe Sequel::Model, '#id' do
+  before(:all) do
+    @model = TestModel.create
+  end
+  
+  it "to_params returns id as a string" do
+    @model.to_param.should == '1'
+  end
+end
+
+describe Sequel::Model, '#new_record?' do
+  before(:all) do
+    @model = TestModel.new
+  end
+  
+  it "behaves like new?" do
+    @model.new_record?.should === @model.new?
+    @model.save
+    @model.new_record?.should === @model.new?
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,8 @@
+--colour
+--format specdoc
+--format failing_examples:previous_failures.txt
+--example previous_failures.txt
+--loadby mtime
+--reverse
+--timeout 20
+--diff

data/spec/spec_helper.rb

@@ -0,0 +1,113 @@
+require 'rubygems'
+require 'erb'
+require 'rr'
+require 'spec'
+require 'sequel'
+require 'active_support/core_ext' # HashWithIndifferentAccess
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+Spec::Runner.configure do |config|
+  # config.mock_with :rr
+end
+
+class MockDataset < Sequel::Dataset
+  def insert(*args)
+    @db.execute insert_sql(*args)
+  end
+
+  def update(*args)
+    @db.execute update_sql(*args)
+  end
+
+  def delete(*args)
+    @db.execute delete_sql(*args)
+  end
+
+  def fetch_rows(sql)
+    return if sql =~ /information_schema/
+    @db.execute(sql)
+    yield({:id => 1, :x => 1})
+  end
+
+  def quoted_identifier(c)
+    "\"#{c}\""
+  end
+end
+
+class MockDatabase < Sequel::Database
+  @@quote_identifiers = false
+  self.identifier_input_method = nil
+  self.identifier_output_method = nil
+  attr_reader :sqls
+
+  def execute(sql, opts={})
+    @sqls ||= []
+    @sqls << sql
+  end
+
+  def reset
+    @sqls = []
+  end
+
+  def schema(table_name, opts)
+    if table_name
+      [[:id, {:primary_key=>true}]]
+    else
+      {table_name=>[[:id, {:primary_key=>true}]]}
+    end
+  end
+
+   def transaction(opts={})
+    return yield if @transactions.include?(Thread.current)
+    execute('BEGIN')
+    begin
+      @transactions << Thread.current
+      yield
+    rescue Exception => e
+      execute('ROLLBACK')
+      transaction_error(e)
+    ensure
+      unless e
+        execute('COMMIT')
+      end
+      @transactions.delete(Thread.current)
+    end
+  end
+
+  def dataset(opts=nil); MockDataset.new(self, opts); end
+end
+
+class << Sequel::Model
+  alias orig_columns columns
+  def columns(*cols)
+    return if cols.empty?
+    define_method(:columns){cols}
+    @dataset.instance_variable_set(:@columns, cols) if @dataset
+    def_column_accessor(*cols)
+    @columns = cols
+    @db_schema = {}
+    cols.each{|c| @db_schema[c] = {}}
+  end
+  def simple_table
+    nil
+  end
+end
+
+module Rails
+  def self.root
+    File.dirname(__FILE__)
+  end
+
+  def self.env
+    'test'
+  end
+
+  def self.logger
+    Logger.new(STDOUT)
+  end
+end
+
+Sequel::Model.use_transactions = false
+Sequel::Model.db = MODEL_DB = MockDatabase.new

data/spec/version_spec.rb

@@ -0,0 +1,9 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'rails_sequel/version'
+
+describe RailsSequel, '#version' do
+  it "returns correct version" do
+    RailsSequel.version.should_not be_empty
+    RailsSequel.version.should =~ /^\d.\d.\d$/
+  end
+end

data/tasks/sequel.rake

@@ -0,0 +1,38 @@
+# Usage:
+#
+# rake sequel:migrate
+# rake sequel:migrate VERSION=0
+# rake sequel:migrate VERSION=3
+#
+desc 'Sequel migration'
+namespace :sequel do
+  def path
+    File.join(RAILS_ROOT, 'db', 'migrate')
+  end
+  
+  namespace :migrate do
+    desc 'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x'
+    task :redo => [ 'sequel:rollback', 'sequel:migrate' ]
+  end
+  
+  desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
+  task :migrate => :environment do
+    if ENV['VERSION']
+      Sequel::Migrator.apply(Sequel::Model.db, path, ENV['VERSION'].to_i)
+    else
+      Sequel::Migrator.apply(Sequel::Model.db, path)
+    end
+  end
+  
+  desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
+  task :rollback => :environment do
+    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+    version = Sequel::Migrator.get_current_migration_version(Sequel::Model.db) - step
+    Sequel::Migrator.apply(Sequel::Model.db, path, version)
+  end
+  
+  desc "Retrieves the current schema version number"
+  task :version => :environment do
+    puts "Current version: #{Sequel::Migrator.get_current_migration_version(Sequel::Model.db)}"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_sequel
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - Piotr Usewicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-10 00:00:00 +00:00
+date: 2009-10-09 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -19,20 +19,36 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- LICENSE
+- README.md
 files: 
+- .document
+- .gitignore
+- LICENSE
+- README.md
+- Rakefile
+- VERSION.yml
+- init.rb
+- lib/rails_sequel.rb
 - lib/rails_sequel/rails_sequel.rb
 - lib/rails_sequel/sequel_ext.rb
 - lib/rails_sequel/version.rb
-- lib/rails_sequel.rb
-- init.rb
-- README.md
-has_rdoc: false
-homepage: http://github.com/pusewicz/rails_sequel/wikis
-post_install_message: 
-rdoc_options: []
+- rails_sequel.gemspec
+- spec/config/database.yml
+- spec/rails_sequel_spec.rb
+- spec/sequel_ext_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/version_spec.rb
+- tasks/sequel.rake
+has_rdoc: true
+homepage: http://github.com/pusewicz/rails_sequel
+licenses: []
 
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -50,9 +66,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Sequel plugin for Ruby on Rails
-test_files: []
-
+test_files: 
+- spec/rails_sequel_spec.rb
+- spec/sequel_ext_spec.rb
+- spec/spec_helper.rb
+- spec/version_spec.rb