nyanko 0.0.5 → 0.0.6

data/Gemfile

@@ -16,6 +16,7 @@ end
 
 group :development, :test do
   gem "pry-rails"
+  gem "thin"
 end
 
 group :assets do

data/lib/nyanko/config.rb

@@ -4,14 +4,19 @@ module Nyanko
       attr_accessor(
         :backtrace_limit,
         :cache_units,
+        :clear_units_cache,
         :compatible_css_class,
+        :enable_logger,
+        :proxy_method_name,
         :raise_error,
         :units_directory_path
       )
 
       def reset
         self.backtrace_limit      = 10
-        self.cache_units          = !Rails.env.development?
+        self.clear_units_cache    = Rails.env.development? || Rails.env.test?
+        self.enable_logger        = true
+        self.proxy_method_name    = :unit
         self.raise_error          = Rails.env.development?
         self.units_directory_path = "app/units"
       end

data/lib/nyanko/controller.rb

@@ -5,6 +5,17 @@ module Nyanko
     module ClassMethods
       private
 
+      def inherited(base)
+        if Config.clear_units_cache && base.name == "ApplicationController"
+          base.class_eval do
+            prepend_before_filter do
+              Nyanko::Loader.cache.clear
+            end
+          end
+        end
+        super
+      end
+
       def unit_action(unit_name, *function_names, &block)
         options = function_names.extract_options!
         block ||= Proc.new { head 400 }

data/lib/nyanko/exception_handler.rb

@@ -2,42 +2,9 @@ module Nyanko
   module ExceptionHandler
     class << self
       def handle(exception)
-        logger.debug Message.new(exception).to_s
+        Logger.debug(exception)
         raise exception if Config.raise_error
       end
-
-      def logger
-        Rails.logger
-      end
-    end
-
-    class Message
-      def initialize(exception)
-        @exception = exception
-      end
-
-      def to_s
-        "#{prefix} #{klass}#{body}\n#{backtrace}"
-      end
-
-      def prefix
-        "  [Nyanko]"
-      end
-
-      def body
-        unless @exception.message.empty?
-          " - #{@exception}"
-        end
-      end
-
-      def klass
-        @exception.class
-      end
-
-      def backtrace
-        lines = @exception.backtrace[0...Config.backtrace_limit]
-        lines.map {|line| "#{prefix}   #{line}" }.join("\n")
-      end
     end
   end
 end

data/lib/nyanko/function.rb

@@ -55,12 +55,11 @@ module Nyanko
 
     def with_unit_view_path(context)
       if context.view?
-        origin = context.view_paths
         context.view_paths.unshift unit.view_path
       end
       yield
     ensure
-      context.view_paths = origin if context.view?
+      context.view_paths.paths.unshift if context.view?
     end
   end
 end

data/lib/nyanko/invoker.rb

@@ -11,6 +11,8 @@ module Nyanko
       result   = function.invoke(self, options.invoke_options)
       result   = surround_with_html_tag(result, function, options) if view?
       result
+    rescue FunctionFinder::FunctionNotFound
+      run_default
     rescue Exception => exception
       ExceptionHandler.handle(exception)
       run_default

data/lib/nyanko/loader.rb

@@ -19,7 +19,7 @@ module Nyanko
     end
 
     def load
-      if loaded? && Config.cache_units
+      if loaded?
         load_from_cache
       else
         load_from_file

data/lib/nyanko/logger.rb

@@ -0,0 +1,60 @@
+module Nyanko
+  module Logger
+
+    class << self
+      ::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
+        end
+      end
+
+      def decorate(message)
+        Message.new(message).to_s
+      end
+
+      def logger
+        Rails.logger
+      end
+    end
+
+    class Message
+      PREFIX = "  [Nyanko]"
+
+      def initialize(object)
+        @object = object
+      end
+
+      def to_s
+        prefix(content)
+      end
+
+      def prefix(str)
+        str.split("\n").map {|line| "#{PREFIX} #{line}" }.join("\n")
+      end
+
+      def content
+        if @object.is_a?(Exception)
+          "#{klass}#{body}\n#{backtrace}"
+        else
+          @object.to_s
+        end
+      end
+
+      def body
+        unless @object.message.empty?
+          " - #@object"
+        end
+      end
+
+      def klass
+        @object.class
+      end
+
+      def backtrace
+        lines = @object.backtrace[0...Config.backtrace_limit]
+        lines.map {|line| "  #{line}" }.join("\n")
+      end
+    end
+  end
+end

data/lib/nyanko/unit.rb

@@ -62,11 +62,10 @@ module Nyanko
       end
 
       def find_function(identifier, label)
-        klass      = ScopeFinder.find(identifier)
-        candidates = scopes.keys
-        target     = klass.ancestors.find {|klass| scopes[klass] }
-        scope      = scopes[target]
-        scope[label] if scope
+        scope     = ScopeFinder.find(identifier)
+        target    = scope.ancestors.find {|klass| scopes[klass] }
+        functions = scopes[target]
+        functions[label] if functions
       end
 
       def functions

data/lib/nyanko/unit_proxy_provider.rb

@@ -7,12 +7,20 @@ module Nyanko
       include Helper
     end
 
-    def unit(name = nil)
-      name ||= Function.current_unit.try(:to_key)
-      if name && unit = Loader.load(name)
-        UnitProxy.new(unit, self)
+    def method_missing(method_name, *args, &block)
+      if method_name == Config.proxy_method_name.to_sym
+        class_eval do
+          define_method(method_name) do |*_args|
+            name = _args.first || Function.current_unit.try(:to_key)
+            if name && unit = Loader.load(name)
+              UnitProxy.new(unit, self)
+            end
+          end
+        end
+        send(method_name, args.first)
+      else
+        super
       end
     end
-    alias_method :ext, :unit
   end
 end

data/lib/nyanko/version.rb

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

data/lib/nyanko.rb

@@ -12,6 +12,7 @@ require "nyanko/function"
 require "nyanko/helper"
 require "nyanko/invoker"
 require "nyanko/loader"
+require "nyanko/logger"
 require "nyanko/railtie"
 require "nyanko/unit"
 require "nyanko/unit_proxy"

data/nyanko.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "slim"
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "thin"
   gem.add_development_dependency "uglifier"
 end

data/spec/controllers/application_controller_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe ApplicationController do
+  controller do
+    def index
+      head 200
+    end
+  end
+
+  it "clears cache before each request" do
+    Nyanko::Loader.cache.should_receive(:clear).exactly(2)
+    get :index
+    get :index
+  end
+end

data/spec/nyanko/exception_handler_spec.rb

@@ -2,33 +2,6 @@ require "spec_helper"
 
 module Nyanko
   describe ExceptionHandler do
-    let(:exception) do
-      exception = Exception.new("error message")
-      exception.set_backtrace(20.times.map {|i| "test.rb:#{i + 1}:in `method#{i + 1}'" })
-      exception
-    end
-
-    let(:lines) do
-      <<-EOS.strip_heredoc.split("\n").map {|line| "  #{line}" }
-        [Nyanko] Exception - error message
-        [Nyanko]   test.rb:1:in `method1'
-        [Nyanko]   test.rb:2:in `method2'
-        [Nyanko]   test.rb:3:in `method3'
-        [Nyanko]   test.rb:4:in `method4'
-        [Nyanko]   test.rb:5:in `method5'
-        [Nyanko]   test.rb:6:in `method6'
-        [Nyanko]   test.rb:7:in `method7'
-        [Nyanko]   test.rb:8:in `method8'
-        [Nyanko]   test.rb:9:in `method9'
-        [Nyanko]   test.rb:10:in `method10'
-      EOS
-    end
-
-    it "logs exception as debug level" do
-      Rails.logger.should_receive(:debug).with(lines.join("\n"))
-      described_class.handle(exception)
-    end
-
     context "when Config.raise_error is truthy" do
       around do |example|
         origin, Config.raise_error = Config.raise_error, true
@@ -37,20 +10,7 @@ module Nyanko
       end
 
       it "raises up error" do
-        expect { described_class.handle(exception) }.to raise_error
-      end
-    end
-
-    describe "when Config.backtrace_limit is configured" do
-      around do |example|
-        origin, Config.backtrace_limit = Config.backtrace_limit, 5
-        example.run
-        Config.backtrace_limit = origin
-      end
-
-      it "prints backtrace up to configured depth" do
-        Rails.logger.should_receive(:debug).with(lines[0..5].join("\n"))
-        described_class.handle(exception)
+        expect { described_class.handle(Exception.new) }.to raise_error
       end
     end
   end

data/spec/nyanko/invoker_spec.rb

@@ -113,6 +113,13 @@ module Nyanko
         end
       end
 
+      context "when function is not found" do
+        it "runs default but not handled by ExceptionHandler" do
+          ExceptionHandler.should_not_receive(:handle)
+          view.invoke(:example_unit, :non_existent_function) { "default" }.should == "default"
+        end
+      end
+
       context "when an error is raised in invoking" do
         context "when block is given" do
           context "when context is a view" do

data/spec/nyanko/loader_spec.rb

@@ -38,20 +38,6 @@ module Nyanko
           described_class.load(:non_existent_unit)
         end
       end
-
-      context "when Config.cache_unit is false" do
-        around do |example|
-          origin, Config.cache_units = Config.cache_units, false
-          example.run
-          Config.cache_units = origin
-        end
-
-        it "loads unit without cache" do
-          described_class.any_instance.should_not_receive(:load_from_cache)
-          described_class.load(:example_unit)
-          described_class.load(:example_unit)
-        end
-      end
     end
   end
 end

data/spec/nyanko/logger_spec.rb

@@ -0,0 +1,90 @@
+require "spec_helper"
+require "stringio"
+
+module Nyanko
+  describe Logger do
+    around do |example|
+      origin, Rails.logger = Rails.logger, ::Logger.new(io)
+      example.run
+      Rails.logger = origin
+    end
+
+    let(:io) do
+      StringIO.new
+    end
+
+    let(:log) do
+      io.string.rstrip
+    end
+
+    let(:exception) do
+      exception = Exception.new("error message")
+      exception.set_backtrace(20.times.map {|i| "test.rb:#{i + 1}:in `method#{i + 1}'" })
+      exception
+    end
+
+    let(:lines) do
+      <<-EOS.strip_heredoc.split("\n").map {|line| "  #{line}" }
+        [Nyanko] Exception - error message
+        [Nyanko]   test.rb:1:in `method1'
+        [Nyanko]   test.rb:2:in `method2'
+        [Nyanko]   test.rb:3:in `method3'
+        [Nyanko]   test.rb:4:in `method4'
+        [Nyanko]   test.rb:5:in `method5'
+        [Nyanko]   test.rb:6:in `method6'
+        [Nyanko]   test.rb:7:in `method7'
+        [Nyanko]   test.rb:8:in `method8'
+        [Nyanko]   test.rb:9:in `method9'
+        [Nyanko]   test.rb:10:in `method10'
+      EOS
+    end
+
+    context "when Config.enable_logger is true" do
+      around do |example|
+        origin, Config.enable_logger = Config.enable_logger, true
+        example.run
+        Config.enable_logger = origin
+      end
+
+      context "when given Exception" do
+        it "parses and logs it" do
+          described_class.debug(exception)
+          log.should == lines.join("\n")
+        end
+
+        context "when Config.backtrace_limit is configured" do
+          around do |example|
+            origin, Config.backtrace_limit = Config.backtrace_limit, 5
+            example.run
+            Config.backtrace_limit = origin
+          end
+
+          it "prints backtrace up to configured depth" do
+            described_class.debug(exception)
+            log.should == lines[0..5].join("\n")
+          end
+        end
+      end
+
+      context "when given String" do
+        it "adds prefix" do
+          described_class.debug("test")
+          log.should == "  [Nyanko] test"
+        end
+      end
+    end
+
+    context "when Config.enable_logger is false" do
+      around do |example|
+        origin, Config.enable_logger = Config.enable_logger, false
+        example.run
+        Config.enable_logger = origin
+      end
+
+      it "logs nothing" do
+        described_class.debug("test")
+        log.should == ""
+      end
+    end
+  end
+end

data/spec/nyanko/unit_proxy_provider_spec.rb

@@ -7,10 +7,6 @@ module Nyanko
     end
 
     describe "#unit" do
-      it "is aliased with `ext`" do
-        view.ext(:example_unit).should be_a UnitProxy
-      end
-
       context "when given unit name" do
         it "returns proxy for specified unit" do
           proxy = view.unit(:example_unit)
@@ -33,6 +29,20 @@ module Nyanko
           proxy.unit.should == ExampleUnit
         end
       end
+
+      context "when Config.proxy_method_name is configured" do
+        around do |example|
+          origin, Config.proxy_method_name = Config.proxy_method_name, :proxy
+          example.run
+          Config.proxy_method_name = origin
+        end
+
+        it "change this method name with it" do
+          proxy = view.proxy(:example_unit)
+          proxy.should be_a UnitProxy
+          view.should be_respond_to(:proxy)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyanko
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -194,6 +210,7 @@ files:
 - lib/nyanko/invoker/function_finder.rb
 - lib/nyanko/invoker/options.rb
 - lib/nyanko/loader.rb
+- lib/nyanko/logger.rb
 - lib/nyanko/railtie.rb
 - lib/nyanko/unit.rb
 - lib/nyanko/unit/extender.rb
@@ -204,6 +221,7 @@ files:
 - lib/nyanko/unit_proxy_provider.rb
 - lib/nyanko/version.rb
 - nyanko.gemspec
+- spec/controllers/application_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -255,6 +273,7 @@ files:
 - spec/nyanko/helper_spec.rb
 - spec/nyanko/invoker_spec.rb
 - spec/nyanko/loader_spec.rb
+- spec/nyanko/logger_spec.rb
 - spec/nyanko/unit/extender_spec.rb
 - spec/nyanko/unit/scope_finder_spec.rb
 - spec/nyanko/unit_proxy_provider_spec.rb
@@ -286,6 +305,7 @@ signing_key:
 specification_version: 3
 summary: Rails extension tool
 test_files:
+- spec/controllers/application_controller_spec.rb
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -337,6 +357,7 @@ test_files:
 - spec/nyanko/helper_spec.rb
 - spec/nyanko/invoker_spec.rb
 - spec/nyanko/loader_spec.rb
+- spec/nyanko/logger_spec.rb
 - spec/nyanko/unit/extender_spec.rb
 - spec/nyanko/unit/scope_finder_spec.rb
 - spec/nyanko/unit_proxy_provider_spec.rb