modularity 0.4.1 → 0.6.0

data/README.rdoc

@@ -14,21 +14,21 @@ Models are often concerned with multiple themes like "authentication", "contact
 a couple of validations and callbacks here, and some method there. Modularity lets you organize your model into multiple
 partial classes, so each file can deal with a single aspect of your model:
 
-  # app/model/user.rb
+  # app/models/user.rb
   class User < ActiveRecord::Base
     does "user/authentication"
     does "user/address"
   end
   
-  # app/model/user/authentication.rb
-  module User::Authentication
+  # app/models/user/authentication_trait.rb
+  module User::AuthenticationTrait
     as_trait do
       # methods, validations, etc. regarding usernames and passwords go here
     end
   end
   
-  # app/model/user/permissions.rb
-  module User::Permissions
+  # app/models/user/permissions_trait.rb
+  module User::PermissionsTrait
     as_trait do
       # methods, validations, etc. regarding contact information go here
     end
@@ -45,13 +45,13 @@ application, allowing you to express your application domain in both classes and
 
 Here is an example of a <tt>strip_field</tt> macro, which created setter methods that remove leading and trailing whitespace from newly assigned values:
 
-  # app/model/article.rb
+  # app/models/article.rb
   class Article
     does "strip_fields", :name, :brand
   end
 
-  # app/model/shared/strip_fields.rb
-  module StripFields
+  # app/models/shared/strip_fields_trait.rb
+  module StripFieldsTrait
     as_trait do |*fields|
       fields.each do |field|
         define_method("#{field}=") do |value|
@@ -69,12 +69,13 @@ that are re-used from multiple classes.
 Using a module to add both instance methods and class methods is {very awkward}[http://redcorundum.blogspot.com/2006/06/mixing-in-class-methods.html].
 Modularity does away with the clutter and lets you say this:
 
-  # app/model/model.rb
+  # app/models/model.rb
   class Model
     does "mixin"
   end
 
-  module Mixins
+  # app/models/mixin_trait.rb
+  module MixinTrait
     as_trait do
       def instance_method
         # ...
@@ -90,6 +91,11 @@ Modularity does away with the clutter and lets you say this:
 
   sudo gem sources -a http://gemcutter.org
   sudo gem install modularity
+  
+== Dependencies
+
+Modularity requires Ruby 1.8.7. Earlier versions are missing <tt>class_exec</tt>. You might be able to hack in <tt>class_exec</tt>
+using {this}[http://github.com/brynary/rspec/blob/f80d61a399b34f58084a378c85a43a95ff484619/lib/spec/extensions/instance_exec.rb] as a guide, but it's not pretty.
 
 == Credits
 

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.6.0

data/lib/modularity.rb

@@ -1 +1,2 @@
 require 'modularity/does'
+

data/lib/modularity/as_trait.rb

@@ -1,11 +1,9 @@
 module Modularity
   module AsTrait
-
     def as_trait(&block)
-      @as_trait = block
+      @trait_macro = block
     end
-
   end
 end
 
-Module.send :include, Modularity::AsTrait
+Object.send :include, Modularity::AsTrait

data/lib/modularity/does.rb

@@ -1,5 +1,5 @@
-require 'modularity/as_trait'
 require 'modularity/inflector'
+require 'modularity/as_trait'
 
 module Modularity
   module Does
@@ -10,10 +10,9 @@ module Modularity
     
     module ClassMethods
       def does(trait_name, *args)
-        trait_name = Modularity::Inflector.camelize(trait_name.to_s)
+        trait_name = "#{Modularity::Inflector.camelize(trait_name.to_s)}Trait"
         trait = Modularity::Inflector.constantize(trait_name)
-        include(trait)
-        macro = trait.instance_variable_get("@as_trait") or raise "Missing as_trait directive in #{trait_name}"
+        macro = trait.instance_variable_get("@trait_macro") or raise "Missing trait directive in #{trait_name}"
         class_exec(*args, &macro)
       end
     end

data/modularity.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modularity}
-  s.version = "0.4.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2010-02-15}
+  s.date = %q{2010-02-18}
   s.description = %q{Traits and partial classes for Ruby}
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [

data/spec/as_trait_spec.rb

@@ -17,13 +17,13 @@ describe Modularity::AsTrait do
   describe 'as_trait' do
 
     it "should let modules save a proc upon loading" do
-      Trait.instance_variable_get("@as_trait").call.should == "hi world"
+      Trait.instance_variable_get("@trait_macro").call.should == "hi world"
     end
 
     it "should let modules save a proc with parameters upon loading" do
-      ParametrizedTrait.instance_variable_get("@as_trait").call("jean").should == "hi, jean"
+      ParametrizedTrait.instance_variable_get("@trait_macro").call("jean").should == "hi, jean"
     end
 
   end
-
+  
 end

data/spec/does_spec.rb

@@ -1,20 +1,26 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-module Trait
-  as_trait {}
+module SomeTrait
+  as_trait do
+    some_trait_included
+  end
 end
 
-module Trait::Child
-  as_trait {}
+module Some
+  module ChildTrait
+    as_trait do
+      some_child_trait_included
+    end
+  end
 end
 
-module CallMethod
+module CallMethodTrait
   as_trait do |field|
     send(field)
   end
 end
 
-module Visibility
+module VisibilityTrait
   as_trait do
     def public_method_from_trait
     end
@@ -27,7 +33,7 @@ module Visibility
   end
 end
 
-module DefineConstantMethod
+module DefineConstantMethodTrait
   as_trait do |name, return_value|
     define_method name do
       return_value
@@ -42,17 +48,17 @@ describe Modularity::AsTrait do
 
   describe 'does' do
   
-    it "should include the named module" do
-      Doer.should_receive(:include).with(Trait)
+    it "should apply the named module" do
+      Doer.should_receive(:some_trait_included)
       Doer.class_eval do
-        does "trait"
+        does "some"
       end
     end
     
-    it "should include a namespaced module, using slash-notation like require" do
-      Doer.should_receive(:include).with(Trait::Child)
+    it "should apply a namespaced module, using slash-notation like require" do
+      Doer.should_receive(:some_child_trait_included)
       Doer.class_eval do
-        does "trait/child"
+        does "some/child"
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: modularity
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - Henning Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-15 00:00:00 +01:00
+date: 2010-02-18 00:00:00 +01:00
 default_executable: 
 dependencies: []