ocean-rails 5.7.1 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c894de92cde73fcc19899a1fc9c6c32566e22d
-  data.tar.gz: 0580b0a02a2c306390ca8428d9a2c9738a161dde
+  metadata.gz: aad06c44231394d3492ed38bc19f036f30243b0e
+  data.tar.gz: 1954dfcda369f4b8940de7e8b5d9b1f5aec1a2de
 SHA512:
-  metadata.gz: 950dc554f6a360463c5c6e222560d8697124f1b5045b575eb0d9f763bbab60ded52484e569aaea1e9f4641642cc4cd5574df8dd4b445f01bd2278d9876af15c5
-  data.tar.gz: 601825c884d9e2c3248d98c70aab36a2fc7685d119a875779ab0e9481fa6434333e9a88fe6ccc44f0e77e9aee68193a0dc12f234c7bb6b9d0f091ad9713a590b
+  metadata.gz: d14611e0298e23b7a58c2e70ee4eca110d3bd8d4351e7874c3b84497dfa577421e2d7eda3d631efd6ef65fab7d871a3151207fa3016dda68d964816779c1f52d
+  data.tar.gz: e9c77525b77d657a8b46f074d16e29064fa3359007b5a21904a55a669a37c2f0d7ffb50416a306552d15adf86652ecf671943225ab66bbb2c36ea5ad38719f12

data/README.rdoc

@@ -119,10 +119,17 @@ block:
 
   # DynamoDB table cleaner
   CHEF_ENV = "master" unless defined?(CHEF_ENV)
-  regexp = Regexp.new("^.+_#{CHEF_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_test$")
+  regexp = Regexp.new("^.+_#{CHEF_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_(test|dev)$")
   cleaner = lambda { 
     c = Aws::DynamoDB::Client.new
-    c.list_tables.table_names.each { |t| c.delete_table({table_name: t}) if t =~ regexp }
+    c.list_tables.table_names.each do |t| 
+      begin
+        c.delete_table({table_name: t}) if t =~ regexp
+      rescue Aws::DynamoDB::Errors::LimitExceededException
+        sleep 1
+        retry
+      end
+    end
   }
 
 Then, inside the +RSpec.configure+ block:

data/lib/generators/ocean_scaffold/templates/controller_specs/create_spec.rb

@@ -16,29 +16,29 @@ describe <%= class_name.pluralize %>Controller do
     
     it "should return JSON" do
       post :create, @args
-      response.content_type.should == "application/json"
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 400 if the X-API-Token header is missing" do
       request.headers['X-API-Token'] = nil
       post :create, @args
-      response.status.should == 400
+      expect(response.status).to eq 400
     end
     
     it "should return a 201 when successful" do
       post :create, @args
-      response.should render_template(partial: "_<%= singular_name %>", count: 1)
-      response.status.should == 201
+      expect(response).to render_template(partial: "_<%= singular_name %>", count: 1)
+      expect(response.status).to eq 201
     end
 
     it "should contain a Location header when successful" do
       post :create, @args
-      response.headers['Location'].should be_a String
+      expect(response.headers['Location']).to be_a String
     end
 
     it "should return the new resource in the body when successful" do
       post :create, @args
-      response.body.should be_a String
+      expect(response.body).to be_a String
     end
     
     #
@@ -47,12 +47,12 @@ describe <%= class_name.pluralize %>Controller do
     #
     # it "should return a 422 if the <%= singular_name %> already exists" do
     #   post :create, @args
-    #   response.status.should == 201
-    #   response.content_type.should == "application/json"
+    #   expect(response.status).to eq 201
+    #   expect(response.content_type).to eq "application/json"
     #   post :create, @args
-    #   response.status.should == 422
-    #   response.content_type.should == "application/json"
-    #   JSON.parse(response.body).should == {"_api_error" => ["<%= class_name %> already exists"]}
+    #   expect(response.status).to eq 422
+    #   expect(response.content_type).to eq "application/json"
+    #   expect(JSON.parse(response.body).to eq({"_api_error" => ["<%= class_name %> already exists"]})
     # end
 
     #
@@ -61,9 +61,9 @@ describe <%= class_name.pluralize %>Controller do
     #
     # it "should return a 422 when there are validation errors" do
     #   post :create, @args.merge('name' => "qz")
-    #   response.status.should == 422
-    #   response.content_type.should == "application/json"
-    #   JSON.parse(response.body).should == {"name"=>["is too short (minimum is 3 characters)"]}
+    #   expect(response.status).to eq 422
+    #   expect(response.content_type).to eq "application/json"
+    #   expect(JSON.parse(response.body)).to eq({"name"=>["is too short (minimum is 3 characters)"]})
     # end
                 
   end

data/lib/generators/ocean_scaffold/templates/controller_specs/delete_spec.rb

@@ -16,30 +16,30 @@ describe <%= class_name.pluralize %>Controller do
     
     it "should return JSON" do
       delete :destroy, id: @<%= singular_name %>
-      response.content_type.should == "application/json"
+      expect(response.content_type).to eq "application/json"
     end
 
     it "should return a 400 if the X-API-Token header is missing" do
       request.headers['X-API-Token'] = nil
       delete :destroy, id: @<%= singular_name %>
-      response.status.should == 400
+      expect(response.status).to eq 400
     end
     
     it "should return a 204 when successful" do
       delete :destroy, id: @<%= singular_name %>
-      response.status.should == 204
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 204
+      expect(response.content_type).to eq "application/json"
     end
 
     it "should return a 404 when the <%= class_name %> can't be found" do
       delete :destroy, id: "0-0-0-0-0"
-      response.status.should == 404
+      expect(response.status).to eq 404
     end
     
     it "should destroy the <%= class_name %> when successful" do
       delete :destroy, id: @<%= singular_name %>
-      response.status.should == 204
-      <%= class_name %>.find_by_id(@<%= singular_name %>.id).should be_nil
+      expect(response.status).to eq 204
+      expect(<%= class_name %>.find_by_id(@<%= singular_name %>.id)).to be_nil
     end
     
   end

data/lib/generators/ocean_scaffold/templates/controller_specs/index_spec.rb

@@ -18,32 +18,32 @@ describe <%= class_name.pluralize %>Controller do
     
     it "should return JSON" do
       get :index
-      response.content_type.should == "application/json"
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 400 if the X-API-Token header is missing" do
       request.headers['X-API-Token'] = nil
       get :index
-      response.status.should == 400
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 400
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 200 when successful" do
       get :index
-      response.status.should == 200
-      response.should render_template(partial: "_<%= singular_name %>", count: 3)
+      expect(response.status).to eq 200
+      expect(response).to render_template(partial: "_<%= singular_name %>", count: 3)
     end
 
     it "should return a collection" do
       get :index
-      response.status.should == 200
+      expect(response.status).to eq 200
       wrapper = JSON.parse(response.body)
-      wrapper.should be_a Hash
+      expect(wrapper).to be_a Hash
       resource = wrapper['_collection']
-      resource.should be_a Hash
+      expect(resource).to be_a Hash
       coll = resource['resources']
-      coll.should be_an Array
-      coll.count.should == 3
+      expect(coll).to be_an Array
+      expect(coll.count).to eq 3
     end
 
   end

data/lib/generators/ocean_scaffold/templates/controller_specs/show_spec.rb

@@ -16,26 +16,26 @@ describe <%= class_name.pluralize %>Controller do
     
     it "should return JSON" do
       get :show, id: @<%= singular_name %>
-      response.content_type.should == "application/json"
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 400 if the X-API-Token header is missing" do
       request.headers['X-API-Token'] = nil
       get :show, id: @<%= singular_name %>
-      response.status.should == 400
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 400
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 404 when the user can't be found" do
       get :show, id: "0-0-0-0-0"
-      response.status.should == 404
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 404
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 200 when successful" do
       get :show, id: @<%= singular_name %>
-      response.status.should == 200
-      response.should render_template(partial: "_<%= singular_name %>", count: 1)
+      expect(response.status).to eq 200
+      expect(response).to render_template(partial: "_<%= singular_name %>", count: 1)
     end
     
   end

data/lib/generators/ocean_scaffold/templates/controller_specs/update_spec.rb

@@ -17,43 +17,43 @@ describe <%= class_name.pluralize %>Controller do
 
     it "should return JSON" do
       put :update, @args
-      response.content_type.should == "application/json"
+      expect(response.content_type).to eq "application/json"
     end
     
     it "should return a 400 if the X-API-Token header is missing" do
       request.headers['X-API-Token'] = nil
       put :update, @args
-      response.status.should == 400
+      expect(response.status).to eq 400
     end
 
     it "should return a 404 if the resource can't be found" do
       put :update, id: "0-0-0-0-0"
-      response.status.should == 404
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 404
+      expect(response.content_type).to eq "application/json"
     end
 
     it "should return a 422 when resource properties are missing (all must be set simultaneously)" do
       put :update, id: @u.id
-      response.status.should == 422
-      response.content_type.should == "application/json"
+      expect(response.status).to eq 422
+      expect(response.content_type).to eq "application/json"
     end
 
     it "should return a 409 when there is an update conflict" do
       @u.update_attributes!({:updated_at => 1.week.from_now}, :without_protection => true)
       put :update, @args
-      response.status.should == 409
+      expect(response.status).to eq 409
     end
         
     it "should return a 200 when successful" do
       put :update, @args
-      response.status.should == 200
-      response.should render_template(partial: "_<%= singular_name %>", count: 1)
+      expect(response.status).to eq 200
+      expect(response).to render_template(partial: "_<%= singular_name %>", count: 1)
     end
 
     it "should return the updated resource in the body when successful" do
       put :update, @args
-      response.status.should == 200
-      JSON.parse(response.body).should be_a Hash
+      expect(response.status).to eq 200
+      expect(JSON.parse(response.body)).to be_a Hash
     end
 
     #
@@ -62,22 +62,22 @@ describe <%= class_name.pluralize %>Controller do
     #
     # it "should return a 422 when there are validation errors" do
     #   put :update, @args.merge('name' => "qz")
-    #   response.status.should == 422
-    #   response.content_type.should == "application/json"
-    #   JSON.parse(response.body).should == {"name"=>["is too short (minimum is 3 characters)"]}
+    #   expect(response.status).to eq 422
+    #   expect(response.content_type).to eq "application/json"
+    #   expect(JSON.parse(response.body)).to eq({"name"=>["is too short (minimum is 3 characters)"]})
     # end
 
 
     # it "should alter the <%= singular_name %> when successful" do
-    #   @u.name.should == @args['name']
-    #   @u.description.should == @args['description']
+    #   expect(@u.name).to eq @args['name']
+    #   expect(@u.description).to eq @args['description']
     #   @args['name'] = "zalagadoola"
     #   @args['description'] = "menchikaboola"
     #   put :update, @args
-    #   response.status.should == 200
+    #   expect(response.status).to eq 200
     #   @u.reload
-    #   @u.name.should == "zalagadoola"
-    #   @u.description.should == "menchikaboola"
+    #   expect(@u.name).to eq "zalagadoola"
+    #   expect(@u.description).to eq "menchikaboola"
     # end
 
   end

data/lib/generators/ocean_scaffold/templates/model_spec.rb

@@ -6,27 +6,27 @@ describe <%= class_name %> do
   describe "attributes" do
     
     it "should have a name" do
-      create(:<%= singular_name %>).name.should be_a String
+      expect(create(:<%= singular_name %>).name).to be_a String
     end
 
     it "should have a description" do
-      create(:<%= singular_name %>).description.should be_a String
+      expect(create(:<%= singular_name %>).description).to be_a String
     end
 
      it "should have a creation time" do
-      create(:<%= singular_name %>).created_at.should be_a Time
+      expect(create(:<%= singular_name %>).created_at).to be_a Time
     end
 
     it "should have an update time" do
-      create(:<%= singular_name %>).updated_at.should be_a Time
+      expect(create(:<%= singular_name %>).updated_at).to be_a Time
     end
   
    it "should have a creator" do
-      create(:<%= singular_name %>).created_by.should be_a String
+      expect(create(:<%= singular_name %>).created_by).to be_a String
     end
 
     it "should have an updater" do
-      create(:<%= singular_name %>).updated_by.should be_a String
+      expect(create(:<%= singular_name %>).updated_by).to be_a String
     end
 
   end
@@ -51,23 +51,23 @@ describe <%= class_name %> do
     
       it "should return an array of <%= class_name %> instances" do
         ix = <%= class_name %>.collection
-        ix.length.should == 3
-        ix[0].should be_a <%= class_name %>
+        expect(ix.length).to eq 3
+        expect(ix[0]).to be_a <%= class_name %>
       end
     
       it "should allow matches on name" do
-        <%= class_name %>.collection(name: 'NOWAI').length.should == 0
-        <%= class_name %>.collection(name: 'bar').length.should == 1
-        <%= class_name %>.collection(name: 'baz').length.should == 1
+        expect(<%= class_name %>.collection(name: 'NOWAI').length).to eq 0
+        expect(<%= class_name %>.collection(name: 'bar').length).to eq 1
+        expect(<%= class_name %>.collection(name: 'baz').length).to eq 1
       end
       
       it "should allow searches on description" do
-        <%= class_name %>.collection(search: 'a').length.should == 2
-        <%= class_name %>.collection(search: 'object').length.should == 3
+        expect(<%= class_name %>.collection(search: 'a').length).to eq 2
+        expect(<%= class_name %>.collection(search: 'object').length).to eq 3
       end
       
       it "key/value pairs not in the index_only array should quietly be ignored" do
-        <%= class_name %>.collection(name: 'bar', aardvark: 12).length.should == 1
+        expect(<%= class_name %>.collection(name: 'bar', aardvark: 12).length).to eq 1
       end
         
     end

data/lib/generators/ocean_scaffold/templates/resource_routing_spec.rb

@@ -4,23 +4,23 @@ describe <%= class_name.pluralize %>Controller do
   describe "routing" do
 
     it "routes to #index" do
-      get("/v1/<%= plural_name %>").should route_to("<%= plural_name %>#index")
+      expect(get("/v1/<%= plural_name %>")).to route_to("<%= plural_name %>#index")
     end
 
     it "routes to #show" do
-      get("/v1/<%= plural_name %>/1-2-3-4-5").should route_to("<%= plural_name %>#show", id: "1-2-3-4-5")
+      expect(get("/v1/<%= plural_name %>/1-2-3-4-5")).to route_to("<%= plural_name %>#show", id: "1-2-3-4-5")
     end
 
     it "routes to #create" do
-      post("/v1/<%= plural_name %>").should route_to("<%= plural_name %>#create")
+      expect(post("/v1/<%= plural_name %>")).to route_to("<%= plural_name %>#create")
     end
 
     it "routes to #update" do
-      put("/v1/<%= plural_name %>/1-2-3-4-5").should route_to("<%= plural_name %>#update", id: "1-2-3-4-5")
+      expect(put("/v1/<%= plural_name %>/1-2-3-4-5")).to route_to("<%= plural_name %>#update", id: "1-2-3-4-5")
     end
 
     it "routes to #destroy" do
-      delete("/v1/<%= plural_name %>/1-2-3-4-5").should route_to("<%= plural_name %>#destroy", id: "1-2-3-4-5")
+      expect(delete("/v1/<%= plural_name %>/1-2-3-4-5")).to route_to("<%= plural_name %>#destroy", id: "1-2-3-4-5")
     end
 
   end

data/lib/generators/ocean_scaffold/templates/view_specs/_resource_spec.rb

@@ -11,45 +11,45 @@ describe "<%= plural_name %>/_<%= singular_name %>" do
 
 
   it "has a named root" do
-    @u.should_not == nil
+    expect(@u).not_to eq nil
   end
 
 
   it "should have three hyperlinks" do
-    @links.size.should == 3
+    expect(@links.size).to eq 3
   end
 
   it "should have a self hyperlink" do
-    @links.should be_hyperlinked('self', /<%= plural_name %>/)
+    expect(@links).to be_hyperlinked('self', /<%= plural_name %>/)
   end
 
   it "should have a creator hyperlink" do
-    @links.should be_hyperlinked('creator', /api_users/)
+    expect(@links).to be_hyperlinked('creator', /api_users/)
   end
 
   it "should have an updater hyperlink" do
-    @links.should be_hyperlinked('updater', /api_users/)
+    expect(@links).to be_hyperlinked('updater', /api_users/)
   end
 
 
   it "should have a name" do
-    @u['name'].should be_a String
+    expect(@u['name']).to be_a String
   end
 
   it "should have a description" do
-    @u['description'].should be_a String
+    expect(@u['description']).to be_a String
   end
 
   it "should have a created_at time" do
-    @u['created_at'].should be_a String
+    expect(@u['created_at']).to be_a String
   end
 
   it "should have an updated_at time" do
-    @u['updated_at'].should be_a String
+    expect(@u['updated_at']).to be_a String
   end
 
   it "should have a lock_version field" do
-    @u['lock_version'].should be_an Integer
+    expect(@u['lock_version']).to be_an Integer
   end
       
 end

data/lib/generators/ocean_scaffold/templates/views/_resource.json.jbuilder

@@ -2,7 +2,10 @@ json.<%= singular_name %> do |json|
 	json._links       hyperlinks(self:    <%= singular_name %>_url(<%= singular_name %>),
 	                             creator: smart_api_user_url(<%= singular_name %>.created_by),
 	                             updater: smart_api_user_url(<%= singular_name %>.updated_by))
-	json.(<%= singular_name %>, :lock_version, :name, :description) 
+	json.(<%= singular_name %>, :lock_version, 
+	                            :name, 
+	                            :description
+	) 
 	json.created_at   <%= singular_name %>.created_at.utc.iso8601
 	json.updated_at   <%= singular_name %>.updated_at.utc.iso8601
 end

data/lib/generators/ocean_setup/templates/aws.yml.example

@@ -13,18 +13,15 @@
 
 
 fake_dynamo: &local
-  use_ssl:            false
-  dynamo_db_endpoint: localhost
-  dynamo_db_port:     4567
+  region:             eu-west-1
+  endpoint:           http://localhost:8000
   access_key_id:      xxx
   secret_access_key:  xxx
-  user_agent_prefix:  Ocean
 
 amazon: &amazon
+  region:             eu-west-1
   access_key_id:      YOURACCESSKEYHERE
   secret_access_key:  YOURSECRETKEYHERE
-  region:             eu-west-1
-  user_agent_prefix:  Ocean
 
 
 #
@@ -41,4 +38,4 @@ test:
   <<: *local
 
 production:
-  <<: *local
+  <<: *amazon

data/lib/generators/ocean_setup/templates/config.yml.example

@@ -40,6 +40,9 @@ LOAD_BALANCERS: []
 # This is the list of IP numbers for the ZeroMQ log hosts. (Only used in production.)
 LOG_HOSTS: []
 
+# The Chef environment
+CHEF_ENV: master
+
 
 ##########################################################################################
 # This section allows you to specify values specific for a particular Rails

data/lib/generators/ocean_setup/templates/gitignore

@@ -36,5 +36,8 @@ config/config.yml
 # Ignore any tailored aws.yml file
 config/aws.yml
 
+# Ignore any tailored smtp.yml file
+config/smtp.yml
+
 # Ignore the Tork config dir
 /.tork

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

@@ -13,6 +13,21 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
+# DynamoDB table cleaner
+CHEF_ENV = "master" unless defined?(CHEF_ENV)
+regexp = Regexp.new("^.+_#{CHEF_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_(test|dev)$")
+cleaner = lambda { 
+  c = Aws::DynamoDB::Client.new
+  c.list_tables.table_names.each do |t| 
+    begin
+      c.delete_table({table_name: t}) if t =~ regexp
+    rescue Aws::DynamoDB::Errors::LimitExceededException
+      sleep 1
+      retry
+    end
+  end
+}
+
 RSpec.configure do |config|
   # ## Mock Framework
   #
@@ -43,6 +58,10 @@ RSpec.configure do |config|
   
   # Make "FactoryGirl" superfluous
   config.include FactoryGirl::Syntax::Methods
+
+  # Uncomment the following two lines if you're using DynamoDB tables
+  #config.before(:suite) { cleaner.call }
+  #config.after(:suite) { cleaner.call }
 end
 
 

data/lib/ocean/ocean_application_controller.rb

@@ -159,7 +159,11 @@ module OceanApplicationController
   # their standard position, begin with an underscore, etc. The +ocean+ gem generator
   # for resources creates a partial in the proper location.
   #
-  def api_render(x, new: false, href: x.present? && url_for(params), override_partial: false)
+  def api_render(x, 
+                 new: false, 
+                 href: x.present? && url_for(params), 
+                 override_partial: false
+                )
     if !x.is_a?(Array) && !(defined?(ActiveRecord) && x.is_a?(ActiveRecord::Relation))
       partial = override_partial || x.to_partial_path
       if new

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "5.7.1"
+  VERSION = "5.7.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.7.2
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus