guilded 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,8 @@
+= 1.0.7 2010-02-19
+
+* Updated view helpers and Guilder to adapt to usage in Rails 3.
+
+
 = 1.0.6 2010-02-18
 
 * Added Rails 3 compliant generators.

data/README.rdoc

@@ -10,7 +10,7 @@ framework is written in ruby, but could be ported to other languages.
 
 Guilded intends to provide a toolset for creating and consuming reusable web components.  Currently, this problem domain is
 filled with JavaScript frameworks.  These frameworks are wonderful and work very well.   However, they do not degrade gracefully and 
-are not accessible.  Guilded seeks to provide the same level of "componentization" and ease of use without sacrificing degradability 
+are not accessible.  Guilded seeks to provide the same level of componentization and ease of use without sacrificing degradability 
 and accessibility.  Guilded will achieve these goals by applying each technology at our disposal (HTML, CSS and JavaScript) to do 
 as it was intended. 
 
@@ -21,7 +21,7 @@ enabled in their browser, but will still be able to use the component when CSS a
 Guilded will use jQuery as it's base JavaScript framework.  jQuery was chosen because it lends itself to progressive enhancement
 due to the way it was authored.  In addition, the tight integration of jQuery's selectors with CSS selectors is also highly 
 desirable.  When authoring a Guilded component, it is encouraged to write the behavior code as a jQuery plugin.  This will 
-allow the jQuery plugin to be used outside of the Guilded project, if desired.
+allow the jQuery or MooTools plugin to be used outside of the Guilded project, if desired.
 
 Guilded also seeks to provide a standardized CSS framework for creating layouts that are reusable and predictable.
 
@@ -117,13 +117,13 @@ have decided to include support for it in Guilded as of release 0.3.0.
 
 == INSTALL FOR RAILS
 
-Add to environment file:
+Add to Gemfile file:
 
-  config.gem "guilded", :version => '1.0.5', :source => 'http://gemcutter.org'
+  gem 'guilded', '1.0.7'
 
 Run:
 
-  sudo rake:gems:install
+  bundle install
 	
 Generate:
 
@@ -140,14 +140,18 @@ the respective file(s).
 
 === COMPONENT FRAMEWORK
 
-You must make a call to the view helper to apply the CSS  It should be placed in your layout:
+You must make a call to the view helper to apply the CSS.  The raw method must be used with Rails 3 as the new default 
+escapes strings.  It should be placed in your layout:
 
-  <%= g_apply_style %>
+  <%= raw g_apply_style %>
 
-There is also a view helper to apply the JavaScript.  You can place this at the bottom of your layout(s) (so you
+There is also two view helpers to apply the JavaScript.  You can place this at the bottom of your layout(s) (so you
 do not have to include it in every template):
 
-  <%= g_apply_behavior %>
+  <%= raw g_apply_includes %>
+  <script type="text/javascript">
+    <%= raw g_apply_behavior %> 
+  </script>
 
 A before filter is automatically set up in your application controller to reset the Guilded singleton that manages 
 everything after each rendering.  The code looks like this:

data/Rakefile

@@ -18,13 +18,22 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|

data/VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

data/guilded.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{guilded}
-  s.version = "1.0.6"
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-19}
   s.description = %q{Guilded intends to provide a toolset for creating and consuming reusable web components.  Currently, this problem domain is filled with JavaScript frameworks.  These frameworks are wonderful and work very well.   However, they do not degrade gracefully and are not accessible (in most cases).  Guilded seeks to provide the same level of "componentization" and ease of use without sacrificing degradability and accessibility.  Guilded will achieve these goals by applying each technology at our disposal (HTML, CSS and JavaScript) to do as it was intended.}
   s.email = %q{jason@lookforwardenterprises.com}
   s.extra_rdoc_files = [
@@ -50,13 +50,14 @@ Gem::Specification.new do |s|
      "script/console",
      "script/destroy",
      "script/generate",
+     "spec/guilded/component_def_spec.rb",
+     "spec/guilded/guilder_spec.rb",
+     "spec/guilded_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
      "tasks/rails.rake",
      "tasks/rspec.rake",
-     "test/guilded/component_def_test.rb",
-     "test/guilded/guilder_test.rb",
      "test/guilded/rails/helpers_test.rb",
-     "test/guilded/rails/view_helpers_test.rb",
-     "test/guilded_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/midas/guilded}
@@ -65,11 +66,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{A framework for building web based components centered around current web standards and best practices.}
   s.test_files = [
-    "test/guilded/component_def_test.rb",
-     "test/guilded/guilder_test.rb",
+    "spec/guilded/component_def_spec.rb",
+     "spec/guilded/guilder_spec.rb",
+     "spec/guilded_spec.rb",
+     "spec/spec_helper.rb",
      "test/guilded/rails/helpers_test.rb",
-     "test/guilded/rails/view_helpers_test.rb",
-     "test/guilded_test.rb",
      "test/test_helper.rb"
   ]
 

data/lib/guilded.rb

@@ -73,7 +73,7 @@ require 'guilded/rails/inactive_record/human_attribute_hint'
 #   <%= g_load_alerter :skin => 'blueish', :id => 'load_alerter' %>
 #
 module Guilded
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end
 
 ActionView::Base.send( :include, Guilded::Rails::ViewHelpers ) if defined?( ActionView )

data/lib/guilded/guilder.rb

@@ -158,15 +158,14 @@ module Guilded
     # method will exceute on document load finish.
     #
     def generate_javascript_init #:nodoc:
-      code = "<script type=\"text/javascript\">"
-      code << "var initGuildedElements = function(){"
+      code = "var initGuildedElements = function(){"
       @g_data_elements.each do |name, data|
         code << "g.#{name} = #{data.to_json};" 
       end
       @g_elements.each_value do |guilded_def| 
         code << "g.#{guilded_def.kind.to_s.camelize( :lower )}Init(#{guilded_def.options.to_json});" unless guilded_def.exclude_js?
       end
-      code << "jQuery('body').trigger('guildedInitialized');};jQuery('document').ready(initGuildedElements);</script>"
+      code << "jQuery('body').trigger('guildedInitialized');};jQuery('document').ready(initGuildedElements);"
     end
     
     # Generates a name to use when caching the current set of Guilded component JavaScript assets.  Sorts and concatenates

data/lib/guilded/rails/view_helpers.rb

@@ -2,35 +2,33 @@ module Guilded
   module Rails
     module ViewHelpers
 
-      # Generates the JavaScript includes for each Guilded element that is used.  Also
-      # generates the initGuildedElements function and includes a call to each GUIlded
-      # elements Init method.
+      # Generates the initGuildedElements function and includes a call to each GUIlded
+      # element(s) Init method.
       #
       # Must be called once per rendered page.  You can include it just before the closing body 
       # tag of your application layout.  If no Guilded elements were called in the template, the 
       # call to g_apply_behavior will not output anything.
       #
       def g_apply_behavior
+        Guilded::Guilder.instance.generate_javascript_init
+      end
+      
+      # Generates the JavaScript include(s) for each Guilded element that is used.
+      #
+      # Must be called once per rendered page.  You can include it just before the closing body 
+      # tag of your application layout.  If no Guilded elements were called in the template, the 
+      # call to g_apply_includes will not output anything.
+      #
+      def g_apply_includes
         g = Guilded::Guilder.instance
         g.generate_asset_lists
         self.output_buffer.sub!( /<!-- guilded.styles -->/, stylesheet_link_tag( g.combined_css_srcs, :cache => "cache/#{g.css_cache_name}" ) )
-        html = javascript_include_tag( g.combined_js_srcs, :cache => "cache/#{g.js_cache_name}" )
-        html << g.generate_javascript_init
-        html
+        javascript_include_tag( g.combined_js_srcs, :cache => "cache/#{g.js_cache_name}" )
       end
       
       def g_apply_style
         "<!-- guilded.styles -->"
       end
-      
-      # Generates the base javascript includes, if they have not alreay been included.
-      #
-      # def g_includes
-      #   return "" if @base_included
-      #   @base_included = true
-      #   javascript_include_tag( 'jquery/jquery-1.2.6.min.js' ) +
-      #     "<script type=\"text/javascript\">$j = jQuery.noConflict(); g={};</script>"
-      # end
 
       # Creates a javascript include tag for a Guilded specific file.  The only difference
       # being that it adds the file to a sources array to be concatenated and included at the 

data/spec/guilded/component_def_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path( File.join( File.dirname(__FILE__), '..', 'spec_helper' ) )
+
+describe Guilded::ComponentDef do
+  before :each do
+    @cd = Guilded::ComponentDef.new( 'grid' )
+    @cd_exclude = Guilded::ComponentDef.new( 'grid', { :exclude_css => true, :exclude_js => true } )
+  end
+  
+  it "should exclude css if specified" do
+    @cd_exclude.exclude_css?.should be_true
+  end
+  
+  it "should exclude js if specified" do
+    @cd_exclude.exclude_js?.should be_true
+  end
+
+  it "should not exclude css unless specified" do
+    @cd.exclude_css?.should be_false
+  end
+
+  it "should not exclude js unless specified" do
+    @cd.exclude_js?.should be_false
+  end
+end

data/spec/guilded/guilder_spec.rb

@@ -0,0 +1,77 @@
+require File.expand_path( File.join( File.dirname(__FILE__), '..', 'spec_helper' ) )
+
+describe Guilded::Guilder do
+  before :each do
+    @g = Guilded::Guilder.instance
+  end
+  
+  it "should return an instance" do
+    @g.should_not be_nil
+  end
+  
+  it "should be a singleton" do
+    @g.initialized_at.should eql( Guilded::Guilder.instance.initialized_at )
+  end
+  
+  it "should have 1 css source after init" do
+    @g.combined_css_srcs.size.should eql( 1 )
+  end
+  
+  it "should have 3 js sources after init" do
+    @g.combined_js_srcs.size.should eql( 3 )
+  end
+  
+  it "should increase count by one when you add a component" do
+    count = @g.count
+    @g.add( 'grid', { :id => 'grid' } )
+    @g.count.should eql( count + 1 )
+  end
+  
+  it "should respond to add" do
+    @g.respond_to?( :add ).should be_true
+  end
+  
+  it "should respond to count" do
+    @g.respond_to?( :count ).should be_true
+  end
+
+  it "should respond to reset!" do
+    @g.respond_to?( :reset! ).should be_true
+  end
+
+  it "should respond to apply" do
+    @g.respond_to?( :apply ).should be_true
+  end
+  
+  it "should respond to generate_javascript_init" do
+    @g.respond_to?( :generate_javascript_init ).should be_true
+  end
+
+  it "should respond_to js_cache_name" do
+    @g.respond_to?( :js_cache_name ).should be_true
+  end
+
+  it "should respond_to css_cache_name" do
+    @g.respond_to?( :css_cache_name ).should be_true
+  end
+  
+  it "should respond_to generate_js_cache_name" do
+    @g.respond_to?( :generate_js_cache_name ).should be_true
+  end
+
+  it "should respond_to generate_css_cache_name" do
+    @g.respond_to?( :generate_css_cache_name ).should be_true
+  end
+
+  it "should respond_to combined_css_srcs" do
+    @g.respond_to?( :combined_css_srcs ).should be_true
+  end
+
+  it "should respond_to combined_js_srcs" do
+    @g.respond_to?( :combined_js_srcs ).should be_true
+  end
+
+  it "should respond_to initialized_at" do
+    @g.respond_to?( :initialized_at ).should be_true
+  end
+end

data/spec/guilded_spec.rb

@@ -0,0 +1,7 @@
+require File.expand_path( File.dirname(__FILE__) + '/spec_helper' )
+
+describe Guilded do
+  it "should be true" do
+    true.should be_true
+  end
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+$LOAD_PATH.unshift( File.dirname(__FILE__) )
+$LOAD_PATH.unshift( File.join( File.dirname(__FILE__), '..', 'lib' ) )
+require 'rubygems'
+require 'guilded'
+require 'spec'
+require 'spec/autorun'
+
+Spec::Runner.configure do |config|
+  
+end
+
+RAILS_ROOT = ''
+GUILDED_CONFIG = {
+  :js_path => "#{RAILS_ROOT}/public/javascripts/",
+  :js_folder => "", # from the js_path
+  :jquery_js => "jquery/jquery-1.3.2.min.js", # from the js_path
+  :css_path => "#{RAILS_ROOT}/public/stylesheets/",
+  :css_folder => "guilded/", # from the css_path
+  :reset_css => "reset-min.css", # from the css_path
+  :environment => 'development'
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: guilded
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -06:00
+date: 2010-02-19 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,13 +75,14 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- spec/guilded/component_def_spec.rb
+- spec/guilded/guilder_spec.rb
+- spec/guilded_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 - tasks/rails.rake
 - tasks/rspec.rake
-- test/guilded/component_def_test.rb
-- test/guilded/guilder_test.rb
 - test/guilded/rails/helpers_test.rb
-- test/guilded/rails/view_helpers_test.rb
-- test/guilded_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/midas/guilded
@@ -112,9 +113,9 @@ signing_key:
 specification_version: 3
 summary: A framework for building web based components centered around current web standards and best practices.
 test_files: 
-- test/guilded/component_def_test.rb
-- test/guilded/guilder_test.rb
+- spec/guilded/component_def_spec.rb
+- spec/guilded/guilder_spec.rb
+- spec/guilded_spec.rb
+- spec/spec_helper.rb
 - test/guilded/rails/helpers_test.rb
-- test/guilded/rails/view_helpers_test.rb
-- test/guilded_test.rb
 - test/test_helper.rb

data/test/guilded/component_def_test.rb

@@ -1,26 +0,0 @@
-require 'test_helper'
-
-class ComponentDefTest < Test::Unit::TestCase
-  context "The ComponentDef" do
-    setup do
-      @cd = Guilded::ComponentDef.new( 'grid' )
-      @cd_exclude = Guilded::ComponentDef.new( 'grid', { :exclude_css => true, :exclude_js => true } )
-    end
-
-    should "exclude css if specified" do
-      assert @cd_exclude.exclude_css?
-    end
-    
-    should "exclude js if specified" do
-      assert @cd_exclude.exclude_js?
-    end
-
-    should "not exclude css unless specified" do
-      assert !@cd.exclude_css?
-    end
-
-    should "not exclude js unless specified" do
-      assert !@cd.exclude_js?
-    end
-  end
-end

data/test/guilded/guilder_test.rb

@@ -1,79 +0,0 @@
-require 'test_helper'
-
-class GuilderTest < Test::Unit::TestCase
-  context "The Guilder" do
-    setup do
-      @g = Guilded::Guilder.instance
-    end
-    
-    should "return an instance" do
-      assert_not_nil @g
-    end
-    
-    should "be a singleton" do
-      assert_equal @g.initialized_at, Guilded::Guilder.instance.initialized_at
-    end
-    
-    should "have 1 css source after init" do
-      assert_equal @g.combined_css_srcs.size, 1
-    end
-    
-    should "have 3 js sources after init" do
-      assert_equal @g.combined_js_srcs.size, 3
-    end
-    
-    should "increase count by one when you add a component" do
-      count = @g.count
-      @g.add( 'grid', { :id => 'grid' } )
-      assert_equal @g.count, count + 1
-    end
-    
-    should "respond to add" do
-      assert @g.respond_to? :add
-    end
-    
-    should "respond to count" do
-      assert @g.respond_to? :count
-    end
-
-    should "respond to reset!" do
-      assert @g.respond_to? :reset!
-    end
-
-    should "respond to apply" do
-      assert @g.respond_to? :apply
-    end
-    
-    should "respond to generate_javascript_init" do
-      assert @g.respond_to? :generate_javascript_init
-    end
-
-    should "respond_to js_cache_name" do
-      assert @g.respond_to? :js_cache_name
-    end
-
-    should "respond_to css_cache_name" do
-      assert @g.respond_to? :css_cache_name
-    end
-    
-    should "respond_to generate_js_cache_name" do
-      assert @g.respond_to? :generate_js_cache_name
-    end
-
-    should "respond_to generate_css_cache_name" do
-      assert @g.respond_to? :generate_css_cache_name
-    end
-
-    should "respond_to combined_css_srcs" do
-      assert @g.respond_to? :combined_css_srcs
-    end
-
-    should "respond_to combined_js_srcs" do
-      assert @g.respond_to? :combined_js_srcs
-    end
-
-    should "respond_to initialized_at" do
-      assert @g.respond_to? :initialized_at
-    end
-  end
-end

data/test/guilded/rails/view_helpers_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class ViewHelpersTest < Test::Unit::TestCase
-  
-  should "be true" do
-    assert true
-  end
-  
-end

data/test/guilded_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class GuildedTest < Test::Unit::TestCase
-  should "be true" do
-    assert true
-  end
-end