RubyGems - curly-templates - Versions diffs - 2.0.1 → 2.1.0.beta1 - Mend

curly-templates 2.0.1 → 2.1.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (55) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +6 -0
data/Gemfile +2 -0
data/README.md +85 -5
data/curly-templates.gemspec +37 -8
data/lib/curly.rb +1 -1
data/lib/curly/{attribute_parser.rb → attribute_scanner.rb} +6 -4
data/lib/curly/compiler.rb +81 -72
data/lib/curly/component_compiler.rb +37 -31
data/lib/curly/component_scanner.rb +19 -0
data/lib/curly/incomplete_block_error.rb +0 -7
data/lib/curly/incorrect_ending_error.rb +0 -21
data/lib/curly/parser.rb +171 -0
data/lib/curly/presenter.rb +1 -1
data/lib/curly/scanner.rb +23 -9
data/spec/attribute_scanner_spec.rb +46 -0
data/spec/collection_blocks_spec.rb +88 -0
data/spec/compiler/context_blocks_spec.rb +42 -0
data/spec/component_compiler_spec.rb +26 -77
data/spec/component_scanner_spec.rb +19 -0
data/spec/{integration/components_spec.rb → components_spec.rb} +0 -0
data/spec/{integration/conditional_blocks_spec.rb → conditional_blocks_spec.rb} +0 -0
data/spec/dummy/.gitignore +1 -0
data/spec/dummy/app/controllers/application_controller.rb +2 -0
data/spec/dummy/app/controllers/dashboards_controller.rb +13 -0
data/spec/dummy/app/helpers/application_helper.rb +5 -0
data/spec/dummy/app/presenters/dashboards/collection_presenter.rb +7 -0
data/spec/dummy/app/presenters/dashboards/item_presenter.rb +7 -0
data/spec/dummy/app/presenters/dashboards/new_presenter.rb +19 -0
data/spec/dummy/app/presenters/dashboards/partials_presenter.rb +5 -0
data/spec/dummy/app/presenters/dashboards/show_presenter.rb +12 -0
data/spec/dummy/app/presenters/layouts/application_presenter.rb +9 -0
data/spec/dummy/app/views/dashboards/_item.html.curly +1 -0
data/spec/dummy/app/views/dashboards/collection.html.curly +5 -0
data/spec/dummy/app/views/dashboards/new.html.curly +3 -0
data/spec/dummy/app/views/dashboards/partials.html.curly +3 -0
data/spec/dummy/app/views/dashboards/show.html.curly +3 -0
data/spec/dummy/app/views/layouts/application.html.curly +8 -0
data/spec/dummy/config.ru +4 -0
data/spec/dummy/config/application.rb +12 -0
data/spec/dummy/config/boot.rb +5 -0
data/spec/dummy/config/environment.rb +5 -0
data/spec/dummy/config/environments/test.rb +36 -0
data/spec/dummy/config/routes.rb +6 -0
data/spec/integration/application_layout_spec.rb +21 -0
data/spec/integration/collection_blocks_spec.rb +17 -78
data/spec/integration/context_blocks_spec.rb +21 -0
data/spec/integration/partials_spec.rb +23 -0
data/spec/parser_spec.rb +95 -0
data/spec/scanner_spec.rb +24 -14
data/spec/spec_helper.rb +4 -3
metadata +49 -14
data/lib/curly/component_parser.rb +0 -13
data/spec/attribute_parser_spec.rb +0 -46
data/spec/incorrect_ending_error_spec.rb +0 -13

data/spec/dummy/config/environment.rb ADDED

@@ -0,0 +1,5 @@
+# Load the Rails application.
+require File.expand_path('../application', __FILE__)
+# Initialize the Rails application.
+Rails.application.initialize!

data/spec/dummy/config/environments/test.rb ADDED

@@ -0,0 +1,36 @@
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = 'public, max-age=3600'
+  # Show full error reports and disable caching.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+  # Raise exceptions instead of rendering exception templates.
+  config.action_dispatch.show_exceptions = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
+  # Print deprecation notices to the stderr.
+  config.active_support.deprecation = :stderr
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+  config.secret_key_base = "yolo"
+end

data/spec/dummy/config/routes.rb ADDED

@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+  root to: "dashboards#show"
+  get "/collection", to: "dashboards#collection"
+  get "/partials", to: "dashboards#partials"
+  get "/new", to: "dashboards#new"
+end

data/spec/integration/application_layout_spec.rb ADDED

@@ -0,0 +1,21 @@
+require 'spec_helper'
+describe "Using Curly for the application layout", type: :request do
+  example "A simple layout view" do
+    get '/'
+    response.body.should == <<-HTML.strip_heredoc
+      <html>
+      <head>
+        <title>Dummy app</title>
+      </head>
+      <body>
+      <h1>Dashboard</h1>
+      <p>Hello, World!</p>
+      <p>Welcome!</p>
+      </body>
+      </html>
+    HTML
+  end
+end

data/spec/integration/collection_blocks_spec.rb CHANGED

@@ -1,88 +1,27 @@
 require 'spec_helper'
-describe "Collection block components" do
-  include RenderingSupport
+describe "Collection blocks", type: :request do
+  example "Rendering collections" do
+    get '/collection'
-  before do
-    item_presenter do
-      presents :item
+    response.body.should == <<-HTML.strip_heredoc
+      <html>
+      <head>
+        <title>Dummy app</title>
+      </head>
+      <body>
+      <ul>
-      def name
-        @item
-      end
-    end
-  end
-  example "with neither identifier nor attributes" do
-    presenter do
-      def items
-        ["one", "two", "three"]
-      end
-    end
-    render("{{*items}}<{{name}}>{{/items}}").should == "<one><two><three>"
-  end
-  example "with an identifier" do
-    presenter do
-      def items(filter = nil)
-        if filter == "even"
-          ["two"]
-        elsif filter == "odd"
-          ["one", "three"]
-        else
-          ["one", "two", "three"]
-        end
-      end
-    end
-    render("{{*items.even}}<{{name}}>{{/items.even}}").should == "<two>"
-    render("{{*items.odd}}<{{name}}>{{/items.odd}}").should == "<one><three>"
-    render("{{*items}}<{{name}}>{{/items}}").should == "<one><two><three>"
-  end
-  example "with attributes" do
-    presenter do
-      def items(length: "1")
-        ["x"] * length.to_i
-      end
-    end
+        <li>uno</li>
-    render("{{*items length=3}}<{{name}}>{{/items}}").should == "<x><x><x>"
-    render("{{*items}}<{{name}}>{{/items}}").should == "<x>"
-  end
-  example "with nested collection blocks" do
-    presenter do
-      def items
-        [{ parts: [1, 2] }, { parts: [3, 4] }]
-      end
-    end
-    item_presenter do
-      presents :item
-      def parts
-        @item[:parts]
-      end
-    end
+        <li>dos</li>
-    part_presenter do
-      presents :part
+        <li>tres!</li>
-      def number
-        @part
-      end
-    end
-    render("{{*items}}<{{*parts}}[{{number}}]{{/parts}}>{{/items}}").should == "<[1][2]><[3][4]>"
-  end
-  def item_presenter(&block)
-    stub_const("ItemPresenter", Class.new(Curly::Presenter, &block))
-  end
+      </ul>
-  def part_presenter(&block)
-    stub_const("ItemPresenter::PartPresenter", Class.new(Curly::Presenter, &block))
+      </body>
+      </html>
+    HTML
   end
 end

data/spec/integration/context_blocks_spec.rb ADDED

@@ -0,0 +1,21 @@
+require 'spec_helper'
+describe "Context blocks", type: :request do
+  example "A context block" do
+    get '/new'
+    response.body.should == <<-HTML.strip_heredoc
+      <html>
+      <head>
+        <title>Dummy app</title>
+      </head>
+      <body>
+      <form accept-charset="UTF-8" action="/new" method="post"><div style="display:none"><input name="utf8" type="hidden" value="&#x2713;" /></div>
+        <b>Name</b> <input id="dashboard_name" name="dashboard[name]" type="text" value="test" />
+      </form>
+      </body>
+      </html>
+    HTML
+  end
+end

data/spec/integration/partials_spec.rb ADDED

@@ -0,0 +1,23 @@
+require 'spec_helper'
+describe "Using Curly for Rails partials", type: :request do
+  example "Rendering a partial" do
+    get '/partials'
+    response.body.should == <<-HTML.strip_heredoc
+      <html>
+      <head>
+        <title>Dummy app</title>
+      </head>
+      <body>
+      <ul>
+        <li>One</li>
+        <li>Two</li>
+      </ul>
+      </body>
+      </html>
+    HTML
+  end
+end

data/spec/parser_spec.rb ADDED

@@ -0,0 +1,95 @@
+require 'spec_helper'
+require 'curly/parser'
+describe Curly::Parser do
+  it "parses component tokens" do
+    tokens = [
+      [:component, "a", nil, {}],
+    ]
+    parse(tokens).should == [
+      component("a")
+    ]
+  end
+  it "parses conditional blocks" do
+    tokens = [
+      [:conditional_block_start, "a?", nil, {}],
+      [:component, "hello", nil, {}],
+      [:block_end, "a?", nil],
+    ]
+    parse(tokens).should == [
+      conditional_block(component("a?"), [component("hello")])
+    ]
+  end
+  it "parses inverse conditional blocks" do
+    tokens = [
+      [:inverse_conditional_block_start, "a?", nil, {}],
+      [:component, "hello", nil, {}],
+      [:block_end, "a?", nil],
+    ]
+    parse(tokens).should == [
+      inverse_conditional_block(component("a?"), [component("hello")])
+    ]
+  end
+  it "parses collection blocks" do
+    tokens = [
+      [:collection_block_start, "mice", nil, {}],
+      [:component, "hello", nil, {}],
+      [:block_end, "mice", nil],
+    ]
+    parse(tokens).should == [
+      collection_block(component("mice"), [component("hello")])
+    ]
+  end
+  it "fails if a block is not closed" do
+    tokens = [
+      [:collection_block_start, "mice", nil, {}],
+    ]
+    expect { parse(tokens) }.to raise_exception(Curly::IncompleteBlockError)
+  end
+  it "fails if a block is closed with the wrong component" do
+    tokens = [
+      [:collection_block_start, "mice", nil, {}],
+      [:block_end, "men", nil, {}],
+    ]
+    expect { parse(tokens) }.to raise_exception(Curly::IncorrectEndingError)
+  end
+  it "fails if there is a closing component too many" do
+    tokens = [
+      [:block_end, "world", nil, {}],
+    ]
+    expect { parse(tokens) }.to raise_exception(Curly::IncorrectEndingError)
+  end
+  def parse(tokens)
+    described_class.parse(tokens)
+  end
+  def component(*args)
+    Curly::Parser::Component.new(*args)
+  end
+  def conditional_block(*args)
+    Curly::Parser::Block.new(:conditional, *args)
+  end
+  def inverse_conditional_block(*args)
+    Curly::Parser::Block.new(:inverse_conditional, *args)
+  end
+  def collection_block(*args)
+    Curly::Parser::Block.new(:collection, *args)
+  end
+end

data/spec/scanner_spec.rb CHANGED

@@ -4,20 +4,14 @@ describe Curly::Scanner, ".scan" do
   it "returns the tokens in the source" do
     scan("foo {{bar}} baz").should == [
       [:text, "foo "],
-      [:component, "bar"],
+      [:component, "bar", nil, {}],
       [:text, " baz"]
     ]
   end
   it "scans components with identifiers" do
     scan("{{foo.bar}}").should == [
-      [:component, "foo.bar"]
-    ]
-  end
-  it "allows components with whitespace" do
-    scan("{{ foo bar}}").should == [
-      [:component, " foo bar"]
+      [:component, "foo", "bar", {}]
     ]
   end
@@ -59,30 +53,46 @@ describe Curly::Scanner, ".scan" do
     ]
   end
+  it "scans context block tags" do
+    scan('{{@search_form}}{{query_field}}{{/search_form}}').should == [
+      [:context_block_start, "search_form", nil, {}],
+      [:component, "query_field", nil, {}],
+      [:block_end, "search_form", nil]
+    ]
+  end
   it "scans conditional block tags" do
     scan('foo {{#bar?}} hello {{/bar?}}').should == [
       [:text, "foo "],
-      [:conditional_block_start, "bar?"],
+      [:conditional_block_start, "bar?", nil, {}],
       [:text, " hello "],
-      [:conditional_block_end, "bar?"]
+      [:block_end, "bar?", nil]
+    ]
+  end
+  it "scans conditional block tags with parameters and attributes" do
+    scan('{{#active.test? name="test"}}yo{{/active.test?}}').should == [
+      [:conditional_block_start, "active?", "test", { "name" => "test" }],
+      [:text, "yo"],
+      [:block_end, "active?", "test"]
     ]
   end
   it "scans inverse block tags" do
     scan('foo {{^bar?}} hello {{/bar?}}').should == [
       [:text, "foo "],
-      [:inverse_conditional_block_start, "bar?"],
+      [:inverse_conditional_block_start, "bar?", nil, {}],
       [:text, " hello "],
-      [:conditional_block_end, "bar?"]
+      [:block_end, "bar?", nil]
     ]
   end
   it "scans collection block tags" do
     scan('foo {{*bar}} hello {{/bar}}').should == [
       [:text, "foo "],
-      [:collection_block_start, "bar"],
+      [:collection_block_start, "bar", nil, {}],
       [:text, " hello "],
-      [:collection_block_end, "bar"]
+      [:block_end, "bar", nil]
     ]
   end

data/spec/spec_helper.rb CHANGED

@@ -1,4 +1,7 @@
-require 'active_support/all'
+ENV["RAILS_ENV"] = "test"
+require 'dummy/config/environment'
+require 'rspec/rails'
 if ENV['CI']
   begin
@@ -9,8 +12,6 @@ if ENV['CI']
   end
 end
-require 'curly'
 module RenderingSupport
   def presenter(&block)
     @presenter = block

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: curly-templates
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.beta1
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -106,15 +106,16 @@ files:
 - curly-templates.gemspec
 - lib/curly-templates.rb
 - lib/curly.rb
-- lib/curly/attribute_parser.rb
+- lib/curly/attribute_scanner.rb
 - lib/curly/compiler.rb
 - lib/curly/component_compiler.rb
-- lib/curly/component_parser.rb
+- lib/curly/component_scanner.rb
 - lib/curly/dependency_tracker.rb
 - lib/curly/error.rb
 - lib/curly/incomplete_block_error.rb
 - lib/curly/incorrect_ending_error.rb
 - lib/curly/invalid_component.rb
+- lib/curly/parser.rb
 - lib/curly/presenter.rb
 - lib/curly/presenter_not_found.rb
 - lib/curly/railtie.rb
@@ -125,15 +126,43 @@ files:
 - lib/generators/curly/controller/templates/presenter.rb.erb
 - lib/generators/curly/controller/templates/view.html.curly.erb
 - lib/rails/projections.json
-- spec/attribute_parser_spec.rb
+- spec/attribute_scanner_spec.rb
+- spec/collection_blocks_spec.rb
 - spec/compiler/collections_spec.rb
+- spec/compiler/context_blocks_spec.rb
 - spec/compiler_spec.rb
 - spec/component_compiler_spec.rb
+- spec/component_scanner_spec.rb
+- spec/components_spec.rb
+- spec/conditional_blocks_spec.rb
+- spec/dummy/.gitignore
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/dashboards_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/presenters/dashboards/collection_presenter.rb
+- spec/dummy/app/presenters/dashboards/item_presenter.rb
+- spec/dummy/app/presenters/dashboards/new_presenter.rb
+- spec/dummy/app/presenters/dashboards/partials_presenter.rb
+- spec/dummy/app/presenters/dashboards/show_presenter.rb
+- spec/dummy/app/presenters/layouts/application_presenter.rb
+- spec/dummy/app/views/dashboards/_item.html.curly
+- spec/dummy/app/views/dashboards/collection.html.curly
+- spec/dummy/app/views/dashboards/new.html.curly
+- spec/dummy/app/views/dashboards/partials.html.curly
+- spec/dummy/app/views/dashboards/show.html.curly
+- spec/dummy/app/views/layouts/application.html.curly
+- spec/dummy/config.ru
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/routes.rb
 - spec/generators/controller_generator_spec.rb
-- spec/incorrect_ending_error_spec.rb
+- spec/integration/application_layout_spec.rb
 - spec/integration/collection_blocks_spec.rb
-- spec/integration/components_spec.rb
-- spec/integration/conditional_blocks_spec.rb
+- spec/integration/context_blocks_spec.rb
+- spec/integration/partials_spec.rb
+- spec/parser_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/spec_helper.rb
@@ -155,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.2.2
@@ -165,15 +194,21 @@ signing_key:
 specification_version: 2
 summary: Free your views!
 test_files:
-- spec/attribute_parser_spec.rb
+- spec/attribute_scanner_spec.rb
+- spec/collection_blocks_spec.rb
 - spec/compiler/collections_spec.rb
+- spec/compiler/context_blocks_spec.rb
 - spec/compiler_spec.rb
 - spec/component_compiler_spec.rb
+- spec/component_scanner_spec.rb
+- spec/components_spec.rb
+- spec/conditional_blocks_spec.rb
 - spec/generators/controller_generator_spec.rb
-- spec/incorrect_ending_error_spec.rb
+- spec/integration/application_layout_spec.rb
 - spec/integration/collection_blocks_spec.rb
-- spec/integration/components_spec.rb
-- spec/integration/conditional_blocks_spec.rb
+- spec/integration/context_blocks_spec.rb
+- spec/integration/partials_spec.rb
+- spec/parser_spec.rb
 - spec/presenter_spec.rb
 - spec/scanner_spec.rb
 - spec/syntax_error_spec.rb