not_only_but_also 0.2.0 → 1.0.0

data/Rakefile

@@ -2,10 +2,10 @@ require 'rubygems'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rubygems/specification'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 GEM_NAME = "not_only_but_also"
-GEM_VERSION = '0.2.0'
+GEM_VERSION = '1.0.0'
 AUTHOR   = "Adam Meehan"
 EMAIL    = "adam.meehan@gmail.com"
 HOMEPAGE = "http://github.com/adzap/not_only_but_also"
@@ -32,19 +32,12 @@ end
 desc 'Default: run specs.'
 task :default => :spec
 
-spec_files = Rake::FileList["spec/**/*_spec.rb"]
-
 desc "Run specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = spec_files
-  t.spec_opts = ["-c"]
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc "Generate code coverage"
-Spec::Rake::SpecTask.new(:coverage) do |t|
-  t.spec_files = spec_files
+RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,/var/lib/gems']
 end
 
 desc 'Generate documentation for plugin.'

data/lib/not_only_but_also.rb

@@ -27,4 +27,4 @@ module NotOnlyButAlso
 
 end
 
-ActiveRecord::Base.extend NotOnlyButAlso::ClassMethods
+Class.send :include, NotOnlyButAlso::ClassMethods

data/spec/not_only_but_also_spec.rb

@@ -1,27 +1,48 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe NotOnlyButAlso do
-
   before do
     Object.send(:remove_const, :Post)    if Object.const_defined?(:Post)
     Object.send(:remove_const, :Comment) if Object.const_defined?(:Comment)
     ActiveSupport::Dependencies.loaded = []
   end
 
-  it 'should include only named context' do
-    Post.class_eval do
-      also_has :validations
+  describe ".not_only_but_also" do
+    context "with array of symbols" do
+      it 'should require symbols as file' do
+        NotOnlyButAlso::Helpers.should_receive(:require_context_file).with('Post', :validations)
+        Post.also_has :validations
+      end
+    end
+
+    context "with block" do
+      it 'should evaluate the block in the class context' do
+        Post.also_has do
+          def self.method_in_block; end
+        end
+        Post.should respond_to(:method_in_block)
+      end
     end
-    Post.should respond_to(:test_validation_method)
-    Post.should_not respond_to(:test_stuff_method)
   end
 
-  it 'should include all named contexts' do
-    Post.class_eval do
-      also_has :validations, :stuff
+  describe NotOnlyButAlso::Helpers do
+    describe ".require_context_file" do
+      it 'should require context file in folder with underscored class name' do
+        NotOnlyButAlso::Helpers.should_receive(:require_dependency).with('post/validations')
+        Post.also_has :validations
+      end
     end
-    Post.should respond_to(:test_validation_method)
-    Post.should respond_to(:test_stuff_method)
   end
 
+  context "integration" do
+    it 'should load files from all contexts' do
+      Post.should_not respond_to(:validation_class_method)
+      Post.should_not respond_to(:stuff_class_method)
+
+      Post.also_has :validations, :stuff
+
+      Post.should respond_to(:validation_class_method)
+      Post.should respond_to(:stuff_class_method)
+    end
+  end
 end

data/spec/rails_root/app/models/post/stuff.rb

@@ -1,4 +1,7 @@
 Post.also_has do
-  def self.test_stuff_method
+  def self.stuff_class_method
+  end
+
+  def stuff_instance_method
   end
 end

data/spec/rails_root/app/models/post/validations.rb

@@ -1,4 +1,7 @@
 Post.also_has do
-  def self.test_validation_method
+  def self.validation_class_method
+  end
+
+  def validation_instance_method
   end
 end

data/spec/rails_root/app/models/post.rb

@@ -1,2 +1,2 @@
-class Post < ActiveRecord::Base
+class Post
 end

data/spec/spec_helper.rb

@@ -1,22 +1,9 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'spec'))
-
 require 'rubygems'
-require 'spec/autorun'
+require 'rspec'
 
-require 'active_record'
-require 'active_support'
+require 'active_support/dependencies'
 require 'not_only_but_also'
 
 RAILS_ROOT = File.join(File.dirname(__FILE__), 'rails_root')
 
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
-
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :posts, :force => true do |t|    
-    t.string :title
-  end
-end
-
-ActiveSupport::Dependencies.load_paths = %W( #{RAILS_ROOT}/app #{RAILS_ROOT}/app/models )
+ActiveSupport::Dependencies.autoload_paths = %W( #{RAILS_ROOT}/app #{RAILS_ROOT}/app/models )

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: not_only_but_also
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 23
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +15,7 @@ autorequire: not_only_but_also
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +11:00
+date: 2011-01-06 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -26,13 +32,13 @@ files:
 - README.rdoc
 - Rakefile
 - lib/not_only_but_also.rb
-- spec/rails_root/app/models/post.rb
+- spec/not_only_but_also_spec.rb
 - spec/rails_root/app/models/post/stuff.rb
 - spec/rails_root/app/models/post/validations.rb
-- spec/not_only_but_also_spec.rb
+- spec/rails_root/app/models/post.rb
 - spec/spec_helper.rb
-- generators/not_only_but_also/templates/context.erb
 - generators/not_only_but_also/not_only_but_also_generator.rb
+- generators/not_only_but_also/templates/context.erb
 has_rdoc: true
 homepage: http://github.com/adzap/not_only_but_also
 licenses: []
@@ -43,21 +49,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: not_only_but_also
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails plugin to split large models into separate files of concern. Like concerned_with but a little more convenient.