noodall-ui 0.0.16 → 0.0.17

data/Gemfile

@@ -4,7 +4,7 @@ source 'http://gems.github.com'
 gemspec
 
 # Required for running as demo rails app
-gem 'rails', '3.0.1'
+gem 'rails', '~> 3.0.1'
 gem 'rmagick', :require => 'RMagick'
 gem 'dragonfly', '~> 0.7.6'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    noodall-ui (0.0.16)
+    noodall-ui (0.0.17)
       dynamic_form
       noodall-core
       thoughtbot-sortable_table (= 0.0.6)
@@ -12,35 +12,34 @@ GEM
   remote: http://gems.github.com/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    bson (1.1.2)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    arel (2.0.6)
+    bson (1.1.4)
     builder (2.1.2)
     canable (0.1.1)
     capybara (0.4.0)
@@ -52,14 +51,14 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.2)
-    celerity (0.8.4)
+    celerity (0.8.5)
     childprocess (0.1.4)
       ffi (~> 0.6.3)
     configuration (1.2.0)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
@@ -80,12 +79,12 @@ GEM
     ffi (0.6.3)
       rake (>= 0.8.7)
     gemcutter (0.6.1)
-    gherkin (2.2.9)
+    gherkin (2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     git (1.2.5)
     haml (3.0.24)
-    i18n (0.4.2)
+    i18n (0.5.0)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
@@ -97,22 +96,22 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.10)
+    mail (2.2.12)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
     mm-multi-parameter-attributes (0.1.1)
       mongo_mapper
-    mongo (1.1.2)
+    mongo (1.1.4)
       bson (>= 1.1.1)
     mongo_mapper (0.8.6)
       activesupport (>= 2.3.4)
       jnunemaker-validatable (~> 1.8.4)
       plucky (~> 0.3.6)
     nokogiri (1.4.4)
-    noodall-core (0.3.2)
+    noodall-core (0.3.6)
       canable (= 0.1.1)
       mm-multi-parameter-attributes (~> 0.1.1)
       mongo_mapper (~> 0.8.6)
@@ -126,19 +125,19 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     ramdiv-mongo_mapper_acts_as_tree (0.1.2)
       mongo_mapper (>= 0.6.8)
@@ -159,14 +158,14 @@ GEM
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.0)
+    selenium-webdriver (0.1.1)
       childprocess (= 0.1.4)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
     spork (0.8.4)
     term-ansicolor (1.0.5)
-    thor (0.14.4)
+    thor (0.14.6)
     thoughtbot-sortable_table (0.0.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
@@ -193,7 +192,7 @@ DEPENDENCIES
   launchy
   noodall-core
   noodall-ui!
-  rails (= 3.0.1)
+  rails (~> 3.0.1)
   rmagick
   rspec-rails (~> 2.0.0.beta.22)
   spork

data/app/controllers/noodall/nodes_controller.rb

@@ -1,6 +1,6 @@
 module Noodall
   class NodesController < ApplicationController
-    rescue_from MongoMapper::DocumentNotFound, :with => :render_404
+    rescue_from MongoMapper::DocumentNotFound, ActionView::MissingTemplate, :with => :render_404
 
     def show
       if flash.any? or published_states_changed_since_global_update? or stale?(:last_modified => GlobalUpdateTime::Stamp.read, :public => true)
@@ -12,8 +12,8 @@ module Noodall
         @page_keywords = @node.keywords
 
         respond_to do |format|
-          format.html { render "nodes/#{@node.class.name.underscore}" }
-          format.rss { render "nodes/#{@node.class.name.underscore}" }
+          format.json { render :json => @node }
+          format.any { render "nodes/#{@node.class.name.underscore}" }
         end
       end
 
@@ -48,7 +48,7 @@ module Noodall
           logger.info "Rendering 404: #{exception.message}"
       end
 
-      render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false
+      render :file => "#{Rails.root}/public/404.html", :status => 404, :layout => false, :content_type => "text/html"
     end
 
   end

data/demo/views/nodes/page_a.rss.builder

@@ -0,0 +1,8 @@
+xml.instruct! :xml, :version=>"1.0"
+xml.rss(:version=>"2.0") do
+  xml.channel do
+    xml.title(@node.title)
+    xml.link(node_url(@node))
+    xml.language('en-gb')
+  end
+end

data/features/group_access_control.feature

@@ -16,6 +16,7 @@ Feature: Groups access control
       | Update     | Update, create children of |
       | Destroy    | Delete                     |
       | Publish    | Publish                    |
+      | View       | View                       |
 
   Scenario: Inherited Permissions
     Given content exists with permissions set

data/features/respond_with_correct_format.feature

@@ -0,0 +1,12 @@
+Feature: Respond with the correct format
+  In order that the developers can add node views in different formats viewing a node should render a registered format if a template for it exists
+
+  Scenario: Render correct format
+    Given a page a exists with a title of "My Formatted Page"
+    When I view the page "My Formatted Page" as "html"
+    Then I should see "My Formatted Page"
+    When I view the page "My Formatted Page" as "rss"
+    Then I should see "My Formatted Page"
+    When I view the page "My Formatted Page" as "xml"
+    Then I should see "The page you were looking for doesn't exist"
+

data/features/step_definitions/node_steps.rb

@@ -28,3 +28,8 @@ end
 Then /^I should see a page of xml$/ do
   page.should have_xpath("//urlset")
 end
+
+When /^I view the page "([^"]*)" as "([^"]*)"$/ do |title, format|
+  visit node_path(Noodall::Node.find_by_title(title), format)
+end
+

data/features/support/mm_factory_steps.rb

@@ -0,0 +1,14 @@
+Factory.factories.values.each do |factory|
+  if factory.build_class.respond_to?(:keys)
+    factory.build_class.keys.each_key do |key|
+      human_column_name = key.downcase.gsub('_', ' ')
+      Given /^an? #{factory.human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+        Factory(factory.factory_name, key => value)
+      end
+
+      Given /^(\d+) #{factory.human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+        count.to_i.times { Factory(factory.factory_name, key => value) }
+      end
+    end
+  end
+end

data/lib/noodall/routes.rb

@@ -7,7 +7,7 @@ module Noodall
           namespace 'noodall/admin', :as => 'noodall_admin', :path => 'admin' do
             resources :nodes do
               resources :nodes
-              member do 
+              member do
                 get :change_template
                 get :move_up
                 get :move_down
@@ -17,7 +17,7 @@ module Noodall
                 get :tree
               end
             end
-          
+
             resources :assets do
               collection do
                 get :images
@@ -34,13 +34,14 @@ module Noodall
             match 'assets/:asset_type/tags' => 'assets#tags', :as => :asset_tags
 
             match 'components/form/:type' => 'components#form'
-            
+
             resources :groups
           end
-          
+
           get "search" => "noodall/nodes#search", :as => :noodall_search
           get "sitemap" => "noodall/nodes#sitemap", :as => :noodall_sitemap
-          get "*permalink(.:format)" =>  'noodall/nodes#show', :as => :node_permalink
+          get "*permalink.:format" =>  'noodall/nodes#show'
+          get "*permalink" =>  'noodall/nodes#show', :as => :node_permalink
         end
       end
     end

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.0.16"
+    VERSION = "0.0.17"
   end
 end

data/public/stylesheets/admin/forms.css

@@ -232,6 +232,7 @@ p.remove span{
           left:20px;
           border:none;
           position:absolute;
+          cursor:pointer;
 }
 
 #content form .fixed-form input.update {
@@ -403,6 +404,10 @@ div#flash a {
           padding:9px;
 }
 
+a, button, input[type="select"] {
+  cursor:pointer;
+}
+
 /* -------------- JQUERY TRANSFROM -------------- */
 
 p.template span.input-wrap {

data/spec/factories/node.rb

@@ -1,4 +1,4 @@
-Factory.define :node do |node|
+Factory.define :node, :class => Noodall::Node do |node|
   node.title { Faker::Lorem.words(3).join(' ') }
   node.body { Faker::Lorem.paragraphs(6) }
   node.published_at { Time.now }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: false
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Steve England
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +00:00
+date: 2010-12-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -190,6 +190,7 @@ files:
 - demo/views/components/_promo.html.erb
 - demo/views/layouts/application.html.erb
 - demo/views/nodes/page_a.html.erb
+- demo/views/nodes/page_a.rss.builder
 - demo/views/nodes/page_b.html.erb
 - demo/views/nodes/page_c.html.erb
 - features/change_templates.feature
@@ -200,6 +201,7 @@ files:
 - features/preview.feature
 - features/promo_component.feature
 - features/publish_content.feature
+- features/respond_with_correct_format.feature
 - features/search.feature
 - features/sitemap.feature
 - features/step_definitions/asset_steps.rb
@@ -217,6 +219,7 @@ files:
 - features/support/cucumber.css
 - features/support/env.rb
 - features/support/logo.png
+- features/support/mm_factory_steps.rb
 - features/support/paths.rb
 - features/support/sevenfeatures.rb
 - lib/generators/noodall/component/USAGE
@@ -633,7 +636,6 @@ files:
 - script/cucumber
 - script/rails
 - spec/factories/asset.rb
-- spec/factories/component.rb
 - spec/factories/node.rb
 - spec/factories/user.rb
 - spec/files/beef.png

data/spec/factories/component.rb

@@ -1,9 +0,0 @@
-# Factory.define :asset do |asset|
-#   asset.tags { Faker::Lorem.words(4) }
-#   asset.title { "Image asset" }
-#   asset.file { File.new("#{Rails.root}/public/images/rails.png") }
-# end
-
-Factory.define :component do |component|
-
-end