not_only_but_also 1.0.0 → 1.1.0

data/Rakefile

@@ -1,43 +1,16 @@
-require 'rubygems'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rubygems/specification'
 require 'rspec/core/rake_task'
 
-GEM_NAME = "not_only_but_also"
-GEM_VERSION = '1.0.0'
-AUTHOR   = "Adam Meehan"
-EMAIL    = "adam.meehan@gmail.com"
-HOMEPAGE = "http://github.com/adzap/not_only_but_also"
-SUMMARY  = "Rails plugin to split large models into separate files of concern. Like concerned_with but a little more convenient."
-
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.rubyforge_project = "not_only_but_also"
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  s.require_path = 'lib'
-  s.autorequire = GEM_NAME
-  s.files = %w(MIT-LICENSE README.rdoc Rakefile) + Dir.glob("{lib,spec,generators}/**/*")
-end
-
-desc 'Default: run specs.'
-task :default => :spec
-
 desc "Run specs"
 RSpec::Core::RakeTask.new(:spec)
 
 desc "Generate code coverage"
 RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
 end
 
 desc 'Generate documentation for plugin.'
@@ -49,18 +22,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM_NAME}-#{GEM_VERSION}}
-end
-
-desc "create a gemspec file"
-task :make_spec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
-  end
-end
+desc 'Default: run specs.'
+task :default => :spec

data/init.rb

@@ -0,0 +1 @@
+require 'not_only_but_also'

data/lib/not_only_but_also.rb

@@ -3,11 +3,14 @@ module NotOnlyButAlso
   module ClassMethods
 
     def not_only_but_also(*contexts, &block)
+      @_not_only_but_also_contexts ||= {}
       if block_given?
-        self.class_eval(&block)
+        context = contexts.first || NotOnlyButAlso::Helpers.context_name_from_file(caller.first)
+        @_not_only_but_also_contexts[context] = block
       else
         contexts.each do |context|
           NotOnlyButAlso::Helpers.require_context_file(name, context)
+          class_eval &@_not_only_but_also_contexts[context]
         end
       end
     end
@@ -19,10 +22,13 @@ module NotOnlyButAlso
 
     def self.require_context_file(class_name, context)
       require_dependency "#{class_name.underscore}/#{context}" 
-    rescue MissingSourceFile => e
-      raise e, "NotOnlyButAlso could not find a file for #{class_name} using context #{context}"
+    rescue MissingSourceFile => ex
+      raise ex, "NotOnlyButAlso could not find a file for #{class_name} using context #{context}"
     end
 
+    def self.context_name_from_file(filename)
+       filename.split('/').last.split('.').first.to_sym
+    end
   end
 
 end

data/lib/not_only_but_also/version.rb

@@ -0,0 +1,3 @@
+module NotOnlyButAlso
+  VERSION = '1.1.0'
+end

data/not_only_but_also.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "not_only_but_also/version"
+
+Gem::Specification.new do |s|
+  s.name        = "not_only_but_also"
+  s.version     = NotOnlyButAlso::VERSION
+  s.authors     = ["Adam Meehan"]
+  s.description = %q{Rails plugin to split large models into separate files of concern. Like concerned_with but more convenient.}
+  s.summary     = s.description
+  s.email       = %q{adam.meehan@gmail.com}
+  s.homepage    = %q{http://github.com/adzap/not_only_but_also}
+
+  s.require_paths    = ["lib"]
+  s.files            = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb }
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.extra_rdoc_files = ["README.rdoc"]
+end

data/spec/not_only_but_also_spec.rb

@@ -5,44 +5,93 @@ describe NotOnlyButAlso do
     Object.send(:remove_const, :Post)    if Object.const_defined?(:Post)
     Object.send(:remove_const, :Comment) if Object.const_defined?(:Comment)
     ActiveSupport::Dependencies.loaded = []
+    Post.class_eval do
+      class << self
+        attr_accessor :_not_only_but_also_contexts
+      end
+    end
   end
 
   describe ".not_only_but_also" do
-    context "with array of symbols" do
-      it 'should require symbols as file' do
+    context "with array of symbols and no block" do
+      it 'should require symbols as files' do
         NotOnlyButAlso::Helpers.should_receive(:require_context_file).with('Post', :validations)
+        Post._not_only_but_also_contexts = {:validations => lambda { } }
+
         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
+        NotOnlyButAlso::Helpers.stub(:require_context_file).with('Post', :validations)
+        Post._not_only_but_also_contexts = {:validations => lambda { def self.method_in_block; end } }
+        Post.also_has :validations
+
         Post.should respond_to(:method_in_block)
       end
     end
+
+    context "with a block" do
+
+      context "and a context name" do
+        it 'should store the block using context name provided' do
+          Post.also_has(:validations) { }
+
+          Post._not_only_but_also_contexts[:validations].should be_kind_of(Proc)
+        end
+      end
+
+      context "and no context name" do
+        it 'should determine context name from file' do
+          Dir.mktmpdir do |dir|
+            filename = "#{dir}/validations.rb"
+            File.open(filename, 'w+') { |f|
+              f.puts "Post.also_has { raise }"
+            }
+
+            load filename
+
+            Post._not_only_but_also_contexts.should have_key(:validations)
+            Post._not_only_but_also_contexts[:validations].should be_kind_of(Proc)
+          end
+        end
+      end
+
+    end
   end
 
   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._not_only_but_also_contexts = {:validations => lambda { } }
+
         Post.also_has :validations
       end
     end
+
+    describe ".context_name_from_file" do
+      it 'should return a symbol from the filename without the file extension' do
+        NotOnlyButAlso::Helpers.context_name_from_file(__FILE__).should == :not_only_but_also_spec
+      end
+    end
   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)
+    before do
+      # Forced load all files to simulate no autoloading.
+      Dir['spec/rails_root/app/models/post/*.rb'].each {|file| require file }
+    end
+
+    it 'should load files from named contexts' do
+      Post.should_not respond_to(:class_method_from_validations)
+      Post.should_not respond_to(:class_method_from_foo)
+      Post.should_not respond_to(:class_method_from_bar)
 
-      Post.also_has :validations, :stuff
+      Post.also_has :validations, :foo
 
-      Post.should respond_to(:validation_class_method)
-      Post.should respond_to(:stuff_class_method)
+      Post.should respond_to(:class_method_from_validations)
+      Post.should respond_to(:class_method_from_foo)
+      Post.should_not respond_to(:class_method_from_bar)
     end
   end
 end

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

@@ -0,0 +1,4 @@
+Post.also_has do
+  def self.class_method_from_bar
+  end
+end

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

@@ -0,0 +1,4 @@
+Post.also_has do
+  def self.class_method_from_foo
+  end
+end

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

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

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

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

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'rubygems'
 require 'rspec'
 
 require 'active_support/dependencies'
+require 'tmpdir'
+
 require 'not_only_but_also'
 
 RAILS_ROOT = File.join(File.dirname(__FILE__), 'rails_root')

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: not_only_but_also
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Adam Meehan
-autorequire: not_only_but_also
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +11:00
+date: 2011-06-14 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
-description: Rails plugin to split large models into separate files of concern. Like concerned_with but a little more convenient.
+description: Rails plugin to split large models into separate files of concern. Like concerned_with but more convenient.
 email: adam.meehan@gmail.com
 executables: []
 
@@ -31,14 +31,19 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- generators/not_only_but_also/not_only_but_also_generator.rb
+- generators/not_only_but_also/templates/context.erb
+- init.rb
 - lib/not_only_but_also.rb
+- lib/not_only_but_also/version.rb
+- not_only_but_also.gemspec
 - spec/not_only_but_also_spec.rb
+- spec/rails_root/app/models/post.rb
+- spec/rails_root/app/models/post/bar.rb
+- spec/rails_root/app/models/post/foo.rb
 - spec/rails_root/app/models/post/stuff.rb
 - spec/rails_root/app/models/post/validations.rb
-- spec/rails_root/app/models/post.rb
 - spec/spec_helper.rb
-- 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: []
@@ -68,10 +73,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: not_only_but_also
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.5.2
 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.
-test_files: []
-
+summary: Rails plugin to split large models into separate files of concern. Like concerned_with but more convenient.
+test_files: 
+- spec/not_only_but_also_spec.rb
+- spec/rails_root/app/models/post.rb
+- spec/rails_root/app/models/post/bar.rb
+- spec/rails_root/app/models/post/foo.rb
+- spec/rails_root/app/models/post/stuff.rb
+- spec/rails_root/app/models/post/validations.rb
+- spec/spec_helper.rb