authorized_rails_scaffolds 0.0.16 → 0.0.17

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e3fdecce3d216b025f9cb384168f1e232985a74
+  data.tar.gz: 96f35de513999468059f27d3b2e73aace8e24072
+SHA512:
+  metadata.gz: fdd49aebe077a4bcf185a0a5121477a10d85dfdcab6fa548ef4979ea919d0c104a50260025b8b3f0079897133e4952b47d85d3d3cfe672b91ad2aa7061d87510
+  data.tar.gz: 934ff948f063a9ebd5fc79d31367c513056393f45cd9149f9cbfeb54b0d440076115ed23d117ae6599d3388185c2fcba4aef9f0672bfd4eb7b83093f1f2f3508

data/lib/authorized_rails_scaffolds/macros/resource_macros.rb

@@ -16,6 +16,10 @@ module AuthorizedRailsScaffolds::Macros::ResourceMacros
     @resource_class ||= (modular_class_name.nil? ? nil : modular_class_name.split('::')[-1]) || var_name.classify
   end
 
+  def resource_key
+    @resource_key ||= "#{resource_name}:"
+  end
+
   # Table name of the Resource being tested (i.e. foo_bar)
   def resource_name
     @resource_name ||= (var_name || resource_class.underscore)
@@ -31,6 +35,11 @@ module AuthorizedRailsScaffolds::Macros::ResourceMacros
     @resource_var ||= "@#{resource_name}"
   end
 
+  # Name for plural of a resource
+  def resource_array_key
+    @resource_array_key ||= "#{resource_array_name}:"
+  end
+
   # Name for plural of a resource
   def resource_array_name
     @resource_array_name ||= (plural_var_name || resource_name.pluralize)

data/lib/authorized_rails_scaffolds/version.rb

@@ -1,3 +1,3 @@
 module AuthorizedRailsScaffolds
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/scaffold/controller.rb

@@ -27,9 +27,11 @@ t_helper = AuthorizedRailsScaffolds::RailsScaffoldControllerHelper.new(
 resource_class = t_helper.resource_class # Non-Namespaced class name
 resource_human_name = t_helper.resource_human_name
 resource_symbol = t_helper.resource_symbol
+resource_key = t_helper.resource_key
 resource_name = t_helper.resource_name
 resource_array_name = t_helper.resource_array_name
 resource_var = t_helper.resource_var
+resource_array_key = t_helper.resource_array_key
 resource_array_var = t_helper.resource_array_var # Pluralized non-namespaced variable name
 
 example_index_path = t_helper.example_index_path
@@ -58,7 +60,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render <%= key_value :json, "{ #{key_value(resource_array_name, resource_array_var)} }" %> }
+      format.json { render :json => { <%= resource_array_key %> <%= resource_array_var %> } }
     end
   end
 
@@ -69,7 +71,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render <%= key_value :json, "{ #{key_value(resource_name, resource_var)} }" %> }
+      format.json { render :json => { <%= resource_key %> <%= resource_var %> } }
     end
   end
 
@@ -80,7 +82,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render <%= key_value :json, "{ #{key_value(resource_name, resource_var)} }" %> }
+      format.json { render :json => { <%= resource_key %> <%= resource_var %> } }
     end
   end
 
@@ -96,11 +98,11 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
 
     respond_to do |format|
       if @<%= orm_instance.save %>
-        format.html { redirect_to <%= t_helper.controller_show_route(resource_var) %>, <%= key_value :notice, "'#{resource_human_name} was successfully created.'" %> }
-        format.json { render <%= key_value :json, "{ #{key_value(resource_name, resource_var)} }" %>, <%= key_value :status, ':created' %>, <%= key_value :location, t_helper.controller_show_route(resource_var) %> }
+        format.html { redirect_to <%= t_helper.controller_show_route(resource_var) %>,  notice: "<%= resource_human_name %> was successfully created." }
+        format.json { render json: { <%= resource_key %> <%= resource_var %> }, :status => :created, location: <%= t_helper.controller_show_route(resource_var) %> }
       else
-        format.html { render <%= key_value :action, '"new"' %> }
-        format.json { render_json_error :unprocessable_entity, <%= key_value('errors', "@#{orm_instance.errors}") %> }
+        format.html { render action: "new" }
+        format.json { render_json_error :unprocessable_entity, errors: <%= "@#{orm_instance.errors}" %> }
       end
     end
   end
@@ -112,11 +114,11 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
 
     respond_to do |format|
       if @<%= orm_instance.update_attributes("params[#{resource_symbol}]") %>
-        format.html { redirect_to <%= t_helper.controller_show_route resource_var %>, <%= key_value :notice, "'#{resource_human_name} was successfully updated.'" %> }
+        format.html { redirect_to <%= t_helper.controller_show_route resource_var %>, notice: "<%= resource_human_name %> was successfully updated." }
         format.json { head :no_content }
       else
-        format.html { render <%= key_value :action, '"edit"' %> }
-        format.json { render_json_error :unprocessable_entity, <%= key_value('errors', "@#{orm_instance.errors}") %> }
+        format.html { render action: "edit" }
+        format.json { render_json_error :unprocessable_entity, errors: <%= "@#{orm_instance.errors}" %> }
       end
     end
   end
@@ -128,7 +130,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
     @<%= orm_instance.destroy %>
 
     respond_to do |format|
-      format.html { redirect_to <%= t_helper.controller_index_route %>, <%= key_value :notice, "'#{resource_human_name} was successfully deleted.'" %> }
+      format.html { redirect_to <%= t_helper.controller_index_route %>, notice: "<%= resource_human_name %> was successfully deleted." }
       format.json { head :no_content }
     end
   end
@@ -163,15 +165,15 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
           redirect_to <%= t_helper.controller_index_route %>, :alert => exception.message
         end
       end
-      format.json { render_json_error :forbidden, <%= key_value('error', 'exception.message') %> }
+      format.json { render_json_error :forbidden, error: exception.message }
     end
   end
 
   def render_json_error(status_code, values = {})
     json_values = {
-      <%= key_value('status', 'Rack::Utils.status_code(status_code)') %>
+      status: Rack::Utils.status_code(status_code)
     }.merge(values)
-    render <%= key_value('status', 'status_code') %>, <%= key_value('json', 'json_values') %>
+    render status: status_code, json: json_values
   end
 
 end

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/model_spec.rb

@@ -6,13 +6,13 @@ describe <%= class_name %> do
 
   # <%= attribute.name %>:<%= attribute.type %>
   <%- if attribute.type == :references -%>
+  it { should belong_to(:<%= attribute.name %>) }
+  <%- end -%>
+  <%- if attribute.type == :references -%>
   it { should allow_mass_assignment_of(:<%= attribute.name %>_id)}
   <%- else -%>
   it { should allow_mass_assignment_of(:<%= attribute.name %>)}
   <%- end -%>
-  <%- if attribute.type == :references -%>
-  it { should belong_to(:<%= attribute.name %>) }
-  <%- end -%>
   <%- if attribute_index == 0 -%>
   it { should validate_presence_of(:<%= attributes[0].name %>) }
   <%- end -%>

data/lib/generators/authorized_rails_scaffolds/install_templates/templates/spec/request_spec.rb

@@ -22,6 +22,11 @@ parent_model_names = t_helper.parent_model_names
 
 -%>
 describe "<%= class_name.pluralize %>" do
+  <%- if parent_model_names.any? -%>
+
+  <%- parent_model_names.each do |parent_model| -%>
+    let(<%= t_helper.references_test_sym(parent_model) %>) { <%= t_helper.create_parent_resource_from_factory parent_model %> }
+  <%- end -%>
 
   # This should return the minimal set of attributes required to create a valid
   # <%= resource_class %>.
@@ -35,11 +40,6 @@ describe "<%= class_name.pluralize %>" do
     FactoryGirl.attributes_for(<%= resource_symbol %>)
   end
 
-<%- if parent_model_names.any? -%>
-<%- parent_model_names.each do |parent_model| -%>
-  let(<%= t_helper.references_test_sym(parent_model) %>) { <%= t_helper.create_parent_resource_from_factory parent_model %> }
-<%- end -%>
-
 <%- end -%>
   describe "GET <%= t_helper.example_index_path %>" do
     context "as a user" do

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: authorized_rails_scaffolds
 version: !ruby/object:Gem::Version
-  version: 0.0.16
-  prerelease: 
+  version: 0.0.17
 platform: ruby
 authors:
 - bmorrall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70151610121940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70151610121940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70151610120260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70151610120260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70151610115080 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70151610115080
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70151610113780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151610113780
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70151610112440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70151610112440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creates scaffolds for Twitter Bootstrap with generated RSpec coverage
 email:
 - bemo56@hotmail.com
@@ -135,27 +149,26 @@ files:
 homepage: https://github.com/bmorrall/authorized_rails_scaffolds
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Replaces Rails and RSpec's default generators with templates taking full
   advantage of Authentication (Devise), Authorization (CanCan) and Test Coverage (RSpec)
 test_files: