governor 0.2.1 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ./
   specs:
-    governor (0.2.0)
+    governor (0.2.2)
       rails (~> 3.0.5)
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/app/controllers/governor/articles_controller.rb

@@ -1,5 +1,6 @@
 class Governor::ArticlesController < ApplicationController
   include Governor::Controllers::Helpers
+  include Governor::Controllers::Methods
   before_filter :init_resource, :only => [:show, :edit, :update, :destroy]
   before_filter :authorize_governor!, :only => [:new, :edit, :create, :update, :destroy]
   helper :governor

data/governor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{governor}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Liam Morley"]
-  s.date = %q{2011-04-10}
+  s.date = %q{2011-04-11}
   s.description = %q{Because Blogojevich would be too tough to remember. It's a pluggable blogging system for Rails 3.}
   s.email = %q{liam@carpeliam.com}
   s.extra_rdoc_files = [
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/governor.rb",
     "lib/governor/article.rb",
     "lib/governor/controllers/helpers.rb",
+    "lib/governor/controllers/methods.rb",
     "lib/governor/formatters.rb",
     "lib/governor/mapping.rb",
     "lib/governor/plugin.rb",

data/lib/governor/article.rb

@@ -4,8 +4,8 @@ module Governor
   module Article
     def self.included(base) #:nodoc:
       base.belongs_to :author, :polymorphic => true
-      Governor::PluginManager.resources(:child_resources).each_key do |resource|
-        base.has_many resource
+      Governor::PluginManager.plugins.each do |plugin|
+        plugin.include_in_model(base)
       end
       
       # Will retrieve all of the articles with a given year, month, or day. If

data/lib/governor/controllers/methods.rb

@@ -0,0 +1,7 @@
+module Governor
+  module Controllers
+    module Methods
+    
+    end
+  end
+end

data/lib/governor/plugin.rb

@@ -1,6 +1,6 @@
 module Governor
   class Plugin
-    attr_reader :name, :migrations, :resources, :helpers
+    attr_reader :name, :migrations, :routes, :resources, :helpers
     def initialize(name)
       @name = name
       @migrations = []
@@ -13,22 +13,22 @@ module Governor
       @migrations << path
     end
     
-    # Adds a nested resource. Any options are passed directly to the router.
-    # Any member or collection routes can be passed in as a block.
+    # Adds routes for articles. These can add member or collection routes to
+    # articles, or even nested resources.
     #
     # Example:
     #
     #     comments = Governor::Plugin.new('comments')
-    #     comments.add_child_resource :comments do
-    #       member do
-    #         put 'mark_spam', 'not_spam'
+    #     comments.set_routes do
+    #       resources :comments do
+    #         member do
+    #           put 'mark_spam', 'not_spam'
+    #         end
     #       end
     #     end
     #
-    def add_child_resource(name, options={}, &block)
-      options[:block] = block if block_given?
-      @resources[:child_resources] ||= {}
-      @resources[:child_resources][name] = options
+    def set_routes(&block)
+      @routes = block
     end
     
     # Specifies that this plugin will display a partial of the given type, at
@@ -46,13 +46,7 @@ module Governor
       @partials[type.to_sym] = path
     end
     
-    # Returns the path associated with the given partial type.
-    #
-    # Example:
-    #
-    #     comments.partial_for(:after_article_whole) # => 'articles/comments'
-    #
-    def partial_for(type)
+    def partial_for(type) #:nodoc:
       @partials[type.to_sym]
     end
     
@@ -68,5 +62,29 @@ module Governor
     def add_helper(mod)
       @helpers << mod
     end
+    
+    def include_in_model(base) #:nodoc:
+      instance_exec(base, &@model_callback) if @model_callback
+    end
+    
+    # Evaluates the block in the scope of the model. This is the equivalent of
+    # creating a mixin, including it within your article class and
+    # implementing +self.included+.
+    #
+    # Example:
+    #
+    #     thinking_sphinx = Governor::Plugin.new('thinking_sphinx')
+    #     thinking_sphinx.register_model_callback do |base|
+    #       base.define_index do
+    #         indexes title
+    #         indexes description
+    #         indexes post
+    #         has created_at
+    #         set_property :delta => true
+    #       end
+    #     end
+    def register_model_callback(&block)
+      @model_callback = block
+    end
   end
 end

data/lib/governor/plugin_manager.rb

@@ -18,18 +18,6 @@ module Governor
       def register(*plugins)
         @@plugins += plugins
       end
-      
-      # A convenience method for obtaining the resources for plugins.
-      #
-      # Example:
-      #
-      #     comments = Governor::Plugin.new('comments')
-      #     comments.add_child_resource :comments, :path_names => {:create => 'comment'}
-      #     Governor::PluginManager.register comments
-      #     Governor::PluginManager.resources(:child_resources) # => {:comments => {:create => 'comment'}}
-      def resources(name)
-        @@plugins.map{|p| p.resources[name] }.compact.reduce({}, :merge)
-      end
     end
   end
 end

data/lib/governor/rails/routes.rb

@@ -19,12 +19,8 @@ module ActionDispatch #:nodoc:
         resources.each do |resource|
           mapping = Governor.map(resource, options)
           resources mapping.resource, :controller => mapping.controller, :governor_mapping => resource do
-            Governor::PluginManager.resources(:child_resources).each_pair do |child_resource, options|
-              options = {:module => :governor}.merge options
-              block = options.delete :block
-              resources(child_resource, options) do
-                instance_eval(&block) if block.present?
-              end
+            Governor::PluginManager.plugins.map{|p| p.routes }.each do |routes|
+              instance_eval(&routes)
             end
           end
         end

data/lib/governor.rb

@@ -5,6 +5,7 @@ require 'governor/formatters'
 require 'governor/mapping'
 
 require 'governor/controllers/helpers'
+require 'governor/controllers/methods'
 
 require 'governor/rails'
 

data/spec/action_dispatch/routing/mapper_spec.rb

@@ -3,18 +3,24 @@ require 'spec_helper'
 module ActionDispatch::Routing
   
   describe Mapper do
-    context "#governate" do
+    context "#governate", :type => :routing do
       
       before do
         @plugin = Governor::Plugin.new('test')
-        @plugin.add_child_resource('test', :some_option => 'value')
+        @plugin.set_routes do
+          resources :foos
+        end
         Governor::PluginManager.register @plugin
+        
+        @article = Factory(:article)
+        Rails.application.reload_routes!
       end
       
-      it "doesn't alter a plugin's options" do
-        Rails.application.reload_routes!
-        
-        @plugin.resources[:child_resources].should == {'test' => {:some_option => 'value'}}
+      it "adds the route" do
+        Rails.application.routes.routes.map(&:name).should include 'article_foos'
+        # the above works, but the below does not :/
+        pending "check with rspec folks to figure out why this doesn't pass"
+        {:get => "/articles/#{@article.id}/foos"}.should route_to(:controller => 'foos', :action => 'show', :governor_mapping => :articles)
       end
       
       after do

data/spec/governor/plugin_manager_spec.rb

@@ -12,15 +12,6 @@ module Governor
       PluginManager.plugins.should include plugin
     end
     
-    it "collects resources for plugins" do
-      plugin1 = Plugin.new('test 1')
-      plugin1.add_child_resource(:moneys)
-      plugin2 = Plugin.new('test 2')
-      plugin2.add_child_resource(:powers, :module => :illinois)
-      PluginManager.register plugin1, plugin2
-      PluginManager.resources(:child_resources).should == {:moneys => {}, :powers => {:module => :illinois}}
-    end
-    
     after do
       remove_plugins = Governor::PluginManager.plugins - @plugins
       remove_plugins.each do |plugin|

data/spec/governor/plugin_spec.rb

@@ -2,10 +2,21 @@ require 'spec_helper'
 
 module Governor
   describe Plugin do
-    before(:each) {@plugin = Plugin.new('test')}
-    it "collects child resources" do
-      @plugin.add_child_resource('tests', :controller => 'governor/tests')
-      @plugin.resources.should == {:child_resources => {'tests' => {:controller => 'governor/tests'}}}
+    before(:each) do
+      @plugin = Plugin.new('test')
+      @plugin.register_model_callback do |base|
+        def base.test_method
+          true
+        end
+      end
+      PluginManager.register @plugin
+    end
+    it "can add code to the model" do
+      class ArticleStub < ActiveRecord::Base
+        establish_connection 'nulldb'
+        include Article
+      end
+      ArticleStub.should respond_to :test_method
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: governor
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Liam Morley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -04:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,6 +235,7 @@ files:
 - lib/governor.rb
 - lib/governor/article.rb
 - lib/governor/controllers/helpers.rb
+- lib/governor/controllers/methods.rb
 - lib/governor/formatters.rb
 - lib/governor/mapping.rb
 - lib/governor/plugin.rb