guilded 1.0.9 → 1.0.10

data/lib/guilded/rails/view_helpers.rb

@@ -22,8 +22,19 @@ module Guilded
       def g_apply_includes
         g = Guilded::Guilder.instance
         g.generate_asset_lists
+        
+        # CSS
         self.output_buffer.sub!( /<!-- guilded.styles -->/, stylesheet_link_tag( g.combined_css_srcs, :cache => "cache/#{g.css_cache_name}" ) )
-        javascript_include_tag( g.combined_js_srcs, :cache => "cache/#{g.js_cache_name}" )
+
+        # JavaScript
+        if g.production? && g.use_remote_jquery
+          js_groups = g.combined_js_srcs.partition { |src| src == g.jquery_js }
+          output = javascript_include_tag( g.jquery_remote_url )
+          output << javascript_include_tag( js_groups[1], :cache => "cache/#{g.js_cache_name}" ) unless js_groups[1].nil?
+        else
+          output = javascript_include_tag( g.combined_js_srcs, :cache => "cache/#{g.js_cache_name}" )
+        end
+        output
       end
       
       def g_apply_style

data/rails_generators/guilded_config/guilded_config_generator.rb

@@ -5,7 +5,7 @@ class GuildedConfigGenerator < Rails::Generator::Base
 
   def manifest
     record do |m|
-      m.file 'load_guilded_settings.rb', 'config/initializers/load_guilded_settings.rb' 
+      m.file 'guilded_config.rb', 'config/initializers/guilded_config.rb' 
     end
   end
 end

data/rails_generators/guilded_config/templates/guilded_config.rb

@@ -0,0 +1,16 @@
+# While Guilded is framework agnostic, this config file is Rails specific.  You can create your own config file based
+# on this one in order to work in different environments.
+#
+GUILDED_CONFIG = {
+  :app_root => Rails.root.to_s,
+  :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
+  :use_remote_jquery => true,
+  :jquery_remote_url => "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js",
+  :mootools_js => "mootools/mootools-1.2.3.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 => Rails.env
+}

data/spec/generators/guilded_assets_generator_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'generators/guilded_assets/guilded_assets_generator'
+
+describe GuildedAssetsGenerator do
+  before :each do
+    @destination = File.join 'tmp', 'test_app'
+    @source = GuildedAssetsGenerator.source_root
+    GuildedAssetsGenerator.start '', :destination_root => @destination
+  end
+  
+  after :each do
+    FileUtils.rm_rf @destination
+  end
+  
+  {"guilded.js" => "public/javascripts/guilded.js",
+   "guilded.min.js" => "public/javascripts/guilded.min.js",
+   "jquery-1.2.6.js" => "public/javascripts/jquery/jquery-1.2.6.js",
+   "jquery-1.2.6.min.js" => "public/javascripts/jquery/jquery-1.2.6.min.js",
+   "jquery-1.3.2.js" => "public/javascripts/jquery/jquery-1.3.2.js",
+   "jquery-1.3.2.min.js" => "public/javascripts/jquery/jquery-1.3.2.min.js",
+   "jquery-url.js" => "public/javascripts/jquery/jquery-url.js",
+   "jquery-url.min.js" => "public/javascripts/jquery/jquery-url.min.js",
+   "mootools-1.2.3.js" => "public/javascripts/mootools/mootools-1.2.3.js",
+   "mootools-1.2.3.min.js" => "public/javascripts/mootools/mootools-1.2.3.min.js",
+   "reset-min.css" => "public/stylesheets/reset-min.css"}.each do |file, path|  
+    
+    it "should copy '#{file}' to '#{path}'" do
+      File.exists?( File.join( @destination, path ) ).should be_true
+    end
+    
+    it "should agree that the contents of '#{file}' are identical to '#{path}'" do
+      File.read( File.join( @source, file ) ).should eql File.read( File.join( @destination, path ) )
+    end
+  end
+end

data/spec/generators/guilded_config_generator_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'generators/guilded_config/guilded_config_generator'
+
+describe GuildedConfigGenerator do
+  before :each do
+    @destination = File.join 'tmp', 'test_app'
+    @source = GuildedConfigGenerator.source_root
+    GuildedConfigGenerator.start '', :destination_root => @destination
+  end
+  
+  after :each do
+    FileUtils.rm_rf @destination
+  end
+  
+  {'guilded_config.rb' => 'config/initializers/guilded_config.rb'}.each do |file, path|  
+    it "should copy '#{file}' to '#{path}'" do
+      File.exists?( File.join( @destination, path ) ).should be_true
+    end
+    
+    it "should agree that the contents of '#{file}' are identical to '#{path}'" do
+      File.read( File.join( @source, file ) ).should eql File.read( File.join( @destination, path ) )
+    end
+  end
+end

data/spec/spec.opts

@@ -1 +1,7 @@
---color
+--colour
+--format progress
+--format html:specifications.html
+--loadby mtime
+--reverse
+--backtrace
+--debugger

data/spec/spec_helper.rb

@@ -9,13 +9,26 @@ Spec::Runner.configure do |config|
   
 end
 
-RAILS_ROOT = ''
+module Rails
+  def self.env
+    'development'
+  end
+  
+  def self.root
+    ''
+  end
+end
+
 GUILDED_CONFIG = {
-  :js_path => "#{RAILS_ROOT}/public/javascripts/",
+  :app_root => Rails.root.to_s,
+  :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/",
+  :use_remote_jquery => true,
+  :jquery_remote_url => "http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js",
+  :mootools_js => "mootools/mootools-1.2.3.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'
+  :environment => Rails.env
 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -05:00
+date: 2010-04-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,9 +32,23 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -44,7 +58,7 @@ dependencies:
         - 2
         version: 2.0.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: 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.
 email: jason@lookforwardenterprises.com
 executables: []
@@ -60,6 +74,20 @@ files:
 - Rakefile
 - VERSION
 - guilded.gemspec
+- lib/generators/guilded_assets/guilded_assets_generator.rb
+- lib/generators/guilded_assets/templates/guilded.js
+- lib/generators/guilded_assets/templates/guilded.min.js
+- lib/generators/guilded_assets/templates/jquery-1.2.6.js
+- lib/generators/guilded_assets/templates/jquery-1.2.6.min.js
+- lib/generators/guilded_assets/templates/jquery-1.3.2.js
+- lib/generators/guilded_assets/templates/jquery-1.3.2.min.js
+- lib/generators/guilded_assets/templates/jquery-url.js
+- lib/generators/guilded_assets/templates/jquery-url.min.js
+- lib/generators/guilded_assets/templates/mootools-1.2.3.js
+- lib/generators/guilded_assets/templates/mootools-1.2.3.min.js
+- lib/generators/guilded_assets/templates/reset-min.css
+- lib/generators/guilded_config/guilded_config_generator.rb
+- lib/generators/guilded_config/templates/guilded_config.rb
 - lib/guilded.rb
 - lib/guilded/component_def.rb
 - lib/guilded/exceptions.rb
@@ -83,10 +111,12 @@ files:
 - rails_generators/guilded_assets/templates/mootools-1.2.3.min.js
 - rails_generators/guilded_assets/templates/reset-min.css
 - rails_generators/guilded_config/guilded_config_generator.rb
-- rails_generators/guilded_config/templates/load_guilded_settings.rb
+- rails_generators/guilded_config/templates/guilded_config.rb
 - script/console
 - script/destroy
 - script/generate
+- spec/generators/guilded_assets_generator_spec.rb
+- spec/generators/guilded_config_generator_spec.rb
 - spec/guilded/component_def_spec.rb
 - spec/guilded/guilder_spec.rb
 - spec/guilded_spec.rb
@@ -127,6 +157,8 @@ signing_key:
 specification_version: 3
 summary: A framework for building web based components centered around current web standards and best practices.
 test_files: 
+- spec/generators/guilded_assets_generator_spec.rb
+- spec/generators/guilded_config_generator_spec.rb
 - spec/guilded/component_def_spec.rb
 - spec/guilded/guilder_spec.rb
 - spec/guilded_spec.rb