activerecord-tableless 1.1.2 → 1.1.3

data/activerecord-tableless.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.version       = "1.1.2"
+  gem.version       = "1.1.3"
   gem.has_rdoc      = true
 
   gem.require_paths = ["lib"]

data/lib/activerecord-tableless.rb

@@ -143,6 +143,7 @@ module ActiveRecord
       def transaction(&block)
         case tableless_options[:database]
         when :pretend_success
+          @_current_transaction_records ||= []
           yield
         when :fail_fast
           raise NoDatabase.new("Can't #transaction on Tableless class")
@@ -224,6 +225,12 @@ module ActiveRecord
         end
       end
       
+      if ActiveRecord::VERSION::STRING < "3.0"
+      else
+        def add_to_transaction
+        end
+      end
+
       private
       
         def escaped_var_name(name, prefix = nil)

data/spec/lib/activerecord-tableless_spec.rb

@@ -3,67 +3,89 @@ require 'active_record'
 require 'activerecord-tableless'
 require 'logger'
 
-ActiveRecord::Base.logger = Logger.new(STDERR)
-ActiveRecord::Base.logger.level = Logger::Severity::UNKNOWN
-
-class ChairFailure < ActiveRecord::Base
-  has_no_table
-  column :id, :integer
-  column :name, :string
+def make_tableless_model(database = nil, nested = nil)
+  eval <<EOCLASS
+  class Chair < ActiveRecord::Base
+    #{database ? "has_no_table :database => :#{database}" : 'has_no_table'}
+    column :id, :integer
+    column :name, :string
+    #{if nested 
+      '
+      has_many :arm_rests
+      accepts_nested_attributes_for :arm_rests 
+      '
+      end}
+  end
+EOCLASS
+  if nested
+  eval <<EOCLASS
+    class ArmRest < ActiveRecord::Base
+      has_no_table
+      column :id, :integer
+      column :chair_id, :integer
+      column :name, :string
+    end
+EOCLASS
+  end
 end
 
-class ChairPretend < ActiveRecord::Base
-  has_no_table :database => :pretend_success
-  column :id, :integer
-  column :name, :string
+def remove_models
+  Object.send(:remove_const, :Chair) rescue nil
+  Object.send(:remove_const, :ArmRest) rescue nil
 end
 
-describe "Tableless attributes" do
+ActiveRecord::Base.logger = Logger.new(STDERR)
+ActiveRecord::Base.logger.level = Logger::Severity::UNKNOWN
 
-  subject { ChairFailure.new }
+shared_examples_for "an active record" do
   it { should respond_to :id }
   it { should respond_to :id= }
   it { should respond_to :name }
   it { should respond_to :name= }
+end
 
+shared_examples_for "nested model" do
+  
 end
 
 describe "Tableless with fail_fast" do
-  let!(:klass) { ChairFailure }
-  subject { ChairFailure.new }
+  before(:all) {make_tableless_model(nil, nil)}
+  after(:all){ remove_models }
+  subject { Chair.new }
 
+  it_behaves_like "an active record"
   describe "class" do
     if ActiveRecord::VERSION::STRING < "3.0"
       describe "#find" do
         it "raises ActiveRecord::Tableless::NoDatabase" do
-          expect { klass.find(1) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+          expect { Chair.find(1) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
         end
       end
       describe "#find(:all)" do
         it "raises ActiveRecord::Tableless::NoDatabase" do
-          expect { klass.find(:all) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+          expect { Chair.find(:all) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
         end
       end
     else ## ActiveRecord::VERSION::STRING >= "3.0"
       describe "#all" do
         it "raises ActiveRecord::Tableless::NoDatabase" do
-          expect { klass.all }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+          expect { Chair.all }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
         end
       end
     end
     describe "#create" do
       it "raises ActiveRecord::Tableless::NoDatabase" do
-        expect { klass.create(:name => 'Jarl') }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+        expect { Chair.create(:name => 'Jarl') }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
       end
     end
     describe "#destroy" do
       it "raises ActiveRecord::Tableless::NoDatabase" do
-        expect { klass.destroy(1) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+        expect { Chair.destroy(1) }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
       end
     end
     describe "#destroy_all" do
       it "raises ActiveRecord::Tableless::NoDatabase" do
-        expect { klass.destroy_all }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
+        expect { Chair.destroy_all }.to raise_exception(ActiveRecord::Tableless::NoDatabase)
       end
     end
   end
@@ -96,25 +118,25 @@ shared_examples_for "a succeeding database" do
     if ActiveRecord::VERSION::STRING < "3.0"
       describe "#find" do
         it "raises ActiveRecord::RecordNotFound" do
-          expect { klass.find(314) }.to raise_exception(ActiveRecord::RecordNotFound)
+          expect { Chair.find(314) }.to raise_exception(ActiveRecord::RecordNotFound)
         end
       end
       describe "#find(:all)" do
-        specify { klass.find(:all) == []}
+        specify { Chair.find(:all) == []}
       end
     else ## ActiveRecord::VERSION::STRING >= "3.0"
       describe "#all" do
-        specify { klass.all == []}
+        specify { Chair.all == []}
       end
     end
     describe "#create" do
-      specify { klass.create(:name => 'Jarl') == true }
+      specify { Chair.create(:name => 'Jarl') == true }
     end
     describe "#destroy" do
-      specify { klass.destroy(1) == true }
+      specify { Chair.destroy(1) == true }
     end
     describe "#destroy_all" do
-      specify { klass.destroy_all == true }
+      specify { Chair.destroy_all == true }
     end
   end
 
@@ -141,20 +163,23 @@ describe "Active record with real database" do
     ActiveRecord::Base.connection.execute("drop table if exists chairs")
     ActiveRecord::Base.connection.execute("create table chairs (id INTEGER PRIMARY KEY, name TEXT )")
     
-    Object.send(:remove_const, Chair) rescue nil
     class Chair < ActiveRecord::Base
     end
   end
-  before(:all) do
+  after(:all) do
+    remove_models
     ActiveRecord::Base.clear_all_connections!
   end
-  let!(:klass) { Chair }
+
   subject { Chair.new(:name => 'Jarl') }
+  it_behaves_like "an active record"
   it_behaves_like "a succeeding database"
 end
 
 describe "Tableless with succeeding database" do
-  let!(:klass) { ChairPretend }
-  subject { ChairPretend.new(:name => 'Jarl') }
+  before(:all) { make_tableless_model(:pretend_success, nil) }
+  after(:all){ remove_models }
+  subject { Chair.new(:name => 'Jarl') }
+  it_behaves_like "an active record"
   it_behaves_like "a succeeding database"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tableless
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3602190657480695753
+      hash: 1824871736398580322
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3602190657480695753
+      hash: 1824871736398580322
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24