crystal 0.0.12 → 0.0.13

data/Rakefile

@@ -1,24 +1,9 @@
 require 'rake_ext'
 
-gem_spec(
+project(
   :name => "crystal",
-  :version => "0.0.12",
+  :version => "0.0.13",
   :summary => "Ruby Web Framework",
-  :dependencies => %w(
-    activesupport
-
-    haml
-    tilt    
-    dictionary
-    json
-    addressable
-    nokogiri
-
-    rack
-    
-    facets
-    ruby-ext
-  ),
 
   :author => "Alexey Petrushin",
   :homepage => "http://github.com/alexeypetrushin/crystal"

data/lib/crystal/gems.rb

@@ -0,0 +1,16 @@
+gem 'activesupport', '3.0.0'
+gem 'i18n', '0.4.1'
+gem 'builder', '2.1.2'
+
+gem 'haml', '3.0.21'
+gem 'tilt', '1.1'
+
+gem 'dictionary', '1.0.0'
+
+gem 'json', '1.4.6'
+gem 'addressable', '2.2.1'
+gem 'nokogiri', '1.4.3.1'
+gem 'rack', '1.2.1'  
+
+
+# gem 'ruby-ext'

data/lib/crystal/support.rb

@@ -1,9 +1,7 @@
-require 'crystal/support/gems'
-
+require 'crystal/gems'
 
 require 'crystal/support/active_support'
 
-
 require 'ruby_ext'
 
 require 'ruby_ext/open_constructor'

data/spec/controller/abstract_controller_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "AbstractController" do  
   with_environment :test

data/spec/controller/controller_context_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "ControllerContext" do
   with_environment :development

data/spec/controller/controller_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "AbstractController" do
   with_environment :test

data/spec/controller/controller_render_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "Controller render" do
   with_environment :test

data/spec/controller/error_handling_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "Error handling" do
   with_environment :test

data/spec/controller/http_controller_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require "controller/spec_helper"
 
 describe "HttpController" do
   with_environment :test

data/spec/controller/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/conveyor/conveyor_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.expand_path(File.dirname(__FILE__))}/helper"
+require "conveyor/spec_helper"
 
 describe "Conveyor" do
   inject :conveyors => :conveyors

data/spec/environment/environment_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'environment/spec_helper'
 
 require 'crystal/environment'
 require 'crystal/spec/environment'

data/spec/environment/logger_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'environment/spec_helper'
 
 require 'crystal/environment'
 

data/spec/environment/minimal_app_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'environment/spec_helper'
 
 require 'crystal/environment'
 

data/spec/environment/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/environment/standard_app_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'environment/spec_helper'
 
 require 'crystal/environment'
 require 'crystal/spec/environment'

data/spec/html/basic_html_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 require 'crystal/spec/xhtml'
 

data/spec/html/flash_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "Flash" do
   with_environment :development

data/spec/html/form_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "FormHelper" do
   class MockFormHelperContext < Crystal::MockTemplateContext

data/spec/html/javascript_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "BasicHtmlHelper" do
   class MockJavascriptHelperContext < Crystal::MockTemplateContext

data/spec/html/model_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "ModelHelper" do
   class MockModelHelperContext < Crystal::MockTemplateContext

data/spec/html/scoped_params_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "ScopedParams" do
   it "basic" do    

data/spec/html/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/html/url_helper_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'html/spec_helper'
 
 describe "UrlHelper" do
   class MockUrlHelperContext < Crystal::MockTemplateContext

data/spec/http/http_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'http/spec_helper'
 
 describe "HTTP basics" do
   inject :environment => :environment,

data/spec/http/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/integration/basic_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'integration/spec_helper'
 
 describe "Integration" do
   with_environment

data/spec/integration/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/remote/remote_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'remote/spec_helper'
 
 describe "Remote Basic" do
   with_environment :test

data/spec/remote/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/router/basic_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'router/spec_helper'
 
 describe "Router Basic" do
   

data/spec/router/configurator_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'router/spec_helper'
 
 describe "Configurator" do  
   

data/spec/router/integration_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'router/spec_helper'
 
 describe "Remote Basic" do  
   with_environment :test

data/spec/router/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/support/callbacks_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'support/spec_helper'
 
 require "crystal/support/callbacks"
 

data/spec/support/filters_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'support/spec_helper'
 
 require "crystal/support/callbacks"
 require "crystal/support/filters"

data/spec/support/safe_hash_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'support/spec_helper'
 
 require "crystal/support/safe_hash"
 

data/spec/support/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/template/{helper.rb → spec_helper.rb}

@@ -1,3 +1,5 @@
+require 'rspec_ext'
+
 dir = File.dirname __FILE__
 crystal_dir = File.expand_path "#{dir}/../.."
 lib_dir = "#{crystal_dir}/lib"

data/spec/template/template_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'template/spec_helper'
 
 describe "Template" do
   Template = Crystal::Template

data/spec/template/tilt_spec.rb

@@ -1,5 +1,4 @@
-require 'rspec_ext'
-require "#{__FILE__.dirname}/helper"
+require 'template/spec_helper'
 
 describe "Tilt" do
   with_environment :development

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crystal
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Alexey Petrushin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +04:00
+date: 2010-10-14 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,138 +24,158 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: i18n
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
         - 0
-        version: "0"
+        - 4
+        - 1
+        version: 0.4.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dictionary
+  name: haml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 45
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 21
+        version: 3.0.21
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: tilt
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: addressable
+  name: dictionary
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: addressable
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 5
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 2
+        - 1
+        version: 2.2.1
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: facets
+  name: nokogiri
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 113
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 3
+        - 1
+        version: 1.4.3.1
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: ruby-ext
+  name: rack
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id010
 description: 
@@ -192,6 +212,7 @@ files:
 - lib/crystal/environment/files_helper.rb
 - lib/crystal/environment/logger.rb
 - lib/crystal/environment.rb
+- lib/crystal/gems.rb
 - lib/crystal/html/controller_helpers/controller_url_helper.rb
 - lib/crystal/html/controller_helpers/flash_helper.rb
 - lib/crystal/html/flash.rb
@@ -248,7 +269,6 @@ files:
 - lib/crystal/support/exception.rb
 - lib/crystal/support/filters.rb
 - lib/crystal/support/format.rb
-- lib/crystal/support/gems.rb
 - lib/crystal/support/micon.rb
 - lib/crystal/support/mime.rb
 - lib/crystal/support/module.rb
@@ -301,10 +321,10 @@ files:
 - spec/controller/error_handling_spec/views/diferrent_error_handling_spec/b.erb
 - spec/controller/error_handling_spec/views/diferrent_error_handling_spec/c.erb
 - spec/controller/error_handling_spec.rb
-- spec/controller/helper.rb
 - spec/controller/http_controller_spec.rb
+- spec/controller/spec_helper.rb
 - spec/conveyor/conveyor_spec.rb
-- spec/conveyor/helper.rb
+- spec/conveyor/spec_helper.rb
 - spec/environment/_dependency_resolver_spec.rb
 - spec/environment/environment_spec/app/app_plugin/config/ec_layout
 - spec/environment/environment_spec/app/app_plugin/ec_some_file
@@ -312,39 +332,39 @@ files:
 - spec/environment/environment_spec/app/config/config.yml
 - spec/environment/environment_spec/gem_plugin/config/ec_layout
 - spec/environment/environment_spec.rb
-- spec/environment/helper.rb
 - spec/environment/logger_spec.rb
 - spec/environment/minimal_app_spec/app.rb
 - spec/environment/minimal_app_spec.rb
+- spec/environment/spec_helper.rb
 - spec/environment/standard_app_spec.rb
 - spec/environment/standard_app_spec_data/config/init.rb
 - spec/environment/standard_app_spec_data/plugin_a/plugin_a.rb
 - spec/html/basic_html_helper_spec.rb
 - spec/html/flash_spec.rb
 - spec/html/form_helper_spec.rb
-- spec/html/helper.rb
 - spec/html/javascript_helper_spec.rb
 - spec/html/model_helper_spec.rb
 - spec/html/scoped_params_spec.rb
+- spec/html/spec_helper.rb
 - spec/html/url_helper_spec.rb
-- spec/http/helper.rb
 - spec/http/http_spec.rb
 - spec/http/http_spec_data/config/init.rb
 - spec/http/http_spec_data/plugin_b/plugin_b.rb
+- spec/http/spec_helper.rb
 - spec/integration/basic_spec/views/smoke_test_spec/action.erb
 - spec/integration/basic_spec.rb
-- spec/integration/helper.rb
-- spec/remote/helper.rb
+- spec/integration/spec_helper.rb
 - spec/remote/remote_spec.rb
+- spec/remote/spec_helper.rb
 - spec/router/basic_spec.rb
 - spec/router/configurator_spec.rb
-- spec/router/helper.rb
 - spec/router/integration_spec.rb
+- spec/router/spec_helper.rb
 - spec/support/callbacks_spec.rb
 - spec/support/filters_spec.rb
-- spec/support/helper.rb
 - spec/support/safe_hash_spec.rb
-- spec/template/helper.rb
+- spec/support/spec_helper.rb
+- spec/template/spec_helper.rb
 - spec/template/template_spec/file.erb
 - spec/template/template_spec/views/basic/custom_context.erb
 - spec/template/template_spec/views/basic/extension.erb

data/lib/crystal/support/gems.rb

@@ -1,12 +0,0 @@
-gem 'activesupport', '>= 3.0.0'
-
-gem 'haml'
-gem 'tilt'
-gem 'facets'
-gem 'dictionary'
-gem 'json'
-gem 'addressable'
-gem 'nokogiri'
-
-gem 'rack', '>= 1.1'
-# gem 'ruby-ext'