nyanko 0.0.6 → 0.0.7

data/lib/nyanko/config.rb

@@ -2,9 +2,9 @@ module Nyanko
   module Config
     class << self
       attr_accessor(
+        :auto_reload,
         :backtrace_limit,
         :cache_units,
-        :clear_units_cache,
         :compatible_css_class,
         :enable_logger,
         :proxy_method_name,
@@ -13,8 +13,10 @@ module Nyanko
       )
 
       def reset
+        self.auto_reload          = Rails.env.development? || Rails.env.test?
         self.backtrace_limit      = 10
-        self.clear_units_cache    = Rails.env.development? || Rails.env.test?
+        self.cache_units          = false
+        self.compatible_css_class = false
         self.enable_logger        = true
         self.proxy_method_name    = :unit
         self.raise_error          = Rails.env.development?

data/lib/nyanko/controller.rb

@@ -6,7 +6,7 @@ module Nyanko
       private
 
       def inherited(base)
-        if Config.clear_units_cache && base.name == "ApplicationController"
+        if Config.auto_reload && base.name == "ApplicationController"
           base.class_eval do
             prepend_before_filter do
               Nyanko::Loader.cache.clear

data/lib/nyanko/function.rb

@@ -30,14 +30,14 @@ module Nyanko
       if Config.compatible_css_class
         %W[
           extension
-          ext_#{unit.name.underscore}
-          ext_#{unit.name.underscore}-#{label}
+          ext_#{unit.unit_name}
+          ext_#{unit.unit_name}-#{label}
         ]
       else
         %W[
           unit
-          unit__#{unit.name.underscore}
-          unit__#{unit.name.underscore}__#{label}
+          unit__#{unit.unit_name}
+          unit__#{unit.unit_name}__#{label}
         ]
       end
     end
@@ -55,11 +55,11 @@ module Nyanko
 
     def with_unit_view_path(context)
       if context.view?
-        context.view_paths.unshift unit.view_path
+        context.view_paths.unshift unit.resolver
       end
       yield
     ensure
-      context.view_paths.paths.unshift if context.view?
+      context.view_paths.paths.shift if context.view?
     end
   end
 end

data/lib/nyanko/helper.rb

@@ -1,8 +1,8 @@
 module Nyanko
   module Helper
     class << self
-      def define(class_name, &block)
-        prefix = UnitProxy.generate_prefix(class_name)
+      def define(unit_name, &block)
+        prefix = UnitProxy.generate_prefix(unit_name)
         define_methods_with_prefix(prefix, &block)
       end
 

data/lib/nyanko/unit.rb

@@ -30,7 +30,7 @@ module Nyanko
       end
 
       def helpers(&block)
-        Helper.define(name, &block)
+        Helper.define(unit_name, &block)
       end
 
       def models(&block)
@@ -49,16 +49,16 @@ module Nyanko
         ActiveIf::Any.new(*labels)
       end
 
-      def to_key
-        name.underscore.to_sym
+      def unit_name
+        @unit_name ||= name.underscore.to_sym
       end
 
       def to_prefix
-        UnitProxy.generate_prefix(name)
+        UnitProxy.generate_prefix(unit_name)
       end
 
       def view_path
-        "#{Config.units_directory_path}/#{name.underscore}/views"
+        "#{Config.units_directory_path}/#{unit_name}/views"
       end
 
       def find_function(identifier, label)
@@ -80,6 +80,10 @@ module Nyanko
         @shared_methods ||= {}
       end
 
+      def resolver
+        @resolver ||= ActionView::OptimizedFileSystemResolver.new(view_path)
+      end
+
       def extender
         @extender ||= Extender.new(to_prefix)
       end

data/lib/nyanko/unit_proxy.rb

@@ -4,8 +4,8 @@ module Nyanko
   class UnitProxy
     attr_reader :unit
 
-    def self.generate_prefix(name)
-      %{__#{name.underscore.gsub("/", "_")}_}
+    def self.generate_prefix(unit_name)
+      "__#{unit_name}_"
     end
 
     def initialize(unit, context)
@@ -20,7 +20,7 @@ module Nyanko
     private
 
     def prefix
-      self.class.generate_prefix(@unit.name)
+      self.class.generate_prefix(@unit.unit_name)
     end
 
     def method_missing(method_name, *args, &block)

data/lib/nyanko/unit_proxy_provider.rb

@@ -8,10 +8,10 @@ module Nyanko
     end
 
     def method_missing(method_name, *args, &block)
-      if method_name == Config.proxy_method_name.to_sym
-        class_eval do
+      if Array.wrap(Config.proxy_method_name).include?(method_name)
+        UnitProxyProvider.class_eval do
           define_method(method_name) do |*_args|
-            name = _args.first || Function.current_unit.try(:to_key)
+            name = _args.first || Function.current_unit.try(:unit_name)
             if name && unit = Loader.load(name)
               UnitProxy.new(unit, self)
             end

data/lib/nyanko/version.rb

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

data/spec/nyanko/exception_handler_spec.rb

@@ -3,10 +3,8 @@ require "spec_helper"
 module Nyanko
   describe ExceptionHandler do
     context "when Config.raise_error is truthy" do
-      around do |example|
-        origin, Config.raise_error = Config.raise_error, true
-        example.run
-        Config.raise_error = origin
+      before do
+        Config.raise_error = true
       end
 
       it "raises up error" do

data/spec/nyanko/helper_spec.rb

@@ -14,7 +14,7 @@ module Nyanko
       end
 
       it "defines helper methods with special prefix" do
-        described_class.define("ExampleUnit") do
+        described_class.define(:example_unit) do
           def test
             "test"
           end

data/spec/nyanko/invoker_spec.rb

@@ -50,11 +50,9 @@ 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
+      context "when Config.compatible_css_class is true" do
+        before do
+          Config.compatible_css_class = true
         end
 
         it "invokes and returns result surrounded by div" do

data/spec/nyanko/logger_spec.rb

@@ -40,10 +40,8 @@ module Nyanko
     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
+      before do
+        Config.enable_logger = true
       end
 
       context "when given Exception" do
@@ -53,10 +51,8 @@ module Nyanko
         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
+          before do
+            Config.backtrace_limit = 5
           end
 
           it "prints backtrace up to configured depth" do
@@ -75,10 +71,8 @@ module Nyanko
     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
+      before do
+        Config.enable_logger = false
       end
 
       it "logs nothing" do

data/spec/nyanko/unit_proxy_provider_spec.rb

@@ -33,16 +33,36 @@ module Nyanko
       context "when Config.proxy_method_name is configured" do
         around do |example|
           origin, Config.proxy_method_name = Config.proxy_method_name, :proxy
+          described_class.class_eval { remove_method origin } if view.respond_to?(origin)
           example.run
-          Config.proxy_method_name = origin
+          described_class.class_eval { remove_method :proxy }
         end
 
         it "change this method name with it" do
+          view.should_not be_respond_to(:proxy)
           proxy = view.proxy(:example_unit)
           proxy.should be_a UnitProxy
           view.should be_respond_to(:proxy)
         end
       end
+
+      context "when Config.proxy_method_name is configured as Array" do
+        around do |example|
+          origin, Config.proxy_method_name = Config.proxy_method_name, [:proxy1, :proxy2]
+          described_class.class_eval { remove_method origin } if view.respond_to?(origin)
+          example.run
+          described_class.class_eval { remove_method :proxy1, :proxy2 }
+        end
+
+        it "change this method name with it" do
+          view.should_not be_respond_to(:proxy1)
+          view.should_not be_respond_to(:proxy2)
+          view.proxy1(:example_unit).should be_a UnitProxy
+          view.proxy2(:example_unit).should be_a UnitProxy
+          view.should be_respond_to(:proxy1)
+          view.should be_respond_to(:proxy2)
+        end
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ end
 
 ENV["RAILS_ENV"] ||= "test"
 require "nyanko"
-Nyanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)
 
 require File.expand_path("../dummy/config/environment", __FILE__)
 require "rspec/rails"
@@ -18,4 +17,9 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
+
+  config.after do
+    Nyanko::Config.reset
+    Nyanko::Config.units_directory_path = File.expand_path("../fixtures/units", __FILE__)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nyanko
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails