acts_as_acts_as 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/acts_as_acts_as/group_macros.rb

@@ -1,3 +1,5 @@
+require 'acts_as_acts_as/requirements'
+
 # Methods available _at the same level as_ examples, including methods that
 # themselves define examples, before, and after blocks
 module ActsAsActsAs::GroupMacros
@@ -22,17 +24,19 @@ module ActsAsActsAs::GroupMacros
   #   end
   def acts_as(acts_as_method, &block)
     # Now use our new object to let the block build up requirements
-    collector = ActsAsActsAs::RequirementsCollector.new
+    collector = ActsAsActsAs::Requirements::Collector.new
+    verifier = ActsAsActsAs::Requirements::Verifier.new(acts_as_method)
+
+    extend ActsAsActsAs::Requirements::Collector::Context
+
     yield collector
 
 
     describe "Acts As Plugin #{acts_as_method}" do
-
-      verifier.verify_requirements(acts_as_method, collector)
+      verifier.verify_requirements(collector)
     end
 
     before(:all) do
-
       ActsAsBillable::BillableObjects.classes_using_billing = []
 
       @valid_model = tableless_model(
@@ -49,7 +53,6 @@ module ActsAsActsAs::GroupMacros
 
       @valid_model_with_table = temp_model(@model_opts)
       @valid_model_with_table.send(acts_as_method)
-
     end
 
     after(:all) do

data/lib/acts_as_acts_as/requirements/collector.rb

@@ -37,9 +37,9 @@ class ActsAsActsAs::Requirements::Collector
     all.inject({}) { |h, c| h.merge(c.requirements) }
   end
 
-  class Context
+  module Context
     [:require_methods, :require_columns, :define_methods, :define_class_methods].each do |x|
-      define_method x { |*args| [x, args] }
+      define_method(x) { |*args| [x, args] }
     end
   end
 

data/lib/acts_as_acts_as/requirements/verifier.rb

@@ -1,26 +1,31 @@
 class ActsAsActsAs::Requirements::Verifier
 
   attr_accessor :acts_as_method
+  include ActsAsActsAs::Macros
 
   def initialize(acts_as_method)
     @acts_as_method = acts_as_method
   end
 
   def verify_requirements(collector)
+    verifier       = self
+    acts_as_method = self.acts_as_method
     collector.all.each do |c|
       describe "with options: #{c.options.inspect}" do
         c.requirements.each_pair do |method, args|
-          send(method, acts_as_method, c.options, c.requirements, *args)
+          verifier.send(method, c.options, c.requirements, *args)
         end
       end 
     end
   end
 
   def require_methods(options, reqs, *methods)
+    verifier       = self
+    acts_as_method = @acts_as_method
     describe 'required methods' do
       methods.each do |meth|
         it "#{meth} must be defined in caller" do
-          mod = tableless_model(
+          mod = verifier.tableless_model(
             :columns => reqs[:require_methods],
             :methods => reqs[:require_methods].reject { |rm| rm == meth }
           )
@@ -31,10 +36,12 @@ class ActsAsActsAs::Requirements::Verifier
   end
 
   def require_columns(options, reqs, *columns)
+    verifier       = self
+    acts_as_method = @acts_as_method
     describe 'required columns' do
       columns.each do |c|
         it "#{c[0]} must be defined as column in caller" do
-          m = tableless_model(
+          m = verifier.tableless_model(
             :columns => reqs[:require_columns].reject { |rc| rc == c },
             :methods => reqs[:require_methods]
           )
@@ -42,11 +49,11 @@ class ActsAsActsAs::Requirements::Verifier
         end
 
         it "#{c[0]} must be of type #{c[1]}" do
-          goodm = tableless_model(
+          goodm = verifier.tableless_model(
             :columns => reqs[:require_columns],
             :methods => reqs[:require_methods]
           )
-          badm = tableless_model(
+          badm = verifier.tableless_model(
             :columns => reqs[:require_columns].map { |rc| (rc != c) ? rc : [rc[0], :badcoltype]},
             :methods => reqs[:require_methods]
           )
@@ -58,10 +65,12 @@ class ActsAsActsAs::Requirements::Verifier
   end
 
   def define_methods(options, reqs, *methods)
+    verifier       = self
+    acts_as_method = @acts_as_method
     describe 'defined methods' do
       methods.each do |meth|
         it "#{meth} method is defined automatically" do
-          mod = tableless_model(
+          mod = verifier.tableless_model(
             :columns => reqs[:require_columns],
             :methods => reqs[:require_methods]
           )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_acts_as
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - phinze
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -06:00
+date: 2010-02-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency