with_model 0.1 → 0.1.1

data/gemfiles/Gemfile.common

@@ -2,6 +2,8 @@ source :rubygems
 
 # gemspec :path => File.join(File.dirname(__FILE__), '..')
 
+gem "mixico"
+
 group :test do
   gem "autotest"
   gem "sqlite3-ruby"

data/gemfiles/rspec1/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
       activesupport (= 2.3.5)
     activesupport (2.3.5)
     autotest (4.4.2)
+    mixico (0.1.4)
     rspec (1.3.1)
     sqlite3-ruby (1.3.2)
 
@@ -14,5 +15,6 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 2.3.5)
   autotest
+  mixico
   rspec (~> 1.0)
   sqlite3-ruby

data/gemfiles/rspec2/Gemfile.lock

@@ -16,6 +16,7 @@ GEM
     builder (2.1.2)
     diff-lcs (1.1.2)
     i18n (0.4.2)
+    mixico (0.1.4)
     rspec (2.1.0)
       rspec-core (~> 2.1.0)
       rspec-expectations (~> 2.1.0)
@@ -33,5 +34,6 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 3.0.0)
   autotest
+  mixico
   rspec (~> 2.0)
   sqlite3-ruby

data/lib/with_model/base.rb

@@ -0,0 +1,27 @@
+require 'mixico'
+
+module WithModel
+  class Base < ActiveRecord::Base
+    class << self
+      def with_model?
+        true
+      end
+
+      def include(*args)
+        @modules_to_unmix ||= []
+        args.each do |mod|
+          unless @modules_to_unmix.include?(mod)
+            @modules_to_unmix << mod
+          end
+        end
+        super
+      end
+
+      def _with_model_deconstructor
+        @modules_to_unmix.each do |mod|
+          disable_mixin mod
+        end if defined?(@modules_to_unmix)
+      end
+    end
+  end
+end

data/lib/with_model/dsl.rb

@@ -1,3 +1,5 @@
+require 'with_model/base'
+
 module WithModel
   class Dsl
     attr_reader :model_initialization
@@ -18,22 +20,19 @@ module WithModel
         attr_accessor name
       end
 
+      model = Class.new(WithModel::Base)
+
       example_group.before do
-        model = Class.new(ActiveRecord::Base)
         silence_warnings { Object.const_set(const_name, model) }
         Object.const_get(const_name).class_eval do
           set_table_name table_name
-          class << self
-            def with_model?
-              true
-            end
-          end
           self.class_eval(&dsl.model_initialization)
         end
         send("#{name}=", model)
       end
 
       example_group.after do
+        model._with_model_deconstructor
         Object.send(:remove_const, const_name)
         Object.const_set(const_name, original_const_value) if original_const_defined
       end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.1"
+  VERSION = "0.1.1"
 end

data/spec/with_model_spec.rb

@@ -95,4 +95,33 @@ describe "a temporary ActiveRecord model created with with_model" do
       BlogPosts.should == blog_posts
     end
   end
+
+  module AMixin
+    def foo
+    end
+  end
+
+  context "with a mixin" do
+    with_model :with_a_mixin do
+      table {}
+      model do
+        include AMixin
+      end
+    end
+
+    before { ::ModelWithMixin = WithAMixin }
+
+    it "should have the mixin" do
+      lambda { ::ModelWithMixin.new.foo }.should_not raise_error
+      ::ModelWithMixin.include?(AMixin).should be_true
+    end
+  end
+
+  context "after a context that uses a mixin" do
+    it "should not have the mixin" do
+      lambda { ::ModelWithMixin.new.foo }.should raise_error(NoMethodError)
+      ::ModelWithMixin.include?(AMixin).should be_false
+    end
+  end
+
 end

data/with_model.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activerecord', '>=2.3.5', '<4.0.0'
+  s.add_dependency 'mixico'
 end

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: with_model
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  version: "0.1"
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Case Commons, LLC
@@ -13,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 -05:00
+date: 2010-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -31,6 +34,7 @@ dependencies:
         version: 2.3.5
     - - <
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 4
         - 0
@@ -38,6 +42,20 @@ dependencies:
         version: 4.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mixico
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Dynamically build a model within an Rspec context
 email: 
 - casecommons-dev@googlegroups.com
@@ -60,6 +78,7 @@ files:
 - gemfiles/rspec2/Gemfile
 - gemfiles/rspec2/Gemfile.lock
 - lib/with_model.rb
+- lib/with_model/base.rb
 - lib/with_model/dsl.rb
 - lib/with_model/version.rb
 - spec/active_record_behaviors_spec.rb
@@ -80,6 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -88,6 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"