noodall-components-general-content 0.0.2 → 0.0.3

data/Gemfile

@@ -3,7 +3,7 @@ source :rubygems
 gemspec
 
 gem "rails", "3.0.1"
-gem 'noodall-ui', :path => "~/Gems/noodall-ui"
+gem 'noodall-ui'
 gem "capybara", ">= 0.3.9"
 gem "rspec-rails", ">= 2.0.0.beta"
 gem 'database_cleaner'

data/Gemfile.lock

@@ -1,16 +1,7 @@
 PATH
   remote: .
   specs:
-    noodall-components-general-content (0.0.2)
-
-PATH
-  remote: /Users/steve/Gems/noodall-ui
-  specs:
-    noodall-ui (0.0.5)
-      dynamic_form
-      noodall-core
-      thoughtbot-sortable_table (= 0.0.6)
-      will_paginate (~> 3.0.pre2)
+    noodall-components-general-content (0.0.3)
 
 GEM
   remote: http://rubygems.org/
@@ -44,7 +35,7 @@ GEM
     activesupport (3.0.1)
     arel (1.0.1)
       activesupport (~> 3.0.0)
-    bson (1.1.1)
+    bson (1.1.4)
     builder (2.1.2)
     canable (0.1.1)
     capybara (0.4.0)
@@ -101,19 +92,24 @@ GEM
     mime-types (1.16)
     mm-multi-parameter-attributes (0.1.1)
       mongo_mapper
-    mongo (1.1.1)
+    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.3.1)
-    noodall-core (0.3.2)
+    noodall-core (0.3.5)
       canable (= 0.1.1)
       mm-multi-parameter-attributes (~> 0.1.1)
       mongo_mapper (~> 0.8.6)
       ramdiv-mongo_mapper_acts_as_tree (~> 0.1.1)
       ruby-stemmer
+    noodall-ui (0.0.14)
+      dynamic_form
+      noodall-core
+      thoughtbot-sortable_table (= 0.0.6)
+      will_paginate (~> 3.0.pre2)
     plucky (0.3.6)
       mongo (~> 1.1)
     polyglot (0.3.1)
@@ -186,7 +182,7 @@ DEPENDENCIES
   faker (~> 0.3.1)
   launchy
   noodall-components-general-content!
-  noodall-ui!
+  noodall-ui
   rails (= 3.0.1)
   rmagick
   rspec-rails (>= 2.0.0.beta)

data/app/views/admin/components/_general_content.html.erb

@@ -12,8 +12,7 @@
     <% unless component.asset.nil? %>
     <span class="file-detail"><%= component.asset.image? ? image_tag( component.asset.url('70x70#', :jpg)  ) : asset_icon(component.asset) %></span>
     <% end -%>
-    <span class="select-file">Select File</span>
-    (<span class="types">Images</span>)
+    <span class="select-file" data-file-types="images">Select File</span>
     <%= f.hidden_field :asset_id, :class => "asset_id" %>
   </p>
 

data/features/step_definitions/component_steps.rb

@@ -19,7 +19,7 @@ When /^(?:|I )fill in the following within the component:$/ do |fields|
   end
 end
 
-When /^(?:|I )press "([^"]*)" within the component$/ do |button|
+When /^(?:|I )press "([^\"]*)" within the component$/ do |button|
   within "#fancybox-inner" do
     click_button(button)
   end
@@ -29,6 +29,8 @@ When /^(?:|I )select an image from the asset library$/ do
   asset = Factory(:asset, :title => "My Image")
   within "#fancybox-inner" do
     page.find(:css, 'span.select-file').click
+    # wait until there is an image to click on so that faster machines don't throw errors
+    wait_until { page.has_css?("#browser-list li:first", :visible => true) }
     click_link "Add"
   end
 end

data/lib/noodall/components/general_content/version.rb

@@ -1,7 +1,7 @@
 module Noodall
   module Components
     module GeneralContent
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-components-general-content
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: []
 
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 +00:00
+date: 2010-12-10 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,6 +33,7 @@ dependencies:
   requirement: *id001
   type: :development
   name: bundler
+  prerelease: false
 description: A text and image component for Noodall
 email: []
 
@@ -105,9 +105,6 @@ files:
 - spec/factories/asset.rb
 - spec/factories/node.rb
 - spec/files/beef.png
-- spec/integration/navigation_spec.rb
-- spec/noodall_component_general_content_spec.rb
-- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/noodall-components-general-content
 licenses: []

data/spec/integration/navigation_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe "Navigation" do
-  include Capybara
-  
-  it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
-  end
-end

data/spec/noodall_component_general_content_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe Noodall::Component::Gallery do
-  it "should be valid" do
-    Noodall::Component::Gallery.should be_a(Module)
-  end
-end

data/spec/spec_helper.rb

@@ -1,30 +0,0 @@
-# Configure Rails Envinronment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-require "rspec/rails"
-
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Configure capybara for integration testing
-require "capybara/rails"
-Capybara.default_driver   = :rack_test
-Capybara.default_selector = :css
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-Rspec.configure do |config|
-  # Remove this line if you don't want Rspec's should and should_not
-  # methods or matchers
-  require 'rspec/expectations'
-  config.include Rspec::Matchers
-
-  # == Mock Framework
-  config.mock_with :rspec
-end