styler 0.1.2 → 0.2.0

data/lib/styler/mixins/rango.rb

@@ -7,21 +7,8 @@ module Styler
   end
 end
 
-module Styler
-  module RangoMixin
-    include Rango::ImplicitRendering
-    def render(template, *models)
-      models.each {|name|
-        instance_variable_set(
-          "@#{name}",
-          ::Styler.new_style_for(
-            instance_variable_get("@#{name}"),
-            {__controller: self}
-          )
-        )
-      }
-      super(template)
-    end
+module Rango::Helpers
+  def style(model)
+    Styler.new_style_for(model)
   end
 end
-

data/lib/styler/style.rb

@@ -42,14 +42,14 @@ module Styler
       def initialize(model, context={})
         serialize_from_hash(context)
         @model = model
-        @type ||= :default
+        @__type ||= :default
       end
 
       attr_reader :model, :request
 
       # Use like style.as(:widget)
       def as(type)
-        @type = type
+        @__type = type
         self
       end
 
@@ -68,7 +68,7 @@ module Styler
 
       # This method compiles the default template path.
       def compile_template_path
-        "#{__class__.to_s.downcase.gsub('::','/')}/#{@type}"
+        "#{__class__.to_s.downcase.gsub('::','/')}/#{@__type}"
       end
 
       alias_method :__class__, :class

data/test/suite/lib/styler/style.rb

@@ -33,20 +33,20 @@ BareTest.suite do
           setup :style, "a style" do
             @model = Model::Foo.new
             @style = ::Styler.new_style_for(@model)
-            @result = [["style/foo/default"], {:@model => @model, :@type => :default}]
+            @result = [["style/foo/default"], {:@model => @model, :@__type => :default}]
           end
           setup :style, "a complex style" do
             @model = Model::Foo.new
             @style = ::Styler.new_style_for(@model)
             @style.with(:bla => "foo")
-            @result = [["style/foo/default"], {:@model => @model, :@type => :default, :@bla => "foo"}]
+            @result = [["style/foo/default"], {:@model => @model, :@__type => :default, :@bla => "foo"}]
           end
           setup :style, "a style with context" do
             model = Model::Foo.new
             style = ::Styler.new_style_for(model)
             style.with(:bla => "foo")
             @style = style.foo
-            @result = [["style/bar/default"], {:@foo => style, :@model => @style.model, :@type => :default, :@bla => "foo"}]
+            @result = [["style/bar/default"], {:@foo => style, :@model => @style.model, :@__type => :default, :@bla => "foo"}]
           end
           assert "it renders :style correctly" do
             equal(@result, @style.to_s)

metadata

@@ -4,16 +4,16 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Simon Hafner aka Tass
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-03-15 00:00:00 +01:00
+date: 2010-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: []