activerecord_views 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a3d25414ba7a2d31b49f8604f17f5c2d73824135
+  data.tar.gz: a68b23bae39199bfa2ae160dfc0bb0e091a2dc88
+SHA512:
+  metadata.gz: e41efe797b61dc942ac41b595b39b0d3c651b2e2966132b313b58f0d342f06fbb170239fc7fe079b879a7a60ea60f02688ee861b6d96f620b745fd4e7bdf2efe
+  data.tar.gz: 090e0cef956babdaacb0fb71199aff94a5e38f04c8b68f1c8b885c99e18f09d80a31e9c145aa0cf2d0ac66e77fe95fc8d530136d7840f34a104b260721b91784

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle
 Gemfile.lock
+gemfiles/*.gemfile.lock
 pkg
 spec/internal/log/*.log

data/Appraisals

@@ -0,0 +1,7 @@
+appraise 'rails3_2' do
+  gem 'rails', '~> 3.2.0'
+end
+
+appraise 'rails4_0' do
+  gem 'rails', '~> 4.0.0'
+end

data/README.markdown

@@ -14,7 +14,7 @@ Advantages over creating views manually in migrations include:
 
 Add this line to your application's `Gemfile`:
 
-```
+```ruby
 gem 'activerecord_views'
 ```
 
@@ -22,7 +22,7 @@ gem 'activerecord_views'
 
 app/models/account.rb:
 
-``` ruby
+```ruby
 class Account < ActiveRecord::Base
   has_many :transactions
 
@@ -33,7 +33,7 @@ end
 
 app/models/transaction.rb:
 
-``` ruby
+```ruby
 class Transaction < ActiveRecord::Base
   belongs_to :account
 end
@@ -41,7 +41,7 @@ end
 
 app/models/account_balance.rb:
 
-``` ruby
+```ruby
 class AccountBalance < ActiveRecord::Base
   is_view
 
@@ -51,7 +51,7 @@ end
 
 app/models/account_balance.sql:
 
-``` sql
+```sql
 SELECT accounts.id AS account_id, coalesce(sum(transactions.amount), 0) AS balance
 FROM accounts
 LEFT JOIN transactions ON accounts.id = transactions.account_id
@@ -60,7 +60,7 @@ GROUP BY accounts.id
 
 Example usage:
 
-``` ruby
+```ruby
 p Account.first.balance
 
 Account.includes(:account_balance).find_each do |account|
@@ -70,7 +70,7 @@ end
 
 ### Usage outside of Rails
 
-``` ruby
+```ruby
 require 'active_record'
 require 'active_record_views'
 ActiveRecordViews.load_path = ['.']

data/Rakefile

@@ -1 +1,14 @@
+require 'appraisal'
+require 'bundler/setup'
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default do
+  if ENV['BUNDLE_GEMFILE'] == File.expand_path('Gemfile')
+    exec 'rake appraisal:all'
+  else
+    Rake::Task['spec'].invoke
+  end
+end

data/activerecord_views.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activerecord', ['>= 3.1', '< 4.1']
 
+  gem.add_development_dependency 'appraisal'
   gem.add_development_dependency 'rspec-rails', '>= 2.14'
   gem.add_development_dependency 'combustion', '>= 0.5.1'
   gem.add_development_dependency 'pg'

data/gemfiles/rails3_2.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 3.2.0"
+
+gemspec :path=>"../"

data/gemfiles/rails4_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path=>"../"

data/lib/active_record_views/checksum_cache.rb

@@ -1,12 +1,5 @@
-require 'active_record'
-
 module ActiveRecordViews
   class ChecksumCache
-    class Model < ActiveRecord::Base
-      self.table_name = 'active_record_views'
-      self.primary_key = 'name'
-    end
-
     def initialize(connection)
       @connection = connection
       init_state_table!
@@ -19,15 +12,16 @@ module ActiveRecordViews
     end
 
     def get(name)
-      Model.where(:name => name).first_or_initialize.checksum
+      @connection.select_value("SELECT checksum FROM active_record_views WHERE name = #{@connection.quote name}")
     end
 
     def set(name, checksum)
-      row = Model.where(:name => name).first_or_initialize
       if checksum
-        row.update_attributes! :checksum => checksum
+        if @connection.update("UPDATE active_record_views SET checksum = #{@connection.quote checksum} WHERE name = #{@connection.quote name}") == 0
+          @connection.insert "INSERT INTO active_record_views (name, checksum) VALUES (#{@connection.quote name}, #{@connection.quote checksum})"
+        end
       else
-        row.destroy
+        @connection.delete "DELETE FROM active_record_views WHERE name = #{@connection.quote name}"
       end
     end
   end

data/lib/active_record_views/extension.rb

@@ -3,7 +3,7 @@ module ActiveRecordViews
     extend ActiveSupport::Concern
 
     def self.currently_migrating?
-      if defined? Rake
+      if defined?(Rake) && Rake.method_defined?(:application)
         Rake.application.top_level_tasks.include?('db:migrate')
       end
     end

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/lib/active_record_views.rb

@@ -25,31 +25,54 @@ module ActiveRecordViews
     raise "could not find #{name}.sql"
   end
 
+  def self.without_transaction(connection)
+    in_transaction = if connection.respond_to? :transaction_open?
+      connection.transaction_open?
+    else
+      !connection.outside_transaction?
+    end
+
+    if in_transaction
+      begin
+        temp_connection = connection.pool.checkout
+        yield temp_connection
+      ensure
+        connection.pool.checkin temp_connection
+      end
+    else
+      yield connection
+    end
+  end
+
   def self.create_view(connection, name, sql)
-    cache = ActiveRecordViews::ChecksumCache.new(connection)
-    checksum = Digest::SHA1.hexdigest(sql)
-    return if cache.get(name) == checksum
+    without_transaction connection do |connection|
+      cache = ActiveRecordViews::ChecksumCache.new(connection)
+      checksum = Digest::SHA1.hexdigest(sql)
+      return if cache.get(name) == checksum
 
-    begin
-      connection.execute "CREATE OR REPLACE VIEW #{connection.quote_table_name name} AS #{sql}"
-    rescue ActiveRecord::StatementInvalid => original_exception
       begin
-        connection.transaction :requires_new => true do
-          connection.execute "DROP VIEW #{connection.quote_table_name name}"
-          connection.execute "CREATE VIEW #{connection.quote_table_name name} AS #{sql}"
+        connection.execute "CREATE OR REPLACE VIEW #{connection.quote_table_name name} AS #{sql}"
+      rescue ActiveRecord::StatementInvalid => original_exception
+        begin
+          connection.transaction :requires_new => true do
+            connection.execute "DROP VIEW #{connection.quote_table_name name}"
+            connection.execute "CREATE VIEW #{connection.quote_table_name name} AS #{sql}"
+          end
+        rescue
+          raise original_exception
         end
-      rescue
-        raise original_exception
       end
-    end
 
-    cache.set name, checksum
+      cache.set name, checksum
+    end
   end
 
   def self.drop_view(connection, name)
-    cache = ActiveRecordViews::ChecksumCache.new(connection)
-    connection.execute "DROP VIEW IF EXISTS #{connection.quote_table_name name}"
-    cache.set name, nil
+    without_transaction connection do |connection|
+      cache = ActiveRecordViews::ChecksumCache.new(connection)
+      connection.execute "DROP VIEW IF EXISTS #{connection.quote_table_name name}"
+      cache.set name, nil
+    end
   end
 
   def self.register_for_reload(sql_path, model_path)

data/spec/active_record_views_extension_spec.rb

@@ -12,6 +12,11 @@ describe ActiveRecordViews::Extension do
       expect(ExternalFileTestModel.first.name).to eq 'External SQL file'
     end
 
+    it 'creates database views from namespaced external SQL files' do
+      expect(ActiveRecordViews).to receive(:create_view).once.and_call_original
+      expect(Namespace::TestModel.first.name).to eq 'Namespaced SQL file'
+    end
+
     it 'errors if external SQL file is missing' do
       expect {
         MissingFileTestModel
@@ -61,7 +66,6 @@ describe ActiveRecordViews::Extension do
         File.unlink sql_file
 
         expect(ActiveRecord::Base.connection).to receive(:execute).with(/\ADROP/).once.and_call_original
-        expect(ActiveRecord::Base.connection).to receive(:execute).with(/\A(?:RELEASE )?SAVEPOINT/).at_least(1).times.and_call_original
         test_request
         test_request # second request does not `drop_view` again
 

data/spec/active_record_views_spec.rb

@@ -4,19 +4,13 @@ describe ActiveRecordViews do
   describe '.create_view' do
     let(:connection) { ActiveRecord::Base.connection }
 
-    self.use_transactional_fixtures = false
-    after do
-      connection.execute 'DROP VIEW IF EXISTS test'
-      connection.execute 'DROP TABLE IF EXISTS active_record_views'
-    end
-
     def create_test_view(sql)
       ActiveRecordViews.create_view connection, 'test', sql
     end
 
     def test_view_sql
       connection.select_value <<-SQL
-        SELECT view_definition
+        SELECT trim(view_definition)
         FROM information_schema.views
         WHERE table_name = 'test'
       SQL
@@ -28,6 +22,15 @@ describe ActiveRecordViews do
       expect(test_view_sql).to eq 'SELECT 1 AS id;'
     end
 
+    it 'persists views if transaction rolls back' do
+      expect(test_view_sql).to be_nil
+      connection.transaction :requires_new => true do
+        create_test_view 'select 1 as id'
+        raise ActiveRecord::Rollback
+      end
+      expect(test_view_sql).to eq 'SELECT 1 AS id;'
+    end
+
     context 'with existing view' do
       before do
         create_test_view 'select 1 as id'

data/spec/internal/app/models/namespace/test_model.rb

@@ -0,0 +1,3 @@
+class Namespace::TestModel < ActiveRecord::Base
+  is_view
+end

data/spec/internal/app/models/namespace/test_model.sql

@@ -0,0 +1 @@
+SELECT 1 AS id, 'Namespaced SQL file'::text AS name;

data/spec/internal/config/database.yml

@@ -1,3 +1,4 @@
 test:
   adapter: postgresql
   database: activerecord_views_test
+  min_messages: warning

data/spec/spec_helper.rb

@@ -5,11 +5,28 @@ require 'combustion'
 require 'active_record_views'
 Combustion.initialize! :active_record, :action_controller do
   config.cache_classes = false
+  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
 end
 require 'rspec/rails'
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
+
+  config.before do
+    connection = ActiveRecord::Base.connection
+
+    connection.execute 'DROP TABLE IF EXISTS active_record_views'
+
+    view_names = connection.select_values <<-SQL
+      SELECT table_name
+      FROM information_schema.views
+      WHERE table_schema = 'public';
+    SQL
+    view_names.each do |view_name|
+      connection.execute "DROP VIEW IF EXISTS #{connection.quote_table_name view_name}"
+    end
+  end
+
 end
 
 def test_request

metadata

@@ -1,84 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2014-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -88,12 +93,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.markdown
 - Rakefile
 - activerecord_views.gemspec
+- gemfiles/rails3_2.gemfile
+- gemfiles/rails4_0.gemfile
 - lib/active_record_views.rb
 - lib/active_record_views/checksum_cache.rb
 - lib/active_record_views/extension.rb
@@ -107,39 +115,34 @@ files:
 - spec/internal/app/models/external_file_test_model.sql
 - spec/internal/app/models/heredoc_test_model.rb
 - spec/internal/app/models/missing_file_test_model.rb
+- spec/internal/app/models/namespace/test_model.rb
+- spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jasoncodes/activerecord_views
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3691843505786316541
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3691843505786316541
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Automatic database view creation for ActiveRecord
 test_files:
 - spec/active_record_views_extension_spec.rb
@@ -148,6 +151,8 @@ test_files:
 - spec/internal/app/models/external_file_test_model.sql
 - spec/internal/app/models/heredoc_test_model.rb
 - spec/internal/app/models/missing_file_test_model.rb
+- spec/internal/app/models/namespace/test_model.rb
+- spec/internal/app/models/namespace/test_model.sql
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/spec_helper.rb