redhillonrails_core 1.0.8 → 1.0.9

data/.rvmrc

@@ -0,0 +1 @@
+rvm 1.8.7@redhillonrails_core

data/Gemfile

@@ -0,0 +1,20 @@
+source :rubygems
+
+gem "pg"
+gem "activerecord", "< 3.0.0"
+gem "rake"
+
+group :development, :test do
+  gem "jeweler"
+  gem "micronaut"
+
+  platforms :ruby_18 do
+    gem "ruby-debug"
+  end
+
+  platforms :ruby_19 do
+    gem "ruby-debug19"
+  end
+end
+
+# vim: ft=ruby

data/Gemfile.lock

@@ -0,0 +1,50 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activerecord (2.3.10)
+      activesupport (= 2.3.10)
+    activesupport (2.3.10)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.1)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    micronaut (0.3.0)
+    pg (0.9.0)
+    rake (0.8.7)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (< 3.0.0)
+  jeweler
+  micronaut
+  pg
+  rake
+  ruby-debug
+  ruby-debug19

data/README.rdoc

@@ -142,7 +142,7 @@ Partial indexes index only a portion of the database. Only PostgreSQL supports t
 
 Create expression-based indexes:
 
-  add_index :users, [:first_name, :last_name], :expression => 'LOWER(first_name || last_name)'
+  add_index :users, [:first_name, :last_name], :expression => 'LOWER(first_name || ' ' || last_name)'
   add_index :places, :expression => 'sin(lat) * cos(lng)', :name => 'index_places_on_something'
   add_index :documents, :body, :expression => "USING gin (to_tsvector('english', body))" 
 
@@ -172,6 +172,15 @@ The plugin also adds a method--<code>defining?()</code>--to
 <code>ActiveRecord::Schema</code> to indicate when <code>define()</code> is running. This is necessary
 as some migration plugins must change their behaviour accordingly.
 
+=== Examples
+
+redhillonrails_core uses Micronaut for specing. The examples are split per-database adapter. Run using Bundler:
+
+  $ bundle install
+  $ bundle exec rake postgresql:examples
+
+Running examples only will fail since the environment won't be setup properly.
+
 === Contributors
 
 * François Beausoleil - http://github.com/francois

data/Rakefile

@@ -12,6 +12,10 @@ begin
     gem.homepage = "http://github.com/mlomnicki/redhillonrails_core"
     gem.authors = ["Michał Łomnicki"]
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+
+    gem.add_dependency "activerecord", "< 3.0.0"
+
+    gem.add_development_dependency "micronaut"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -38,10 +42,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
-task :default => :test
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
@@ -51,3 +51,26 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require "micronaut/rake_task"
+Micronaut::RakeTask.new(:examples) do |examples|
+  examples.pattern = "examples/**/*_example.rb"
+  examples.ruby_opts << "-Ilib -Iexamples"
+end
+
+Micronaut::RakeTask.new(:rcov) do |examples|
+  examples.pattern = "examples/**/*_example.rb"
+  examples.rcov_opts = "-Ilib -Iexamples"
+  examples.rcov = true
+end
+
+task :examples => :check_dependencies
+
+task :default => :examples
+
+namespace :postgresql do
+  task :examples do
+    ENV["ADAPTER"] = "postgresql"
+    Rake::Task["examples"].invoke
+  end
+end

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/examples/example_helper.rb

@@ -0,0 +1,44 @@
+require "micronaut"
+require "active_record"
+require "redhillonrails_core"
+require "fileutils"
+
+begin
+  require "ruby-debug"
+rescue LoadError
+  # Don't care - debugging won't be available
+end
+
+# Log data somewhere interesting
+FileUtils.mkdir_p("log") rescue nil
+ActiveRecord::Base.logger = Logger.new("log/test.log")
+
+# The model we'll be playing along with. Nothing ActiveRecord-like is expected or required here.
+class User < ActiveRecord::Base
+end
+
+# We drop and reload the schema on all specs, to make it easier to know what'll be in the DB
+case ENV["ADAPTER"]
+when "postgresql"
+  ActiveRecord::Base.establish_connection :adapter => "postgresql", :database => "redhillonrails_core_test", :min_messages => "warning"
+else
+  raise ArgumentError, "ADAPTER environment variable left unset: run tests and set ADAPTER to a known value. Valid values are: postgresql"
+end
+
+Micronaut.configure do |c|
+  c.before :each do
+    @migrator.suppress_messages do
+      @migrator.up
+    end
+  end
+
+  c.before :each do
+    User.reset_column_information
+  end
+
+  c.after :each do
+    @migrator.suppress_messages do
+      @migrator.down
+    end
+  end
+end

data/examples/postgresql_index_parser_example.rb

@@ -0,0 +1,198 @@
+require "example_helper"
+require "red_hill_consulting/core/active_record/connection_adapters/postgresql_adapter"
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "simple indexes" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username
+        end
+
+        add_index :users, :username
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse the index and return appropriate information" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.name.should == "index_users_on_username"
+    index.columns.should == ["username"]
+    index.unique.should == false
+    index.should be_case_sensitive
+    index.expression.should be_nil
+  end
+
+end
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "unique indexes" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username
+        end
+
+        add_index :users, :username, :unique => true, :case_sensitive => true
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse the index and return appropriate information" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.name.should == "index_users_on_username"
+    index.columns.should == ["username"]
+    index.unique.should == true
+    index.should be_case_sensitive
+    index.expression.should be_nil
+  end
+
+end
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "case-insensitive indexes" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username
+        end
+
+        add_index :users, :username, :case_sensitive => false
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse the index and return appropriate information" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.name.should == "index_users_on_username"
+    index.columns.should == ["username"]
+    index.unique.should == false
+    index.should_not be_case_sensitive
+    index.expression.should be_nil
+  end
+
+end
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "partial indexes" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username, :state
+        end
+
+        add_index :users, :username, :unique => true, :name => "index_users_on_active_usernames", :conditions => {:state => "active"}
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse conditional index and report conditions" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.should be_case_sensitive
+    index.columns.should == ["username"]
+
+    # FIXME: This is subject to change depending on the PostgreSQL version
+    index.conditions.should == "state::text = 'active'::text"
+  end
+
+end
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "expression indexes" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username, :state
+        end
+
+        add_index :users, :expression => "USING gin (to_tsvector('english', username))", :name => "index_users_full_text"
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse conditional index and report conditions" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.unique.should == false
+    index.should be_case_sensitive
+    index.columns.should be_nil
+
+    # FIXME: This is subject to change depending on the PostgreSQL version
+    index.conditions.should be_nil
+    index.expression.should == "gin (to_tsvector('english'::regconfig, username::text))"
+  end
+
+end
+
+describe RedHillConsulting::Core::ActiveRecord::ConnectionAdapters::PostgresqlAdapter, "case insensitive + partial index" do
+
+  before :all do
+    @migrator = Class.new(ActiveRecord::Migration) do
+      def self.up
+        create_table :users do |t|
+          t.string :username, :state
+        end
+
+        add_index :users, :username, :unique => true, :case_sensitive => false, :conditions => {:state => %w(active suspended invited)}
+      end
+
+      def self.down
+        drop_table :users
+      end
+    end
+  end
+
+  it "should parse as an expression index" do
+    indexes = User.indexes
+    indexes.length.should == 1
+
+    index = indexes.first
+    index.unique.should == false   # We don't attempt to determine if this is true/false when it's an expression index
+    index.should be_case_sensitive # Same here: return the default value - expression trumps all other values
+    index.columns.should be_nil    # And we know the columns aren't specified when it's an expression
+
+    # FIXME: This is subject to change depending on the PostgreSQL version
+    index.conditions.should be_nil
+    index.expression.should == "btree (lower(username::text)) WHERE state::text = ANY (ARRAY['active'::character varying, 'suspended'::character varying, 'invited'::character varying]::text[])"
+  end
+
+end

data/lib/red_hill_consulting/core/active_record/base.rb

@@ -26,7 +26,7 @@ module RedHillConsulting::Core::ActiveRecord
           columns_without_redhillonrails_core
           cols = columns_hash
           indexes.each do |index|
-            next if index.columns.empty?
+            next if index.columns.blank?
             column_name = index.columns.reverse.detect { |name| name !~ /_id$/ } || index.columns.last
             column = cols[column_name]
             column.case_sensitive = index.case_sensitive?

data/lib/red_hill_consulting/core/active_record/connection_adapters/abstract_adapter.rb

@@ -9,7 +9,11 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
       initialize_without_redhillonrails_core(*args)
       adapter = nil
       case adapter_name
-      when 'MySQL' 
+      # name of MySQL adapter depends on mysql gem
+      # * with mysql gem adapter is named MySQL
+      # * with mysql2 gem adapter is named Mysql2
+      # Here we handle this and hopefully futher adapter names
+      when /^MySQL/i 
         adapter = 'MysqlAdapter'
       when 'PostgreSQL' 
         adapter = 'PostgresqlAdapter'

data/lib/red_hill_consulting/core/active_record/connection_adapters/postgresql_adapter.rb

@@ -65,7 +65,18 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
       result.each do |(index_name, unique, index_def)|
         case_sensitive_match = INDEX_CASE_INSENSITIVE_REGEX.match(index_def)
         partial_index_match = INDEX_PARTIAL_REGEX.match(index_def)
-        if case_sensitive_match || partial_index_match
+        if non_btree_match = INDEX_NON_BTREE_REGEX.match(index_def) || (case_sensitive_match && partial_index_match) then
+          # If we have both types of indexes simultaneously, we don't try to parse it all: simply assume it's an expression index
+          indexes.delete_if { |index| index.name == index_name } # prevent duplicated indexes
+
+          index = ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, false, nil)
+          index.expression = if case_sensitive_match then
+                               index_def.split(/using/i, 2).last.strip
+                             else
+                               non_btree_match[1]
+                             end
+          indexes << index
+        elsif case_sensitive_match || partial_index_match then
           # column_definitions may be ie. 'LOWER(lower)' or 'login, deleted_at' or LOWER(login), deleted_at
           column_definitions = case_sensitive_match ? case_sensitive_match[1] : partial_index_match[1] 
 
@@ -73,17 +84,11 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
           column_names = determine_index_column_names(column_definitions)
 
           index = ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, unique == "t", column_names)
-          index.case_sensitive = !!case_sensitive_match
+          index.case_sensitive = !case_sensitive_match
           # conditions may be ie. active = true AND deleted_at IS NULL. 
           index.conditions = partial_index_match[2] if partial_index_match 
           indexes << index
 
-        elsif non_btree_match = INDEX_NON_BTREE_REGEX.match(index_def) then
-          indexes.delete_if { |index| index.name == index_name } # prevent duplicated indexes
-
-          index = ActiveRecord::ConnectionAdapters::IndexDefinition.new(table_name, index_name, false, [])
-          index.expression = non_btree_match[1]
-          indexes << index
         end
       end
 

data/lib/redhillonrails_core.rb

@@ -24,7 +24,7 @@ module RedHillConsulting::Core::ActiveRecord::ConnectionAdapters
   autoload :Mysql4Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql4_adapter'
   autoload :Mysql5Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql5_adapter'
   autoload :PostgresqlAdapter, 'red_hill_consulting/core/active_record/connection_adapters/postgresql_adapter'
-  autoload :Sqlite3Adapter, 'red_hill_consulting/core/active_record/connection_adapters/mysql_adapter'
+  autoload :Sqlite3Adapter, 'red_hill_consulting/core/active_record/connection_adapters/sqlite3_adapter'
 end
 
 ActiveRecord::Base.send(:include, RedHillConsulting::Core::ActiveRecord::Base)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - "Micha\xC5\x82 \xC5\x81omnicki"
@@ -14,10 +14,121 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-12-11 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  prerelease: false
+  type: :runtime
+  name: pg
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id002
+  prerelease: false
+  type: :runtime
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  prerelease: false
+  type: :runtime
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  prerelease: false
+  type: :development
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
+  prerelease: false
+  type: :development
+  name: micronaut
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
+  prerelease: false
+  type: :development
+  name: ruby-debug
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
+  prerelease: false
+  type: :development
+  name: ruby-debug19
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id008
+  prerelease: false
+  type: :runtime
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+  prerelease: false
+  type: :development
+  name: micronaut
 description: RedHill on Rails Core is a plugin that features to support other RedHill on Rails plugins. It creates and drops views and foreign-keys or obtains indexes directly from a model class.
 email: michal.lomnicki@gmail.com
 executables: []
@@ -28,12 +139,16 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rvmrc
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
+- examples/example_helper.rb
+- examples/postgresql_index_parser_example.rb
 - init.rb
 - lib/red_hill_consulting/core.rb
 - lib/red_hill_consulting/core/active_record.rb
@@ -60,12 +175,11 @@ homepage: http://github.com/mlomnicki/redhillonrails_core
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -73,7 +187,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -83,9 +196,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RedHill on Rails Core is a plugin that features to support other RedHill on Rails plugins
-test_files: []
-
+test_files: 
+- examples/example_helper.rb
+- examples/postgresql_index_parser_example.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC