oracle_enhanced 1.2.5 → 1.3.0.pre

data/Rakefile

@@ -11,7 +11,7 @@ Oracle "enhanced" ActiveRecord adapter contains useful additional methods for wo
 This adapter is superset of original ActiveRecord Oracle adapter.
 EOS
     gem.email = "raimonds.simanovskis@gmail.com"
-    gem.homepage = "http://github.com/plukevdh/oracle-enhanced"
+    gem.homepage = "http://github.com/rsim/oracle-enhanced"
     gem.authors = ["Raimonds Simanovskis"]
     gem.add_dependency "activerecord", ">= 2.0.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-1.2.5
+1.3.0.pre

data/lib/active_record/connection_adapters/oracle_enhanced.rake

@@ -15,14 +15,14 @@ namespace :db do
   namespace :structure do
     redefine_task :dump => :environment do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
-      File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-      File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.structure_dump_fk_constraints }
+      ActiveRecord::Base.establish_connection(abcs[Rails.env])
+      File.open("db/#{Rails.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+      File.open("db/#{Rails.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.structure_dump_fk_constraints }
       if ActiveRecord::Base.connection.supports_migrations?
-        File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
+        File.open("db/#{Rails.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
       end
-      if abcs[RAILS_ENV]['structure_dump'] == "db_stored_code"
-         File.open("db/#{RAILS_ENV}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.structure_dump_db_stored_code }
+      if abcs[Rails.env]['structure_dump'] == "db_stored_code"
+         File.open("db/#{Rails.env}_structure.sql", "a") { |f| f << ActiveRecord::Base.connection.structure_dump_db_stored_code }
       end
 
     end
@@ -32,7 +32,7 @@ namespace :db do
     redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
       ActiveRecord::Base.establish_connection(:test)
-      IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |ddl|
+      IO.readlines("db/#{Rails.env}_structure.sql").join.split("\n\n").each do |ddl|
         ddl.chop! if ddl.last == ";"
         ActiveRecord::Base.connection.execute(ddl) unless ddl.blank?
       end

data/lib/active_record/connection_adapters/oracle_enhanced_adapter.rb

@@ -128,8 +128,8 @@ module ActiveRecord
       end
       private :add_order_with_lobs!
       #:stopdoc:
-      alias_method :add_order_without_lobs!, :add_order!
-      alias_method :add_order!, :add_order_with_lobs!
+      alias_method :add_order!, :add_order_with_lobs! #rails 3 issues
+      alias_method :add_order_without_lobs!, :add_order!   
       #:startdoc:
     end
     
@@ -1641,7 +1641,7 @@ require 'active_record/connection_adapters/oracle_enhanced_dirty'
 begin
   require 'active_record/connection_adapters/oracle_enhanced_tasks'
 rescue LoadError
-end if defined?(RAILS_ROOT)
+end if defined?(Rails.root)
 
 # Handles quoting of oracle reserved words
 require 'active_record/connection_adapters/oracle_enhanced_reserved_words'

data/lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb

@@ -53,8 +53,8 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '1.9'
 
   rescue LoadError
     warning_message = "WARNING: Please install unicode_utils gem to support Unicode aware upcase and downcase for String#mb_chars"
-    if defined?(RAILS_DEFAULT_LOGGER)
-      RAILS_DEFAULT_LOGGER.warn warning_message
+    if !(Rails.logger.nil?)
+      Rails.logger.warn warning_message
     else
       STDERR.puts warning_message
     end

data/lib/active_record/connection_adapters/oracle_enhanced_tasks.rb

@@ -1,5 +1,5 @@
 # implementation idea taken from JDBC adapter
-if defined?(Rake.application) && Rake.application && ActiveRecord::Base.configurations[RAILS_ENV]['adapter'] == 'oracle_enhanced'
+if defined?(Rake.application) && Rake.application && ActiveRecord::Base.configurations[Rails.env]['adapter'] == 'oracle_enhanced'
   oracle_enhanced_rakefile = File.dirname(__FILE__) + "/oracle_enhanced.rake"
   if Rake.application.lookup("environment")
     # rails tasks already defined; load the override tasks now

data/lib/oracle_enhanced.rb

@@ -0,0 +1,3 @@
+#dummy for easier require
+
+require 'active_record/connection_adapters/oracle_enhanced_adapter'

data/oracle_enhanced.gemspec

@@ -0,0 +1,98 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{oracle_enhanced}
+  s.version = "1.3.0.pre"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Raimonds Simanovskis"]
+  s.date = %q{2010-03-03}
+  s.description = %q{Oracle "enhanced" ActiveRecord adapter contains useful additional methods for working with new and legacy Oracle databases.
+This adapter is superset of original ActiveRecord Oracle adapter.
+}
+  s.email = %q{raimonds.simanovskis@gmail.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "License.txt",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/active_record/connection_adapters/emulation/oracle_adapter.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced.rake",
+     "lib/active_record/connection_adapters/oracle_enhanced_adapter.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_connection.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_core_ext.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_cpk.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_dirty.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_jdbc_connection.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_oci_connection.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_procedures.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_reserved_words.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_schema_definitions.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_schema_dumper.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_tasks.rb",
+     "lib/active_record/connection_adapters/oracle_enhanced_version.rb",
+     "lib/oracle_enhanced.rb",
+     "oracle_enhanced.gemspec",
+     "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/rsim/oracle-enhanced}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Oracle enhanced adapter for ActiveRecord}
+  s.test_files = [
+    "spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_core_ext_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_cpk_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_data_types_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_dbms_output_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_dirty_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_emulate_oracle_adapter_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_procedures_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_schema_dump_spec.rb",
+     "spec/active_record/connection_adapters/oracle_enhanced_schema_spec.rb",
+     "spec/spec_helper.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
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    else
+      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+  end
+end
+

data/spec/spec_helper.rb

@@ -40,11 +40,14 @@ if ENV['RAILS_GEM_VERSION'] >= '2.3'
 else
   require 'action_controller/session/active_record_store'
 end
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby'
-  gem 'ruby-oci8', '>=2.0.4'
+if !defined?(RUBY_ENGINE)
+  gem 'ruby-oci8', '=2.0.3'
+  require 'oci8'
+elsif RUBY_ENGINE == 'ruby'
+  gem 'ruby-oci8', '=2.0.3'
   require 'oci8'
 elsif RUBY_ENGINE == 'jruby'
-  gem 'activerecord-jdbc-adapter'
+  gem "activerecord-jdbc-adapter"
   require 'active_record/connection_adapters/jdbc_adapter'
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oracle_enhanced
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
-  - 2
-  - 5
-  version: 1.2.5
+  - 3
+  - 0
+  - pre
+  version: 1.3.0.pre
 platform: ruby
 authors: 
 - Raimonds Simanovskis
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 -05:00
+date: 2010-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +81,8 @@ files:
 - lib/active_record/connection_adapters/oracle_enhanced_schema_statements_ext.rb
 - lib/active_record/connection_adapters/oracle_enhanced_tasks.rb
 - lib/active_record/connection_adapters/oracle_enhanced_version.rb
+- lib/oracle_enhanced.rb
+- oracle_enhanced.gemspec
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_adapter_structure_dumper_spec.rb
 - spec/active_record/connection_adapters/oracle_enhanced_connection_spec.rb
@@ -95,7 +98,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/plukevdh/oracle-enhanced
+homepage: http://github.com/rsim/oracle-enhanced
 licenses: []
 
 post_install_message: 
@@ -112,11 +115,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: