contextify 0.1.6 → 0.2.0

data/.rspec

@@ -0,0 +1 @@
+--colour --format documentation

data/ChangeLog.md

@@ -1,3 +1,10 @@
+### 0.2.0 / 2010-10-27
+
+* Added {Contextify::ContextifiedClassMethods}.
+* Fixed a block-variable shadowing bug in
+  {Contextify::ClassMethods#contextify}.
+* Removed the `metaid.rb` extension.
+
 ### 0.1.6 / 2010-05-23
 
 * Moved the Contextify YARD handlers into the

data/README.md

@@ -48,7 +48,9 @@ Ruby files without having to use YAML or define classes named like the file.
 
     $ sudo gem install contextify
 
-## License
+## Copyright
+
+Copyright (c) 2010 Hal Brodigan
 
 See {file:LICENSE.txt} for license information.
 

data/Rakefile

@@ -1,41 +1,35 @@
 require 'rubygems'
 require 'rake'
-require './lib/contextify/version.rb'
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'contextify'
-    gem.version = Contextify::VERSION
-    gem.license = 'MIT'
-    gem.summary = %Q{Loads Ruby Objects containing methods and procs from Ruby files.}
-    gem.description = %Q{Contextify can load Ruby Objects containing methods and procs from Ruby files without having to use YAML or define classes named like the file.}
-    gem.email = 'postmodern.mod3@gmail.com'
-    gem.homepage = 'http://github.com/postmodern/contextify'
-    gem.authors = ['Postmodern']
-    gem.add_development_dependency 'rspec', '>= 1.3.0'
-    gem.has_rdoc = 'yard'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+  gem 'ore-tasks', '~> 0.1.2'
+  require 'ore/tasks'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs += ['lib', 'spec']
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['--options', '.specopts']
+  Ore::Tasks.new
+rescue LoadError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `gem install ore-tasks` to install 'ore/tasks'."
 end
 
-task :spec => :check_dependencies
+begin
+  gem 'rspec', '~> 2.0.0'
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new
+rescue LoadError => e
+  task :spec do
+    abort "Please run `gem install rspec` to install RSpec."
+  end
+end
 task :default => :spec
 
 begin
+  gem 'yard', '~> 0.6.0'
   require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
+
+  YARD::Rake::YardocTask.new  
+rescue LoadError => e
   task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
+    abort "Please run `gem install yard` to install YARD."
   end
 end

data/contextify.gemspec

@@ -1,85 +1,10 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{contextify}
-  s.version = "0.1.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Postmodern"]
-  s.date = %q{2010-05-23}
-  s.description = %q{Contextify can load Ruby Objects containing methods and procs from Ruby files without having to use YAML or define classes named like the file.}
-  s.email = %q{postmodern.mod3@gmail.com}
-  s.extra_rdoc_files = [
-    "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     ".specopts",
-     ".yardopts",
-     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "contextify.gemspec",
-     "lib/contextify.rb",
-     "lib/contextify/class_methods.rb",
-     "lib/contextify/contextify.rb",
-     "lib/contextify/exceptions.rb",
-     "lib/contextify/exceptions/context_not_found.rb",
-     "lib/contextify/exceptions/unknown_context.rb",
-     "lib/contextify/extensions.rb",
-     "lib/contextify/extensions/meta.rb",
-     "lib/contextify/extensions/meta/object.rb",
-     "lib/contextify/pending_context.rb",
-     "lib/contextify/version.rb",
-     "lib/contextify/yard.rb",
-     "spec/contextify_spec.rb",
-     "spec/helpers/book_context.rb",
-     "spec/helpers/book_review_context.rb",
-     "spec/helpers/contexts.rb",
-     "spec/helpers/contexts/load_error.rb",
-     "spec/helpers/contexts/neuromancer_review.rb",
-     "spec/helpers/contexts/no_method_error.rb",
-     "spec/helpers/contexts/snow_crash.rb",
-     "spec/helpers/contexts/syntax_error.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.has_rdoc = %q{yard}
-  s.homepage = %q{http://github.com/postmodern/contextify}
-  s.licenses = ["MIT"]
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Loads Ruby Objects containing methods and procs from Ruby files.}
-  s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/helpers/book_review_context.rb",
-     "spec/helpers/contexts/no_method_error.rb",
-     "spec/helpers/contexts/snow_crash.rb",
-     "spec/helpers/contexts/load_error.rb",
-     "spec/helpers/contexts/syntax_error.rb",
-     "spec/helpers/contexts/neuromancer_review.rb",
-     "spec/helpers/book_context.rb",
-     "spec/helpers/contexts.rb",
-     "spec/contextify_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+begin
+  Ore::Specification.new do |gemspec|
+    # custom logic here
   end
+rescue NameError
+  STDERR.puts "The 'contextify.gemspec' file requires Ore."
+  STDERR.puts "Run `gem install ore` to install Ore."
 end
-

data/gemspec.yml

@@ -0,0 +1,16 @@
+name: contextify
+summary: Loads Ruby Objects containing methods and procs from Ruby files.
+description:
+  Contextify can load Ruby Objects containing methods and procs from Ruby
+  files without having to use YAML or define classes named like the file.
+license: MIT
+authors: Postmodern
+email: postmodern.mod3@gmail.com
+homepage: http://github.com/postmodern/contextify
+has_yard: true
+
+development_dependencies:
+  ore: ~> 0.2.0
+  ore-tasks: ~> 0.1.2
+  rspec: ~> 2.0.0
+  yard: ~> 0.6.0

data/lib/contextify/class_methods.rb

@@ -1,4 +1,4 @@
-require 'contextify/extensions'
+require 'contextify/contextified_class_methods'
 
 module Contextify
   module ClassMethods
@@ -11,27 +11,10 @@ module Contextify
     def contextify(name)
       name = name.to_s
 
-      Contextify.contexts[name] = self
-
-      meta_def(:context_name) { name }
-
-      meta_def(:load_context_block) do |path|
-        Contextify.load_block(name,path)
-      end
-
-      meta_def(:load_context) do |path,*args|
-        pending = Contextify.load_blocks(path)
+      @context_name = name
+      extend ContextifiedClassMethods
 
-        context, block = pending.find do |name,block|
-          Contextify.contexts[name].ancestors.include?(self)
-        end
-
-        if (context && block)
-          obj = Contextify.contexts[name].new(*args)
-          obj.instance_eval(&block)
-          obj
-        end
-      end
+      Contextify.contexts[name] = self
 
       # define the top-level context wrappers
       Kernel.module_eval %{

data/lib/contextify/contextified_class_methods.rb

@@ -0,0 +1,45 @@
+module Contextify
+  module ContextifiedClassMethods
+    # The name of the context
+    attr_reader :context_name
+
+    #
+    # Loads a block defined under the context.
+    #
+    # @param [String] path
+    #   The path to load the block from.
+    #
+    # @return [Proc]
+    #   The block defined for the context.
+    #
+    def load_context_block(path)
+      Contextify.load_block(@context_name,path)
+    end
+
+    #
+    # Loads a compatible context.
+    #
+    # @param [String] path
+    #   The path to load the context from.
+    #
+    # @param [Array] arguments
+    #   Additional arguments to use when creating the context.
+    #
+    # @return [Object]
+    #   The loaded context.
+    #
+    def load_context(path,*arguments)
+      pending = Contextify.load_blocks(path)
+
+      pending_name, pending_block = pending.find do |name,block|
+        Contextify.contexts[name].ancestors.include?(self)
+      end
+
+      if (pending_name && pending_block)
+        obj = Contextify.contexts[pending_name].new(*arguments)
+        obj.instance_eval(&pending_block)
+        obj
+      end
+    end
+  end
+end

data/lib/contextify/version.rb

@@ -1,4 +1,4 @@
 module Contextify
   # contextify version
-  VERSION = '0.1.6'
+  VERSION = '0.2.0'
 end

data/spec/contextify_spec.rb

@@ -8,6 +8,7 @@ describe Contextify do
 
   before(:all) do
     @snow_crash_path = context_path(:snow_crash)
+    @discrete_structures_path = context_path(:discrete_structures)
     @neuromancer_path = context_path(:neuromancer_review)
 
     @syntax_error_path = context_path(:syntax_error)
@@ -17,10 +18,12 @@ describe Contextify do
 
   it "should contain defined contexts" do
     Contextify.is_context?('book').should == true
+    Contextify.is_context?('text_book').should == true
   end
 
   it "should create a class-level context name" do
     Book.context_name.should == 'book'
+    TextBook.context_name.should == 'text_book'
   end
 
   it "should raise UnknownContext when loading unknwon-contexts" do
@@ -99,6 +102,12 @@ describe Contextify do
     book.class.should == Book
   end
 
+  it "should load contexts which inherit from the contextified class" do
+    book = Book.load_context(@discrete_structures_path)
+    book.should_not be_nil
+    book.class.should == TextBook
+  end
+
   it "should return nil when loading contexts incompatible with the class" do
     BookReview.load_context(@snow_crash_path).should be_nil
   end

data/spec/helpers/contexts.rb

@@ -1,4 +1,5 @@
 require 'helpers/book_context'
+require 'helpers/text_book_context'
 require 'helpers/book_review_context'
 
 module Helpers

data/spec/helpers/contexts/discrete_structures.rb

@@ -0,0 +1,4 @@
+text_book do
+  @title = 'Discrete Structures, Logic, and Computability, 2nd Edition'
+  @author = 'James L. Hein'
+end

data/spec/helpers/text_book_context.rb

@@ -0,0 +1,7 @@
+require 'helpers/book_context'
+
+class TextBook < Book
+
+  contextify :text_book
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-gem 'rspec', '>=1.3.0'
-require 'spec'
+require 'rspec'
 
 require 'contextify/version'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: contextify
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Postmodern
@@ -15,25 +14,69 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-23 00:00:00 -07:00
+date: 2010-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: ore
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
-        - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 2
+        - 0
+        version: 0.2.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ore-tasks
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 2
+        version: 0.1.2
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
+  type: :development
+  version_requirements: *id004
 description: Contextify can load Ruby Objects containing methods and procs from Ruby files without having to use YAML or define classes named like the file.
 email: postmodern.mod3@gmail.com
 executables: []
@@ -41,27 +84,23 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- ChangeLog.md
-- LICENSE.txt
 - README.md
 files: 
-- .gitignore
-- .specopts
+- .rspec
 - .yardopts
 - ChangeLog.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - contextify.gemspec
+- gemspec.yml
 - lib/contextify.rb
 - lib/contextify/class_methods.rb
+- lib/contextify/contextified_class_methods.rb
 - lib/contextify/contextify.rb
 - lib/contextify/exceptions.rb
 - lib/contextify/exceptions/context_not_found.rb
 - lib/contextify/exceptions/unknown_context.rb
-- lib/contextify/extensions.rb
-- lib/contextify/extensions/meta.rb
-- lib/contextify/extensions/meta/object.rb
 - lib/contextify/pending_context.rb
 - lib/contextify/version.rb
 - lib/contextify/yard.rb
@@ -69,19 +108,21 @@ files:
 - spec/helpers/book_context.rb
 - spec/helpers/book_review_context.rb
 - spec/helpers/contexts.rb
+- spec/helpers/contexts/discrete_structures.rb
 - spec/helpers/contexts/load_error.rb
 - spec/helpers/contexts/neuromancer_review.rb
 - spec/helpers/contexts/no_method_error.rb
 - spec/helpers/contexts/snow_crash.rb
 - spec/helpers/contexts/syntax_error.rb
+- spec/helpers/text_book_context.rb
 - spec/spec_helper.rb
 has_rdoc: yard
 homepage: http://github.com/postmodern/contextify
 licenses: 
 - MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -89,7 +130,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -98,25 +138,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: contextify
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Loads Ruby Objects containing methods and procs from Ruby files.
 test_files: 
-- spec/spec_helper.rb
-- spec/helpers/book_review_context.rb
-- spec/helpers/contexts/no_method_error.rb
-- spec/helpers/contexts/snow_crash.rb
-- spec/helpers/contexts/load_error.rb
-- spec/helpers/contexts/syntax_error.rb
-- spec/helpers/contexts/neuromancer_review.rb
-- spec/helpers/book_context.rb
-- spec/helpers/contexts.rb
 - spec/contextify_spec.rb

data/.gitignore

@@ -1,9 +0,0 @@
-doc
-pkg
-tmp/*
-.DS_Store
-.yardoc
-*.db
-*.log
-*.swp
-*~

data/.specopts

@@ -1 +0,0 @@
---colour --format specdoc

data/lib/contextify/extensions.rb

@@ -1 +0,0 @@
-require 'contextify/extensions/meta'

data/lib/contextify/extensions/meta.rb

@@ -1 +0,0 @@
-require 'contextify/extensions/meta/object'

data/lib/contextify/extensions/meta/object.rb

@@ -1,24 +0,0 @@
-# metaprogramming assistant -- metaid.rb
-class Object
-  # The hidden singleton lurks behind everyone
-  def metaclass; class << self; self; end; end
-  def meta_eval(&blk); metaclass.instance_eval(&blk); end
-
-  # A class_eval version of meta_eval
-  def metaclass_eval(&blk); metaclass.class_eval(&blk); end
-
-  # A class_def version of meta_def
-  def metaclass_def(name, &blk)
-    metaclass_eval { define_method(name, &blk) }
-  end
-  
-  # Adds methods to a metaclass
-  def meta_def(name, &blk)
-    meta_eval { define_method(name, &blk) }
-  end
-  
-  # Defines an instance method within a class
-  def class_def(name, &blk)
-    class_eval { define_method(name, &blk) }
-  end
-end