rad_core 0.0.30 → 0.2.0

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake_ext'
 
 project(
   name: 'rad',
+  version: '0.2.0',
   official_name: 'rad_core',  
   gem: true,
   summary: 'Simple and highly customizable Web Framework encouraging to build an app as a set of low-coupled components instead of monolith',

data/lib/rad/gems.rb

@@ -1,23 +1,10 @@
-# core gems dependencies
-# 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 '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 'rack', '1.3.0'
 gem 'thin', '1.2.7'
-
 gem 'mail', '2.2.14'
 
 if respond_to? :fake_gem
@@ -25,4 +12,21 @@ if respond_to? :fake_gem
   fake_gem 'vfs'
   fake_gem 'micon'
   fake_gem 'class_loader'
-end
+end
+
+# 
+# Gems for specs
+# 
+# gem 'nokogiri', '1.4.4'
+
+
+# 
+# Old stuff
+# 
+# core gems dependencies
+# gem 'i18n', '0.5.0'
+# gem 'polyglot', '0.3.1'
+# gem 'treetop', '1.4.9'
+# gem 'mime-types', '1.16'
+# gem 'builder', '2.1.2'
+# 

data/lib/rad/spec/controller.rb

@@ -1,4 +1,4 @@
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.before :all do |context|
     self.response, self.workspace = nil
   end

data/lib/rad/spec/http_controller.rb

@@ -1,6 +1,6 @@
 require 'rad/spec/controller'
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.after :all do |context|
     context.wcall_options = {}
   end

data/lib/rad/spec/mailer.rb

@@ -10,7 +10,7 @@ end
 
 rspec.include Rad::MailerSpecHelper
 
-Rspec.configure do |config|  
+RSpec.configure do |config|  
   config.before do 
     Rad::MailerSpecHelper.sent_letters = []
   end

data/lib/rad/spec.rb

@@ -1,4 +1,6 @@
 require 'rspec_ext'
+require 'rspec_ext/xhtml'
+
 require 'rad'
 
 %w(

data/spec/html/form_helper_spec.rb

@@ -21,11 +21,13 @@ describe "FormHelper" do
     @t.file_field_tag('item').should == %(<input class=" file_input" name="item" type="file"></input>)
   end
 
-  it "form_tag" do
-    @t.form_tag(id: 'the_form', action: '/'){"content"}
-    @t.buffer.to_xhtml('#the_form').should_be_fuzzy_equal_to(
-      id: 'the_form', action: '/', content: 'content', method: 'post'
-    )
+  if String.method_defined? :to_xhtml
+    it "form_tag" do
+      @t.form_tag(id: 'the_form', action: '/'){"content"}
+      @t.buffer.to_xhtml('#the_form').to_fuzzy_hash.should == {id: 'the_form', action: '/', content: 'content', method: 'post'}
+    end
+  else
+    warn "WARN: skipping spec"
   end
 
   it "hidden_field_tag" do

data/spec/html/model_helper_spec.rb

@@ -9,76 +9,78 @@ describe "ModelHelper" do
     @t = MockModelHelperContext.new
   end
   
-  it "form_for" do
-    @t.form_for(:aname, nil, id: 'the_form', action: '/'){"content"}
-    @t.buffer.to_xhtml('#the_form').should_be_fuzzy_equal_to(
-      id: 'the_form', action: '/', content: 'content', method: 'post'
-    )
-  end
+  if String.method_defined? :to_xhtml
+    it "form_for" do
+      @t.form_for(:aname, nil, id: 'the_form', action: '/'){"content"}
+      @t.buffer.to_xhtml('#the_form').to_fuzzy_hash.should == {id: 'the_form', action: '/', content: 'content', method: 'post'}
+    end
     
-  it "error_messages" do
-    @t.form_for(:aname, nil){|f| f.error_messages}
-    lambda{@t.buffer.to_xhtml('form div')}.should raise_error(/not found/)
+    it "error_messages" do
+      @t.form_for(:aname, nil){|f| f.error_messages}
+      lambda{@t.buffer.to_xhtml('form div')}.should raise_error(/not found/)
         
-    model = {errors: {base: ['some error']}}
-    @t.buffer = ""
-    @t.form_for(:book, model){|f| f.error_messages}
-    @t.buffer.to_xhtml('form div').should_be_fuzzy_equal_to class: 'error_messages', content: 'some error'
-  end
+      model = {errors: {base: ['some error']}}
+      @t.buffer = ""
+      @t.form_for(:book, model){|f| f.error_messages}
+      @t.buffer.to_xhtml('form div').to_fuzzy_hash.should == {class: 'error_messages', content: 'some error'}
+    end
   
-  it "field error" do
-    model = {
-      title: "Super Hero",
-      errors: {title: ['some error in title']}
-    }
-    @t.form_for(:book, model){|f| f.text_field(:title)}
-    doc = @t.buffer.to_xhtml
-    doc.css("form div.field_error_messages").first.content.should == "some error in title"
-    doc.css("form span.field_with_errors input").first.should_be_fuzzy_equal_to name: "book[title]", value: "Super Hero"
-  end
+    it "field error" do
+      model = {
+        title: "Super Hero",
+        errors: {title: ['some error in title']}
+      }
+      @t.form_for(:book, model){|f| f.text_field(:title)}
+      doc = @t.buffer.to_xhtml
+      doc.css("form div.field_error_messages").first.content.should == "some error in title"
+      doc.css("form span.field_with_errors input").first.to_fuzzy_hash.should == {name: "book[title]", value: "Super Hero"}
+    end
   
-  it "should insert human readable label if not specified" do
-    model = {}
-    model.stub(:t).and_return{|k| "translated #{k}"}
+    it "should insert human readable label if not specified" do
+      model = {}
+      model.stub(:t).and_return{|k| "translated #{k}"}
     
-    @t.form_for(:book, model){|f| f.text_field(:title)}
-    @t.buffer.should =~ /translated title/
+      @t.form_for(:book, model){|f| f.text_field(:title)}
+      @t.buffer.should =~ /translated title/
     
-    @t.form_for(:book, model){|f| f.text_field(:title, label: 'some label')}
-    @t.buffer.should =~ /some label/
-  end
+      @t.form_for(:book, model){|f| f.text_field(:title, label: 'some label')}
+      @t.buffer.should =~ /some label/
+    end
   
-  it "field_helpers" do
-    model = {
-      available: false,
-      title: "Super Hero",
-      theme: 'simple'
-    }
+    it "field_helpers" do
+      model = {
+        available: false,
+        title: "Super Hero",
+        theme: 'simple'
+      }
     
-    @t.form_for(:book, model){|f| %{
-      #{f.check_box :available}
-      #{f.file_field :title}
-      #{f.hidden_field :title}
-      #{f.password_field :title}
-      #{f.radio_button :available}
-      #{f.submit 'Ok'}
-      #{f.text_field :title}
-      #{f.text_area :title}
-      #{f.select :theme, %w(a b)}
-    } }
-    doc = @t.buffer.to_xhtml
+      @t.form_for(:book, model){|f| %{
+        #{f.check_box :available}
+        #{f.file_field :title}
+        #{f.hidden_field :title}
+        #{f.password_field :title}
+        #{f.radio_button :available}
+        #{f.submit 'Ok'}
+        #{f.text_field :title}
+        #{f.text_area :title}
+        #{f.select :theme, %w(a b)}
+      } }
+      doc = @t.buffer.to_xhtml
     
-    # checkbox is special case, we are using it with <input type='hidden' .../> tag.
-    doc.css("*[type='hidden']").first.should_be_fuzzy_equal_to name: "book[available]", value: '0'
-    doc.css("*[type='checkbox']").first.should_be_fuzzy_equal_to name: "book[available]", value: '1'
+      # checkbox is special case, we are using it with <input type='hidden' .../> tag.
+      doc.css("*[type='hidden']").first.to_fuzzy_hash.should == {name: "book[available]", value: '0'}
+      doc.css("*[type='checkbox']").first.to_fuzzy_hash.should == {name: "book[available]", value: '1'}
     
-    doc.css("*[type='file']").first.should_be_fuzzy_equal_to name: "book[title]"
-    doc.css("*[type='hidden']").last.should_be_fuzzy_equal_to name: "book[title]", value: 'Super Hero'
-    doc.css("*[type='password']").first.should_be_fuzzy_equal_to name: "book[title]"
-    doc.css("*[type='radio']").first.should_be_fuzzy_equal_to name: "book[available]", value: '1'
-    doc.css("*[type='submit']").first.should_be_fuzzy_equal_to value: 'Ok'
-    doc.css("*[type='text']").first.should_be_fuzzy_equal_to name: "book[title]", value: 'Super Hero'
-    doc.css("textarea").first.should_be_fuzzy_equal_to name: "book[title]", content: 'Super Hero'
-    doc.css("select").first.should_be_fuzzy_equal_to name: "book[theme]"
+      doc.css("*[type='file']").first.to_fuzzy_hash.should == {name: "book[title]"}
+      doc.css("*[type='hidden']").last.to_fuzzy_hash.should == {name: "book[title]", value: 'Super Hero'}
+      doc.css("*[type='password']").first.to_fuzzy_hash.should == {name: "book[title]"}
+      doc.css("*[type='radio']").first.to_fuzzy_hash.should == {name: "book[available]", value: '1'}
+      doc.css("*[type='submit']").first.to_fuzzy_hash.should == {value: 'Ok'}
+      doc.css("*[type='text']").first.to_fuzzy_hash.should == {name: "book[title]", value: 'Super Hero'}
+      doc.css("textarea").first.to_fuzzy_hash.should == {name: "book[title]", content: 'Super Hero'}
+      doc.css("select").first.to_fuzzy_hash.should == {name: "book[theme]"}
+    end
+  else
+    warn "WARN: skipping spec"
   end
 end

data/spec/html/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'rad/spec/xhtml'
 
 class Rad::MockTemplateContext
   inherit Rad::Html::BasicHtmlHelper

data/spec/web/view_routing_helper_spec.rb

@@ -54,89 +54,93 @@ describe "UrlHelper" do
     @t = MockUrlHelperContext.new
   end
   
-  describe "link_to" do    
-    it "should works with url_for attributes" do
-      @t.link_to('Book', Object, :method, {format: 'html'}, class: 'highlight').to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=html", content: 'Book')
+  if String.method_defined? :to_xhtml
+    describe "link_to" do    
+      it "should works with url_for attributes" do
+        @t.link_to('Book', Object, :method, {format: 'html'}, class: 'highlight').to_xhtml('a').
+          to_fuzzy_hash.should == {class: "highlight", href: "url_for: Object.method?format=html", content: 'Book'}
         
-      @t.link_to(Object, :method, {format: 'html'}, class: 'highlight'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "url_for: Object.method?format=html", content: 'Book')
+        @t.link_to(Object, :method, {format: 'html'}, class: 'highlight'){'Book'}.to_xhtml('a').
+          to_fuzzy_hash.should == {class: "highlight", href: "url_for: Object.method?format=html", content: 'Book'}
         
-      @t.link_to('Book', :method).to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "url_for: .method", content: 'Book')
-    end
+        @t.link_to('Book', :method).to_xhtml('a').
+          to_fuzzy_hash.should == {href: "url_for: .method", content: 'Book'}
+      end
     
-    it "should works with url_for_path attributes" do
-      @t.link_to('Book', '/some_book', class: 'highlight').to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: 'Book')      
+      it "should works with url_for_path attributes" do
+        @t.link_to('Book', '/some_book', class: 'highlight').to_xhtml('a').
+          to_fuzzy_hash.should == {class: "highlight", href: "/some_book", content: 'Book'}
       
-      @t.link_to('/some_book', class: 'highlight'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(class: "highlight", href: "/some_book", content: 'Book')
+        @t.link_to('/some_book', class: 'highlight'){'Book'}.to_xhtml('a').
+          to_fuzzy_hash.should == {class: "highlight", href: "/some_book", content: 'Book'}
         
-      @t.link_to('/some_book'){'Book'}.to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "/some_book", content: 'Book')
-    end
+        @t.link_to('/some_book'){'Book'}.to_xhtml('a').
+          to_fuzzy_hash.should == {href: "/some_book", content: 'Book'}
+      end
     
-    it "links for 'js', 'json' formats should be automatically became remote" do
-      @t.link_to('Book', @t.url_for('/some_book', format: 'json')).to_xhtml('a').should_be_fuzzy_equal_to(
-        href: '#', content: 'Book',
-        'data-action' => 'url_for: /some_book?format=json', 'data-method' => 'post', 'data-remote' => 'true'
-      )
+      it "links for 'js', 'json' formats should be automatically became remote" do
+        @t.link_to('Book', @t.url_for('/some_book', format: 'json')).to_xhtml('a').to_fuzzy_hash.should == {
+          href: '#', content: 'Book',
+          'data-action' => 'url_for: /some_book?format=json', 'data-method' => 'post', 'data-remote' => 'true'
+        }
       
-      @t.link_to('Book', :method, format: 'js').to_xhtml('a').should_be_fuzzy_equal_to(
-        href: '#', content: 'Book',
-        'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
-      )
+        @t.link_to('Book', :method, format: 'js').to_xhtml('a').to_fuzzy_hash.should == {
+          href: '#', content: 'Book',
+          'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
+        }
       
-      @t.link_to('Book', :method, {format: 'js'}, class: 'highlight').to_xhtml('a').should_be_fuzzy_equal_to(
-        href: '#', content: 'Book', class: 'highlight',
-        'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
-      )
-    end
+        @t.link_to('Book', :method, {format: 'js'}, class: 'highlight').to_xhtml('a').to_fuzzy_hash.should == {
+          href: '#', content: 'Book', class: 'highlight',
+          'data-action' => 'url_for: .method?format=js', 'data-method' => 'post', 'data-remote' => 'true'
+        }
+      end
     
-    it "confirm" do
-      attrs = @t.link_to('Book', '/some_book', confirm: 'Are you shure?').to_xhtml('a')
-      attrs.should_not include('data-remote')
-      attrs.should_not include('data-action')
-      attrs.should_not include('data-method')
-      attrs.should_be_fuzzy_equal_to(
-        href: "/some_book", content: 'Book',
-        'data-confirm' => "Are you shure?"
-      )
-    end
+      it "confirm" do
+        attrs = @t.link_to('Book', '/some_book', confirm: 'Are you shure?').to_xhtml('a')
+        attrs.should_not include('data-remote')
+        attrs.should_not include('data-action')
+        attrs.should_not include('data-method')
+        attrs.to_fuzzy_hash.should == {
+          href: "/some_book", content: 'Book',
+          'data-confirm' => "Are you shure?"
+        }
+      end
     
-    it "POST method" do
-      attrs = @t.link_to('Book', '/some_book', method: :post).to_xhtml('a')
-      attrs.should_not include('data-remote')
-      attrs.should_be_fuzzy_equal_to(
-        href: "#", content: 'Book',
-        'data-action' => '/some_book', 'data-method' => 'post'
-      )      
-    end
+      it "POST method" do
+        attrs = @t.link_to('Book', '/some_book', method: :post).to_xhtml('a')
+        attrs.should_not include('data-remote')
+        attrs.to_fuzzy_hash.should == {
+          href: "#", content: 'Book',
+          'data-action' => '/some_book', 'data-method' => 'post'
+        }
+      end
     
-    it "remote" do
-      @t.link_to('Book', '/some_book', remote: true).to_xhtml('a').should_be_fuzzy_equal_to(
-        href: "#", content: 'Book',
-        'data-action' => '/some_book', 'data-method' => 'post', 'data-remote' => 'true'
-      )
-    end
+      it "remote" do
+        @t.link_to('Book', '/some_book', remote: true).to_xhtml('a').to_fuzzy_hash.should == {
+          href: "#", content: 'Book',
+          'data-action' => '/some_book', 'data-method' => 'post', 'data-remote' => 'true'
+        }
+      end
     
-    it ":back" do
-      env = Object.new
-      env.stub(:[]).and_return('/go_back')
-      request = Object.new
-      request.stub(:env).and_return(env)
-      workspace = Object.new
-      workspace.stub(:request).and_return(request)
-      @t.stub(:workspace).and_return(workspace)
+      it ":back" do
+        env = Object.new
+        env.stub(:[]).and_return('/go_back')
+        request = Object.new
+        request.stub(:env).and_return(env)
+        workspace = Object.new
+        workspace.stub(:request).and_return(request)
+        @t.stub(:workspace).and_return(workspace)
       
-      @t.link_to('Book', :back).to_xhtml('a').should_be_fuzzy_equal_to(href: "/go_back", content: 'Book')
-      @t.link_to('Book', :back, class: '_some_js_mark').to_xhtml('a').
-        should_be_fuzzy_equal_to(href: "/go_back", class: '_some_js_mark', content: 'Book')
-    end
+        @t.link_to('Book', :back).to_xhtml('a').to_fuzzy_hash.should == {href: "/go_back", content: 'Book'}
+        @t.link_to('Book', :back, class: '_some_js_mark').to_xhtml('a').
+          to_fuzzy_hash.should == {href: "/go_back", class: '_some_js_mark', content: 'Book'}
+      end
     
-    it "#" do
-      @t.link_to('Book', '#').to_xhtml('a').should_be_fuzzy_equal_to(href: "#", content: 'Book')
+      it "#" do
+        @t.link_to('Book', '#').to_xhtml('a').to_fuzzy_hash.should == {href: "#", content: 'Book'}
+      end    
     end
+  else
+    warn "WARN: skipping spec"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rad_core
 version: !ruby/object:Gem::Version 
-  version: 0.0.30
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: 
@@ -307,7 +307,6 @@ files:
 - lib/rad/spec/router.rb
 - lib/rad/spec/template.rb
 - lib/rad/spec/web.rb
-- lib/rad/spec/xhtml.rb
 - lib/rad/spec.rb
 - lib/rad/tasks.rb
 - lib/rad/template/_context.rb

data/lib/rad/spec/xhtml.rb

@@ -1,33 +0,0 @@
-require 'nokogiri'
-
-class String
-  def to_xhtml css = nil    
-    node = Nokogiri::HTML(self)
-    unless css
-      node
-    else
-      nodes = node.css(css)
-      raise "Elements for '#{css}' CSS query not found!" if nodes.size < 1
-      raise "Found more than one elment for '#{css}' CSS query!" if nodes.size > 1
-      nodes.first
-    end
-  end
-end
-
-require 'nokogiri'
-::Nokogiri::XML::Node.class_eval do
-  def should_be_fuzzy_equal_to attributes
-    node_attributes = {}
-    
-    attributes.each do |k, v|
-      nv = if k.to_s == 'content'
-        self.content
-      else
-        self[k.to_s]
-      end
-      node_attributes[k] = nv
-    end
-    
-    node_attributes.should == attributes
-  end
-end