viewlet 0.0.1 → 0.0.3

data/README.md

@@ -143,7 +143,22 @@ To include list_section viewlet JS in your application add
 
 to your `application.js`
 
-## Misc
+## Tips
+
+* You do not have to provide a block to `viewlet`:
+
+```haml
+= viewlet(:password_strength)
+```
+
+* You can use hash syntax (and block syntax):
+
+```haml
+= viewlet(:password_strength, :levels => %w(none weak good))
+
+= viewlet(:password_strength, :levels => %w(none weak good)) do |ps|
+  - ps.levels %w(none weak good excellent) # overrides levels
+```
 
 * Let's say we decide to make our list_section viewlet use
 third-party list re-ordering library (e.g. `orderable-list.js`).
@@ -189,14 +204,31 @@ that could be used as HTML id.
 `class_name` option lets you set custom viewlet class:
 
 ```haml
-= viewlet(:list_section, :class_name => "CustomListSectionViewlet") do
+= viewlet(:list_section, {}, :class_name => "CustomListSectionViewlet") do
   ...
 ```
 
-* You do not have to pass in block to `viewlet`:
+* If you are using HAML you can use special syntax to output a viewlet:
 
 ```haml
-= viewlet(:password_strength)
+%list_section_viewlet # viewlet name suffixed with '_viewlet'
+  heading "Group members"
+  empty_description "No members in this group"
+
+  collapse_button false
+  add_button do
+    = link_to "Invite Members", new_group_member_path(@group)
+
+  items @group.members
+
+  row_title do |member|
+    .name= member.name
+    .summary= member.summary
+
+  row_details do |member|
+    = render :partial => "some_other_partial", :locals => {:member => member}
+
+%password_strength_viewlet{:levels => %w(none weak good)}
 ```
 
 ## Todo

data/examples/bootstrap_progress_bar/bootstrap_progress_bar.html.haml

@@ -0,0 +1,4 @@
+- css_classes = [("active" if defined?(active)), ("progress-striped" if defined?(striped))]
+
+.progress{:class => css_classes.join(" ")}
+  .bar{:percent => "#{width}%"}

data/examples/bootstrap_progress_bar/usage.hml.haml

@@ -0,0 +1,6 @@
+%progress_bar_viewlet{:percent => 20, :stripped => true, :active => true}
+
+%progress_bar_viewlet
+  percent 20
+  stripped
+  active

data/lib/viewlet/base.rb

@@ -17,14 +17,14 @@ module Viewlet
 
     private
 
-    def method_missing(method, *args, &block)
-      is_write_op = if @variables[method].is_a?(Proc)
+    def method_missing(variable_name, *args, &block)
+      is_write_op = if @variables[variable_name].is_a?(Proc)
         block.present?
       else
         args.any? || block.present?
       end
 
-      send("_#{is_write_op ? :write : :read}_variable", method, *args, &block)
+      send("_#{is_write_op ? :write : :read}_variable", variable_name, *args, &block)
     end
 
     def _read_variable(name, *args, &block)

data/lib/viewlet/haml.rb

@@ -0,0 +1,70 @@
+Haml::Parser.class_eval do
+  # `%simple_viewlet` becomes `= viewlet(:simple)`
+  # `%complex_viewlet` becomes `= viewlet(:complex) do |viewlet_0|`
+  def push_with_viewlet_tag(node)
+    if node.value[:name].try(:end_with?, "_viewlet")
+      node = build_viewlet_node(node)
+    end
+    push_without_viewlet_tag(node)
+  end
+  alias_method_chain :push, :viewlet_tag
+
+  raise "Haml::Parser#close_script already defined" if private_method_defined?(:close_script)
+  def close_script(node)
+    viewlet_pop
+  end
+
+  # `prop "whatever"` becomes `- viewlet_0.prop "whatever"`
+  def plain_with_viewlet_parent_tag(text, escape_html = nil)
+    if viewlet_definition?
+      silent_script(" #{viewlet_peek}.#{text}")
+    else
+      plain_without_viewlet_parent_tag(text, escape_html)
+    end
+  end
+  alias_method_chain :plain, :viewlet_parent_tag
+
+  private
+
+  def build_viewlet_node(node)
+    name = node.value[:name].gsub(/_viewlet$/, "")
+    attrs = attributes_string(node.value[:attributes_hashes])
+    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}"
+    else
+      attributes_hashes = ", (#{attributes_hashes.join(").merge(")})"
+    end
+  end
+
+  def viewlet_peek
+    viewlet_names.last.try(:first)
+  end
+
+  # Viewlet variables can only be configured
+  # on the next indentation level from viewlet call
+  def viewlet_definition?
+    if viewlet_names.last
+      @line.tabs == viewlet_names.last.last + 1
+    end
+  end
+
+  def viewlet_push
+    viewlet_names.push(["viewlet_#{viewlet_names.size}", @line.tabs])
+    viewlet_peek
+  end
+
+  def viewlet_pop
+    viewlet_names.pop
+  end
+
+  def viewlet_names
+    @viewlet_names ||= []
+  end
+end

data/lib/viewlet/helpers.rb

@@ -1,9 +1,13 @@
 module Viewlet
   module Helpers
-    def viewlet(name, options={}, &block)
+    def viewlet(name, variables={}, options={}, &block)
       klass = options[:class_name].try(:constantize) || Base
       viewlet = klass.new(name, self)
 
+      variables.each do |name, value|
+        viewlet.send(name, value)
+      end
+
       case block.arity
         when 0 then block.call
         when 1 then block.call(viewlet)

data/lib/viewlet/railtie.rb

@@ -1,9 +1,13 @@
 module Viewlet
   class Railtie < ::Rails::Railtie
-    initializer "viewlets.view_helpers" do
+    initializer "viewlet.view_helpers" do
       ActionView::Base.send :include, Viewlet::Helpers
     end
 
+    config.before_configuration do
+      require "viewlet/haml" if defined?(Haml)
+    end
+
     config.to_prepare do |app|
       Rails.application.config.assets.paths << Rails.root.join("app", "viewlets")
     end

data/lib/viewlet/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: viewlet
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dmitriy Kalinin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-20 00:00:00 -07:00
+date: 2012-07-24 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,11 +34,14 @@ files:
 - MIT.LICENSE
 - README.md
 - Rakefile
+- examples/bootstrap_progress_bar/bootstrap_progress_bar.html.haml
+- examples/bootstrap_progress_bar/usage.hml.haml
 - examples/bootstrap_tabs/bootstrap_tabs.html.haml
 - examples/bootstrap_tabs/plugin.js
 - examples/bootstrap_tabs/usage.html.haml
 - lib/viewlet.rb
 - lib/viewlet/base.rb
+- lib/viewlet/haml.rb
 - lib/viewlet/helpers.rb
 - lib/viewlet/railtie.rb
 - lib/viewlet/template.rb