nezu 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac75044557f02b4b54a04c3ad4d074b7d86c1cd
-  data.tar.gz: 7db33c6544789096b0038ae9f03767cd52548641
+  metadata.gz: d98336e57c79a4eb2e7be4d6a93745250a518032
+  data.tar.gz: 7a0fff0ba1aa12e30e8e985f2a0d0b9b7b75df43
 SHA512:
-  metadata.gz: 73bf7bdebfe716378ae42717ded8305efec61dc614131369686225e510dd152c73c1f425c8a3a371fbd6b0950dff05e786363053eb425d3ad23fc7ff4e3db954
-  data.tar.gz: 77600514d23d02dac3eb6fa2044b69dfca3650f1141d1ca12520e31e903bbb12ac188c2c4720dde315d0b733c1e78190ccafa4737e4a1ea28b0e5223cd2b7384
+  metadata.gz: 51585cd03c24893d086c8497cc798ad2a4bb67e159485c39bb1c2e9109c6542e84dc0521560b716fadc660fa06be4d13bec8cf71eaad509ec65ca87c35ea3978
+  data.tar.gz: 1f8d1782cd621046137d7b8d2bc4a1d2215f6d24671e2c84872ee230ab2717a5667c5ca9c0433724581d9bdd14579e44e0c1f457a96edb9bc1a339a155cec5a1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nezu (0.7.1)
+    nezu (0.7.2)
       activerecord
       activesupport
       amqp
@@ -13,71 +13,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    amq-client (1.0.2)
-      amq-protocol (>= 1.2.0)
+    amq-protocol (1.9.2)
+    amqp (1.3.0)
+      amq-protocol (>= 1.9.2)
       eventmachine
-    amq-protocol (1.7.0)
-    amqp (1.0.2)
-      amq-client (~> 1.0.2)
-      amq-protocol (>= 1.3.0)
-      eventmachine
-    arel (4.0.0)
-    atomic (1.1.12)
+    arel (4.0.2)
+    atomic (1.1.14)
     builder (3.1.4)
-    bunny (0.10.2)
-      amq-protocol (>= 1.6.0)
+    bunny (1.1.2)
+      amq-protocol (>= 1.9.2)
     columnize (0.3.6)
-    configatron (2.13.0)
-      yamler (>= 0.1.0)
-    debugger (1.6.1)
+    configatron (3.0.1)
+    debugger (1.6.5)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
+      debugger-ruby_core_source (~> 1.3.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
-    diff-lcs (1.2.4)
+    debugger-ruby_core_source (1.3.1)
+    diff-lcs (1.2.5)
     eventmachine (1.0.3)
-    i18n (0.6.4)
-    json (1.8.0)
+    i18n (0.6.9)
+    json (1.8.1)
     minitest (4.7.5)
-    multi_json (1.7.9)
-    mysql2 (0.3.13)
-    rake (10.1.0)
-    rdoc (3.12.2)
+    multi_json (1.8.4)
+    mysql2 (0.3.15)
+    rake (10.1.1)
+    rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.1)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    sdoc (0.3.20)
-      json (>= 1.1.3)
-      rdoc (~> 3.10)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thread_safe (0.1.2)
+    rspec-mocks (2.14.5)
+    sdoc (0.4.0)
+      json (~> 1.8)
+      rdoc (~> 4.0, < 5.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thread_safe (0.1.3)
       atomic
-    tins (0.8.3)
-    tzinfo (0.3.37)
-    yamler (0.1.0)
+    tins (1.0.0)
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.8.0

data/lib/nezu/generators/application/app_generator.rb

@@ -5,22 +5,22 @@ module Nezu
         include Nezu::Generators
 
         def initialize(destination_root)
-          configatron.destination_root = destination_root
-          configatron.app_name =  File.basename(destination_root)
-          name_space = configatron.app_name.split(/_/).map(&:capitalize).join('').to_sym
-          configatron.name_space = Object.const_set(name_space, Module.new) unless Object.const_defined?(name_space)
+          Nezu::Config.destination_root = destination_root
+          Nezu::Config.app_name =  File.basename(destination_root)
+          name_space = Nezu::Config.app_name.split(/_/).map(&:capitalize).join('').to_sym
+          Nezu::Config.name_space = Object.const_set(name_space, Module.new) unless Object.const_defined?(name_space)
         end
 
         def generate!
-          raise Nezu::Generators::Application::AppGeneratorError, "\"#{configatron.destination_root}\" already exists" if Dir.exist?(configatron.destination_root)
-          FileUtils.mkdir_p(configatron.destination_root)
+          raise Nezu::Generators::Application::AppGeneratorError, "\"#{Nezu::Config.destination_root}\" already exists" if Dir.exist?(Nezu::Config.destination_root)
+          FileUtils.mkdir_p(Nezu::Config.destination_root)
           generate_files_from_manifest!
           rename_app_name_template
         end
 
         def rename_app_name_template
-          File.rename(File.join(configatron.destination_root,'app/consumers/$app_name.rb'),
-            File.join(configatron.destination_root,"app/consumers/#{configatron.app_name}.rb"))
+          File.rename(File.join(Nezu::Config.destination_root,'app/consumers/$app_name.rb'),
+            File.join(Nezu::Config.destination_root,"app/consumers/#{Nezu::Config.app_name}.rb"))
         end
 
         def generate_files_from_manifest! # TODO rewrite so a MANIFEST isn´t needed

data/lib/nezu/generators.rb

@@ -5,19 +5,19 @@ require 'nezu/generators/application/app_generator'
 module Nezu
   module Generators
 
-    configatron.template_paths = [Nezu.gem_path.join('lib/nezu/generators/application/templates')] + ENV['NEZU_TEMPLATES'].to_s.split(':')
-    configatron.file_suffixes = %w(tt)
+    Nezu::Config.template_paths = [Nezu.gem_path.join('lib/nezu/generators/application/templates')] + ENV['NEZU_TEMPLATES'].to_s.split(':')
+    Nezu::Config.file_suffixes = %w(tt)
 
     def template_to(filename) # e.g. "config/amqp.yml"
-      dirname = File.join(configatron.destination_root, File.dirname(filename))
+      dirname = File.join(Nezu::Config.destination_root, File.dirname(filename))
       source_file = find_template(filename)
       if source_file
         FileUtils.mkdir_p(dirname)
 
-        if configatron.file_suffixes.include?(source_file.split('.')[-1])
+        if Nezu::Config.file_suffixes.include?(source_file.split('.')[-1])
           e = ERB.new(File.read(source_file))
-          File.open(File.join(configatron.destination_root, filename.sub(/\.tt$/,'')), File::CREAT|File::TRUNC|File::WRONLY) do |f|
-            f.write(e.result(configatron.binding))
+          File.open(File.join(Nezu::Config.destination_root, filename.sub(/\.tt$/,'')), File::CREAT|File::TRUNC|File::WRONLY) do |f|
+            f.write(e.result(Nezu::Config.binding))
           end
         else
           FileUtils.cp(source_file, dirname)
@@ -28,9 +28,9 @@ module Nezu
     private
 
     def find_template(filename)
-      candidates = configatron.template_paths.map do |path|
+      candidates = Nezu::Config.template_paths.map do |path|
         [File.join(path, filename)] +
-        configatron.file_suffixes.map do |suffix|
+        Nezu::Config.file_suffixes.map do |suffix|
           File.join(path, filename) + '.' + suffix
         end
       end.flatten

data/lib/nezu/runner.rb

@@ -10,8 +10,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.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}")
+      AMQP.start(Nezu::Config.amqp.send(Nezu.env.to_sym).url) do |connection, open_ok|
+        Nezu.logger.debug("[Nezu Runner] AMQP connection #{Nezu::Config.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

@@ -9,6 +9,7 @@ module Nezu
         action = params.delete('__action')
 
         result = self.send(action.to_sym, params)
+        #debugger
         reply_to = result[:end] == 'true' ? nil : params['__reply_to']
 
         if reply_to

data/lib/nezu/runtime/producer.rb

@@ -4,7 +4,7 @@ module Nezu
       extend Nezu::Runtime::Common
 
       def self.push!(params = {})
-        connection = Bunny.new(configatron.amqp.send(Nezu.env.to_sym).url, :threaded => false)
+        connection = Bunny.new(Nezu::Config.amqp[Nezu.env.to_sym].url, :threaded => false)
         connection.start
         channel = connection.create_channel
         queue ||= channel.queue(queue_name)

data/lib/nezu/runtime/recipient.rb

@@ -8,7 +8,7 @@ module Nezu
 
     class RecipientError < RuntimeError
       def self.does_not_exist(q)
-        klass = q.sub(/^#{configatron.amqp.development.queue_prefix}./, '').sub(/.#{configatron.amqp.development.queue_postfix}$/,'').classify
+        klass = q.sub(/^#{Nezu::Config.amqp.development.queue_prefix}./, '').sub(/.#{Nezu::Config.amqp.development.queue_postfix}$/,'').classify
         message = %Q(
           The class "#{klass}" doesn`t exist or is not a child of "Nezu::Runtime::Producer".
           Please create one in \"app/producers/#{klass.underscore}.rb\" with the content of at least:

data/lib/nezu/runtime.rb

@@ -11,12 +11,12 @@ module Nezu
       begin
         configure_from_yaml('amqp.yml')
       rescue
-        Nezu.logger.fatal("[Nezu Runner] no amqp config please create one in config/amqp.yml") unless configatron.amqp.present?
+        Nezu.logger.fatal("[Nezu Runner] no amqp config please create one in config/amqp.yml") unless Nezu::Config.amqp.present?
         raise
       end
-      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)
+      if Nezu::Config.database.send(Nezu.env).database.present? && !Class.const_defined?(:Rails)
+        require Nezu::Config.database.send(Nezu.env).adapter
+        ActiveRecord::Base.establish_connection(Nezu::Config.database.send(Nezu.env.to_sym).to_hash)
         ActiveRecord::Base.logger = Logger.new(Nezu.root.join('log/', 'database.log'))
       end
 
@@ -38,7 +38,7 @@ module Nezu
       end
 
       Nezu.logger.debug("[Nezu Runner] config loaded")
-      Nezu.logger.debug(configatron.amqp)
+      Nezu.logger.debug(Nezu::Config.amqp)
     end
 
     module Common
@@ -59,10 +59,11 @@ module Nezu
       #
       def inherited(subclass)
         subclass.class_eval {cattr_accessor :queue_name} #:exchange_name?
+        #debugger
         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 << "#{Nezu::Config.amqp[Nezu.env.to_sym].queue_prefix}." unless Nezu::Config.amqp[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 << ".#{Nezu::Config.amqp[Nezu.env.to_sym].queue_postfix}" unless Nezu::Config.amqp[Nezu.env.to_sym].queue_postfix.nil?
         subclass.queue_name
       end
 
@@ -77,7 +78,7 @@ module Nezu
       config_file = Nezu.root.join('config', yaml_file)
       if File.exist?(config_file)
         yaml = YAML.load_file(config_file)
-        configatron.configure_from_hash(File.basename(yaml_file.sub(/.yml/, '')) => yaml)
+        Nezu::Config.configure_from_hash(File.basename(yaml_file.sub(/.yml/, '')) => yaml)
       else
         Nezu.logger.info("#{config_file} doesn`t exist. I`m skipping it")
       end

data/lib/nezu.rb

@@ -8,8 +8,14 @@ require 'configatron'
 require 'term/ansicolor'
 require 'nezu/runtime'
 
+# Just an empty Module to give consumers a home
+module Consumers;end
+# Just an empty Module to give producers a home
+module Producers;end
+
 module Nezu
   mattr_accessor :logger, :app, :env, :root, :gem_path
+  Config = configatron
 
   #used by Nezu.env and Nezu.env.developent? etc.
   class Env < String
@@ -47,7 +53,7 @@ module Nezu
   self.env = Env.new(ENV['NEZU_ENV']||'development')
 
   # Returns the app as a class
-  self.app = configatron.app_name.classify
+  self.app = Nezu::Config.app_name.classify
 
   # Returns a String like object with the applications absolute root
   self.root = Root::APP_PATH

data/spec/functional/generators/app_generator_spec.rb

@@ -9,15 +9,15 @@ describe Nezu::Generators::Application::AppGenerator do
     end
 
     it 'should have a destination_root' do
-      configatron.destination_root.should == '/blah/foo'
+      Nezu::Config.destination_root.should == '/blah/foo'
     end
 
     it 'should have an app_name' do
-      configatron.app_name.should == 'foo'
+      Nezu::Config.app_name.should == 'foo'
     end
 
     it 'should have a scope' do
-      configatron.name_space.should == Foo
+      Nezu::Config.name_space.should == Foo
       Foo.class.should be_a(Module)
     end
   end

data/spec/functional/generators_spec.rb

@@ -6,16 +6,16 @@ describe Nezu::Generators do
   describe '#template_to' do
     it 'should create a (parsed) copy in the app dir' do
       template_to('test_file')
-      File.exists?(File.join(configatron.destination_root, '/test_file')).should be_true
+      File.exists?(File.join(Nezu::Config.destination_root, '/test_file')).should be_true
     end
 
     it 'should parse .tt files using erb' do
       template_to('test_file')
-      File.read(File.join(configatron.destination_root, '/test_file')).match(/Hi there/).should_not be_nil
+      File.read(File.join(Nezu::Config.destination_root, '/test_file')).match(/Hi there/).should_not be_nil
     end
 
     after do
-      %x(rm -rf #{configatron.destination_root})
+      %x(rm -rf #{Nezu::Config.destination_root})
     end
   end
 

data/spec/functional/runtime/consumer_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 require 'nezu/runtime/consumer'
 describe Nezu::Runtime::Consumer do
   describe '::descendants' do
+    before do
+      #Nezu::Config.amqp.test
+      #Nezu::Config.amqp.test.queue_prefix=:test
+      #Nezu::Config.amqp.test.queue_postfix='test'
+    end
+
     it 'should return a list of heirs' do
       class Consumer1 < Nezu::Runtime::Consumer;end
       class Consumer2 < Nezu::Runtime::Consumer;end
@@ -12,7 +18,10 @@ describe Nezu::Runtime::Consumer do
   describe '#handle_message' do
     before do
       class Consumer1 < Nezu::Runtime::Consumer;end
-      Consumer1.any_instance.should_receive(:send).any_number_of_times.and_return({a: 'hash', with: 'no real_value'})
+      Consumer1.any_instance.stub(:send) do |action, params|
+        params ||= {}
+        params.merge({__action: action})
+      end
       @consumer = Consumer1.new
     end
 
@@ -30,17 +39,17 @@ describe Nezu::Runtime::Consumer do
     end
 
     it 'should use the queue_prefix if its set' do
-      configatron.amqp.send(Nezu.env.to_sym).queue_prefix = 'the_prefix'
+      Nezu::Config.amqp[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.send(Nezu.env.to_sym).queue_prefix = nil
+      Nezu::Config.amqp[Nezu.env.to_sym].queue_prefix = nil
     end
 
     it 'should use the queue_postfix if its set' do
-      configatron.amqp.send(Nezu.env.to_sym).queue_postfix = 'the_postfix'
+      Nezu::Config.amqp[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.send(Nezu.env.to_sym).queue_postfix = nil
+      Nezu::Config.amqp[Nezu.env.to_sym].queue_postfix = nil
     end
   end
 

data/spec/functional/runtime/producer_spec.rb

@@ -2,19 +2,19 @@ require 'spec_helper'
 require 'nezu/runtime/producer'
 describe Nezu::Runtime::Producer do
   before do
-    #Bunny.stub!(:new).and_return(AlwaysHappy.new)
+    #Bunny.stub!(:new) { AlwaysHappy.new }
   end
 
   describe '::push!' do
     it 'should create a new message on the server' do
-      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, :threaded=>false).and_return(AlwaysHappy.new)
+      Nezu::Config.amqp[Nezu.env.to_sym].url = 'amqp://127.0.0.1'
+      Bunny.should_receive(:new).with(Nezu::Config.amqp[Nezu.env.to_sym].url, :threaded=>false).and_return(AlwaysHappy.new)
       module ExampleProducers;class MyQueue<Nezu::Runtime::Producer;end;end
       ExampleProducers::MyQueue.push!(:foo => 'bar')
     end
 
     it 'should close its connection' do
-      configatron.amqp.send(Nezu.env.to_sym).url = 'amqp://127.0.0.1'
+      Nezu::Config.amqp[Nezu.env.to_sym].url = 'amqp://127.0.0.1'
       Bunny::Session.any_instance.should_receive(:close)
       module ExampleProducers;class MyQueue<Nezu::Runtime::Producer;end;end
       ExampleProducers::MyQueue.push!(:foo => 'bar')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nezu
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Sascha Teske
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp