modularity 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5bd19df6610f9cadb9ba1bd5a88552537c32245d
-  data.tar.gz: cf2bf788602724e9927093685a0474b8fe3d8397
+SHA256:
+  metadata.gz: 429e10c8fecef4d2111b5ca35805fe7d034869422e3ab1c098378e6f970f8caa
+  data.tar.gz: e0cecc3bda150b73fb39b7fff2eef48d328dba303bb8842b5aa28be09287f26f
 SHA512:
-  metadata.gz: f1d52d9653cded8e868156da655f6d020d63473d3e5b4b95dfd0071b504c1a811997077d79ca642100271885739b2ceac8be4de08a706ae87ebbc93f739cc248
-  data.tar.gz: 3d46ef0be45c6f6beefe09f99c17b8c0c67d82494b822c988074b025eb5b065c41f772b522db016adeca357ec3d90acd3b794faba316a4069c91e499c3561013
+  metadata.gz: 4526b4df0b655e0eb5de00b82a65f8081bd51390bbb71e2ac3ff38c670b8b541e9b24df7935d563e51d7f07d8a6a3fc8af83c0e803321d5fef47238cd640f080
+  data.tar.gz: bd2ba2ab6fe3ba0150d07c43022d8eccd9f7bf17f669d1d4c6f6df129b5bdc42e22d9212c56886dff34c5f2d41217360fcbd3fb91ebd02e9984162b8d2aa93c7

data/.github/workflows/test.yml

@@ -0,0 +1,36 @@
+---
+name: Tests
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - ruby: 2.5.7
+          gemfile: Gemfile
+        - ruby: 2.7.4
+          gemfile: Gemfile
+        - ruby: 3.0.2
+          gemfile: Gemfile
+    env:
+      BUNDLE_GEMFILE: "${{ matrix.gemfile }}"
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+    - name: Bundle
+      run: |
+        gem install bundler:2.2.22
+        bundle install --no-deployment
+    - name: Run tests
+      run: bundle exec rspec

data/.gitignore

@@ -2,4 +2,3 @@ doc
 pkg
 *.gem
 .idea
-Gemfile.lock

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.ruby-version

@@ -0,0 +1 @@
+2.5.7

data/CHANGELOG.md

@@ -0,0 +1,22 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## Unreleased
+
+### Breaking changes
+
+### Compatible changes
+
+
+## 3.0.0 - 2021-08-24
+
+### Breaking changes
+
+- Removed migration guide for modularity version 1.
+- Removed support for Ruby < `2.5.0`.
+
+### Compatible changes
+
+- Added this CHANGELOG file.

data/Gemfile

@@ -1,3 +1,8 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec
+
+gem 'rake'
+gem 'rspec'
+gem 'pry-byebug'
+gem 'gemika'

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    modularity (3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    byebug (11.1.3)
+    coderay (1.1.3)
+    diff-lcs (1.4.4)
+    gemika (0.6.1)
+    method_source (1.0.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  gemika
+  modularity!
+  pry-byebug
+  rake
+  rspec
+
+BUNDLED WITH
+   2.2.26

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2009 Henning Koch
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,5 +1,6 @@
-Modularity 2 - Traits and partial classes for Ruby
-==================================================
+[![Tests](https://github.com/makandra/modularity/workflows/Tests/badge.svg)](https://github.com/makandra/modularity/actions)
+
+# Modularity 2 - Traits and partial classes for Ruby
 
 Modularity enhances Ruby's [`Module`](http://apidock.com/ruby/Module) so it can be used traits and partial classes.
 This allows very simple definition of meta-programming macros like the
@@ -8,13 +9,17 @@ This allows very simple definition of meta-programming macros like the
 Modularity also lets you organize large models into multiple source files
 in a way that is less awkward than using modules.
 
-Note that this is **Modularity 2**, which has a different syntax older version.
-Modularity 1 users can use [a script to migrate their code](#migrating-from-modularity-1)
-or use the [modularity1 branch](https://github.com/makandra/modularity/tree/modularity1).
+## Installation
+
+Add the following to your `Gemfile`:
 
+```
+gem 'modularity'
+```
+
+Now run `bundle install`.
 
-Example 1: Easy meta-programming macros
-----------------------------------------
+## Example 1: Easy meta-programming macros
 
 Ruby allows you to construct classes using meta-programming macros like
 `acts_as_tree` or `has_many :items`. These macros will add methods,
@@ -27,81 +32,83 @@ and macros.
 
 Here is an example of a `strip_field` macro, which created setter methods that remove leading and trailing whitespace from newly assigned values:
 
-    # app/models/article.rb
-    class Article < ActiveRecord::Base
-      include DoesStripFields[:name, :brand]
-    end
-
-    # app/models/shared/does_strip_fields.rb
-    module DoesStripFields
-      as_trait do |*fields|
-        fields.each do |field|
-          define_method("#{field}=") do |value|
-            self[field] = value.strip
-          end
-        end
+```
+# app/models/article.rb
+class Article < ActiveRecord::Base
+  include DoesStripFields[:name, :brand]
+end
+
+# app/models/shared/does_strip_fields.rb
+module DoesStripFields
+  as_trait do |*fields|
+    fields.each do |field|
+      define_method("#{field}=") do |value|
+        self[field] = value.strip
       end
     end
+  end
+end
+```
 
 Notice the `as_trait` block.
 
 We like to add `app/models/shared` and `app/controllers/shared` to the load paths of our Rails projects.
 These are great places to store macros that are re-used from multiple classes.
 
-
-Example 2: Mixins with class methods
-------------------------------------
+## Example 2: Mixins with class methods
 
 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/models/model.rb
-    class Model
-      include Mixin
+```
+# app/models/model.rb
+class Model
+  include Mixin
+end
+
+# app/models/mixin.rb
+module Mixin
+  as_trait do
+    def instance_method
+      # ...
     end
-
-    # app/models/mixin.rb
-    module Mixin
-      as_trait do
-        def instance_method
-          # ...
-        end
-        def self.class_method
-          # ..
-        end
-      end
+    def self.class_method
+      # ..
     end
+  end
+end
+```
 
 `private` and `protected` will also work as expected when defining a trait.
 
-
-Example 3: Splitting a model into multiple source files
--------------------------------------------------------
+## Example 3: Splitting a model into multiple source files
 
 Models are often concerned with multiple themes like "authentication", "contact info" or "permissions", each requiring
 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/models/user.rb
-    class User < ActiveRecord::Base
-      include DoesAuthentication
-      include DoesPermissions
-    end
-
-    # app/models/user/does_authentication.rb
-    module User::DoesAuthentication
-      as_trait do
-        # methods, validations, etc. regarding usernames and passwords go here
-      end
-    end
-
-    # app/models/user/does_permissions.rb
-    module User::DoesPermissions
-      as_trait do
-        # methods, validations, etc. regarding contact information go here
-      end
-    end
+```
+# app/models/user.rb
+class User < ActiveRecord::Base
+  include DoesAuthentication
+  include DoesPermissions
+end
+
+# app/models/user/does_authentication.rb
+module User::DoesAuthentication
+  as_trait do
+    # methods, validations, etc. regarding usernames and passwords go here
+  end
+end
+
+# app/models/user/does_permissions.rb
+module User::DoesPermissions
+  as_trait do
+    # methods, validations, etc. regarding contact information go here
+  end
+end
+```
 
 Some criticism has been raised for splitting large models into files like this.
 Essentially, even though have an easier time navigating your code, you will still
@@ -110,41 +117,12 @@ have one giant model with many side effects.
 There are [many better ways](http://blog.codeclimate.com/blog/2012/10/17/7-ways-to-decompose-fat-activerecord-models/)
 to decompose a huge Ruby class.
 
+## Development
 
-Installation
-------------
+* Install Bundler 2 `gem install bundler:2.2.22` and run `bundle install` to have a working development setup.
+* Running tests for the current Ruby version: `bundle exec rake`
+* Running tests for all supported Ruby version: Push the changes to Github in a feature branch, open a merge request and have a look at the test matrix in Github actions
 
-Add the following to your `Gemfile`:
-
-    gem 'modularity', '>=2'
-
-Now run `bundle install`.
-
-
-Migrating from Modularity 1
----------------------------
-
-If you have been using Modularity 1 with the `does` syntax, we provide a script to migrate your Ruby project
-automatically.
-
-1. Make sure your project has tests and you have a backup of your files (or pushed your commits to Git)
-
-2. From your project directory, do this:
-
-        find . -name "*.rb" | migrate-modularity1-to-modularity2
-
-3. The script will rename your files and change your code. It will also syntax-check your files after conversion
-   (since the script is not perfect).
-
-4. Check the diff to see what the script has done.
-
-5. Run tests to see if everything still works.
-
-
-
-
-Credits
--------
+## Credits
 
 Henning Koch from [makandra.com](http://makandra.com/)
-

data/Rakefile

@@ -1,12 +1,5 @@
-require 'rake'
-require 'spec/rake/spectask'
 require 'bundler/gem_tasks'
+require 'bundler/setup'
+require 'gemika/tasks'
 
-desc 'Default: Run all specs.'
-task :default => :spec
-
-desc "Run all specs"
-Spec::Rake::SpecTask.new() do |t|
-  t.spec_opts = ['--options', "\"spec/spec.opts\""]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end
+task default: 'matrix:spec'

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'modularity'
+require 'pry'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+Pry.start

data/lib/modularity/version.rb

@@ -1,3 +1,3 @@
 module Modularity
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

data/modularity.gemspec

@@ -1,23 +1,27 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'modularity/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{modularity}
-  s.version = Modularity::VERSION
-  s.authors = ["Henning Koch"]
-  s.email = %q{github@makandra.de}
-  s.homepage = %q{http://github.com/makandra/modularity}
-  s.summary = %q{Traits and partial classes for Ruby}
-  s.description = %q{Traits and partial classes for Ruby}
+Gem::Specification.new do |spec|
+  spec.name = 'modularity'
+  spec.version = Modularity::VERSION
+  spec.required_ruby_version = '>= 2.5.0'
+  spec.authors = ['Henning Koch']
+  spec.email = ['henning.koch@makandra.de']
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.summary = 'Traits and partial classes for Ruby'
+  spec.description = 'Traits and partial classes for Ruby'
+  spec.homepage = 'https://github.com/makandra/modularity'
+  spec.license = 'MIT'
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '<2')
-  s.add_development_dependency('rspec_candy')
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r(^exe/)) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
+  # Development dependencies are defined in the Gemfile (therefore no `spec.add_development_dependency` directives)
 end

metadata

@@ -1,82 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: modularity
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rspec_candy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2021-08-24 00:00:00.000000000 Z
+dependencies: []
 description: Traits and partial classes for Ruby
-email: github@makandra.de
-executables:
-- migrate-modularity1-to-modularity2
+email:
+- henning.koch@makandra.de
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".github/workflows/test.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
-- MIT-LICENSE
+- Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
-- bin/migrate-modularity1-to-modularity2
+- bin/console
 - lib/modularity.rb
 - lib/modularity/as_trait.rb
-- lib/modularity/migrator.rb
 - lib/modularity/version.rb
 - modularity.gemspec
-- spec/modularity/as_trait_spec.rb
-- spec/modularity/migrator_spec.rb
-- spec/rcov.opts
-- spec/spec.opts
-- spec/spec_helper.rb
-homepage: http://github.com/makandra/modularity
-licenses: []
+homepage: https://github.com/makandra/modularity
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -84,17 +42,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 3.2.26
 signing_key: 
 specification_version: 4
 summary: Traits and partial classes for Ruby

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Henning Koch
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/bin/migrate-modularity1-to-modularity2

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.dirname(__FILE__)) + '/../lib/modularity/migrator'
-
-ARGF.each do |path|
-  Modularity::Migrator.migrate(path.strip)
-end

data/lib/modularity/migrator.rb

@@ -1,53 +0,0 @@
-gem 'activesupport'
-require 'active_support/all'
-require 'fileutils'
-
-module Modularity
-  class Migrator
-    class << self
-
-      def migrate(old_path)
-        old_path = File.expand_path(old_path)
-        new_path = fix_filename(old_path)
-        rename(old_path, new_path) unless old_path == new_path
-        old_code = File.read(new_path)
-        new_code = fix_code(old_code)
-        rewrite_file(new_path, new_code) unless old_code == new_code
-        puts "Migrated #{old_path}"
-        `ruby -c #{new_path}`
-        new_code
-      end
-
-      private
-
-      def fix_filename(path)
-        path = File.expand_path(path)
-        new_path = path.sub(/\/([^\/]+)_trait\.rb$/, '/does_\\1.rb')
-        new_path
-      end
-
-      def fix_code(code)
-        code = code.gsub(/module (.*?)([A-Za-z0-9_]+)Trait\b/, 'module \\1Does\\2')
-        code = code.gsub(/does ['":]([A-Za-z0-9\_\/]+)(?:'|"|$)(?:,\s*(.*)$)?/) do
-          trait_path = $1
-          parameters = $2
-          trait_path = trait_path.sub(/([A-Za-z0-9\_]+)$/, 'does_\\1')
-          trait_class = trait_path.camelize # don't use classify, it removes plurals!
-          substituted = "include #{trait_class}"
-          substituted << "[#{parameters}]" if parameters
-          substituted
-        end
-        code
-      end
-
-      def rename(old, new)
-        FileUtils.mv(old, new)
-      end
-
-      def rewrite_file(path, content)
-        File.open(path, "w") { |file| file.write(content) }
-      end
-
-    end
-  end
-end

data/spec/modularity/as_trait_spec.rb

@@ -1,210 +0,0 @@
-require 'spec_helper'
-
-describe Modularity::AsTrait do
-
-  describe '.included' do
-    
-    before :each do
-      @doing_class = Class.new
-    end
-
-    describe 'without parameters' do
-  
-      it "applies the trait macro of the given module" do
-
-        module DoesSome
-          as_trait do
-            some_trait_included
-          end
-        end
-
-        @doing_class.should_receive(:some_trait_included)
-
-        @doing_class.class_eval do
-          include DoesSome
-        end
-
-      end
-
-      it "applies the trait macro of the given namespaced module" do
-
-        module Some
-          module DoesChild
-            as_trait do
-              some_child_trait_included
-            end
-          end
-        end
-
-        @doing_class.should_receive(:some_child_trait_included)
-
-        @doing_class.class_eval do
-          include Some::DoesChild
-        end
-
-      end
-
-      it "lets a trait define methods with different visibility" do
-
-        module DoesVisibility
-          as_trait do
-            def public_method_from_trait
-            end
-            protected
-            def protected_method_from_trait
-            end
-            private
-            def private_method_from_trait
-            end
-          end
-        end
-
-        @doing_class.class_eval do
-          include DoesVisibility
-        end
-
-        instance = @doing_class.new
-
-        instance.public_methods.collect(&:to_s).should include("public_method_from_trait")
-        instance.protected_methods.collect(&:to_s).should include("protected_method_from_trait")
-        instance.private_methods.collect(&:to_s).should include("private_method_from_trait")
-
-      end
-
-      it 'appends methods outside the trait macro' do
-
-        module HybridModule
-
-          as_trait do
-            define_method :trait_method do
-            end
-          end
-
-          def vanilla_method
-          end
-
-        end
-
-        @doing_class.class_eval do
-          include HybridModule
-        end
-
-        instance = @doing_class.new
-
-        instance.should respond_to(:trait_method)
-        instance.should respond_to(:vanilla_method)
-
-      end
-
-      it 'applies multiple trait macros' do
-
-        module FirstTrait
-          as_trait do
-            define_method :first do
-            end
-          end
-        end
-
-        module SecondTrait
-          as_trait do
-            define_method :second do
-            end
-          end
-        end
-
-        @doing_class.class_eval do
-          include FirstTrait
-          include SecondTrait
-        end
-
-        instance = @doing_class.new
-
-        instance.should respond_to(:first)
-        instance.should respond_to(:second)
-
-      end
-
-    end
-
-    describe "with parameters" do
-
-      it "it applies a trait macro with parameters" do
-
-        module DoesCallMethod
-          as_trait do |field|
-            send(field)
-          end
-        end
-
-        @doing_class.should_receive(:foo)
-        @doing_class.class_eval do
-          include DoesCallMethod[:foo]
-        end
-
-      end
-
-      it "facilitates metaprogramming acrobatics" do
-
-        module DoesDefineConstantMethod
-          as_trait do |name, return_value|
-            define_method name do
-              return_value
-            end
-          end
-        end
-
-        @doing_class.class_eval do
-          include DoesDefineConstantMethod["some_method", "some_return_value"]
-        end
-
-        instance = @doing_class.new
-        instance.should respond_to(:some_method)
-        instance.some_method.should == "some_return_value"
-      end
-
-      it "allies to call an unparametrized trait macro with an empty parameter list" do
-
-        module DoesSome
-          as_trait do
-            some_trait_included
-          end
-        end
-
-        @doing_class.should_receive(:some_trait_included)
-
-        @doing_class.class_eval do
-          include DoesSome[]
-        end
-
-      end
-
-      it 'appends methods outside the trait macro' do
-
-        module HybridModuleWithParameters
-
-          as_trait do |name|
-            define_method name do
-            end
-          end
-
-          def vanilla_method
-          end
-
-        end
-
-        @doing_class.class_eval do
-          include HybridModuleWithParameters[:trait_method]
-        end
-
-        instance = @doing_class.new
-
-        instance.should respond_to(:trait_method)
-        instance.should respond_to(:vanilla_method)
-
-      end
-
-    end
-
-  end
-
-end

data/spec/modularity/migrator_spec.rb

@@ -1,109 +0,0 @@
-require 'spec_helper'
-
-require 'modularity/migrator' # this is an optional file and thus not loaded automatically
-
-describe Modularity::Migrator do
-
-  subject do
-    Modularity::Migrator
-  end
-
-  describe '.fix_filename' do
-
-    it 'should replace the suffix _trait with a prefix does' do
-      subject.send(:fix_filename, '/path/to/search_trait.rb').should == '/path/to/does_search.rb'
-    end
-
-    it "should not rename files that don't end in _trait.rb" do
-      subject.send(:fix_filename, '/path/to/search.rb').should == '/path/to/search.rb'
-    end
-
-  end
-
-  describe '.fix_code' do
-
-    it 'renames a module FooBarTrait to DoesFooBar' do
-
-      old_code = <<-RUBY
-        module Namespace::FooBarTrait
-          as_trait do
-            define_method :foo do
-            end
-            define_method :bar do
-            end
-          end
-        end
-      RUBY
-
-      new_code = <<-RUBY
-        module Namespace::DoesFooBar
-          as_trait do
-            define_method :foo do
-            end
-            define_method :bar do
-            end
-          end
-        end
-      RUBY
-
-      subject.send(:fix_code, old_code).should == new_code
-    end
-
-    it "does not rename modules that aren't traits" do
-
-      old_code = <<-RUBY
-        module Namespace::FooBar
-          def foo
-          end
-          def bar
-          end
-        end
-      RUBY
-
-      subject.send(:fix_code, old_code).should == old_code
-    end
-
-    it 'replaces does calls with include' do
-
-      old_code = <<-RUBY
-        class User < ActiveRecord::Base
-          does 'user/search'
-          does 'user/account_settings'
-          does 'trashable'
-        end
-      RUBY
-
-      new_code = <<-RUBY
-        class User < ActiveRecord::Base
-          include User::DoesSearch
-          include User::DoesAccountSettings
-          include DoesTrashable
-        end
-      RUBY
-
-      subject.send(:fix_code, old_code).should == new_code
-    end
-
-    it 'puts does parameters into square brackets' do
-
-      old_code = <<-RUBY
-        class User < ActiveRecord::Base
-          does 'flag', :active, :default => true
-          does 'record/search', :field => :email
-        end
-      RUBY
-
-      new_code = <<-RUBY
-        class User < ActiveRecord::Base
-          include DoesFlag[:active, :default => true]
-          include Record::DoesSearch[:field => :email]
-        end
-      RUBY
-
-      subject.send(:fix_code, old_code).should == new_code
-
-    end
-
-  end
-
-end

data/spec/rcov.opts

@@ -1,2 +0,0 @@
---exclude "spec/*,gems/*"
---rails

data/spec/spec.opts

@@ -1,4 +0,0 @@
---colour
---format progress
---loadby mtime
---reverse

data/spec/spec_helper.rb

@@ -1,4 +0,0 @@
-$: << File.join(File.dirname(__FILE__), "/../lib" )
-
-require "#{File.dirname(__FILE__)}/../lib/modularity"
-require 'rspec_candy/all'