with_model 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+### 0.2.2
+
+The table block is now optional.
+
 ### 0.2.1
 
 Fix a bug when the with_model name contains capital letters. Now you can

data/lib/with_model.rb

@@ -2,7 +2,7 @@ require "with_model/dsl"
 
 module WithModel
   def with_model(name, &block)
-    Dsl.new(name, self).instance_eval(&block)
+    Dsl.new(name, self).tap { |dsl| dsl.instance_eval(&block) }.execute
   end
 
   def with_table(name, options = {}, &block)

data/lib/with_model/dsl.rb

@@ -3,43 +3,50 @@ require 'active_support/inflector'
 
 module WithModel
   class Dsl
-    attr_reader :model_initialization
+    NOOP = lambda {|*|}
 
     def initialize(name, example_group)
-      dsl = self
-
+      @name = name
       @example_group = example_group
-      @table_name = table_name = "with_model_#{name.to_s.tableize}_#{$$}"
-      @model_initialization = lambda {|*|}
+      @model_initialization = NOOP
+      @table_block = NOOP
+      @table_options = {}
+    end
+
+    def table(options = {}, &block)
+      @table_options = options
+      @table_block = block
+    end
 
-      const_name = name.to_s.camelize.to_sym
+    def model(&block)
+      @model_initialization = block
+    end
+
+    def execute
+      model_initialization = @model_initialization
+      const_name = @name.to_s.camelize.to_sym
+      table_name = "with_model_#{@name.to_s.tableize}_#{$$}"
 
       original_const_defined = Object.const_defined?(const_name)
       original_const_value = Object.const_get(const_name) if original_const_defined
 
       model = Class.new(WithModel::Base)
 
-      example_group.before do
+      @example_group.before do
         silence_warnings { Object.const_set(const_name, model) }
         Object.const_get(const_name).class_eval do
           set_table_name table_name
-          self.class_eval(&dsl.model_initialization)
+          self.class_eval(&model_initialization)
         end
       end
 
-      example_group.after do
-        model._with_model_deconstructor if defined?(Mixico)
+      @example_group.after do
+        model._with_model_deconstructor if model.respond_to?(:_with_model_deconstructor)
         Object.send(:remove_const, const_name)
         Object.const_set(const_name, original_const_value) if original_const_defined
       end
-    end
 
-    def table(options = {}, &block)
-      @example_group.with_table(@table_name, options, &block)
-    end
-
-    def model(&block)
-      @model_initialization = block
+      @example_group.with_table(table_name, @table_options, &@table_block)
     end
   end
 end

data/lib/with_model/version.rb

@@ -1,3 +1,3 @@
 module WithModel
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/with_model_spec.rb

@@ -195,4 +195,24 @@ describe "a temporary ActiveRecord model created with with_model" do
 
   end
 
+  context "without a table block" do
+    with_model :blog_post do
+    end
+
+    it "should act like a normal ActiveRecord model" do
+      record = BlogPost.create!
+      record.reload
+      record.destroy
+      lambda {
+        record.reload
+      }.should raise_error(ActiveRecord::RecordNotFound)
+    end
+
+    if defined?(ActiveModel)
+      describe "the class" do
+        subject { BlogPost.new }
+        it_should_behave_like "ActiveModel"
+      end
+    end
+  end
 end

metadata

@@ -1,38 +1,42 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: with_model
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000 -04:00
+
+date: 2011-07-11 00:00:00 -04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &2164522740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 2.3.5
     - - <
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 4.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2164522740
+  version_requirements: *id001
 description: Dynamically build a model within an Rspec context
-email:
+email: 
 - casecommons-dev@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .autotest
 - .gitignore
 - .rspec
@@ -56,29 +60,32 @@ files:
 has_rdoc: true
 homepage: https://github.com/Casecommons/with_model
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Dynamically build a model within an Rspec context
-test_files:
+test_files: 
 - spec/active_record_behaviors_spec.rb
 - spec/readme_spec.rb
 - spec/spec_helper.rb