nyanko 0.0.8 → 0.0.9

data/lib/nyanko/active_if.rb

@@ -18,6 +18,8 @@ module Nyanko
       end
     end
 
+    attr_reader :conditions, :options
+
     def initialize(*conditions, &block)
       @options    = conditions.extract_options!
       @conditions = conditions
@@ -30,7 +32,7 @@ module Nyanko
 
     def blocks
       @blocks ||= begin
-        @conditions.map do |condition|
+        conditions.map do |condition|
           condition.is_a?(Any) ? condition.to_block : self.class.find(condition)
         end << @block
       end.compact

data/lib/nyanko/function.rb

@@ -23,7 +23,7 @@ module Nyanko
         with_unit_view_path(context) do
           capture_exception(context) do
             result = context.instance_eval(&block)
-            result = decorate(result, context, options[:type]) if context.view?
+            result = decorate(result, context, options[:type]) if context.view? && result.present?
             result
           end
         end

data/lib/nyanko/invoker.rb

@@ -33,14 +33,18 @@ module Nyanko
     def method_missing(method_name, *args, &block)
       if shared_method = __find_shared_method(method_name)
         instance_exec(*args, &shared_method)
-      elsif args.empty? && local = __find_unit_local(method_name)
-        local
+      elsif args.empty? && __find_unit_local(method_name)
+        __fetch_unit_local(method_name)
       else
         super
       end
     end
 
     def __find_unit_local(method_name)
+      __current_unit_locals.has_key?(method_name)
+    end
+
+    def __fetch_unit_local(method_name)
       __current_unit_locals[method_name]
     end
 

data/lib/nyanko/logger.rb

@@ -5,7 +5,7 @@ module Nyanko
       ::Logger::Severity.constants.each do |level|
         method_name = level.downcase
         define_method(method_name) do |message|
-          logger.send(method_name, decorate(message)) if Config.enable_logger
+          logger.try(method_name, decorate(message)) if Config.enable_logger
         end
       end
 

data/lib/nyanko/test.rb

@@ -1,7 +1,13 @@
 module Nyanko
   module Test
-    def self.activations
-      @activations ||= {}
+    class << self
+      def activations
+        @activations ||= {}
+      end
+
+      def included(base)
+        base.send :include, UnitProxyProvider
+      end
     end
 
     def enable_unit(unit_name)

data/lib/nyanko/unit/extender/active_record_class_methods.rb

@@ -37,9 +37,10 @@ module Nyanko
         %w[belongs_to has_many has_one].each do |method_name|
           class_eval <<-EOS
             def #{method_name}(*args, &block)
-              name    = @prefix + args.shift.to_s
+              label   = args.shift.to_s
+              name    = @prefix + label
               options = args.extract_options!
-              options = options.reverse_merge(:class_name => @mod.to_s)
+              options = options.reverse_merge(:class_name => label.singularize.camelize)
               args << options
               @mod.#{method_name}(name.to_sym, *args, &block)
             end

data/lib/nyanko/unit_proxy_provider.rb

@@ -4,7 +4,6 @@ module Nyanko
 
     included do
       extend UnitProxyProvider
-      include Helper
     end
 
     # Define #unit method in this class when #unit is called in first time.

data/lib/nyanko/version.rb

@@ -1,3 +1,3 @@
 module Nyanko
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

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

@@ -44,6 +44,10 @@ module ExampleUnit
       key
     end
 
+    function(:falsy) do
+      key.nil?
+    end
+
     function(:shared) do
       shared("args")
     end
@@ -59,6 +63,10 @@ module ExampleUnit
     function(:render) do
       render "/test", :local => "test"
     end
+
+    function(:blank) do
+      " "
+    end
   end
 
   helpers do

data/spec/nyanko/invoker_spec.rb

@@ -28,6 +28,11 @@ module Nyanko
           should == "value"
       end
 
+      it "invokes with falsy locals" do
+        view.invoke(:example_unit, :falsy, :locals => { :key => nil }, :type => :plain).
+          should == true
+      end
+
       it "invokes with shared method" do
         view.invoke(:example_unit, :shared, :type => :plain).should == "shared args"
       end
@@ -74,11 +79,17 @@ module Nyanko
       end
 
       context "when type is :plain" do
-        it "invokes defined function for current context and return result" do
+        it "does not surround result with html element" do
           view.invoke(:example_unit, :test, :type => :plain).should == "test"
         end
       end
 
+      context "when the result is blank" do
+        it "does not surround result with html element" do
+          view.invoke(:example_unit, :blank).should == " "
+        end
+      end
+
       context "when type is :inline" do
         it "invokes and returns result surrounded by span" do
           view.invoke(:example_unit, :test, :type => :inline).should ==

data/spec/nyanko/logger_spec.rb

@@ -80,5 +80,15 @@ module Nyanko
         log.should == ""
       end
     end
+
+    context "when Rails.logger is nil" do
+      before do
+        Rails.stub(:logger)
+      end
+
+      it "does notihng" do
+        expect { described_class.debug(exception) }.not_to raise_error(NoMethodError)
+      end
+    end
   end
 end

data/spec/nyanko/unit_spec.rb

@@ -122,6 +122,8 @@ module Nyanko
           expand(:ExampleModel) do
             scope :active, lambda { where(:deleted_at => nil) }
 
+            has_one :user
+
             def test
               "test"
             end
@@ -144,6 +146,12 @@ module Nyanko
               define_method(name) { "scoped" }
             end
           end
+
+          def self.has_one(name, *args)
+            singleton_class.class_eval do
+              define_method(name) { args }
+            end
+          end
         end
       end
 
@@ -155,9 +163,13 @@ module Nyanko
         ExampleModel.__example_unit_test.should == "test"
       end
 
-      it "defines association methods with prefix" do
+      it "defines scope method with prefix" do
         ExampleModel.__example_unit_active.should == "scoped"
       end
+
+      it "defines has_one association method with prefix" do
+        ExampleModel.__example_unit_user.should == [:class_name => "User"]
+      end
     end
 
     describe ".view_path" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyanko
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -375,3 +375,4 @@ test_files:
 - spec/nyanko/unit_proxy_spec.rb
 - spec/nyanko/unit_spec.rb
 - spec/spec_helper.rb
+has_rdoc: