nyanko 0.0.4 → 0.0.5

data/lib/nyanko/config.rb

@@ -4,6 +4,7 @@ module Nyanko
       attr_accessor(
         :backtrace_limit,
         :cache_units,
+        :compatible_css_class,
         :raise_error,
         :units_directory_path
       )

data/lib/nyanko/controller.rb

@@ -2,10 +2,6 @@ module Nyanko
   module Controller
     extend ActiveSupport::Concern
 
-    included do
-      include Invoker
-    end
-
     module ClassMethods
       private
 

data/lib/nyanko/function.rb

@@ -26,6 +26,22 @@ module Nyanko
       end
     end
 
+    def css_classes
+      if Config.compatible_css_class
+        %W[
+          extension
+          ext_#{unit.name.underscore}
+          ext_#{unit.name.underscore}-#{label}
+        ]
+      else
+        %W[
+          unit
+          unit__#{unit.name.underscore}
+          unit__#{unit.name.underscore}__#{label}
+        ]
+      end
+    end
+
     private
 
     def with_unit_stack(context)

data/lib/nyanko/invoker.rb

@@ -5,6 +5,7 @@ module Nyanko
   module Invoker
     def invoke(*args, &block)
       options = Options.new(*args)
+      defaults_stack << block
       unit_locals_stack << options.locals
       function = FunctionFinder.find(self, options)
       result   = function.invoke(self, options.invoke_options)
@@ -12,15 +13,9 @@ module Nyanko
       result
     rescue Exception => exception
       ExceptionHandler.handle(exception)
-      case
-      when !block
-        nil
-      when view?
-        capture(&block)
-      else
-        instance_exec(&block)
-      end
+      run_default
     ensure
+      defaults_stack.pop
       unit_locals_stack.pop
     end
 
@@ -32,6 +27,16 @@ module Nyanko
       is_a?(ActionView::Base)
     end
 
+    def run_default
+      if block = defaults_stack.last
+        if view?
+          capture(&block)
+        else
+          instance_exec(&block)
+        end
+      end
+    end
+
     private
 
     # Search shared method or locals variable
@@ -45,23 +50,22 @@ module Nyanko
       end
     end
 
+    def defaults_stack
+      @defaults_stack ||= []
+    end
+
     def unit_locals_stack
       @unit_locals_stack ||= []
     end
 
     def surround_with_html_tag(str, function, options)
-      classes = %W[
-        unit
-        unit__#{function.unit.name.underscore}
-        unit__#{function.unit.name.underscore}__#{function.label}
-      ]
       case options.type
       when :plain
         str
       when :inline
-        content_tag(:span, str, :class => classes)
+        content_tag(:span, str, :class => function.css_classes)
       else
-        content_tag(:div, str, :class => classes)
+        content_tag(:div, str, :class => function.css_classes)
       end
     end
   end

data/lib/nyanko/invoker/function_finder.rb

@@ -17,7 +17,7 @@ module Nyanko
         @options[:functions].find do |unit_name, label|
           unit       = find_unit(unit_name)
           identifier = @options[:as] || @context.class
-          next unless unit.active?(@context, @options[:active_if_options])
+          next unless unit.try(:active?, @context, @options[:active_if_options])
           function = unit.find_function(identifier, label)
           break function if function
         end

data/lib/nyanko/railtie.rb

@@ -1,8 +1,8 @@
 module Nyanko
   class Railtie < Rails::Railtie
     initializer "nyanko" do |app|
-      ::ActionView::Base.send(:include, Invoker, Helper, UnitProxyProvider)
-      ::ActionController::Base.send(:include, Controller)
+      ::ActionView::Base.send(:include, Helper, Invoker, UnitProxyProvider)
+      ::ActionController::Base.send(:include, Controller, Invoker, UnitProxyProvider)
       ::ActiveRecord::Base.send(:include, UnitProxyProvider)
       ::ActiveRecord::Relation.send(:include, UnitProxyProvider)
       ::ActiveRecord::Associations::CollectionAssociation.send(:include, UnitProxyProvider)

data/lib/nyanko/unit.rb

@@ -12,8 +12,6 @@ module Nyanko
     module ClassMethods
       attr_accessor :current_scope
 
-      delegate :active?, :to => :@active_if
-
       def scope(identifier)
         self.current_scope = ScopeFinder.find(identifier)
         scopes[current_scope] ||= {}
@@ -25,6 +23,7 @@ module Nyanko
       def function(label, &block)
         functions[label] = Function.new(self, label, &block)
       end
+      alias_method :callback, :function
 
       def shared(label, &block)
         shared_methods[label] = block
@@ -42,6 +41,10 @@ module Nyanko
         @active_if = ActiveIf.new(*conditions, &block)
       end
 
+      def active?(context, options = {})
+        @active_if.active?(context, options.merge(:unit => self))
+      end
+
       def any(*labels)
         ActiveIf::Any.new(*labels)
       end

data/lib/nyanko/version.rb

@@ -1,3 +1,3 @@
 module Nyanko
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/fixtures/units/example_unit/example_unit.rb

@@ -21,6 +21,10 @@ module ExampleUnit
     function(:alias) do
       "alias"
     end
+
+    function(:default) do
+      run_default
+    end
   end
 
   scope(:view) do

data/spec/nyanko/invoker_spec.rb

@@ -50,6 +50,19 @@ module Nyanko
         end
       end
 
+      context "when compatible css class option is specified" do
+        around do |example|
+          origin, Config.compatible_css_class = Config.compatible_css_class, true
+          example.run
+          Config.compatible_css_class = origin
+        end
+
+        it "invokes and returns result surrounded by div" do
+          view.invoke(:example_unit, :test).should ==
+            '<div class="extension ext_example_unit ext_example_unit-test">test</div>'
+        end
+      end
+
       context "when type is :plain" do
         it "invokes defined function for current context and return result" do
           view.invoke(:example_unit, :test, :type => :plain).should == "test"
@@ -69,6 +82,18 @@ module Nyanko
         end
       end
 
+      context "when run_default is called in function" do
+        it "invokes given block as a fallback" do
+          controller.invoke(:example_unit, :default) { "default" }.should == "default"
+        end
+      end
+
+      context "when run_default is called but no block given" do
+        it "invokes given block as a fallback" do
+          controller.invoke(:example_unit, :default).should == nil
+        end
+      end
+
       context "when non-existent unit is specified" do
         it "does nothing" do
           view.invoke(:non_existent_unit, :test, :type => :plain).should == nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyanko
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors: