imperator-ext 0.2.1 → 0.2.2

data/README.md

@@ -89,7 +89,7 @@ require 'imperator/command/macros'
 
 imperator_command_factory.use do |factory|
   # put common/shared logic in this REST base class
-  factory.default_rest_class = Imperator::Mongoid::Command::Rest
+  factory.set_default_rest_class Imperator::Mongoid::Command::Rest, :mongoid
 
   factory.create_rest :all, Post do
     on_error do
@@ -122,17 +122,30 @@ If you include the macros, the following macros are exposed:
 * `#create_rest_command`
 * `#imperator_class_factory
 
+The CommandFactory can be used standalone, by subclassing or even by instance as the example below illustrates! (see specs for details)
+
 Usage example:
 
 ```ruby
-# ensure all attributes of model are reflected in Command (if adaptor makes it possible)
-Imperator::Command::ClassFactory.default_options = {auto_attributes: true}
+class AutoCommandFactory < Imperator::Command::ClassFactory
+  def initialize
+    # if Model adaptor makes it possible
+    # - ensure all attributes of model are reflected in Command
+    @default_options = {auto_attributes: true}
+  end
+end
 
 module PostController
   class Update < Action
 
     command do
-      @command ||= create_rest_command(:update, Post).new object_hash
+      @command ||= command_factory.create_rest_command(:update, Post).new object_hash
+    end
+
+    protected
+
+    def command_factory
+      AutoCommandFactory.instance
     end
   end
 end

data/VERSION

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

data/imperator-ext.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "imperator-ext"
-  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 = ["Kristian Mandrup"]

data/lib/imperator/command/class_factory.rb

@@ -4,17 +4,57 @@ require 'imperator/command/rest'
 class Imperator::Command
   # http://johnragan.wordpress.com/2010/02/18/ruby-metaprogramming-dynamically-defining-classes-and-methods/
   class ClassFactory
-    class << self
+    include Singleton
+
+    module ClassMethods
       def use &block
         yield self
       end
+    end
+
+    module Methods
+      attr_writer   :default_class, :initial_rest_classes, :initial_rest_class
+      attr_accessor :default_rest_classes
+
+      def initial_rest_classes
+        @initial_rest_classes ||= {:mongoid => Imperator::Mongoid::Command::Rest}
+      end
+
+      def default_class
+        @default_class ||= ::Imperator::Command
+      end      
+
+      def default_rest_class model = nil
+        return initial_rest_class unless model
+        return default_rest_classes[:mongoid] if model.ancestors.include?(Mongoid::Document)        
+      end
+
+      def initial_rest_class
+        @initial_rest_class ||= Imperator::Command::Rest
+      end
 
-      def default_parent clazz
-        @default_parent ||= clazz
+      def set_default_rest_class model, type = nil
+        unless type.nil?
+          @default_rest_classes[type.to_sym] = model
+          return
+        end
+        @initial_rest_class = model        
       end
 
-      def get_default_parent
-        @default_parent ||= ::Imperator::Command
+      def reset_rest!
+        @default_rest_classes = initial_rest_classes
+        @initial_rest_class = Imperator::Command::Rest
+      end
+
+      def reset!
+        reset_rest!
+        default_class = ::Imperator::Command
+      end
+
+      attr_writer :default_options
+
+      def default_options
+        @default_options ||= {}
       end
 
       # Usage:
@@ -23,10 +63,11 @@ class Imperator::Command
       # end
       def build_command action, model, options = {}, &block
         clazz_name = "#{action.to_s.camelize}#{model.to_s.camelize}Command"
-        parent = options[:parent] || get_default_parent
+        parent = options[:parent] || default_class
         clazz = parent ? Class.new(parent) : Class.new
         Object.const_set clazz_name, clazz
-        clazz = self.const_get(clazz_name)
+        context = self.kind_of?(Class) ? self : self.class
+        clazz = context.const_get(clazz_name)
         if options[:auto_attributes]
           clazz.instance_eval do
             if respond_to? :attributes_for
@@ -46,7 +87,7 @@ class Imperator::Command
       # end
       def rest_command action, model, options = {}, &block
         options.reverse_merge! default_options
-        options[:parent] ||= get_default_rest_class(model)
+        options[:parent] ||= default_rest_class(model)
         rest_commands_for(model, options, &block) and return if action.to_sym == :all
         if rest_actions.include? action.to_sym        
           action_name = "#{action}_command_for"
@@ -56,30 +97,6 @@ class Imperator::Command
         end
       end
 
-      attr_writer :default_rest_class
-
-      def get_default_rest_class model
-        model.ancestors.include?(Mongoid::Document) ? default_mongoid_rest_class : default_rest_class
-      end
-
-      def default_rest_class
-        @default_rest_class ||= Imperator::Command::Rest
-      end
-
-      def default_mongoid_rest_class
-        @default_mongoid_rest_class ||= Imperator::Mongoid::Command::Rest
-      end
-
-      def reset_rest_class
-        @default_rest_class = Imperator::Command::Rest
-      end
-
-      attr_writer :default_options
-
-      def default_options
-        @default_options ||= {}
-      end
-
 
       protected
 
@@ -117,5 +134,10 @@ class Imperator::Command
         end
       end
     end
+
+    extend Methods
+    extend ClassMethods
+
+    include Methods
   end
 end

data/spec/imperator-ext/command/class_factory_spec.rb

@@ -25,13 +25,16 @@ end
 class Payment
 end
 
+class Property
+end
+
 describe Imperator::Command::ClassFactory do
   subject { Imperator::Command::ClassFactory }
 
   describe '.rest_command' do
     context 'update' do
       before :all do
-        subject.default_rest_class = Imperator::Command::Rest
+        subject.set_default_rest_class Imperator::Command::Rest
         subject.rest_command :update, Article, :parent => UpdateRestCommand, :auto_attributes => true do
           def hello
             "hello"
@@ -49,7 +52,7 @@ describe Imperator::Command::ClassFactory do
 
     context 'create' do
       before :all do
-        subject.default_rest_class = Imperator::Command::Rest
+        subject.set_default_rest_class Imperator::Command::Rest
         subject.rest_command :create, Article, :parent => CreateRestCommand, :auto_attributes => true do
           def hello
             "hello"
@@ -67,7 +70,7 @@ describe Imperator::Command::ClassFactory do
 
     context 'delete' do
       before :all do
-        subject.default_rest_class = Imperator::Command::Rest
+        subject.set_default_rest_class Imperator::Command::Rest
         subject.rest_command :delete, Article, :parent => DeleteRestCommand, :auto_attributes => true do
           def hello
             "hello"
@@ -94,7 +97,7 @@ describe Imperator::Command::ClassFactory do
       subject.build_command :show, Post
     end    
 
-    its(:get_default_parent) { should == Imperator::Command }
+    its(:default_class) { should == Imperator::Command }
     specify { ShowPostCommand.superclass.should == Imperator::Command }
   end
 
@@ -116,14 +119,14 @@ describe Imperator::Command::ClassFactory do
     end
   end
 
-  describe '.default_rest_class' do
+  describe '.set_default_rest_class' do
     describe 'default class' do
       its(:default_rest_class) { should == Imperator::Command::Rest }
     end
 
-    describe 'set default_rest_class to UpdateRestCommand' do
+    describe 'set_default_rest_class to UpdateRestCommand' do
       before :all do
-        subject.default_rest_class = UpdateRestCommand
+        subject.set_default_rest_class UpdateRestCommand
       end
 
       its(:default_rest_class) { should == UpdateRestCommand }     
@@ -146,7 +149,7 @@ describe 'private methods' do
     describe 'rest command builders' do
       describe '.create_command_for' do
         before do
-          subject.reset_rest_class
+          subject.reset_rest!
           subject.send :create_command_for, Post
         end
 
@@ -155,7 +158,7 @@ describe 'private methods' do
 
       describe '.update_command_for' do
         before do
-          subject.default_rest_class = UpdateRestCommand
+          subject.set_default_rest_class UpdateRestCommand
           subject.send :update_command_for, Account
         end
 
@@ -164,7 +167,7 @@ describe 'private methods' do
 
       describe '.delete_command_for' do
         before do
-          subject.reset_rest_class
+          subject.reset!
           subject.send :delete_command_for, Account
         end
 
@@ -184,3 +187,52 @@ describe 'private methods' do
   end
 end
 
+class MySubFactory < Imperator::Command::ClassFactory
+  def self.initial_rest_class
+    @initial_rest_class ||= UpdateRestCommand
+  end
+
+  def initialize
+    @default_options = {:hello => 'you'}
+  end
+end
+
+describe 'subclass' do
+  describe MySubFactory do
+    subject { MySubFactory }
+
+    describe 'new initial_rest_class' do
+      its(:initial_rest_class) { should == UpdateRestCommand }
+    end
+  end
+end
+
+describe 'instance' do
+  describe MySubFactory do
+    subject { MySubFactory.instance }
+
+    describe 'new default_options' do
+      its(:default_options) {should == {:hello => 'you'} }
+    end
+
+    describe '.rest_command' do
+      context 'update' do
+        before :all do
+          subject.set_default_rest_class Imperator::Command::Rest
+          subject.rest_command :update, Property, :parent => UpdateRestCommand, :auto_attributes => true do
+            def hello
+              "hello"
+            end
+          end
+        end
+
+        context 'UpdatePropertyCommand created' do
+          let(:command) { UpdatePropertyCommand.new }
+
+          specify { UpdatePropertyCommand.superclass.should == UpdateRestCommand }
+          specify { command.hello.should == "hello" }
+        end
+      end 
+    end    
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperator-ext
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4197596095852566251
+      hash: 3676978282257002910
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: