viewlet 0.0.3 → 0.0.5

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--profile

data/README.md

@@ -229,6 +229,9 @@ that could be used as HTML id.
     = render :partial => "some_other_partial", :locals => {:member => member}
 
 %password_strength_viewlet{:levels => %w(none weak good)}
+
+%password_strength_viewlet
+  - levels %w(none weak good) # notice optional dash at the beginning
 ```
 
 ## Todo

data/lib/viewlet.rb

@@ -1,7 +1,7 @@
 require "viewlet/version"
 require "viewlet/base"
 require "viewlet/helpers"
-require "viewlet/railtie"
+require "viewlet/railtie" if defined?(Rails)
 
 module Viewlet
 end

data/lib/viewlet/base.rb

@@ -29,7 +29,7 @@ module Viewlet
 
     def _read_variable(name, *args, &block)
       if @variables[name].is_a?(Proc)
-        @view.capture(*args, &@variables[name])
+        @variables[name].call(*args)
       else
         @variables[name]
       end
@@ -39,7 +39,11 @@ module Viewlet
       @variables[name] = if block
         # HAML changes argument-less block {|| } into block {|*a| }
         # which makes block.arity to be -1 instead of just 0
-        block.arity == -1 ? @view.capture(&block) : block
+        if block.arity == -1
+          @view.capture(&block)
+        else
+          Proc.new { |*a| @view.capture(*a, &block) }
+        end
       else
         args.first
       end

data/lib/viewlet/haml.rb

@@ -1,3 +1,6 @@
+require "active_support/core_ext/object/try"
+require "active_support/core_ext/module/aliasing"
+
 Haml::Parser.class_eval do
   # `%simple_viewlet` becomes `= viewlet(:simple)`
   # `%complex_viewlet` becomes `= viewlet(:complex) do |viewlet_0|`
@@ -14,10 +17,19 @@ Haml::Parser.class_eval do
     viewlet_pop
   end
 
+  # `- prop "whatever"` becomes `- viewlet_0.prop "whatever"`
+  def silent_script_with_viewlet_parent_tag(text)
+    if viewlet_definition?
+      text = "- #{viewlet_peek}.#{text.gsub(/^\-\s*/, "")}"
+    end
+    silent_script_without_viewlet_parent_tag(text)
+  end
+  alias_method_chain :silent_script, :viewlet_parent_tag
+
   # `prop "whatever"` becomes `- viewlet_0.prop "whatever"`
-  def plain_with_viewlet_parent_tag(text, escape_html = nil)
+  def plain_with_viewlet_parent_tag(text, escape_html=nil)
     if viewlet_definition?
-      silent_script(" #{viewlet_peek}.#{text}")
+      silent_script_without_viewlet_parent_tag(" #{viewlet_peek}.#{text}")
     else
       plain_without_viewlet_parent_tag(text, escape_html)
     end
@@ -28,18 +40,21 @@ Haml::Parser.class_eval do
 
   def build_viewlet_node(node)
     name = node.value[:name].gsub(/_viewlet$/, "")
-    attrs = attributes_string(node.value[:attributes_hashes])
+    attrs = attributes_string(node)
     block = "do |#{viewlet_push}|" if block_opened?
     script(" viewlet(:#{name} #{attrs}) #{block}")
   end
 
-  def attributes_string(attributes_hashes)
-    if attributes_hashes.empty?
-      attributes_hashes = ""
-    elsif attributes_hashes.size == 1
-      attributes_hashes = ", #{attributes_hashes.first}"
+  def attributes_string(node)
+    return ", #{node.value[:attributes].inspect}" \
+      unless node.value[:attributes].empty?
+
+    if (hashes = node.value[:attributes_hashes]).empty?
+      ""
+    elsif hashes.size == 1
+      ", #{hashes.first}"
     else
-      attributes_hashes = ", (#{attributes_hashes.join(").merge(")})"
+      ", (#{hashes.join(").merge(")})"
     end
   end
 

data/lib/viewlet/template.rb

@@ -1,3 +1,5 @@
+require "action_view"
+
 module Viewlet
   class Template
     def self.find(name)

data/lib/viewlet/version.rb

@@ -1,3 +1,3 @@
 module Viewlet
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/spec/app/viewlets/attributes.html.haml

@@ -0,0 +1,2 @@
+= attr1
+= attr2 if defined?(attr2)

data/spec/app/viewlets/block_with_argument.html.haml

@@ -0,0 +1,3 @@
+= block_with_argument.text("method-argument")
+= capture("capture-argument", &text)
+= text.call("call-argument")

data/spec/app/viewlets/block_without_argument.html.haml

@@ -0,0 +1 @@
+= text

data/spec/app/viewlets/content.html.haml

@@ -0,0 +1 @@
+= text

data/spec/app/viewlets/div.html.haml

@@ -0,0 +1 @@
+%div

data/spec/haml/block_variables_with_arguments.html.haml

@@ -0,0 +1,28 @@
+%block_with_argument_viewlet
+  text { |arg| "block-curly-#{arg}" }
+
+%block_with_argument_viewlet
+  - text { |arg| "block-curly-dash-#{arg}" }
+
+%block_with_argument_viewlet
+  text do |arg|
+    = "block-do-#{arg}"
+
+%block_with_argument_viewlet
+  - text do |arg|
+    = "block-do-dash-#{arg}"
+
+__END__
+block-curly-method-argument
+block-curly-capture-argument
+block-curly-call-argument
+block-curly-dash-method-argument
+block-curly-dash-capture-argument
+block-curly-dash-call-argument
+block-do-method-argument
+block-do-capture-argument
+block-do-call-argument
+
+block-do-dash-method-argument
+block-do-dash-capture-argument
+block-do-dash-call-argument

data/spec/haml/block_variables_without_arguments.html.haml

@@ -0,0 +1,34 @@
+%block_without_argument_viewlet
+  text { "block-curly" }
+
+%block_without_argument_viewlet
+  - text { "block-curly-dash" }
+
+%block_without_argument_viewlet
+  text do
+    block-do
+
+%block_without_argument_viewlet
+  - text do
+    block-do-dash
+
+%block_without_argument_viewlet
+  text do
+    - block_var = "block-var" # use dash!
+    = block_var
+
+%block_without_argument_viewlet
+  - text do
+    - block_var = "block-var-dash" # use dash!
+    = block_var
+
+__END__
+block-curly
+block-curly-dash
+block-do
+
+block-do-dash
+
+block-var
+
+block-var-dash

data/spec/haml/nested_viewlet.html.haml

@@ -0,0 +1,11 @@
+%content_viewlet
+  text do
+    outer-viewlet
+
+    %content_viewlet
+      text do
+        inner-viewlet
+
+__END__
+outer-viewlet
+inner-viewlet

data/spec/haml/tag.html.haml

@@ -0,0 +1,4 @@
+%div_viewlet
+
+__END__
+<div></div>

data/spec/haml/variables_by_attributes.html.haml

@@ -0,0 +1,9 @@
+%attributes_viewlet{:attr1 => "attr1"}
+%attributes_viewlet{:attr1 => "attr1", :attr2 => "attr2"}
+%attributes_viewlet{:attr1 => {:nested => "attr"}}
+
+__END__
+attr1
+attr1
+attr2
+nestedattr

data/spec/haml/variables_by_block.html.haml

@@ -0,0 +1,24 @@
+%content_viewlet
+  text "simple"
+
+%content_viewlet
+  - text "simple-dash"
+
+- outside_local_var = "outside-local-var"
+%content_viewlet
+  - text outside_local_var
+
+- @outside_instance_var = "outside-instance-var"
+%content_viewlet
+  - text @outside_instance_var
+
+- extend Module.new(){ def outside_method; "outside-method"; end }
+%content_viewlet
+  - text outside_method
+
+__END__
+simple
+simple-dash
+outside-local-var
+outside-instance-var
+outside-method

data/spec/haml_syntax_spec.rb

@@ -0,0 +1,21 @@
+require "spec_helper"
+require "haml"
+require "viewlet"
+require "viewlet/haml"
+
+describe "HAML syntax" do
+  let(:view) { SimpleView.new }
+
+  Dir[File.dirname(__FILE__) + "/haml/*.haml"].each do |f|
+    it("is able to render #{f}") { check_template(f) }
+  end
+
+  def check_template(file_path)
+    output = Haml::Engine.new(File.read(file_path)).render(view, {})
+    template_piece(output, :first).should == template_piece(File.read(file_path), :last)
+  end
+
+  def template_piece(output, piece=:first)
+    output.split("__END__").send(piece).strip
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+require "rubygems"
+require "bundler/setup"
+
+require "viewlet"
+
+require "haml"
+require "haml/template/plugin" # registers HAML with ActionView
+
+module Rails # stub
+  def self.root
+    Pathname.new(File.expand_path(File.dirname(__FILE__)))
+  end
+end
+
+class SimpleView < ActionView::Base
+  include ActionView::Helpers::CaptureHelper
+  include Viewlet::Helpers
+end
+
+RSpec.configure do |config|
+  config.backtrace_clean_patterns = []
+end

data/spec/viewlet_helper_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+describe "viewlet helper" do
+  let(:view) { SimpleView.new }
+
+  it "does not require a block" do
+    output = view.viewlet(:div)
+    output.should == "<div></div>\n"
+  end
+
+  it "accepts a argument-less block" do
+    output = view.viewlet(:div) {}
+    output.should == "<div></div>\n"
+  end
+
+  it "accepts a block with argument" do
+    output = view.viewlet(:div) { |v| }
+    output.should == "<div></div>\n"
+  end
+
+  it "raises error when variable used in the template is not provided" do
+    expect {
+      view.viewlet(:content)
+    }.to raise_error(ActionView::Template::Error, /undefined local variable or method `text'/)
+  end
+
+  describe "variable setting" do
+    it "allows to pass variables by hash" do
+      output = view.viewlet(:content, :text => "by-hash")
+      output.should == "by-hash\n"
+    end
+
+    it "allows to pass variables by block" do
+      output = view.viewlet(:content) do |v|
+        v.text "by-block"
+      end
+
+      output.should == "by-block\n"
+    end
+
+    it "overrides variables set by hash when set again by block" do
+      output = view.viewlet(:content, :text => "by-hash") do |v|
+        v.text "by-block"
+      end
+
+      output.should == "by-block\n"
+    end
+
+    it "allows to set variable as a block" do
+      output = view.viewlet(:block_without_argument) do |v|
+        v.text { "no-arg" }
+      end
+
+      output.should == "no-arg\n"
+    end
+
+    it "allows to set variable as a block that takes arguments" do
+      output = view.viewlet(:block_with_argument) do |v|
+        v.text { |arg| arg }
+      end
+
+      output.should == "method-argument\ncapture-argument\ncall-argument\n"
+    end
+  end
+end

data/viewlet.gemspec

@@ -16,7 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
+  s.add_runtime_dependency "activesupport"
+  s.add_runtime_dependency "actionpack"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "haml"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viewlet
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dmitriy Kalinin
@@ -15,10 +15,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2012-07-28 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Rails view components
 email: 
 - cppforlife@gmail.com
@@ -30,6 +84,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - MIT.LICENSE
 - README.md
@@ -46,8 +101,21 @@ files:
 - lib/viewlet/railtie.rb
 - lib/viewlet/template.rb
 - lib/viewlet/version.rb
+- spec/app/viewlets/attributes.html.haml
+- spec/app/viewlets/block_with_argument.html.haml
+- spec/app/viewlets/block_without_argument.html.haml
+- spec/app/viewlets/content.html.haml
+- spec/app/viewlets/div.html.haml
+- spec/haml/block_variables_with_arguments.html.haml
+- spec/haml/block_variables_without_arguments.html.haml
+- spec/haml/nested_viewlet.html.haml
+- spec/haml/tag.html.haml
+- spec/haml/variables_by_attributes.html.haml
+- spec/haml/variables_by_block.html.haml
+- spec/haml_syntax_spec.rb
+- spec/spec_helper.rb
+- spec/viewlet_helper_spec.rb
 - viewlet.gemspec
-has_rdoc: true
 homepage: https://github.com/cppforlife/viewlet
 licenses: []
 
@@ -77,9 +145,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails view components
-test_files: []
-
+test_files: 
+- spec/app/viewlets/attributes.html.haml
+- spec/app/viewlets/block_with_argument.html.haml
+- spec/app/viewlets/block_without_argument.html.haml
+- spec/app/viewlets/content.html.haml
+- spec/app/viewlets/div.html.haml
+- spec/haml/block_variables_with_arguments.html.haml
+- spec/haml/block_variables_without_arguments.html.haml
+- spec/haml/nested_viewlet.html.haml
+- spec/haml/tag.html.haml
+- spec/haml/variables_by_attributes.html.haml
+- spec/haml/variables_by_block.html.haml
+- spec/haml_syntax_spec.rb
+- spec/spec_helper.rb
+- spec/viewlet_helper_spec.rb