ocean-rails 1.17.1 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f4c9f1d0cf3130fbe82b956e01e7282f05a745c
-  data.tar.gz: 012d4bb1419a3c9b8c03797458f693b73bd5ab2c
+  metadata.gz: fd5977e6afad651145c7c9cc95297d8a75d99c33
+  data.tar.gz: 7d7ab9cbad3c22ae3e9453f1642e9d3c7e680f40
 SHA512:
-  metadata.gz: b4987a49ded6766c8f9544976bc3c59bec852f54a4ed719de68964001db72fcda1ecf7e877e9b45dc6b080a444b09b01fa931543b748604380b16e9d0165940c
-  data.tar.gz: 821fbd0ca06f22ab1ca12314a9a6c75bc00e2afee92dc58dddd47aa8a65f9c7e50b2bc3e527739144a4bafe09c7a8ddb8e5da08752854a30949740d1a22c8e1a
+  metadata.gz: 23550b1f69775920f6d7e4b8be5384896165aecb1790ec635055e7c4d539e2920e17c1b0665e4e7b27874e503c8eeac89715587986989c66b8abb8bbf3ef2f1e
+  data.tar.gz: 4d4f4c0064a79fb2729713a0da96a9f0084ec1c68dff4796d61fff18c93afa37fd0d4db0309a58e3f9cb5f81948c4e665e2924d019dcfc95a478c2b2e7a86691

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -20,6 +14,8 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
 
 
@@ -35,4 +31,4 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :default => :test
+task default: :test

data/{lib/generators/ocean_setup/templates → app/controllers}/alive_controller.rb

@@ -1,11 +1,5 @@
-#
-# The path /alive is implemented solely for the benefit of Varnish,
-# which is set up to use it for health checking. Due to the routing
-# implemented in Varnish, /alive can never be reached from the outside.
-#
-
 class AliveController < ApplicationController
-  
+
   skip_before_action :require_x_api_token
   skip_before_action :authorize_action
 
@@ -14,5 +8,5 @@ class AliveController < ApplicationController
     # If there is a DB, call to it here to ensure it too is healthy
     render text: "ALIVE", status: 200
   end
-  
+
 end

data/config/routes.rb

@@ -0,0 +1,5 @@
+Rails.application.routes.draw do
+
+  get "/alive" => "alive#index"
+
+end

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -20,10 +20,6 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     copy_file "application_controller.rb", "#{Rails.root}/app/controllers/application_controller.rb"
   end
 
-  def install_application_helper
-    copy_file "application_helper.rb", "#{Rails.root}/app/helpers/application_helper.rb"
-  end
-
   def install_spec_helper_and_support_files
     copy_file "spec_helper.rb", "#{Rails.root}/spec/spec_helper.rb"
     copy_file "hyperlinks.rb", "#{Rails.root}/spec/support/hyperlinks.rb"
@@ -33,13 +29,6 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     template "routes.rb", "#{Rails.root}/config/routes.rb"
   end
 
-  def install_alive_controller_and_specs
-    copy_file "alive_controller.rb", "#{Rails.root}/app/controllers/alive_controller.rb"
-    route 'get "/alive" => "alive#index"'
-    copy_file "alive_routing_spec.rb", "#{Rails.root}/spec/routing/alive_routing_spec.rb"
-    copy_file "alive_spec.rb", "#{Rails.root}/spec/requests/alive_spec.rb"
-  end
-
   def turn_off_asset_pipeline
     application "# Disable the asset pipeline
     config.assets.enabled = false    
@@ -50,7 +39,6 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     application "# Handle our own exceptions internally, so we can return JSON error bodies
     config.exceptions_app = ->(env) { ErrorsController.action(:show).call(env) }
     "
-    copy_file "errors_controller.rb", "#{Rails.root}/app/controllers/errors_controller.rb"
   end
 
   def turn_off_sessions_and_cookies
@@ -72,12 +60,9 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
     "
   end
 
-  def install_initializers
-    copy_file "api_constants.rb",   "#{Rails.root}/config/initializers/api_constants.rb"
+  def install_config_yml_files
     template  "config.yml.example", "#{Rails.root}/config/config.yml.example"
     template  "config.yml.example", "#{Rails.root}/config/config.yml"
-    copy_file "ocean_constants.rb", "#{Rails.root}/config/initializers/ocean_constants.rb"
-    copy_file "zeromq_logger.rb",   "#{Rails.root}/config/initializers/zeromq_logger.rb"
   end
 
   def replace_gemfile

data/lib/ocean-rails.rb

@@ -1,3 +1,5 @@
+require "ocean/engine"
+
 require "ocean/api"
 require "ocean/api_resource"
 require "ocean/ocean_resource_model" if defined? ActiveRecord
@@ -11,7 +13,9 @@ require "ocean/flooding"
 INVALIDATE_MEMBER_DEFAULT =     ["($|/|\\?)"]
 INVALIDATE_COLLECTION_DEFAULT = ["($|\\?)"]
 
+
 module Ocean
+
   class Railtie < Rails::Railtie
     # Silence the /alive action
     initializer "ocean.swap_logging_middleware" do |app|
@@ -22,6 +26,7 @@ module Ocean
       g.templates.unshift File::expand_path('../templates', __FILE__)
     end 
   end
+  
 end
 
 

data/lib/ocean/engine.rb

@@ -0,0 +1,4 @@
+module Ocean
+  class Engine < ::Rails::Engine
+  end
+end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "1.17.1"
+  VERSION = "1.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 1.17.1
+  version: 1.18.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -201,6 +201,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/alive_controller.rb
+- app/controllers/errors_controller.rb
+- app/helpers/application_helper.rb
+- config/initializers/api_constants.rb
+- config/initializers/ocean_constants.rb
+- config/initializers/zeromq_logger.rb
+- config/routes.rb
 - 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
@@ -213,24 +220,17 @@ files:
 - lib/generators/ocean_scaffold/templates/views/_resource.json.jbuilder
 - lib/generators/ocean_scaffold/USAGE
 - lib/generators/ocean_setup/ocean_setup_generator.rb
-- lib/generators/ocean_setup/templates/alive_controller.rb
-- lib/generators/ocean_setup/templates/alive_routing_spec.rb
-- lib/generators/ocean_setup/templates/alive_spec.rb
-- lib/generators/ocean_setup/templates/api_constants.rb
 - lib/generators/ocean_setup/templates/application_controller.rb
-- lib/generators/ocean_setup/templates/application_helper.rb
 - lib/generators/ocean_setup/templates/config.yml.example
-- lib/generators/ocean_setup/templates/errors_controller.rb
 - lib/generators/ocean_setup/templates/Gemfile
 - lib/generators/ocean_setup/templates/gitignore
 - lib/generators/ocean_setup/templates/hyperlinks.rb
-- lib/generators/ocean_setup/templates/ocean_constants.rb
 - lib/generators/ocean_setup/templates/routes.rb
 - lib/generators/ocean_setup/templates/spec_helper.rb
-- lib/generators/ocean_setup/templates/zeromq_logger.rb
 - lib/generators/ocean_setup/USAGE
 - lib/ocean/api.rb
 - lib/ocean/api_resource.rb
+- lib/ocean/engine.rb
 - lib/ocean/flooding.rb
 - lib/ocean/ocean_application_controller.rb
 - lib/ocean/ocean_resource_controller.rb
@@ -241,7 +241,6 @@ files:
 - lib/ocean/zeromq_logger.rb
 - lib/ocean-rails.rb
 - lib/tasks/ocean_tasks.rake
-- lib/template.rb
 - lib/templates/rails/scaffold_controller/controller.rb
 - MIT-LICENSE
 - Rakefile

data/lib/generators/ocean_setup/templates/alive_routing_spec.rb

@@ -1,11 +0,0 @@
-require "spec_helper"
-
-describe AliveController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/alive").should route_to("alive#index")
-    end
-
-  end
-end

data/lib/generators/ocean_setup/templates/alive_spec.rb

@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe "/alive (for Varnish health checking)" do
-
-  it "should return a 200 with a body of OK" do
-    get "/alive", {}, {'HTTP_ACCEPT' => "application/json"}
-    response.status.should be(200)
-    response.body.should == "ALIVE"
-  end
-  
-
-end

data/lib/template.rb

@@ -1,31 +0,0 @@
-# Update the Gemfile
-gem "ocean-rails", git: "git://github.com/OceanDev/ocean-rails.git"
-
-# Install a .rvmrc file
-run "rvm rvmrc create ruby-2.0.0-p195@rails-4.0.0"
-# Select the ruby and gem bag
-run "rvm use ruby-2.0.0-p195@rails-4.0.0"
-# Run bundle install - we need the generators in it now
-run "bundle install"
-
-# Set up the application as a SOA service Rails application
-generate "ocean_setup", app_name
-
-# Install the required gems and package them with the app
-run "bundle install"
-run "bundle package --all"
-
-# Remove the asset stuff from the application conf file
-gsub_file "config/application.rb", 
-          /    # Enable the asset pipeline.+config\.assets\.version = '1\.0'\s/m, ''
-
-# Set up SQLite to run tests in memory
-gsub_file "config/database.yml",
-          /test:\s+adapter: sqlite3\s+database: db\/test.sqlite3/m,
-          'test:
-  adapter: sqlite3
-  database: ":memory:"
-  verbosity: quiet'
-
-# Get the DBs in order
-rake "db:migrate"