concern 0.2.1 → 0.2.2

data/Readme.md

@@ -67,8 +67,12 @@ Adding to the concerned, e.g. validations/associations/scopes etc.
 
 More examples can be found in [spec/examples](http://github.com/grosser/concern/tree/master/spec/examples)
 
-Author
-======
+Authors
+=======
+
+### [Contributors](http://github.com/grosser/concern/contributors)
+ - [Colin Curtin](http://github.com/perplexes)
+
 [Michael Grosser](http://grosser.it)  
 grosser.michael@gmail.com  
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/concern.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{concern}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-10-29}
   s.description = %q{Seperation of concerns without meta-madness and namespace pollution}
   s.email = %q{grosser.michael@gmail.com}
   s.files = [
@@ -23,13 +23,15 @@ Gem::Specification.new do |s|
      "spec/examples/a/b.rb",
      "spec/examples/a/bc_def_gh.rb",
      "spec/examples/adding.rb",
+     "spec/examples/blocks.rb",
      "spec/examples/complex_inline.rb",
      "spec/examples/complex_require.rb",
      "spec/examples/delegate.rb",
      "spec/examples/inline.rb",
      "spec/examples/load.rb",
      "spec/examples/parent_warning.rb",
-     "spec/examples/picky_delegate.rb"
+     "spec/examples/picky_delegate.rb",
+     "spec/examples/pollution.rb"
   ]
   s.homepage = %q{http://github.com/grosser/concern}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -42,10 +44,12 @@ Gem::Specification.new do |s|
      "spec/examples/complex_inline.rb",
      "spec/examples/parent_warning.rb",
      "spec/examples/adding.rb",
+     "spec/examples/pollution.rb",
      "spec/examples/complex_require.rb",
      "spec/examples/load.rb",
      "spec/examples/a/b.rb",
      "spec/examples/a/bc_def_gh.rb",
+     "spec/examples/blocks.rb",
      "spec/examples/delegate.rb",
      "spec/examples/inline.rb"
   ]

data/lib/concern.rb

@@ -6,11 +6,8 @@ class Concern
   def self.classify(lib)
     lib.split('/').map{|part| part.gsub(/(?:^|_)(.)/){ $1.upcase } }.join('::')
   end
-end
 
-class Object
-  def self.concern(lib, options={})
-    # load delegate
+  def self.class_from_lib(lib)
     lib = lib.to_s
     klass = Concern.classify(lib)
     begin
@@ -23,37 +20,49 @@ class Object
     unless klass.instance_methods.map{|x|x.to_s}.include?('concerned=')
       raise "A concern must always extend Concern"
     end
+    klass
+  end
 
-    # make accessor
-    accessor = lib.split('/').last.to_sym
-    eval <<-EOF
+  def self.add_accessor_for_concern(concerned, accessor, concern)
+    concerned.class_eval <<-EOF, __FILE__, __LINE__
       def #{accessor}
         return @#{accessor} if @#{accessor}
-        @#{accessor} = #{klass}.new
+        @#{accessor} = #{concern}.new
         @#{accessor}.concerned = self
         @#{accessor}
       end
     EOF
+  end
+  
+  module ClassMethods
+    def concern(lib, options={})
+      concern = Concern.class_from_lib(lib)
+      accessor = lib.split('/').last.to_sym
 
-    # call included
-    base = eval(name) #self.class is always Class, but name is class that called concern
-    klass.included(base) if klass.respond_to? :included
+      Concern.add_accessor_for_concern(self, accessor, concern)
 
-    # delegate methods
-    if options[:delegate]
-      methods = if options[:delegate].is_a?(Array)
-        options[:delegate]
-      else
-        klass.public_instance_methods(false)
-      end
+      # tell the concern it was included
+      concerned = eval(name) #self.class is always Class, but name is class that called concern
+      concern.included(concerned) if concern.respond_to? :included
 
-      methods.each do |method|
-        eval <<-EOF
-          def #{method}(*args)
-            #{accessor}.#{method}(*args)
-          end
-        EOF
+      # delegate methods calls to the concern
+      if options[:delegate]
+        methods_to_delegate = if options[:delegate].is_a?(Array)
+          options[:delegate]
+        else
+          concern.public_instance_methods(false)
+        end
+
+        methods_to_delegate.each do |method|
+          class_eval <<-EOF, __FILE__, __LINE__
+            def #{method}(*args, &block)
+              #{accessor}.send(:#{method}, *args, &block)
+            end
+          EOF
+        end
       end
     end
   end
-end
+end
+
+Object.send(:extend, Concern::ClassMethods)

data/spec/concern_spec.rb

@@ -30,4 +30,12 @@ describe "Concern" do
   it "warns when parent is not Concern" do
     `ruby spec/examples/parent_warning.rb`.should == "SUCCESS"
   end
+  
+  it "shouldn't pollute the global namespace" do
+    `ruby spec/examples/pollution.rb`.should == "SUCCESS"
+  end
+  
+  it "should delegate blocks" do
+    `ruby spec/examples/blocks.rb`.should == "SUCCESS"
+  end
 end

data/spec/examples/blocks.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH << 'lib'
+require 'concern'
+
+class A
+  class B < Concern
+    def test
+      yield
+    end
+  end
+  concern 'a/b', :delegate => [:test]
+end
+
+print A.new.test{ "SUCCESS" }

data/spec/examples/pollution.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH << 'lib'
+require 'concern'
+
+class A
+  class B < Concern
+    def random_method_name
+    end
+  end
+  concern 'a/b', :delegate => [:random_method_name]
+end
+
+class C
+  class D < Concern
+    def random_method_name2
+    end
+  end
+  concern 'c/d', :delegate => true
+end
+
+if Object.instance_methods.include?("random_method_name") && Object.instance_methods.include?("random_method_name2")
+  print "FAIL"
+else
+  print "SUCCESS"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - spec/examples/a/b.rb
 - spec/examples/a/bc_def_gh.rb
 - spec/examples/adding.rb
+- spec/examples/blocks.rb
 - spec/examples/complex_inline.rb
 - spec/examples/complex_require.rb
 - spec/examples/delegate.rb
@@ -44,6 +45,7 @@ files:
 - spec/examples/load.rb
 - spec/examples/parent_warning.rb
 - spec/examples/picky_delegate.rb
+- spec/examples/pollution.rb
 has_rdoc: true
 homepage: http://github.com/grosser/concern
 licenses: []
@@ -80,9 +82,11 @@ test_files:
 - spec/examples/complex_inline.rb
 - spec/examples/parent_warning.rb
 - spec/examples/adding.rb
+- spec/examples/pollution.rb
 - spec/examples/complex_require.rb
 - spec/examples/load.rb
 - spec/examples/a/b.rb
 - spec/examples/a/bc_def_gh.rb
+- spec/examples/blocks.rb
 - spec/examples/delegate.rb
 - spec/examples/inline.rb