themeable 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa6d3445f0046219df9a252081e25219a8fcb5c2
-  data.tar.gz: 5aaa8a8c34245b06311d348652f258f35e5cac98
+  metadata.gz: 226dd22ad75dcbfb96aa75860a0c8cb733cedfec
+  data.tar.gz: 9dc9079e67e956c5486543615891f0ab19cc6ffb
 SHA512:
-  metadata.gz: 0c505f3ca0972da747652603733b79aa74d267d316bbe55370bb0e86266454016b6bf80a5cba0811d6024f3aef1176435505d6eac0c83df8f8b7cb7cae00e9bb
-  data.tar.gz: 5f16c93af12deaa041f7fa9e7d537b9cf97903cb0ee5c6d3e0e9520be3fa62b306ee166cb8092b596168c9eec44eef2bf31e8fffcd5dc56ee27f404aac739dd2
+  metadata.gz: 33dffd44dd810e344ed29ec70625221a950588f341da2054950aea59e9ec1094e966011bffe221e2c49be4db32b3524141a74d3d417ee110811e946c8fe73b2d
+  data.tar.gz: d2ffc2a5423dacc228742ba9f8bea34548242aeba590bcc7efb93277a4ae6f71d1a1db5c4235cbc6e0b5592bf8715df387dfc5fb8120979d5a69af9f3d90e83c

data/lib/themeable/acts_as_themeable.rb

@@ -18,7 +18,7 @@ module Themeable
             return if theme_name == :none
             view_paths = lookup_context.view_paths.to_a.map(&:to_path)
             theme = Themeable.theme(__themeable_theme_name)
-            theme_view_path = File.join(theme.path, 'views')
+            theme_view_path = File.join(theme.root_path, theme.theme_path, 'views')
             lookup_context.view_paths = view_paths.insert(1, theme_view_path)
           end
         RUBY

data/lib/themeable/command.rb

@@ -31,15 +31,20 @@ module Themeable
         "\n  s.add_dependency 'themeable'"
       end
 
+      # generators
       template 'theme_views_generator.rb', "lib/generators/themeable/#{theme_name}/views_generator.rb"
       template 'theme_assets_generator.rb', "lib/generators/themeable/#{theme_name}/assets_generator.rb"
 
-      create_file "theme/assets/#{theme_name}/vendor/.gitkeep"
+      # assets and views
       create_file "theme/assets/#{theme_name}/application.css"
       create_file "theme/assets/#{theme_name}/application.js"
       create_file "theme/views/layouts/.gitkeep"
       template "view_application.html.erb", "theme/views/layouts/application.html.erb"
 
+      # vender files
+      create_file "vendor/#{theme_name}/.gitkeep"
+
+      # libs
       remove_file "lib/#{app_name}.rb"
       template 'theme_main.rb', "lib/#{app_name}.rb"
 

data/lib/themeable/railtie.rb

@@ -5,9 +5,9 @@ module Themeable
       ActionController::Base.send :include, Themeable::ActsAsThemeable
     end
     initializer :themeable do
-      # puts "== Themeable =="
       Themeable.themes.each do |theme|
-        config.assets.paths << File.join(theme.path, 'assets')
+        config.assets.paths << File.join(theme.root_path, theme.theme_path, 'assets')
+        config.assets.paths << File.join(theme.root_path, 'vendor')
         config.assets.precompile << /\A#{Regexp.escape(theme.name)}\/[^\/]+\.(js|css)\z/
         config.assets.precompile << /\A#{Regexp.escape(theme.name)}\/.+\.(gif|jpg|png|svg)\z/
       end

data/lib/themeable/theme.rb

@@ -1,27 +1,71 @@
 module Themeable
+
+  # Theme's basic module, automatically define methods
+  #   - name
+  #   - root_path
+  #   - theme_path
   module Theme
     def self.included(subclass)
+
       Themeable.add_theme(subclass)
-      subclass.instance_eval <<-'RUBY'
-        
-        @name = nil
+
+      # set default values
+      caller_file = caller.first
+      if caller_file =~ %r{/theme_(.+?)/lib/theme_\1\.rb}
+        default_name = $1.to_sym
+        default_root = File.expand_path(File.join(caller_file, '../../'))
+      end
+
+      subclass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
+        @name = #{default_name.inspect}
+
+        # Theme name
+        #
+        # @return [Symbol]
         def name
           @name || raise("Theme name is no defined")
         end
 
-        @path = nil
-        def path
-          @path || raise("Theme path is no defined")
+        @root_path = #{default_root.inspect}
+
+        # Theme project's root path
+        #
+        # @return [String]
+        def root_path
+          @root_path || raise("Theme project's root path is no defined")
+        end
+
+        # Theme's relative path, 'theme' by default
+        #
+        # @return [String] default is 'theme'
+        def theme_path
+          @theme_path || 'theme'
         end
 
-        private
+        protected
 
+        # Set theme name
+        #
+        # @param [String] name
+        # @return [Symbol] symbolized name
         def set_name(name)
           @name = name.to_sym
         end
 
-        def set_path(path)
-          @path = path
+        # Set root path of theme project
+        #
+        # @param [String] path
+        # @return [String]
+        def set_root_path(path)
+          @root_path = path
+        end
+
+        # Set theme's relative path, which path includes assets and views
+        #
+        # @param [String] path is a relative path where assets and views locate.
+        # @return [String]
+        def set_theme_path(path)
+          @theme_path = theme_path
         end
 
       RUBY

data/lib/themeable/version.rb

@@ -1,3 +1,3 @@
 module Themeable
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/templates/theme_main.rb

@@ -3,6 +3,7 @@ require 'theme_<%= theme_name %>/version'
 
 module <%= app_name.camelize %>
   include Themeable::Theme
-  set_name '<%= theme_name %>'
-  set_path File.expand_path('../../theme', __FILE__)
+  # set_name '<%= theme_name %>' # by default, resovle name by file path automatically
+  # set_root_path File.expand_path('../..', __FILE__)
+  # set_theme_path 'theme'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: themeable
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - xiaohui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails