lolita 3.0.4 → 3.0.5

data/GUIDELINE

@@ -13,3 +13,8 @@ rails g lolita:install
 
 change your project initializers/lolita.rb
 
+# For cucumber testing 
+gem install akephalos
+bundle exec cucumber features
+
+

data/Gemfile

@@ -1,24 +1,29 @@
 source "http://rubygems.org"
 
-# Thing how to seperate gems for Rails Enginge from those that are only for lolita
+# Thing how to seperate gems for Rails Engine from those that are only for lolita
 gem "rails", "~>3.0"
 gem "will_paginate", "~> 3.0.pre2"
 gem "abstract"
+gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1
 
 group :mongoid do
-  gem "mongo"
-  gem "mongoid", "~> 2.0.0.rc.7"
-  gem "bson_ext"
+	gem "mongo"
+	gem "mongoid", "~> 2.0.0.rc.7"
+	gem "bson_ext"
 end
 
 #gem 'cover_me', '>= 1.0.0.rc6', :group => :test
- gem "jeweler", "~> 1.5.2", :group=>:development
+gem "jeweler", "~> 1.5.2", :group=>:development
 group :test,:development do
-  gem "rspec", ">=2.2.0"
-  gem "rspec-rails"
-  gem "factory_girl"
-  gem 'ffaker' 
- # gem "rspec-cells"
-  #gem "sqlite3-ruby"
-  gem "ruby-debug19"
-end
+	gem "rspec", ">=2.2.0"
+	gem "rspec-rails"
+	gem "factory_girl"
+	gem 'ffaker'
+	# gem "rspec-cells"
+	#gem "sqlite3-ruby"
+	gem "ruby-debug19"
+	gem "cucumber-rails"
+	gem "capybara"
+	gem "database_cleaner"
+	gem "akephalos"
+end

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/app/controllers/lolita/rest_controller.rb

@@ -60,8 +60,10 @@ class Lolita::RestController < ApplicationController
   
   def save_and_redirect
     if self.resource.save
+      flash.now[:notice] = I18n.t "lolita.shared.save_notice"
       show_form
     else
+      flash.now[:alert] = I18n.t "lolita.shared.save_alert"
       show_form #to_list
     end
   end
@@ -69,6 +71,7 @@ class Lolita::RestController < ApplicationController
   def to_list
     page=resource_class.lolita.list.paginate(params[:page])
     builder=build_response_for(:list,:page=>page)
-    render_component *builder
+    render :index
+    #render_component *builder
   end
 end

data/app/helpers/lolita_helper.rb

@@ -1,3 +1,12 @@
 module LolitaHelper
-  
+	
+	# Classes for div block that is located to the right of menu
+	# This is helpful because different positionings within it exist depending on action
+  def content_classes
+    classes = []
+    if params[:action] == "edit"
+    	classes << "with-secondary"
+    end
+    classes.join(" ")
+  end
 end

data/app/views/components/lolita/list/_new_resource.html.erb

@@ -1,4 +1,4 @@
 <a href="<%= new_lolita_resource_path%>" class="create">
   <%= I18n.t("lolita.list.add_new",:name=>resource_name) %>
-  <%= image_tag "lolita/plus.png", :alt=>"+"%>
+  <%= image_tag "lolita/plus.png", :alt=>"+" %>
 </a>

data/app/views/components/lolita/list/_tool_cell.html.erb

@@ -1,4 +1,4 @@
-<td>
-  <%= link_to "E",edit_lolita_resource_path(:id=>record.id) %>
-  <%= link_to "D", lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
+<td class="tool-cell">
+  <%= link_to "Edit",edit_lolita_resource_path(:id=>record.id) %>
+  <%= link_to "Delete", lolita_resource_path(:id=>record.id),:method=>:delete,:confirm=>I18n.t("lolita.list.confirm") %>
 </td>

data/app/views/components/lolita/shared/_flash.html.erb

@@ -0,0 +1,13 @@
+<div id="flash" style="display:none">
+  <%= flash[:notice] if flash[:notice] %>
+  <%= flash[:alert]  if flash[:alert] %>
+</div>
+
+<% if request.xhr? && (flash[:notice] || flash[:alert]) %>
+  <script>
+    $("#flash").slideDown("fast");
+    setTimeout(function() { 
+      $("#flash").slideUp("fast") 
+    }, 10000); //wait 10 seconds and then slide up
+  </script>
+<% end%>

data/app/views/components/lolita/shared/_right_sidebar.html.erb

@@ -0,0 +1,14 @@
+<div class="secondary">
+  <div class="box">
+    <div class="boxtitle black">
+      <h1><%= t "lolita.tabs.save" %></h1>
+      <div class="arrow"></div>
+    </div>
+    <div class="save black">
+      <div class="last-save">
+        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.respond_to?(:updated_at) && resource.updated_at %>
+      </div>
+      <button class="save-all"><%=I18n.t("lolita.tabs.save")%></button>
+    </div>
+  </div>
+</div>

data/app/views/components/lolita/tab/_default.html.erb

@@ -5,6 +5,7 @@
 %>
 <%= form_tag "#", :id=>"tab-form-#{tab.__id__}" do |form| %>
   <div class="tab-content">
+    <%#= error_messages_for resource #TODO removed in Rails 3, now available as plugin .. %> 
     <% tab.fields_with_field_set do |fields_or_field,field_set| %>
       <% if field_set %>
         <%= render_component :"lolita/field_set", :display, :fields=>fields_or_field,:field_set=>field_set %>

data/app/views/components/lolita/tabs/_display.html.erb

@@ -1,26 +1,11 @@
-<% content_for :content_class do "with-secondary" end %>
+<%= render_component :"lolita/shared", :flash, :flash => flash %> <%# FIXME does it really need passed flash as local var? %>
+<%= render_component :"lolita/shared", :right_sidebar %>
 
-<%#= flash %>
-
-<div class="secondary"> <%#= right sidebar %>
-  <div class="box">
-    <div class="boxtitle black">
-      <h1><%= t "lolita.tabs.save" %></h1>
-      <div class="arrow"></div>
-    </div>
-    <div class="save black">
-      <div class="last-save">
-        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.updated_at %>
-      </div>
-      <button class="save-all"><%=I18n.t("lolita.tabs.save")%></button>
-    </div>
-  </div>
-</div>
+<%#= resource.errors.full_messages if resource.errors.any? %>
 
 <% #mode container div with all data-* method to helper and change to block method %>
 <div id="tabs-<%= resource_name %>" class="tabs" data-method="<%=resource.new_record? ? "POST" : "PUT" %>" data-tabs-url="<%=resource.new_record? ? lolita_resources_path : lolita_resource_path(:id=>resource.id)%>">
   <% tabs.each do |tab| %>
     <%= render_component :"lolita/tab", :display, :tab=>tab  %>
   <% end %>
-</div>
-
+</div>

data/app/views/lolita/layouts/application.html.erb

@@ -22,7 +22,7 @@
       <%= render_component :"lolita/shared", :header %>
       <div id="main" role="main">
         <%= render_component :"lolita/navigation",:display %>
-        <div id="content" class="<%= content_for :content_class %>">
+        <div id="content" class="<%= content_classes %>">
           <%= yield %>
         </div>
       </div>

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   lolita:
     shared:
+      save_notice: Successfully saved.
+      save_alert: Save did not succeed.
       log_out: Log out
     tabs:
       last_save: Last saved

data/features/create_page.feature

@@ -0,0 +1,20 @@
+Feature: Create pages
+    In order to manage content
+    As lolita user
+    I want to create posts
+
+    Scenario: List and create new with valid data
+      When I go to list
+      And I follow "Add new post"
+      And I fill in "Title" with "Lolita is nice"
+      When I press "Save" within ".save"
+      Then I should see "Successfully saved"
+      When I follow "Post"
+      #Then I should see "Lolita is nice"
+      
+		Scenario: List and create new with invalid data
+			When I go to list
+	      And I follow "Add new post"
+	      When I press "Save" within ".save"
+	      Then I should see "Save did not succeed"
+	      When I follow "Post"

data/features/step_definitions/lolita_steps.rb

@@ -0,0 +1,7 @@
+Given /^I am lolita user$/ do
+  @profile = Profile.create
+end
+
+Then /^print output$/ do
+  save_and_open_page
+end

data/features/step_definitions/web_steps.rb

@@ -0,0 +1,219 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
+Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_true
+    else
+      assert field_checked
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_false
+    else
+      assert !field_checked
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end