ocean-rails 1.28.5 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958fd26f16c3c3905b9b43b1b7bd083d1cbfe995
-  data.tar.gz: c16d8063b84b0832afa29d6d0370cd60c3f701b3
+  metadata.gz: fcf55b4f49837f9a37be96010aa3e638895d1326
+  data.tar.gz: 9c6a3af682a40a0ea6c492fb2f43d4da537a3cd3
 SHA512:
-  metadata.gz: 39012b1196ef503166a2f54962b78533a477fa78ff5498b3bc113059df708e060d25f5e754bf5fe31d3db4e9729beebf568749ce7ec882da085fc7213f3e95b1
-  data.tar.gz: 486bf0b75ef9a90b1dfeab62cf812ccea54ccc0bdba0e79aeb63efc219a237df74a4697312d85f325b981675bf72e890332992ca80f0cad18fe6995104ac4d82
+  metadata.gz: e6291db5e043024c0da10a7087322b91a9cd96c0445b7472ecfb6a6ff88a99ad98885ec8fbb44bdb6e9217351dbfe72f4e60d88ba46db04c095cbbf1a8f07f3d
+  data.tar.gz: dcb7bcf7fc48b0ce69c8ca4938ea6e18ea89f05fd623b3ffdf0399986db8f5523b898b09b0b9e6a1d1fa5d150a67e01aac4e88c6e3c169ba486676fdc2ef4dd1

data/config/initializers/zeromq_logger.rb

@@ -1,5 +1,5 @@
 
-if Rails.env == 'never' # 'production'
+if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
 
   # Use a different logger for distributed setups
   Rails.logger = ActiveSupport::TaggedLogging.new(ZeromqLogger.new)

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.28.5"
+  VERSION = "1.29.0"
 end

data/lib/ocean/zeromq_logger.rb

@@ -9,7 +9,7 @@ require 'socket'
 class ZeromqLogger
 
   attr_accessor :level, :log_tags
-
+  attr_accessor :formatter
 
   #
   # Obtains the IP of the current process, initialises the @logger object
@@ -23,6 +23,7 @@ class ZeromqLogger
     # Set up the logger
     @logger = ZeroLog.new
     @logger.init_log_data_sender "/tmp/sub_push_#{Process.pid}"
+    @formatter = ::Logger::Formatter.new
   end
 
   #
@@ -69,7 +70,7 @@ class ZeromqLogger
   #
   # +msg+:       The log message itself. 
   #
-  def add(level, msg, progname)
+  def add(level, msg, progname="")
     return true if level < @level
     msg = progname if msg.blank?
     return true if msg.blank?       # Don't send
@@ -86,4 +87,25 @@ class ZeromqLogger
     true
   end
 
+
+  def debug(*args)
+    add 0, *args
+  end
+
+  def info(*args)
+    add 1, *args
+  end
+
+  def warn(*args)
+    add 2, *args
+  end
+
+  def error(*args)
+    add 3, *args
+  end
+
+  def fatal(*args)
+    add 4, *args
+  end
+
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.28.5
+  version: 1.29.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-purge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,140 +84,140 @@ dependencies:
   name: ffi-rzmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack-attack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ocean-dynamo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: "== Ocean\n\nOcean is an architecture for creating server-oriented architectures
@@ -243,6 +243,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/controllers/alive_controller.rb
 - app/controllers/errors_controller.rb
 - app/helpers/application_helper.rb
@@ -251,6 +254,7 @@ files:
 - config/initializers/ocean_constants.rb
 - config/initializers/zeromq_logger.rb
 - config/routes.rb
+- lib/generators/ocean_scaffold/USAGE
 - lib/generators/ocean_scaffold/ocean_scaffold_generator.rb
 - lib/generators/ocean_scaffold/templates/controller_specs/create_spec.rb
 - lib/generators/ocean_scaffold/templates/controller_specs/delete_spec.rb
@@ -261,18 +265,18 @@ files:
 - lib/generators/ocean_scaffold/templates/resource_routing_spec.rb
 - lib/generators/ocean_scaffold/templates/view_specs/_resource_spec.rb
 - lib/generators/ocean_scaffold/templates/views/_resource.json.jbuilder
-- lib/generators/ocean_scaffold/USAGE
+- lib/generators/ocean_setup/USAGE
 - lib/generators/ocean_setup/ocean_setup_generator.rb
+- lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/application_controller.rb
 - lib/generators/ocean_setup/templates/application_helper.rb
 - lib/generators/ocean_setup/templates/aws.yml.example
 - lib/generators/ocean_setup/templates/config.yml.example
-- lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/gitignore
 - lib/generators/ocean_setup/templates/hyperlinks.rb
 - lib/generators/ocean_setup/templates/routes.rb
 - lib/generators/ocean_setup/templates/spec_helper.rb
-- lib/generators/ocean_setup/USAGE
+- lib/ocean-rails.rb
 - lib/ocean/api.rb
 - lib/ocean/api_resource.rb
 - lib/ocean/engine.rb
@@ -284,12 +288,8 @@ files:
 - lib/ocean/version.rb
 - lib/ocean/zero_log.rb
 - lib/ocean/zeromq_logger.rb
-- lib/ocean-rails.rb
 - lib/tasks/ocean_tasks.rake
 - lib/templates/rails/scaffold_controller/controller.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 homepage: https://github.com/OceanDev/ocean-rails
 licenses:
 - MIT
@@ -300,17 +300,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ~>
+  - - "~>"
     - !ruby/object:Gem::Version
       version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: This gem implements common Ocean behaviour for Ruby and Ruby on Rails.