nezu 0.5.11 → 0.5.13

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    nezu (0.4.18)
+    nezu (0.5.13)
       activerecord (~> 3.2.11)
       activesupport (~> 3.2.11)
       amqp
-      bunny (>= 0.9.0.pre6)
+      bunny (>= 0.9.0.pre8)
       configatron
       mysql2
       term-ansicolor
@@ -13,23 +13,23 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    amq-client (0.9.12)
+    amq-client (1.0.0)
       amq-protocol (>= 1.2.0)
       eventmachine
     amq-protocol (1.2.0)
-    amqp (0.9.10)
-      amq-client (~> 0.9.12)
+    amqp (1.0.0)
+      amq-client (~> 1.0.0)
       amq-protocol (~> 1.2.0)
       eventmachine
     arel (3.0.2)
@@ -48,9 +48,9 @@ GEM
     debugger-ruby_core_source (1.2.0)
     diff-lcs (1.2.1)
     eventmachine (1.0.3)
-    i18n (0.6.4)
+    i18n (0.6.1)
     json (1.7.7)
-    multi_json (1.6.1)
+    multi_json (1.7.1)
     mysql2 (0.3.11)
     rake (10.0.3)
     rdoc (3.12.2)
@@ -66,7 +66,7 @@ GEM
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
-    term-ansicolor (1.1.1)
+    term-ansicolor (1.1.4)
     tzinfo (0.3.37)
     yamler (0.1.0)
 

data/README.md

@@ -9,6 +9,16 @@ It has two major modes of usage:
   2. (bundle exec) nezu run
     inside your app folder starts your application and subscribes all your consumers to their appropriate queues
 
+  3. Start
+     amqp-consume --queue="test.pong.dev" cat
+     in other shell
+
+  4. Do
+     amqp-publish --routing-key=test.your_app_name.dev --body='{"__action":"ping","__reply_to":"test.pong.dev","test":23}'
+     in 3rd shell, now you should see the result:
+     {"test":23,"__action":"ping_result"}
+     in the output of amqp-consume an debug messages in "nezu run" output
+
 *BIGFATALPHAWARNING:*
  This hasn`t been fully tested yet. So if your working on a nuclear plant or so, go back to sleep this will be a lower risk
 

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.13

data/lib/nezu/generators/application/MANIFEST

@@ -6,9 +6,10 @@ app/consumers/$app_name.rb.tt
 app/consumers/.gitkeep
 app/models/.gitkeep
 app/producers/.gitkeep
+app/producers/pong.rb.tt
 config/amqp.yml.tt
 config/boot.rb.tt
-config/database.yml.tt
+config/database.yml.example.tt
 config/initializers/.gitkeep
 config/nezu.rb.tt
 db/.gitkeep

data/lib/nezu/generators/application/templates/app/consumers/$app_name.rb.tt

@@ -1,7 +1,7 @@
 class <%= name_space %> < Nezu::Runtime::Consumer
   def ping(*params)
     Nezu::LOGGER.info("Action: ping received params #{params}")
-    params
+    params[0]
   end
 end
 

data/lib/nezu/generators/application/templates/app/producers/pong.rb.tt

@@ -0,0 +1,3 @@
+class Pong < Nezu::Runtime::Producer
+end
+

data/lib/nezu/generators.rb

@@ -5,7 +5,7 @@ require 'nezu/generators/application/app_generator'
 module Nezu
   module Generators
 
-    configatron.template_paths = [File.join(Nezu::GEM_DIR, 'lib/nezu/generators/application/templates')] + ENV['NEZU_TEMPLATES'].to_s.split(':')
+    configatron.template_paths = [Nezu.gem_path.join('lib/nezu/generators/application/templates')] + ENV['NEZU_TEMPLATES'].to_s.split(':')
     configatron.file_suffixes = %w(tt)
 
     def template_to(filename) # e.g. "config/amqp.yml"

data/lib/nezu/runner.rb

@@ -9,8 +9,8 @@ module Nezu
     # this is the starting point for every application running with "$> nezu run"
     # it get called from cli.rb
     def self.start
-      AMQP.start(configatron.amqp.url) do |connection, open_ok|
-        Nezu.logger.debug("[Nezu Runner] AMQP connection #{configatron.amqp.url}")
+      AMQP.start(configatron.amqp.send(Nezu.env.to_sym).url) do |connection, open_ok|
+        Nezu.logger.debug("[Nezu Runner] AMQP connection #{configatron.amqp.send(Nezu.env.to_sym).url}")
         channel = AMQP::Channel.new(connection, :auto_recovery => true)
         Nezu.logger.debug("[Nezu Runner] AMQP channel #{channel}")
         Nezu::Runtime::Consumer.descendants.each do |consumer|

data/lib/nezu/runtime/consumer.rb

@@ -1,23 +1,13 @@
 module Nezu
   module Runtime
     class Consumer
-      def self.inherited(subclass) #:nodoc:
-        subclass.class_eval {cattr_accessor :queue_name}
-        subclass.queue_name = ''
-        subclass.queue_name << "#{configatron.amqp.queue_prefix}." unless configatron.amqp.queue_prefix.nil?
-        subclass.queue_name << subclass.to_s.gsub(/::/, '.').underscore
-        subclass.queue_name << ".#{configatron.amqp.queue_postfix}" unless configatron.amqp.queue_postfix.nil?
-      end
-
-      def self.descendants
-        ObjectSpace.each_object(Class).select { |klass| klass < self }
-      end
+      extend Nezu::Runtime::Common
 
       def handle_message(metadata, payload)
         Nezu.logger.debug("NEZU Consumer[#{self.class}] payload: #{payload}")
         params = JSON.parse(payload.to_s)
         action = params.delete('__action')
-        reply_to = params.delete('__reply_to')
+        reply_to = params['__reply_to']
         result = self.send(action.to_sym, params)
         if reply_to
           result.reverse_merge!('__action' => "#{action}_result")

data/lib/nezu/runtime/producer.rb

@@ -1,21 +1,10 @@
 module Nezu
   module Runtime
     class Producer
-      def self.inherited(subclass)
-        subclass.class_eval {cattr_accessor :queue_name} #:exchange_name?
-        subclass.queue_name = ''
-        subclass.queue_name << "#{configatron.amqp.queue_prefix}." unless configatron.amqp.queue_prefix.nil?
-        subclass.queue_name << subclass.to_s.gsub(/::/, '.').underscore
-        subclass.queue_name << ".#{configatron.amqp.queue_postfix}" unless configatron.amqp.queue_postfix.nil?
-        subclass.queue_name
-      end
-
-      def self.descendants
-        ObjectSpace.each_object(Class).select { |klass| klass < self }
-      end
+      extend Nezu::Runtime::Common
 
       def self.push!(params = {})
-        conn = Bunny.new(configatron.amqp.url)
+        conn = Bunny.new(configatron.amqp.send(Nezu.env.to_sym).url)
         conn.start
         ch = conn.create_channel
         q  = ch.queue(queue_name)

data/lib/nezu/runtime.rb

@@ -14,10 +14,10 @@ module Nezu
         Nezu.logger.fatal("[Nezu Runner] no amqp config please create one in config/amqp.yml") unless configatron.amqp.present?
         raise
       end
-
-      if configatron.database.present? && !Class.const_defined?(:Rails)
-        ActiveRecord::Base.establish_connection(configatron.database.to_hash)
-        ActiveRecord::Base.logger = Logger.new(File.expand_path(File.join('log/', 'database.log')))
+      if configatron.database.send(Nezu.env).database.present? && !Class.const_defined?(:Rails)
+        require configatron.database.send(Nezu.env).adapter
+        ActiveRecord::Base.establish_connection(configatron.database.send(Nezu.env.to_sym).to_hash)
+        ActiveRecord::Base.logger = Logger.new(Nezu.root.join('log/', 'database.log'))
       end
 
       req_files = Dir.glob(Nezu.root.join('app', 'consumers', '*.rb'))
@@ -34,10 +34,40 @@ module Nezu
       Nezu.logger.debug(configatron.amqp)
     end
 
+    module Common
+
+      # creates a class method ::queue_name with a queue name derived from the class name and pre- and posfixes.
+      # e.g if a classes name is Foo the queue_name will be "your_prefix.foo.your_postfix"
+      # to avoid naming conflicts it is also possible to scope the class in modules "Producers" or "Consumers"
+      # so a somthing like:
+      #:code
+      # module Producers
+      #   class FooBar < Nezu::Runtime::Producer
+      #   end
+      # end
+      #
+      # will result in a queue "your_prefix.foo_bar.your_postfix"
+      # the same goes for module "Consumers". This is especially useful if you need a consumer and a producer
+      # on the same queue
+      #
+      def inherited(subclass)
+        subclass.class_eval {cattr_accessor :queue_name} #:exchange_name?
+        subclass.queue_name = ''
+        subclass.queue_name << "#{configatron.amqp.send(Nezu.env.to_sym).queue_prefix}." unless configatron.amqp.send(Nezu.env.to_sym).queue_prefix.nil?
+        subclass.queue_name << subclass.to_s.gsub(/^(Producers|Consumers)::/, '').gsub(/::/, '.').underscore
+        subclass.queue_name << ".#{configatron.amqp.send(Nezu.env.to_sym).queue_postfix}" unless configatron.amqp.send(Nezu.env.to_sym).queue_postfix.nil?
+        subclass.queue_name
+      end
+
+      def descendants
+        ObjectSpace.each_object(Class).select { |klass| klass < self }
+      end
+    end
+
     private
 
     def self.configure_from_yaml(yaml_file) #:nodoc:
-      yaml = YAML.load_file(Nezu.root.join('config', yaml_file))[Nezu.env]
+      yaml = YAML.load_file(Nezu.root.join('config', yaml_file))
       configatron.configure_from_hash(File.basename(yaml_file.sub(/.yml/, '')) => yaml)
     end
   end

data/lib/nezu.rb

@@ -11,8 +11,6 @@ require 'nezu/runtime'
 module Nezu
   mattr_accessor :logger
 
-  GEM_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
   #used by Nezu.env and Nezu.env.developent? etc.
   class Env < String
     def method_missing(meth, params=nil) #:nodoc:
@@ -28,11 +26,12 @@ module Nezu
 
   class Root < String
     APP_PATH = self.new(File.expand_path(Dir.pwd))
+    GEM_PATH = self.new(File.expand_path(File.join(File.dirname(__FILE__), '..')))
 
     # you can do Nezu.root.join('path', 'to', 'your', 'stuff') and get the
     # absolute path of your stuff
     def join(*params)
-      File.join(APP_PATH, params)
+      File.join(self, params)
     end
   end
 
@@ -106,6 +105,11 @@ module Nezu
     Root::APP_PATH
   end
 
+  # Returns a String like object with the gems absolute root
+  def self.gem_path
+    Root::GEM_PATH
+  end
+
   # turn errors into warnings if used in verbose mode (Nezu.try(true) { ... })
   # useful if you find it acceptable that something isn't
   # working

data/lib/tasks/nezu_db.rake

@@ -0,0 +1,94 @@
+#require 'nezu/runner'
+require 'active_support/core_ext/object/inclusion'
+require 'active_record'
+require 'debugger'
+
+namespace :nezu do
+  db_namespace = namespace :db do
+    task :load_config do
+      Nezu.logger.level = Logger::INFO
+      Nezu::Runtime.load_config
+    end
+
+    desc 'Create all the local databases defined in config/database.yml'
+    task :create => [:load_config] do
+        databases = YAML.load_file(File.join(Nezu.root.join('config', 'database.yml'))).map {|k,v| v }.uniq
+        databases.each do |db|
+          print "creating #{db['database']}..."
+          ActiveRecord::Base.establish_connection(db.merge({'database' => nil}))
+          ActiveRecord::Base.connection.create_database(db['database']) rescue (puts 'ERROR'; next)
+          puts 'done'
+        end
+    end
+
+    desc "Migrate the database (options: VERSION=x, VERBOSE=false)."
+    task :migrate => [:load_config] do
+      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
+      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
+        ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
+      end
+      db_namespace["schema:dump"].invoke
+    end
+
+    desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
+    task :rollback => [:load_config] do
+      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+      ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+      db_namespace['schema:dump'].invoke
+    end
+
+    namespace :migrate do
+      # desc 'Resets your database using your migrations for the current environment'
+      #task :reset => ['db:drop', 'db:create', 'db:migrate']
+
+      desc 'Runs the "up" for a given migration VERSION.'
+      task :up => [:load_config] do
+        version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+        raise 'VERSION is required' unless version
+        ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_paths, version)
+        db_namespace['dump'].invoke
+      end
+
+      desc 'Runs the "down" for a given migration VERSION.'
+      task :down => [:load_config] do
+        version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+        raise 'VERSION is required' unless version
+        ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_paths, version)
+        db_namespace['_dump'].invoke
+      end
+
+      # desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
+      task :redo => [:load_config] do
+        if ENV['VERSION']
+          db_namespace['migrate:down'].invoke
+          db_namespace['migrate:up'].invoke
+        else
+          db_namespace['rollback'].invoke
+          db_namespace['migrate'].invoke
+        end
+      end
+    end
+
+    namespace :schema do
+      desc 'Create a db/schema.rb file'
+      task :dump => [:load_config] do
+        require 'active_record/schema_dumper'
+        filename = ENV['SCHEMA'] || "#{Nezu.root}/db/schema.rb"
+        File.open(filename, "w:utf-8") do |file|
+          ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        end
+      end
+
+      desc 'Create a db from schema.rb file'
+      task :load => [:load_config] do
+        #require 'active_record/schema_dumper'
+        #filename = ENV['SCHEMA'] || "#{Nezu.root}/db/schema.rb"
+        #File.open(filename, "w:utf-8") do |file|
+          #ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        #end
+      end
+    end
+  end
+end
+
+

data/spec/functional/runtime/consumer_spec.rb

@@ -30,17 +30,17 @@ describe Nezu::Runtime::Consumer do
     end
 
     it 'should use the queue_prefix if its set' do
-      configatron.amqp.queue_prefix = 'the_prefix'
+      configatron.amqp.send(Nezu.env.to_sym).queue_prefix = 'the_prefix'
       module JustAModule;class ConsumerWithPrefix<Nezu::Runtime::Consumer;end;end
       JustAModule::ConsumerWithPrefix.queue_name.should == 'the_prefix.just_a_module.consumer_with_prefix'
-      configatron.amqp.queue_prefix = nil
+      configatron.amqp.send(Nezu.env.to_sym).queue_prefix = nil
     end
 
     it 'should use the queue_postfix if its set' do
-      configatron.amqp.queue_postfix = 'the_postfix'
+      configatron.amqp.send(Nezu.env.to_sym).queue_postfix = 'the_postfix'
       module JustAModule;class ConsumerWithPostfix<Nezu::Runtime::Consumer;end;end
       JustAModule::ConsumerWithPostfix.queue_name.should == 'just_a_module.consumer_with_postfix.the_postfix'
-      configatron.amqp.queue_postfix = nil
+      configatron.amqp.send(Nezu.env.to_sym).queue_postfix = nil
     end
   end
 

data/spec/functional/runtime/producer_spec.rb

@@ -7,8 +7,8 @@ describe Nezu::Runtime::Producer do
 
   describe '::push!' do
     it 'should create a new message on the server' do
-      configatron.amqp.url = 'amqp://127.0.0.1'
-      Bunny.should_receive(:new).with(configatron.amqp.url).and_return(AlwaysHappy.new)
+      configatron.amqp.send(Nezu.env.to_sym).url = 'amqp://127.0.0.1'
+      Bunny.should_receive(:new).with(configatron.amqp.send(Nezu.env.to_sym).url).and_return(AlwaysHappy.new)
       module ExampleProducers;class MyQueue<Nezu::Runtime::Producer;end;end
       ExampleProducers::MyQueue.push!(:foo => 'bar')
     end

data/spec/support/sample_project/config/nezu.rb

@@ -7,5 +7,7 @@ Dir.glob("**/*.rb").each do |f|
   require f
 end
 
+require 'producers/pong'
+
 LOGGER = Logger.new('log/SampleProject.log')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nezu
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -217,9 +217,10 @@ files:
 - lib/nezu/generators/application/templates/app/consumers/.gitkeep
 - lib/nezu/generators/application/templates/app/models/.gitkeep
 - lib/nezu/generators/application/templates/app/producers/.gitkeep
+- lib/nezu/generators/application/templates/app/producers/pong.rb.tt
 - lib/nezu/generators/application/templates/config/amqp.yml.tt
 - lib/nezu/generators/application/templates/config/boot.rb.tt
-- lib/nezu/generators/application/templates/config/database.yml.tt
+- lib/nezu/generators/application/templates/config/database.yml.example.tt
 - lib/nezu/generators/application/templates/config/initializers/.gitkeep
 - lib/nezu/generators/application/templates/config/nezu.rb.tt
 - lib/nezu/generators/application/templates/db/.gitkeep
@@ -231,7 +232,7 @@ files:
 - lib/nezu/runtime/producer.rb
 - lib/nezu/runtime/recipient.rb
 - lib/nezu/runtime/worker.rb
-- lib/tasks/databases.rake
+- lib/tasks/nezu_db.rake
 - nezu.gemspec
 - spec/functional/generators/app_generator_spec.rb
 - spec/functional/generators_spec.rb
@@ -272,12 +273,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1835155368988834994
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1835155368988834994
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/tasks/databases.rake

@@ -1,112 +0,0 @@
-#require 'nezu/runner'
-require 'active_support/core_ext/object/inclusion'
-require 'active_record'
-require 'debugger'
-
-#def load_config
-  #yaml = YAML.load_file(File.join(Nezu.root.join('config', 'database.yml')))
-  #configatron.databases.configure_from_hash(yaml)
-#end
-
-def connect_to(env, without_db=false)
-  config = configatron.databases.send(env).to_hash
-  config.delete(:database) if without_db
-  @connection = ActiveRecord::Base.establish_connection(config)
-end
-
-db_namespace = namespace :db do
-  task :load_config do
-    yaml = YAML.load_file(File.join(Nezu.root.join('config', 'database.yml')))
-    configatron.databases.configure_from_hash(yaml)
-  end
-
-  desc 'Create all the local databases defined in config/database.yml'
-  task :create do
-    begin
-      load_config
-      configatron.databases.to_hash.each do |k,v|
-        print "creating #{k}`s db (#{v}) ... "
-        connect_to(k, true)
-        ActiveRecord::Base.connection.create_database(v[:database])
-        puts 'done'
-      end
-    rescue Mysql2::Error => e
-      puts "not done (#{e.to_s})"
-    end
-  end
-
-  task :migrate => [:load_config] do
-    connect_to(Nezu.env)
-    if ENV['VERSION']
-      db_namespace['migrate:down'].invoke
-      db_namespace['migrate:up'].invoke
-    else
-      ActiveRecord::Migrator.migrate(Nezu.root.join('db', 'migrate')) do |migration|
-        migration.migrate(:up)
-      end
-    end
-  end
-
-  desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
-  task :rollback => [:environment, :load_config] do
-    connect_to(Nezu.env)
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
-    db_namespace['schema:dump'].invoke
-  end
-
-  namespace :migrate do
-    # desc 'Resets your database using your migrations for the current environment'
-    #task :reset => ['db:drop', 'db:create', 'db:migrate']
-
-    desc 'Runs the "up" for a given migration VERSION.'
-    task :up => [:environment, :load_config] do
-      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-      raise 'VERSION is required' unless version
-      ActiveRecord::Migrator.run(:up, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['dump'].invoke
-    end
-
-    desc 'Runs the "down" for a given migration VERSION.'
-    task :down => [:environment, :load_config] do
-      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-      raise 'VERSION is required' unless version
-      ActiveRecord::Migrator.run(:down, ActiveRecord::Migrator.migrations_paths, version)
-      db_namespace['_dump'].invoke
-    end
-
-    # desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
-    task :redo => [:environment, :load_config] do
-      if ENV['VERSION']
-        db_namespace['migrate:down'].invoke
-        db_namespace['migrate:up'].invoke
-      else
-        db_namespace['rollback'].invoke
-        db_namespace['migrate'].invoke
-      end
-    end
-  end
-
-  namespace :schema do
-    desc 'Create a db/schema.rb file'
-    task :dump => [:environment, :load_config] do
-      require 'active_record/schema_dumper'
-      connect_to(Nezu.env)
-      filename = ENV['SCHEMA'] || "#{Nezu.root}/db/schema.rb"
-      File.open(filename, "w:utf-8") do |file|
-        ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-      end
-    end
-
-    desc 'Create a db from schema.rb file'
-    task :load => [:load_config] do
-      #require 'active_record/schema_dumper'
-      connect_to(Nezu.env)
-      #filename = ENV['SCHEMA'] || "#{Nezu.root}/db/schema.rb"
-      #File.open(filename, "w:utf-8") do |file|
-        #ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
-      #end
-    end
-  end
-end
-