angelo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebbf63326421673b1352e779ea177d5f7b43c610
-  data.tar.gz: c1e169dd0f1d88a64bdc70df502edd24533a187d
+  metadata.gz: 82990928178a891fac3eb49454474d3e5136ab87
+  data.tar.gz: 9fe7dec6dfffd783e3a804f5766b31be2c024491
 SHA512:
-  metadata.gz: 823587abc0ddec2fd5ffd496feb3c0295f5aa331882bad9314895a329d487ab7c823aa106b617fe447e135bf73ba50e9a0eb2ccebaa4c958590e441af60bba2f
-  data.tar.gz: e6972e20b9b724331d0873b809e8ebb7f5dbbb571ddd59e1694c56083ef7fcd5d49a4d755a4c4b90986af819bbddbb58648ecfeb714f80752055b1070b10c66a
+  metadata.gz: f2da2084362c910fcd9b4766dec667d574409c6fe3f100554ffc1c72679648ffef54d386a340c4b686aa8896205f956baf8b51f0b48d6a465ee4003448ce4d80
+  data.tar.gz: d0d2410e21038dd060f5f384bb033571481a9088ada01f8b838be59558ea436101935991f428f254902c858ac590f00ffa0cb8a651572c5aa57ba46e2fb471c9

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 changelog
 =========
 
+### 0.3.1 10 nov 2014 yep, same day - jeez
+
+* refactor views dir and public dir setting into top level DSLish methods
+    * set views path with `views_dir 'vues'`
+    * set public path with `public_dir 'publick'`
+
 ### 0.3.0 10 nov 2014
 
 thanks: @mighe

data/README.md

@@ -424,7 +424,7 @@ To make `erb` available in route blocks
 class Foo < Angelo::Base
   include Angelo::Tilt::ERB
 
-  @@views = 'some/other/path' # defaults to './views'
+  views_dir 'some/other/path' # defaults to './views'
 
   get '/' do
     erb :index
@@ -603,7 +603,7 @@ class Foo < Angelo::Base
 
 end
 
-Foo.run
+Foo.run!
 ```
 
 ### Contributing

data/lib/angelo/base.rb

@@ -36,16 +36,6 @@ module Angelo
             @root ||= File.expand_path '..', app_file
           end
 
-          def view_dir
-            v = self.class_variable_get(:@@views) rescue DEFAULT_VIEW_DIR
-            File.join root, v
-          end
-
-          def public_dir
-            p = self.class_variable_get(:@@public_dir) rescue DEFAULT_PUBLIC_DIR
-            File.join root, p
-          end
-
         end
 
       end
@@ -70,6 +60,18 @@ module Angelo
         @port
       end
 
+      def views_dir d = nil
+        @views_dir = d if d
+        @views_dir ||= DEFAULT_VIEWS_DIR
+        File.join root, @views_dir
+      end
+
+      def public_dir d = nil
+        @public_dir = d if d
+        @public_dir ||= DEFAULT_PUBLIC_DIR
+        File.join root, @public_dir
+      end
+
       def report_errors!
         @report_errors = true
       end

data/lib/angelo/tilt/erb.rb

@@ -16,12 +16,12 @@ module Angelo
         DEFAULT_LAYOUT = 'layout.html.erb'
 
         def view_glob *glob
-          File.join view_dir, *glob
+          File.join views_dir, *glob
         end
 
         def templatify *glob
           Dir[view_glob *glob].reduce({}) do |h,v|
-            sym = v.gsub view_dir + '/', ''
+            sym = v.gsub views_dir + '/', ''
             return h if (block_given? && yield(v))
             sym.gsub! '/', '_'
             sym.gsub! /\.\w+?\.erb$/, ''

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/lib/angelo.rb

@@ -36,7 +36,7 @@ module Angelo
   DEFAULT_ADDR = '127.0.0.1'
   DEFAULT_PORT = 4567
 
-  DEFAULT_VIEW_DIR = 'views'
+  DEFAULT_VIEWS_DIR = 'views'
   DEFAULT_PUBLIC_DIR = 'public'
 
   DEFAULT_LOG_LEVEL = ::Logger::INFO

data/test/angelo_spec.rb

@@ -509,6 +509,34 @@ describe Angelo::Base do
 
     end
 
+    describe 'views_dir' do
+
+      define_app do
+        views_dir 'sucka'
+        get('/'){ self.class.views_dir }
+      end
+
+      it 'sets dir for view templates' do
+        get '/'
+        last_response_must_be_html File.join(@server.base.root, 'sucka')
+      end
+
+    end
+
+    describe 'public_dir' do
+
+      define_app do
+        public_dir 'sucka'
+        get('/'){ self.class.public_dir }
+      end
+
+      it 'sets dir for public files' do
+        get '/'
+        last_response_must_be_html File.join(@server.base.root, 'sucka')
+      end
+
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel