simple_resource 0.1.0 → 0.2.0

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+0.2.0 (January 15, 2013)
+
+* CanCan support
+* Default locales are in config/locales/en.yml
+* Redirect to collection_url after create and update actions
+
 0.1.0 (October 19, 2012)
 
 * First release with basic functionality

data/{DEVELOPER_GUIDE.md → CONTRIBUTING.md}

@@ -1,4 +1,4 @@
-# SimpleResource for Developers
+# Contributing to SimpleResource
 
 ## Forking the project
 
@@ -22,11 +22,11 @@ And then execute:
 
 ## Running tests
 
-Start Guard:
-
-    $ bundle exec guard start
-
-Run all specs by pressing the enter.
+    $ cd spec/dummy
+    $ rake db:setup
+    $ rake db:test:clone
+    $ cd ../..
+    $ rake spec
 
 ## Adding a new feature
 

data/README.md

@@ -12,6 +12,7 @@ SimpleResource speeds up development of standard Rails applications by integrati
 * Support for external form builders
     * [Formtastic](https://github.com/justinfrench/formtastic)
     * [SimpleForm](https://github.com/plataformatec/simple_form)
+* Support for CanCan
 
 ## Requirements
 
@@ -28,6 +29,44 @@ And then execute:
 
     $ bundle
 
+## Usage
+
+Inherit your resource controllers from SimpleResource::BaseController. For example:
+
+    class ProjectsController < SimpleResource::BaseController
+    end
+
+That's it. Your resource now uses Formtastic as a form builder, views from SimpleResource and restful actions from Inherited Resources.
+
+### Configuring form builder
+
+You can configure which form builders you want to use. Configuration can be done application-wide or per resource.
+
+For example, if you like to use simple_form by default for all your resources, configure the builder in the app/views/simple_resource/_form.html.erb:
+
+    <%= render_form "simple_form" %>
+
+If you like to use simple_form only for products resource, put the above line into the app/views/products/_form.html.erb.
+
+### Creating own form builder
+
+Put your form builder into the app/views/simple_resource/builders/_my_builder.html.erb:
+
+    <form>
+      <% fields.each do |field| %>
+        <%= input_field_tag(field) %>
+      <% end %>
+      <%= submit_tag "Submit" %>
+    </form>
+
+Then use it (see section "Configuring form builder"):
+
+    <%= render_form "my_builder" %>
+
+### Overriding views
+
+You may override SimpleResource views application-wide or per resource.
+
 ## Support
 
 If you have any questions or issues with SimpleResource, or if you like to report a bug, please create an [issue on GitHub](https://github.com/jarijokinen/simple_resource/issues).

data/app/controllers/simple_resource/base_controller.rb

@@ -1,6 +1,22 @@
 module SimpleResource
   class BaseController < ::ApplicationController
+    if defined?(CanCan)
+      load_and_authorize_resource
+
+      rescue_from CanCan::AccessDenied do |exception|
+        redirect_to root_url, alert: exception.message
+      end
+    end
+
     inherit_resources
     defaults route_prefix: ""
+
+    def create
+      create! { collection_url }
+    end
+        
+    def update
+      update! { collection_url }
+    end
   end
 end

data/app/helpers/simple_resource/base_helper.rb

@@ -13,22 +13,24 @@ module SimpleResource
     end
 
     def collection_title
-      I18n.t("activerecord.models.#{controller_name.singularize}.other",
+      t("activerecord.models.#{controller_name.singularize}.other",
         default: controller_name.humanize)
     end
 
     def new_resource_title
-      I18n.t("simple_resource.new_resource", resource_name: resource_human_name, 
-        default: "New #{resource_human_name}")
+      t("simple_resource.titles.new_resource", resource_name: resource_human_name)
+    end
+    
+    def new_resource_link_title
+      t("simple_resource.links.new_resource", resource_name: resource_human_name)
     end
 
     def new_resource_link
-      link_to(new_resource_title, new_resource_path)
+      link_to(new_resource_link_title, new_resource_path)
     end
 
     def edit_resource_title
-      I18n.t("simple_resource.edit_resource", resource_name: resource_human_name, 
-        default: "Edit #{resource_human_name}")
+      t("simple_resource.titles.edit_resource", resource_name: resource_human_name)
     end
 
     def resource_attributes
@@ -49,7 +51,7 @@ module SimpleResource
 
     def attribute_human_name(attribute_name)
       attribute_name = attribute_name.to_s
-      I18n.t("activerecord.attributes.#{controller_name.singularize}.#{attribute_name}",
+      t("activerecord.attributes.#{controller_name.singularize}.#{attribute_name}",
         default: attribute_name.humanize)
     end
 
@@ -66,7 +68,7 @@ module SimpleResource
       action_name = action_name.to_sym
       if action_name == :delete
         link_to(t("simple_resource.#{action_name.to_s}", default: title), path,
-          method: :delete, confirm: t("simple_resource.delete_confirmation", default: "Are you sure?"))
+          method: :delete, confirm: t("simple_resource.messages.delete_confirmation"))
       else
         link_to(t("simple_resource.#{action_name.to_s}", default: title), path)
       end
@@ -74,9 +76,9 @@ module SimpleResource
 
     def default_actions_for(resource)
       html = Array.new
-      html << link_to_action(:show, "Show", resource_path(resource))
-      html << link_to_action(:edit, "Edit", edit_resource_path(resource))
-      html << link_to_action(:delete, "Delete", resource_path(resource))
+      html << link_to_action(:show, t("simple_resource.links.show"), resource_path(resource))
+      html << link_to_action(:edit, t("simple_resource.links.edit"), edit_resource_path(resource))
+      html << link_to_action(:delete, t("simple_resource.links.delete"), resource_path(resource))
       html.join("\n").html_safe
     end
 

data/app/views/simple_resource/base/index.html.erb

@@ -1,4 +1,9 @@
 <% @title ||= collection_title %>
 
-<%= render_collection_table %>
+<%=
+  unless collection.blank?
+    render_collection_table
+  end
+%>
+
 <%= new_resource_link %>

data/app/views/simple_resource/builders/_formtastic.html.erb

@@ -2,6 +2,6 @@
   <%= f.inputs(*(fields)) %>
   <%= f.actions do %>
     <%= f.action :submit %>
-    <%= f.action :cancel, label: t(:cancel, default: "Cancel"), url: collection_path %>
+    <%= f.action :cancel, label: t("simple_resource.buttons.cancel"), url: collection_path %>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  simple_resource:
+    buttons:
+      cancel: "Cancel"
+    links:
+      new_resource: "New %{resource_name}"
+      edit_resource: "Edit %{resource_name}"
+      show: "Show"
+      edit: "Edit"
+      delete: "Delete"
+    messages:
+      delete_confirmation: "Are you sure?"
+    titles:
+      new_resource: "New %{resource_name}"
+      edit_resource: "Edit %{resource_name}"

data/lib/simple_resource/version.rb

@@ -1,3 +1,3 @@
 module SimpleResource
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/simple_resource.gemspec

@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", "~> 3.2.8"
+  gem.add_dependency "rails", "~> 3.2.11"
   gem.add_dependency "inherited_resources", "~> 1.3.1"
 
-  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "capybara", "1.1.4"
   gem.add_development_dependency "database_cleaner"
   gem.add_development_dependency "factory_girl_rails"
   gem.add_development_dependency "forgery"

data/spec/dummy/app/controllers/backend/languages_controller.rb

@@ -1,2 +1,4 @@
-class Backend::LanguagesController < SimpleResource::BaseController
+module Backend
+  class LanguagesController < SimpleResource::BaseController
+  end
 end

data/spec/dummy/app/models/language.rb

@@ -1,4 +1,6 @@
 class Language < ActiveRecord::Base
   attr_accessible :name
   has_many :posts
+
+  validates_presence_of :name
 end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -7,6 +7,9 @@
     <%= csrf_meta_tags %>
   </head>
   <body>
+    <% flash.each do |key, msg| %>
+      <%= content_tag(:div, msg, class: "flash #{key}") %>
+    <% end %>
     <%= content_tag(:h1, @title) unless @title.blank? %>
     <%= yield %>
   </body>

data/spec/dummy/config/application.rb

@@ -33,7 +33,7 @@ module Dummy
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
+    # config.i18n.default_locale = :fi
 
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"

data/spec/dummy/config/locales/fi.yml

@@ -8,9 +8,14 @@ fi:
       language:
         name: "Nimi"
   simple_resource:
-    new_resource: "Uusi %{resource_name}"
-    edit_resource: "Muokkaa %{resource_name}"
-    show: "Näytä"
-    edit: "Muokkaa"
-    delete: "Poista"
-    delete_confirmation: "Oletko varma?"
+    links:
+      new_resource: "Uusi %{resource_name}"
+      edit_resource: "Muokkaa %{resource_name}"
+      show: "Näytä"
+      edit: "Muokkaa"
+      delete: "Poista"
+    messages:
+      delete_confirmation: "Oletko varma?"
+    titles:
+      new_resource: "Uusi %{resource_name}"
+      edit_resource: "Muokkaa %{resource_name}"

data/spec/features/languages_spec.rb

@@ -0,0 +1,169 @@
+require "spec_helper"
+
+describe "Languages resource" do
+  let!(:collection) { FactoryGirl.create_list(:language, 10) }
+  
+  before :each do
+    visit "/languages"
+  end
+
+  describe "index" do
+    it "has a correct title" do
+      page.html.should have_xpath "//title", text: "Languages | Dummy"
+    end
+
+    it "has a correct heading" do
+      page.should have_css "h1", text: "Languages"
+    end
+
+    it "lists all languages" do
+      within "table" do
+        within "thead" do
+          page.should have_css "th", text: "Name"
+        end
+        within "tbody" do
+          collection.each do |resource|
+            page.should have_css "td", text: resource.name
+            page.should have_link "Show", href: "/languages/#{resource.id}"
+            page.should have_link "Edit", href: "/languages/#{resource.id}/edit"
+            page.should have_link "Delete", href: "/languages/#{resource.id}"
+          end
+        end
+      end
+    end
+
+    it "has a link to create a new language" do
+      page.should have_link "New Language", href: "/languages/new"
+    end
+  end
+
+  describe "creating a new language" do
+    let(:resource) { FactoryGirl.build(:language) }
+
+    before :each do
+      click_link "New Language"
+    end
+    
+    it "has a correct title" do
+      page.html.should have_xpath "//title", text: "New Language | Dummy"
+    end
+
+    it "has a correct heading" do
+      page.should have_css "h1", text: "New Language"
+    end
+
+    it "has a name field" do
+      page.should have_field "Name"
+    end
+
+    it "has a create language button" do
+      page.should have_button "Create Language"
+    end
+
+    it "has a cancel link" do
+      page.should have_link "Cancel", href: "/languages"
+    end
+
+    context "with correct values" do
+      before :each do
+        fill_in "Name", with: resource.name
+        click_button "Create Language"
+      end
+
+      it "redirects to index" do
+        page.current_path.should == "/languages"
+      end
+
+      it "displays success message" do
+        page.should have_content "Language was successfully created"
+      end
+
+      it "lists the new resource" do
+        page.should have_content resource.name
+      end
+    end
+
+    context "without a required field" do
+      before :each do
+        click_button "Create Language"
+      end
+      
+      it "stays on the same page" do
+        page.should have_css "h1", text: "New Language"
+        page.should have_field "Name"
+      end
+
+      it "displays inline error message" do
+        page.should have_content "can't be blank"
+      end
+    end
+  end
+  
+  describe "editing a language" do
+    let(:resource) { collection.first }
+    let(:new_resource) { FactoryGirl.build(:language) }
+
+    before :each do
+      click_link "Edit"
+    end
+    
+    it "has a correct title" do
+      page.html.should have_xpath "//title", text: "Edit Language | Dummy"
+    end
+
+    it "has a correct heading" do
+      page.should have_css "h1", text: "Edit Language"
+    end
+
+    it "has a name field" do
+      page.should have_field "Name", with: resource.name
+    end
+
+    it "has a update language button" do
+      page.should have_button "Update Language"
+    end
+
+    it "has a cancel link" do
+      page.should have_link "Cancel", href: "/languages"
+    end
+
+    context "with correct values" do
+      before :each do
+        fill_in "Name", with: new_resource.name
+        click_button "Update Language"
+      end
+
+      it "redirects to index" do
+        page.current_path.should == "/languages"
+      end
+
+      it "displays success message" do
+        page.should have_content "Language was successfully updated"
+      end
+
+      it "lists the new resource" do
+        page.should have_content new_resource.name
+      end
+      
+      it "does not list the old resource" do
+        page.should_not have_content resource.name
+      end
+    end
+
+    context "without a required field" do
+      before :each do
+        fill_in "Name", with: ""
+        click_button "Update Language"
+      end
+      
+      it "stays on the same page" do
+        page.should have_css "h1", text: "Edit Language"
+        page.should have_field "Name"
+      end
+
+      it "displays inline error message" do
+        page.should have_content "can't be blank"
+      end
+    end
+  end
+end

data/spec/helpers/base_helper_spec.rb

@@ -181,7 +181,7 @@ describe SimpleResource::BaseHelper do
       
       it "returns translated show link" do
         set_locale
-        helper.link_to_action(:show, "Show", "/languages/1").should eq('<a href="/languages/1">Näytä</a>')
+        helper.link_to_action(:show, "Näytä", "/languages/1").should eq('<a href="/languages/1">Näytä</a>')
         reset_locale
       end
     end
@@ -193,7 +193,7 @@ describe SimpleResource::BaseHelper do
       
       it "returns translated edit link" do
         set_locale
-        helper.link_to_action(:edit, "Edit", "/languages/1/edit").should eq('<a href="/languages/1/edit">Muokkaa</a>')
+        helper.link_to_action(:edit, "Muokkaa", "/languages/1/edit").should eq('<a href="/languages/1/edit">Muokkaa</a>')
         reset_locale
       end
     end
@@ -205,7 +205,7 @@ describe SimpleResource::BaseHelper do
       
       it "returns translated delete link" do
         set_locale
-        helper.link_to_action(:delete, "Delete", "/languages/1").should eq('<a href="/languages/1" data-confirm="Oletko varma?" data-method="delete" rel="nofollow">Poista</a>')
+        helper.link_to_action(:delete, "Poista", "/languages/1").should eq('<a href="/languages/1" data-confirm="Oletko varma?" data-method="delete" rel="nofollow">Poista</a>')
         reset_locale
       end
     end
@@ -369,8 +369,8 @@ describe SimpleResource::BaseHelper do
               </div>
               <fieldset class="inputs">
                 <ol>
-                  <li class="string input optional stringish" id="language_name_input">
-                    <label class=" label" for="language_name">Name</label>
+                  <li class="string input required stringish" id="language_name_input">
+                    <label class=" label" for="language_name">Name<abbr title="required">*</abbr></label>
                     <input id="language_name" maxlength="255" name="language[name]" type="text" />
                   </li>
                 </ol>
@@ -411,8 +411,8 @@ describe SimpleResource::BaseHelper do
               </div>
               <fieldset class="inputs">
                 <ol>
-                  <li class="string input optional stringish" id="language_name_input">
-                    <label class=" label" for="language_name">Name</label>
+                  <li class="string input required stringish" id="language_name_input">
+                    <label class=" label" for="language_name">Name<abbr title="required">*</abbr></label>
                     <input id="language_name" maxlength="255" name="language[name]" type="text" 
                       value="#{language.name}" />
                   </li>

data/spec/spec_helper.rb

@@ -37,5 +37,6 @@ end
 
 Spork.each_run do
   require "factory_girl_rails"
+  ActiveSupport::Dependencies.clear
   FactoryGirl.reload
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_resource
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -231,9 +231,8 @@ files:
 - .rspec
 - .travis.yml
 - CHANGELOG.md
-- DEVELOPER_GUIDE.md
+- CONTRIBUTING.md
 - Gemfile
-- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -248,6 +247,7 @@ files:
 - app/views/simple_resource/base/show.html.erb
 - app/views/simple_resource/builders/_formtastic.html.erb
 - app/views/simple_resource/builders/_simple_form.html.erb
+- config/locales/en.yml
 - lib/simple_resource.rb
 - lib/simple_resource/engine.rb
 - lib/simple_resource/version.rb
@@ -298,8 +298,8 @@ files:
 - spec/factories/categories.rb
 - spec/factories/languages.rb
 - spec/factories/posts.rb
+- spec/features/languages_spec.rb
 - spec/helpers/base_helper_spec.rb
-- spec/integration/languages_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 homepage: https://github.com/jarijokinen/simple_resource
@@ -314,12 +314,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1479618243370591090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1479618243370591090
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -372,8 +378,7 @@ test_files:
 - spec/factories/categories.rb
 - spec/factories/languages.rb
 - spec/factories/posts.rb
+- spec/features/languages_spec.rb
 - spec/helpers/base_helper_spec.rb
-- spec/integration/languages_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-has_rdoc: 

data/Guardfile

@@ -1,30 +0,0 @@
-guard "spork", rspec_env: { "RAILS_ENV" => "test" } do
-  watch("config/application.rb")
-  watch("config/environment.rb")
-  watch("config/environments/test.rb")
-  watch(%r{^config/initializers/.+\.rb$})
-  watch("Gemfile")
-  watch("Gemfile.lock")
-  watch("spec/spec_helper.rb") { :rspec }
-end
-
-guard "rspec", cli: "--drb --color", all_on_start: false, all_after_pass: false do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch("spec/spec_helper.rb")  { "spec" }
-
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch("config/routes.rb")                           { "spec/routing" }
-  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
-  
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
-  
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance" }
-end
-

data/spec/integration/languages_spec.rb

@@ -1,39 +0,0 @@
-require "spec_helper"
-
-describe "Languages" do
-  describe "#index" do
-    let!(:collection) { FactoryGirl.create_list(:language, 10) }
-
-    before :each do
-      visit "/languages"
-    end
-
-    it "has a correct title" do
-      page.should have_xpath "//title", text: "Languages | Dummy"
-    end
-
-    it "has a correct heading" do
-      page.should have_css "h1", "Languages"
-    end
-
-    it "lists all languages" do
-      within "table" do
-        within "thead" do
-          page.should have_css "th", text: "Name"
-        end
-        within "tbody" do
-          collection.each do |resource|
-            page.should have_css "td", text: resource.name
-            page.should have_link "Show", href: "/languages/#{resource.id}"
-            page.should have_link "Edit", href: "/languages/#{resource.id}/edit"
-            page.should have_link "Delete", href: "/languages/#{resource.id}"
-          end
-        end
-      end
-    end
-
-    it "has a link to create a new language" do
-      page.should have_link "New Language", href: "/languages/new"
-    end
-  end
-end