RubyGems - noodall - Versions diffs - 0.0.4 → 0.0.5 - Mend

noodall 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/lib/noodall/generator.rb +10 -0
data/lib/noodall/templates/Gemfile +14 -6
data/lib/noodall/templates/app/views/layouts/application.html.erb.tt +5 -0
data/lib/noodall/templates/config/initializers/noodall.rb +9 -1
data/lib/noodall/templates/config/routes.rb +1 -0
data/lib/noodall/templates/config/sitemap.yml +24 -0
data/lib/noodall/templates/db/seeds.rb +3 -2
data/lib/noodall/templates/features/component_slots.feature +29 -6
data/lib/noodall/templates/features/content_templates.feature +9 -4
data/lib/noodall/templates/features/step_definitions/cms_node_steps.rb +22 -5
data/lib/noodall/templates/features/step_definitions/component_steps.rb +55 -1
data/lib/noodall/templates/lib/tasks/populate.rake +10 -0
data/lib/noodall/version.rb +1 -1
metadata +8 -6

data/lib/noodall/generator.rb CHANGED Viewed

@@ -22,6 +22,16 @@ module Noodall
       copy_file "config/cucumber.yml"
     end
+    def lib
+      super
+      copy_file "lib/tasks/populate.rake"
+    end
+    def config
+      super
+      copy_file "config/sitemap.yml"
+    end
   end
   class AppGenerator < Rails::Generators::AppGenerator

data/lib/noodall/templates/Gemfile CHANGED Viewed

@@ -1,23 +1,31 @@
 source 'http://rubygems.org'
+source 'http://gems.github.com'
 gem 'rails', '3.0.3'
-gem 'noodall-ui'
+gem 'mm-multi-parameter-attributes', :git => 'git://github.com/kernow/mm-multi-parameter-attributes.git'
+gem 'noodall-ui', '~> 0.1.9'
 gem 'noodall-devise'
-gem 'bson_ext', '~> 1.0.9'
+gem 'bson_ext', '~> 1.2.0'
 gem 'rmagick', :require => 'RMagick'
-gem 'dragonfly', '~> 0.7.6'
+gem 'dragonfly', '~> 0.8.1'
+gem 'factory_girl_rails'
+gem 'fakerama'
+group :production, :staging do
+  gem 'dalli'
+  gem 'rack-cache', '~> 1.0.0', :require => 'rack/cache'
+  gem 'rack-contrib', :require => 'rack/contrib'
+end
 group :development, :test do
   gem 'capybara'
   gem 'database_cleaner'
   gem 'cucumber-rails'
   gem 'cucumber'
-  gem 'rspec-rails', "~> 2.0.0.beta.22"
+  gem 'rspec-rails', "~> 2.0.0"
   gem 'spork'
   gem 'launchy'    # So you can do Then show me the page
-  gem 'jeweler', '~> 1.4.0'
   gem 'factory_girl_rails'
-  gem "faker", "~> 0.3.1"
   gem "haml"
 end

data/lib/noodall/templates/app/views/layouts/application.html.erb.tt CHANGED Viewed

@@ -11,6 +11,11 @@
   <%%= csrf_meta_tag %>
 </head>
 <body>
+  <%%= form_tag(noodall_search_path, :method => :get, :class => 'search') do %>
+    <%%= text_field_tag :q, params[:q] || 'Enter keyword(s) here'  %>
+    <%%= submit_tag 'Search' %>
+  <%% end %>
   <%%= flash_messages %>
   <%%= yield %>

data/lib/noodall/templates/config/initializers/noodall.rb CHANGED Viewed

@@ -1,3 +1,11 @@
+# Use Noodall's default dragonfly setup for assets
 require 'noodall/dragonfly'
-Noodall::Node.slots :main, :wide, :small
+# Set the slots that are avaiable to put components in
+Noodall::Node.slots :main, :large, :small
+# Set the mongo collection name for nodes
 Noodall::Node.set_collection_name 'nodes'
+# Reset global update time on startup
+Noodall::GlobalUpdateTime::Stamp.update!

data/lib/noodall/templates/config/routes.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 <%= app_const %>.routes.draw do
   devise_for :users
+  get 'admin' => 'noodall/admin/nodes#index', :as => 'admin_root'
   namespace :admin do
     resources :users
   end

data/lib/noodall/templates/config/sitemap.yml ADDED Viewed

@@ -0,0 +1,24 @@
+home:
+  title: Welcome
+  type: Home
+#about:
+#  title: About Us
+#  type: ContentPage
+# children:
+#    1st Service:
+#      type: content_page
+#    2nd Service:
+#      type: content_page
+#      children:
+#        Subber:
+#          type: content_page
+#contact-us:
+#  title: Contact Us
+#  type: ContentPage
+#privacy-policy:
+#  title: Privacy Policy
+#  type: ContentPage
+#terms-conditions:
+#  title: Terms Conditions
+#  type: ContentPage

data/lib/noodall/templates/db/seeds.rb CHANGED Viewed

@@ -6,5 +6,6 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 #
-User.create!(:name => "Mr Admin", :email => "hello@wearebeef.co.uk", :password => "passw0rd", :password_confirmation => "passw0rd", :groups => ['admin'])
-Home.create!(:title => "Home", :publish => true, :body => "Welcome")
+Noodall::Node.create_indexes!
+Noodall::Site.build!
+User.create(:name => "Mr Admin", :email => "hello@wearebeef.co.uk", :password => "passw0rd", :password_confirmation => "passw0rd", :groups => ['admin'])

data/lib/noodall/templates/features/component_slots.feature CHANGED Viewed

@@ -1,15 +1,38 @@
+# http://www.pivotaltracker.com/story/show/8969343
 Feature: Component Slots
   In order that web site editors can add functionality and information to content they will be able to fill slots with components
+  Background:
+    Given I am signed in as a website editor
   Scenario Outline: Component Slots
     Given a <Template Name> exists
-    And I am signed in as a website editor
     When I am editing the <Template Name>
-    Then I should be able to place components in <Hero Slots Per Page> hero slots
-    And I should be able to place components in <Wide Slots Per Page> wide slots
-    And I should be able to place components in <Small Slots Per Page> small slots
+    Then I should be able to place components in <Hero> hero slots
+    And I should be able to place components in <Large> large slots
+    And I should be able to place components in <Small> small slots
+    And I should be able to place components in <Call> call slots
+    And I should be able to place components in <Promo> promo slots
+    Examples:
+      | Template Name | Hero | Large | Small | Call | Promo |
+      | Home          | 1    | 0     | 2     | 4    | 4     |
+      | Landing Page  | 1    | 0     | 10    | 0    | 0     |
+      | Content Page  | 0    | 3     | 10    | 0    | 0     |
+      | Sign Up Form  | 0    | 0     | 0     | 0    | 0     |
+      | Article List  | 0    | 0     | 5     | 0    | 0     |
+      | Article       | 0    | 3     | 5     | 0    | 0     |
+    @javascript
+  Scenario Outline: Available Slots
+    Given I am placing a component in a <Slot Name> slot
+    Then I should be able choose from the components <Avaiable Components>
     Examples:
-      | Template Name       | Hero Slots Per Page | Wide Slots Per Page | Small Slots Per Page |
-      | home                | 0                   | 0                   | 4                    |
+      | Slot Name | Avaiable Components                                                                                                          |
+      | Hero      | Carousel                                                                                                                     |
+      | Large     | Call To Action, General Content, Quote, Gallery, Logo Ticker, Twitter, Latest Articles, Asset Download                       |
+      | Small     | Call To Action, Call To Action Image, General Content, Quote, Gallery, Logo Ticker, Twitter, Latest Articles, Asset Download |
+      | Call      | Call To Action, Call To Action Image                                                                                         |
+      | Promo     | General Content                                                                                                              |

data/lib/noodall/templates/features/content_templates.feature CHANGED Viewed

@@ -1,3 +1,4 @@
+# http://www.pivotaltracker.com/story/show/8969347
 Feature: Content Templates
   In order to change how the content looks and acts on the website a website editor will be able to select from predetermined templates
@@ -9,14 +10,18 @@ Feature: Content Templates
     Then I should be able select a template from the following:
       | Template     |
       | Landing Page |
+      | Article List |
   Scenario Outline: Create Child Content
     Given I create a new child under a <Parent Template Name>
     Then I should be able select a template from "<Allowed Templates>"
     Examples:
-      | Parent Template Name | Allowed Templates                             |
-      | Home                 | Content Page                                  |
-     #| Content Page         | Content Page, Event Page                      |
-     #| Event Page           | Content Page                                  |
+      | Parent Template Name | Allowed Templates                                      |
+      | Home                 | none                                                   |
+      | Landing Page         | Landing Page, Content Page, Sign Up Form, Article List |
+      | Content Page         | Landing Page, Content Page, Sign Up Form               |
+      | Sign Up Form         | Content Page                                           |
+      | Article List         | Article                                                |
+      | Article              | none                                                   |

data/lib/noodall/templates/features/step_definitions/cms_node_steps.rb CHANGED Viewed

@@ -18,7 +18,11 @@ When /^I am editing the (.*)$/ do |model|
 end
 Then /^I should be able to place components in (\d+) (.*) slots$/ do |number, slot_type|
-  page.should have_css("#slot-list .#{slot_type}-slot", :count => number.to_i)
+  if number.to_i == 0
+    page.should_not have_css("#slot-list .#{slot_type}-slot")
+  else
+    page.should have_css("#slot-list .#{slot_type}-slot", :count => number.to_i)
+  end
 end
 When /^I create a new root$/ do
@@ -30,8 +34,7 @@ When /^I create a new child under a (.*)$/ do |template_title|
   #create the ancester
   parent = Factory(template.to_sym)
-  visit noodall_admin_node_nodes_path(parent)
-  click_link 'New'
+  visit new_noodall_admin_node_node_path(parent)
 end
@@ -42,8 +45,12 @@ Then /^I should be able select a template from the following:$/ do |table|
 end
 Then /^I should be able select a template from "([^\"]*)"$/ do |templates|
-  templates.split(',').map(&:strip).each do |template|
-    choose(template)
+  if templates == 'none'
+    page.should_not have_css('.template input')
+  else
+    templates.split(',').map(&:strip).each do |template|
+      choose(template)
+    end
   end
 end
@@ -82,3 +89,13 @@ Given /^each child has (\d+) children$/ do |count|
     end
   end
 end
+Given /^the (.*) titled "([^"]*)" has the following children:$/ do |template, title, table|
+  @_content = dehumanize(template).find_by_title(title)
+  table.map_headers! {|header| header.parameterize('_').to_sym }
+  table.hashes.each do |attributes|
+    factory_type = attributes.delete(:type).parameterize('_')
+    Factory(factory_type, attributes.merge(:parent => @_content, :publish => true))
+  end
+end

data/lib/noodall/templates/features/step_definitions/component_steps.rb CHANGED Viewed

@@ -19,6 +19,27 @@ When /^(?:|I )fill in the following within the component:$/ do |fields|
   end
 end
+Given /^I am placing a component in a (.*) slot$/ do |slot|
+  begin
+    Home.send("#{slot.downcase}_slots", 1)
+  rescue Exception => e
+    # Hides validation errors if the slot already exists
+  end
+  node = Home.create!(:title => "Test Node")
+  visit noodall_admin_node_path(node)
+  within('ol#slot-list') do
+    click_link "#{slot} Slot"
+  end
+end
+Then /^I should be able choose from the components (.*)$/ do |components|
+  components.split(',').map(&:strip).each do |component|
+    Then %{I select the "#{component}" component}
+  end
+end
 Then /^I add some images from the asset library$/ do
   5.times do |i|
     Factory(:asset, :title => "Image #{i}")
@@ -30,18 +51,51 @@ Then /^I add some images from the asset library$/ do
     end
   end
   page.find(:css, 'li.action a').click
+  sleep 2
+end
+Then /^I add some assets to from the asset library$/ do
+  2.times do |i|
+    Factory(:txt_asset, :title => "Text Asset #{i}")
+  end
+  3.times do |i|
+    Factory(:zip_asset, :title => "Zip Asset #{i}")
+  end
+  page.find(:css, 'span.add-multi-asset').click
+  sleep 1
+  within "#asset-browser" do
+    within "#browser-list li[title='Text Asset 0']" do
+      click_link "Add"
+    end
+    within "#browser-list li[title='Zip Asset 1']" do
+      click_link "Add"
+    end
+    within "#browser-list li[title='Zip Asset 2']" do
+      click_link "Add"
+    end
+  end
+  page.find(:css, 'li.action a').click
+  sleep 2
+end
+Then /^should see a list of the files I selected$/ do
+  page.should have_css(".downloads li a", :count => 3)
+  page.should have_css(".downloads li a[href$='.txt']", :count => 1)
+  page.should have_css(".downloads li a[href$='.zip']", :count => 2)
 end
 When /^(?:|I )press "([^"]*)" within the component$/ do |button|
   within "#fancybox-inner" do
     click_button(button)
   end
-  sleep 1
+  sleep 2
 end
 When /^(?:|I )select an image from the asset library$/ do
   asset = Factory(:asset, :title => "My Image")
   page.find(:css, 'span.select-file').click
+  sleep 1
   click_link "Add"
   sleep 5
 end

data/lib/noodall/templates/lib/tasks/populate.rake ADDED Viewed

@@ -0,0 +1,10 @@
+namespace :db do
+  task :seed => :environment do
+    require 'db/seeds'
+  end
+  task :populate => :seed do
+    # Create some sub pages
+  end
+end

data/lib/noodall/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Noodall
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: noodall
 version: !ruby/object:Gem::Version
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease:
   segments:
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: []
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-10 00:00:00 +00:00
+date: 2011-02-16 00:00:00 +00:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -125,6 +125,7 @@ files:
 - lib/noodall/templates/config/locales/devise.en.yml
 - lib/noodall/templates/config/locales/en.yml
 - lib/noodall/templates/config/routes.rb
+- lib/noodall/templates/config/sitemap.yml
 - lib/noodall/templates/db/seeds.rb
 - lib/noodall/templates/doc/README_FOR_APP
 - lib/noodall/templates/features/component_slots.feature
@@ -137,6 +138,7 @@ files:
 - lib/noodall/templates/features/support/home_page.rb
 - lib/noodall/templates/features/support/paths.rb
 - lib/noodall/templates/gitignore
+- lib/noodall/templates/lib/tasks/populate.rake
 - lib/noodall/templates/public/404.html
 - lib/noodall/templates/public/422.html
 - lib/noodall/templates/public/500.html
@@ -190,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key:
 specification_version: 3
 summary: Noodall meta-gem that depends on the other components