imperator 0.1.0 → 0.2.0

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in commando.gemspec
 gemspec
+
+gem "pry", :group => [:test, :development]

data/README.md

@@ -68,5 +68,12 @@ Commands can also be used on forms in place of ActiveRecord models.
 ###Using a command in the background (Delayed::Job)
     Delayed::Job.enqueue command
 
+###Contributors
+Many thanks to the following contributors for bugfixes, testing, and
+additional functionality
+
+* Jason Staten (@statianzo)
+* Jay Adkisson (@jayferd)
+* Nick Maloney (@nmaloney)
 
 		  

data/imperator.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
-  s.add_development_dependency "pry"
   # s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "uuidtools"
-  s.add_runtime_dependency "active_attr"
+  s.add_runtime_dependency "activemodel"
+  s.add_runtime_dependency "virtus"
 end

data/lib/imperator.rb

@@ -1,8 +1,6 @@
-require 'active_attr'
 require "imperator/version"
 require 'imperator/invalid_command_error'
 require 'imperator/command'
-require 'pry'
 
 module Imperator
   # Your code goes here...

data/lib/imperator/command.rb

@@ -1,27 +1,31 @@
 require 'uuidtools'
+require 'active_model'
+require 'virtus'
 class Imperator::Command
-  include ActiveAttr::Model
+  include ActiveModel::Validations
   extend ActiveModel::Callbacks
+  include Virtus
+
+  if defined? ActiveModel::Serializable
+    include ActiveModel::Serializable::JSON
+    include ActiveModel::Serializable::XML
+  else
+    include ActiveModel::Serializers::JSON
+    include ActiveModel::Serializers::Xml
+  end
 
   define_model_callbacks :create, :perform, :initialize
 
-  cattr_accessor :commit_mode
-  attribute :id
-
-  after_initialize :set_uuid
-
-  class << self
-    attr_accessor :perform_block
-  end
+  attribute :id, String, :default => proc { UUIDTools::UUID.timestamp_create.to_s }
 
   def self.action(&block)
-    @perform_block = block
+    define_method(:action, &block)
   end
 
   alias_method :params, :attributes
 
-  def as_json
-    attributes.as_json
+  def as_json(*args)
+    attributes.as_json(*args)
   end
 
   def persisted?
@@ -61,26 +65,12 @@ class Imperator::Command
     self.perform
   end
 
-  def perform
-    raise "You need to define the perform block for #{self.class.name}" unless self.class.perform_block
-    run_callbacks :perform do 
-      self.instance_exec(&self.class.perform_block)
-    end
+  # @abstract
+  def action
+    raise NoMethodError.new("Please define #action for #{self.class.name}")
   end
 
-  def method_missing(method, *args)
-    method_root = method.to_s.gsub(/=$/, "")
-    if method.to_s[/=$/]
-      self.attributes[method_root] = args.first
-    elsif attributes.has_key?(method_root)
-      self.attributes[method]
-    else
-      super
-    end
-  end
-
-  private 
-  def set_uuid
-    self.id = UUIDTools::UUID.timestamp_create.to_s if self.id.nil?
+  def perform
+    run_callbacks(:perform) { action }
   end
 end

data/lib/imperator/version.rb

@@ -1,3 +1,3 @@
 module Imperator 
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/imperator/command_spec.rb

@@ -3,22 +3,46 @@ describe Imperator::Command do
 
   describe "#perform" do
     class CommandTestException < Exception; end
-    class TestCommand < Imperator::Command
-      action do
-        raise CommandTestException.new 
+    context "using DSL " do
+      class DSLTestCommand < Imperator::Command
+        action do
+          raise CommandTestException.new 
+        end
+      end
+
+      let(:command){DSLTestCommand.new}
+      it "runs the action block when #perform is called" do
+        lambda{command.perform}.should raise_exception(CommandTestException)
+      end
+    end
+
+    context "using method definition" do
+      class MethodTestCommand < Imperator::Command
+        def action 
+          raise CommandTestException.new
+        end
+      end
+      let(:command){MethodTestCommand.new}
+      it "runs the action method when #perform is called" do
+        lambda{command.perform}.should raise_exception(CommandTestException)
       end
     end
+  end
+
+  describe "actions" do
+    context "using DSL" do
+      class ActionDSLExampleCommand < Imperator::Command
+        action do
 
-    let(:command){TestCommand.new}
-    it "runs the action block when #perform is called" do
-      lambda{command.perform}.should raise_exception(CommandTestException)
+        end
+      end
     end
   end
 
   describe "attributes" do
     class AttributeCommand < Imperator::Command
-      attribute :gets_default, :default => "foo"
-      attribute :declared_attr
+      attribute :gets_default, String, :default => "foo"
+      attribute :declared_attr, String
     end
 
     it "throws away undeclared attributes in mass assignment" do
@@ -39,6 +63,13 @@ describe Imperator::Command do
       command = AttributeCommand.new :gets_default => "bar"
       command.gets_default.should == "bar"
     end
+
+    it "will create attributes as json" do
+      command = AttributeCommand.new
+      command.as_json.should == {"id" => command.id,
+                                 "gets_default" => "foo",
+                                 "declared_attr" => nil}
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imperator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 -05:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70180076248340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,31 +22,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70180076248340
 - !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
+  name: uuidtools
+  requirement: &70180076247920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70180076247920
 - !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: &70180076278720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70180076278720
 - !ruby/object:Gem::Dependency
-  name: active_attr
-  requirement: !ruby/object:Gem::Requirement
+  name: virtus
+  requirement: &70180076278300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,12 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70180076278300
 description: Imperator is a small gem to help with command objects. The command pattern
   is a design pattern used to encapsulate all of the information needed to execute
   a method or process at a point in time. In a web application, commands are typically
@@ -95,6 +76,7 @@ files:
 - lib/imperator/invalid_command_error.rb
 - lib/imperator/version.rb
 - spec/imperator/command_spec.rb
+has_rdoc: true
 homepage: http://github.com/karmajunkie/imperator
 licenses: []
 post_install_message: 
@@ -115,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Imperator supports the command pattern