authorized_rails_scaffolds 0.0.15 → 0.0.16

data/lib/authorized_rails_scaffolds.rb

@@ -29,6 +29,7 @@ module AuthorizedRailsScaffolds
 
 end
 
+require "authorized_rails_scaffolds/macros/attribute_macros"
 require "authorized_rails_scaffolds/macros/controller_macros"
 require "authorized_rails_scaffolds/macros/factory_macros"
 require "authorized_rails_scaffolds/macros/path_macros"

data/lib/authorized_rails_scaffolds/macros/attribute_macros.rb

@@ -0,0 +1,34 @@
+#
+# requires attributes to be defined
+#
+module AuthorizedRailsScaffolds::Macros::AttributeMacros
+
+  def output_attributes
+    unless @output_attributes
+      @output_attributes = []
+
+      # First attribute
+      @output_attributes << attributes.first unless attributes.empty?
+
+      # Reference Attribtues
+      @output_attributes += attributes[1..-1].reject{|attribute| ![:references].include? attribute.type }
+
+      # Standard Attributes
+      @output_attributes += attributes[1..-1].reject{|attribute| [:references].include? attribute.type }
+    end
+    @output_attributes
+  end
+
+  def references_attributes
+    @references_attributes ||= output_attributes.reject{|attribute| ![:references].include? attribute.type }
+  end
+
+  def standard_attributes
+    @standard_attributes ||= output_attributes.reject{|attribute| [:time, :date, :datetime, :references].include? attribute.type }
+  end
+
+  def datetime_attributes
+    @datetime_attributes ||= output_attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+  end
+
+end

data/lib/authorized_rails_scaffolds/rspec_scaffold_helper.rb

@@ -24,4 +24,32 @@ class AuthorizedRailsScaffolds::RSpecScaffoldHelper < AuthorizedRailsScaffolds::
     super attribute_name, variable
   end
 
+  def start_nesting_block
+    if parent_model_names.any?
+      "context \"within #{parent_model_names.join('/')} nesting\" do"
+    else
+      'context do # Within default nesting'
+    end
+  end
+
+  def start_shallow_nesting_block
+    if shallow_routes?
+      'context do # Within shallow nesting'
+    else
+      start_nesting_block
+    end
+  end
+
+  def end_nesting_block
+    'end'
+  end
+
+  def describe_nesting_comment
+    if parent_model_names.any?
+      "within #{parent_model_names.join('/')} nesting"
+    else
+      "Within default nesting"
+    end
+  end
+
 end

data/lib/authorized_rails_scaffolds/rspec_scaffold_view_helper.rb

@@ -1,24 +1,13 @@
 class AuthorizedRailsScaffolds::RSpecScaffoldViewHelper < AuthorizedRailsScaffolds::RSpecScaffoldHelper
+  include AuthorizedRailsScaffolds::Macros::AttributeMacros
   include AuthorizedRailsScaffolds::Macros::FactoryMacros
 
   def initialize(options = {})
     super options
   end
 
-  def output_attributes
-    @output_attributes ||= @attributes.reject{|attribute| [:timestamp].include? attribute.type }
-  end
-
-  def references_attributes
-    @references_attributes ||= @attributes.reject{|attribute| ![:references].include? attribute.type }
-  end
-
-  def standard_attributes
-    @standard_attributes ||= @attributes.reject{|attribute| [:time, :date, :datetime, :references].include? attribute.type }
-  end
-
-  def datetime_attributes
-    @datetime_attributes ||= @attributes.reject{|attribute| ![:time, :date, :datetime].include? attribute.type }
+  def attributes
+    @attributes
   end
 
   def date_select_year_value(date_string)

data/lib/authorized_rails_scaffolds/version.rb

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

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

@@ -100,7 +100,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
         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) %> }
       else
         format.html { render <%= key_value :action, '"new"' %> }
-        format.json { render <%= key_value :json, "{ " + key_value('errors', "@#{orm_instance.errors}") + " }" %>, <%= key_value :status, ':unprocessable_entity' %> }
+        format.json { render_json_error :unprocessable_entity, <%= key_value('errors', "@#{orm_instance.errors}") %> }
       end
     end
   end
@@ -116,7 +116,7 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
         format.json { head :no_content }
       else
         format.html { render <%= key_value :action, '"edit"' %> }
-        format.json { render <%= key_value :json, "{ " + key_value('errors', "@#{orm_instance.errors}") + " }" %>, <%= key_value :status, ':unprocessable_entity' %> }
+        format.json { render_json_error :unprocessable_entity, <%= key_value('errors', "@#{orm_instance.errors}") %> }
       end
     end
   end
@@ -163,9 +163,16 @@ class <%= t_helper.controller_class_name %> < <%= t_helper.application_controlle
           redirect_to <%= t_helper.controller_index_route %>, :alert => exception.message
         end
       end
-      format.json { head :no_content, :status => :forbidden }
+      format.json { render_json_error :forbidden, <%= key_value('error', 'exception.message') %> }
     end
   end
 
+  def render_json_error(status_code, values = {})
+    json_values = {
+      <%= key_value('status', 'Rack::Utils.status_code(status_code)') %>
+    }.merge(values)
+    render <%= key_value('status', 'status_code') %>, <%= key_value('json', 'json_values') %>
+  end
+
 end
 <% end -%>

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

@@ -73,7 +73,7 @@ describe <%= t_helper.controller_class_name %> do
 <%- end -%>
 <% unless options[:singleton] -%>
   describe "GET index" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_nesting_block %>
       <%- t_helper.parent_models.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -116,12 +116,12 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
 <% end -%>
   describe "GET show" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_shallow_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -163,12 +163,19 @@ describe <%= t_helper.controller_class_name %> do
             assigns(<%= resource_symbol %>).should eq(<%= resource_test_var %>)
           end
         end
+        describe 'with request for missing <%= resource_human_name %>' do
+          it "raises a ActiveRecord::RecordNotFound when no <%= resource_human_name %> is found" do
+            expect {
+              get :show, {<%= t_helper.build_example_show_params ":id => #{(10..99).to_a.sample}" %>}
+            }.to raise_exception(ActiveRecord::RecordNotFound)
+          end
+        end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
   describe "GET new" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -208,11 +215,11 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
   describe "GET edit" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_shallow_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -255,11 +262,11 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
   describe "POST create" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -325,11 +332,11 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
   describe "PUT update" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_shallow_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -401,11 +408,11 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
   describe "DELETE destroy" do
-    context <% if parent_model_names.any? %>"within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+    <%= t_helper.start_shallow_nesting_block %>
       <%- parent_model_names.each do |parent_model| -%>
       grant_ability :read, <%= parent_model.classify %>
       <%- end -%>
@@ -452,7 +459,7 @@ describe <%= t_helper.controller_class_name %> do
           end
         end
       end
-    end
+    <%= t_helper.end_nesting_block %>
   end
 
 end

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

@@ -51,7 +51,7 @@ describe "<%= resource_directory %>/edit" do
     controller.stub(:current_ability) { @ability }
   end
 
-  context<% if parent_model_names.any? %> "within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+  <%= t_helper.start_shallow_nesting_block %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_names.each do |parent_model| -%>
@@ -133,5 +133,5 @@ describe "<%= resource_directory %>/edit" do
     end
 
 <% end -%>
-  end
+  <%= t_helper.end_nesting_block %>
 end

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

@@ -52,7 +52,7 @@ describe "<%= resource_directory %>/index" do
     controller.stub(:current_ability) { @ability }
   end
 
-  context<% if parent_model_names.any? %> "within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+  <%= t_helper.start_nesting_block %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_names.each do |parent_model| -%>
@@ -236,6 +236,6 @@ describe "<%= resource_directory %>/index" do
         end
       end
     end
-  end
+  <%= t_helper.end_nesting_block %>
 
 end

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

@@ -49,7 +49,7 @@ describe "<%= resource_directory %>/new" do
     controller.stub(:current_ability) { @ability }
   end
 
-  context<% if parent_model_names.any? %> "within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+  <%= t_helper.start_nesting_block %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_names.each do |parent_model| -%>
@@ -130,5 +130,5 @@ describe "<%= resource_directory %>/new" do
 <% end -%>
     end
 <% end -%>
-  end
+  <%= t_helper.end_nesting_block %>
 end

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

@@ -51,7 +51,7 @@ describe "<%= resource_directory %>/show" do
     controller.stub(:current_ability) { @ability }
   end
 
-  context<% if parent_model_names.any? %> "within <%= parent_model_names.join('/') %> nesting"<% end %> do<%- unless parent_model_names.any? -%> # Within default nesting<% end %>
+  <%= t_helper.start_nesting_block %>
     before(:each) do
       # Add Properties for view scope
 <%- parent_model_names.each do |parent_model| -%>
@@ -119,6 +119,6 @@ describe "<%= resource_directory %>/show" do
       end
     end
 <% end -%>
-  end
+  <%= t_helper.end_nesting_block %>
 
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: authorized_rails_scaffolds
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
+  prerelease: 
 platform: ruby
 authors:
 - bmorrall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70151610121940 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *70151610121940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70151610120260 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *70151610120260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70151610115080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *70151610115080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70151610113780 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70151610113780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70151610112440 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70151610112440
 description: Creates scaffolds for Twitter Bootstrap with generated RSpec coverage
 email:
 - bemo56@hotmail.com
@@ -95,6 +81,7 @@ files:
 - authorized_rails_scaffolds.gemspec
 - lib/authorized_rails_scaffolds.rb
 - lib/authorized_rails_scaffolds/helper.rb
+- lib/authorized_rails_scaffolds/macros/attribute_macros.rb
 - lib/authorized_rails_scaffolds/macros/controller_macros.rb
 - lib/authorized_rails_scaffolds/macros/factory_macros.rb
 - lib/authorized_rails_scaffolds/macros/parent_macros.rb
@@ -148,26 +135,27 @@ 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: 2.0.3
+rubygems_version: 1.8.10
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Replaces Rails and RSpec's default generators with templates taking full
   advantage of Authentication (Devise), Authorization (CanCan) and Test Coverage (RSpec)
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 48159be8830cab29219981b558c48f647cac5651
-  data.tar.gz: 31db50aea7a19dfa206edc4b9eb0dcff5e20d48a
-SHA512:
-  metadata.gz: 01f6d37305d7e270d045d18f833130b14ed50086bd8e03b83e1364496272437dc8a0d7e2d1e06ae536aca9c6e519626d8ad8271af7be6c353353feaf93e0a1fa
-  data.tar.gz: 90483813b42dbb7437d30f4e56782782988babdf1423c7825d3dabfefdcdc9a225c6cdf172fe97767ece17a211cbd371e4a92d4bb7214b872af6a817ef88f997