rad_core 0.0.29 → 0.0.30

data/lib/rad/_support/require.rb

@@ -31,8 +31,6 @@ require 'micon/rad'
 
 require 'rad/_support/class_loader'
 
-require 'dictionary'
-
 require 'thread'
 require 'time'
 require 'uri'
@@ -48,8 +46,6 @@ require 'rad/_support/addressable'
 #
 require 'rad/_support/hacks_and_fixes'
 
-autoload :Nokogiri, 'nokogiri'
-
 [  
   'module',
   'callbacks',

data/lib/rad/gems.rb

@@ -1,21 +1,19 @@
 # core gems dependencies
-gem 'i18n', '0.5.0'
-gem 'polyglot', '0.3.1'
-gem 'treetop', '1.4.9'
-gem 'mime-types', '1.16'
+# gem 'i18n', '0.5.0'
+# gem 'polyglot', '0.3.1'
+# gem 'treetop', '1.4.9'
+# gem 'mime-types', '1.16'
 
 # core gems
 gem 'activesupport', '3.0.7'
-gem 'builder', '2.1.2'
+# gem 'builder', '2.1.2'
 
 gem 'haml', '3.0.25'
 gem 'tilt', '1.2.1'
 
 gem 'json', '1.4.6'
 gem 'addressable', '2.2.2'
-gem 'nokogiri', '1.4.4'
-
-gem 'dictionary', '1.0.0'  
+# gem 'nokogiri', '1.4.4'
 
 gem 'rack', '1.3.0'
 gem 'thin', '1.2.7'

data/lib/rad/router/_router.rb

@@ -14,7 +14,7 @@ class Rad::Router
   end        
   
   def routers= routers
-    @routers = Dictionary.new
+    @routers = {}
     routers.each do |k, v| 
       k.must_be.present
       v.must_be.present        

data/lib/rad/spec/http_controller.rb

@@ -56,8 +56,7 @@ rspec do
   end
   
   protected
-    def parse_wcall_arguments *args
-      
+    def parse_wcall_arguments *args      
       # parsing params
       params = args.extract_options!
       first = args.first
@@ -66,16 +65,10 @@ rspec do
       if args.size == 1 and first.is_a?(String) and first =~ /^\/|^http:/
         uri = Uri.parse first          
         workspace_variables[:path] = uri.path
-        workspace_variables[:params] = uri.query_values          
         workspace_variables[:env] = Rad::Http::Request.stub_environment(first)
-        # if first =~ /^\//
-        #   workspace_variables[:path] = first
-        # else          
-        #   uri = Uri.parse first          
-        #   workspace_variables[:path] = uri.path
-        #   workspace_variables[:params] = uri.query_values          
-        #   workspace_variables[:env] = Rad::Http::Request.stub_environment(first)      
-        # end
+        
+        # some params may be defined in :url ans some in :params, merging both
+        params = uri.query_values.merge params if uri.query_values
       elsif (first.is_a?(String) or first.is_a?(Symbol)) and args.size <= 2
         workspace_variables[:path] = '/'
         workspace_variables[:class] = wcall_options[:controller] || raise("not defined wcall controller (use set_wcall controller: SomeController)!")
@@ -89,7 +82,7 @@ rspec do
       else
         raise "Invalid input!"
       end
-      
+
       # preparing environment
       workspace_variables[:env] ||= {}
       workspace_variables[:env].reverse_merge! Rad::Http::Request.stub_environment      

data/lib/rad/spec/xhtml.rb

@@ -1,3 +1,5 @@
+require 'nokogiri'
+
 class String
   def to_xhtml css = nil    
     node = Nokogiri::HTML(self)

data/readme.md

@@ -1,6 +1,6 @@
 # Rad - Ruby Web Framework
 
-Simple and highly customizable Web Framework encouraging to build an app as a set of low-coupled components instead of monolith. 
+Simple and highly customizable Web Framework encouraging to build an app as a set of cooperating components instead of monolith. 
 With an architecture heavily inspired by Rails, Spring IoC, JBoss Seam and JEE (but without config burden).
 
 You can start instantly using one of predefined profiles, or take a total control over all aspects of environment and completelly modify it according to Your goals (everything is a component, if You don't like the router, controller or views - throw it out and introduce Your own).
@@ -20,6 +20,7 @@ Here's the classic **sample blog app** [rad-sample.heroku.com](http://rad-sample
 - Simple things should be simple (simple API, instant start with minimal config)
 - Complete control if You need it, it's designed to be open and customizable
 - Agile/Extreme development should be easy (specs, iterative development, fast prototyping)
+- Be small (and it's small, actually it's nothing more than a thin integration layer over a lot's of other gems)
 
 ## Some thecnical thoughts and ideas:
 
@@ -29,7 +30,15 @@ Here's the classic **sample blog app** [rad-sample.heroku.com](http://rad-sample
 - I also tried to comply to KISS principle - always fighting complex stuff, seeking for not needed API or code that can be eliminated or delegated to external library.
 - I tried to reuse existing good stuff as much as possible, for example - web tier looks kinda like Rails (so, You don't have to learn much of new stuff and API) but the behaviour of it is slightly (or sometimes significally) different.
 
+## It's small
+
+I would like to mention it one more time - Rad is not a super-specialized framework like Sinatra, it's the universal and full-featured Web Framework, but it's size is small, really small! 
+Take a look at [code statistics](http://ruby-lang.info/blog/simple-approach-to-measure-the-agility-and-complexi-4mu), find there the 'rad_core' word and compare it's size with others, actually it's even smaller, because the half of code belongs to specs.
+
+I believe **small code size is very important**, it means that the project is easy to understand, easy to refactor and customize and it's agile (by agility I mean high speed of reaction and adoption to changing world environment and requirements).
+
 ## Why did I make another Rails?
+
 There are many things that I like in Rails:
 
 - high productivity

data/spec/router/router_spec.rb

@@ -25,9 +25,10 @@ describe "Router Basic" do
   end
     
   it "encode_method" do
-    lambda{@router.encode_method :class_method, false}.should raise_error(/route method/)    
-    @router.routers.first.should_receive(:encode_method).and_return([BlogsController, :show])
-    @router.encode_method(:class_method, false).should == [BlogsController, :show]
+    lambda{@router.encode_method :some_method, false}.should raise_error(/route method/)    
+    first_router_in_chain = @router.routers.to_a[0][1]    
+    first_router_in_chain.should_receive(:encode_method).and_return([BlogsController, :show])
+    @router.encode_method(:some_method, false).should == [BlogsController, :show]
   end
     
   it "decode" do    

data/spec/web/spec_helper_spec.rb

@@ -52,7 +52,7 @@ describe "spec helper" do
   describe "routes" do
     before do
       router = rad[:router]
-      router.routers.unshift :restful_router, Rad::Router::RestfulRouter.new
+      router.routers[:restful_router] = Rad::Router::RestfulRouter.new
       router.routers[:restful_router].add :planes, class_name: 'Planes'
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rad_core
 version: !ruby/object:Gem::Version 
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors: 
@@ -10,56 +10,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-29 00:00:00 +04:00
+date: 2011-07-30 00:00:00 +04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: polyglot
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: treetop
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.4.9
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -67,21 +23,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: builder
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -89,10 +34,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -100,10 +45,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -111,10 +56,10 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: addressable
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -122,32 +67,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.4.4
-  type: :runtime
-  prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: dictionary
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id012
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -155,10 +78,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -166,10 +89,10 @@ dependencies:
         version: 1.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: mail
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -177,10 +100,10 @@ dependencies:
         version: 2.2.14
   type: :runtime
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby_ext
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -188,10 +111,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: vfs
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -199,10 +122,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id017
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: micon
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,10 +133,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id018
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: class_loader
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -221,7 +144,7 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id019
+  version_requirements: *id012
 description: 
 email: 
 executables: