demeter 2.0.2 → 2.0.3

data/README.markdown

@@ -77,6 +77,7 @@ Contributor
 -----------
 
 * Nando Vieira (<http://simplesideias.com.br/>)
+* Tino Gomes (<http://blog.tinogomes.com/>)
 
 License:
 --------

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/demeter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demeter}
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emerson Macedo"]
-  s.date = %q{2010-01-22}
+  s.date = %q{2010-02-27}
   s.description = %q{A simple way to apply the Law of Demeter to your Ruby objects.}
   s.email = %q{emerleite@gmail.com}
   s.extra_rdoc_files = [

data/lib/demeter.rb

@@ -3,6 +3,12 @@ module Demeter
     base.class_eval do
       include InstanceMethods
       extend ClassMethods
+
+      class << self
+        attr_accessor :demeter_names
+      end
+
+      base.demeter_names = []
     end
   end
 
@@ -23,20 +29,22 @@ module Demeter
 
       send(method_name)
     end
-  end
 
-  module ClassMethods
-    def demeter(*attr_names)
-      @@demeter_names ||= []
-      @@demeter_names += attr_names
-    end
+    def respond_to?(method_name, include_private = false)
+      object_method_name = method_name.to_s
+      object_name = self.class.demeter_names.find {|name| object_method_name =~ /^#{name}_/ }
 
-    def demeter_names
-      @@demeter_names ||= []
+      if object_name && (object = send(object_name))
+        object.respond_to?(object_method_name.gsub(/^#{Regexp.escape(object_name.to_s)}_/, ""))
+      else
+        super
+      end
     end
+  end
 
-    def demeter_names=(names)
-      @@demeter_names = names
+  module ClassMethods
+    def demeter(*attr_names)
+      self.demeter_names = attr_names
     end
   end
 end

data/lib/demeter/active_record.rb

@@ -1,3 +1,6 @@
-ActiveRecord::Base.class_eval do
-  extend ::Demeter
+class ActiveRecord::Base
+  def self.inherited(base)
+    super
+    base.send :extend, ::Demeter
+  end
 end if defined? ActiveRecord::Base

data/lib/demeter/version.rb

@@ -2,7 +2,7 @@ module Demeter
   module Version
     MAJOR = "2"
     MINOR = "0"
-    PATCH = "2"
+    PATCH = "3"
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/demeter/active_record_spec.rb

@@ -2,7 +2,9 @@ require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "Demeter on ActiveRecord" do
   it "should respond to demeter method" do
-    ActiveRecord::Base.should respond_to(:demeter)
+    Project.should respond_to(:demeter)
+    Task.should respond_to(:demeter)
+    Owner.should respond_to(:demeter)
   end
 
   it "should dispatch original method missing" do
@@ -13,8 +15,15 @@ describe "Demeter on ActiveRecord" do
   end
 
   it "should also dispatch original method missing when not demetered" do
-    Demeter::ClassMethods.send(:remove_class_variable, :@@demeter_names)
     owner = Owner.new
-    owner.name.should be_nil #name uses ActiveRecord method_missing instance method
+    owner.name.should be_nil
+  end
+
+  it "should load demeter_names for each model" do
+    Task.demeter :project
+    Owner.demeter :task
+
+    Task.demeter_names.should == [:project]
+    Owner.demeter_names.should == [:task]
   end
 end

data/spec/demeter/demeter_spec.rb

@@ -14,6 +14,38 @@ describe "Demeter" do
     subject.profile.interests = %w(games programming music movies)
   end
 
+  it "should respond to demeterized methods" do
+    User.demeter :address
+    user = User.new
+
+    user.should respond_to(:address_street)
+    user.should respond_to(:address_city)
+    user.should respond_to(:address_country)
+    user.should respond_to(:address_state)
+    user.should respond_to(:address_zip_code)
+  end
+
+  it "should keep responding to instance methods" do
+    User.demeter :address
+    user = User.new
+
+    user.should respond_to(:name)
+    user.should respond_to(:address)
+    user.should respond_to(:video_game)
+    user.should respond_to(:profile)
+    user.should respond_to(:methods)
+    user.should respond_to(:public_methods)
+  end
+
+  it "should not respond to unknown methods" do
+    User.demeter :address
+    user = User.new
+
+    user.should_not respond_to(:video_game_title)
+    user.should_not respond_to(:video_production_year)
+    user.should_not respond_to(:profile_interests)
+  end
+
   it "should allow demeter only one object" do
     Person.demeter :animal
     person = Person.new
@@ -68,7 +100,6 @@ describe "Demeter" do
 
   describe Demeter::ClassMethods do
     it "should return an array of demeter_names" do
-      Demeter::ClassMethods.send(:remove_class_variable, :@@demeter_names)
       User.demeter_names.should be_kind_of(Array)
     end
   end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "benchmark"
 require "active_record"
 
 # Load library
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
 require "demeter"
 
 # Establish connection with in memory SQLite 3 database

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: demeter
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Emerson Macedo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-22 00:00:00 -02:00
+date: 2010-02-27 00:00:00 -03:00
 default_executable: 
 dependencies: []