themeable 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cef87560b607a92b5dfa8c4692ab57b6369eb859
-  data.tar.gz: b9f2a3168a7c316731f249c7103bc3c440a91cc6
+  metadata.gz: 75b3c47db91293c2e49684d97d70f775791730d1
+  data.tar.gz: 232ff8ac46a535c430b5dbaa897415efd86d5e81
 SHA512:
-  metadata.gz: 4c9a39cf63ab63e3dbd249d1435816e97b0642d332c6736edecd1c0a441dc76efa0c4b9f3c5deb754507ebda46543233503cdcaaa209f505ad499ee45bc0e6a2
-  data.tar.gz: 562a6a08afb6aae83717cf390580fcf666da407360b1e5340883eabcf0db8fdf1f656d0e47f10579a6d0de4a7f418060a3268f0ee5b3a0b36dc7b2e50778993b
+  metadata.gz: e7df2f4254fe2cdf39cea6019b4f76e6f3496b0ff75061e005307f94828d225f05b4625bbc6fc39d2470d632a9a1b47ee67d4d90ea042466d8b4b23ca842f2df
+  data.tar.gz: a8438169271767e7f894cbf98e35653d2a8a0411fe9354517b80837d276a901bf3f65c7f7c022931ad8f980e48cb65ff0d7faf6b6013375c164871ec556a4148

data/README.md

@@ -71,7 +71,7 @@ Some vendor files have relative urls in the CSS files for imports, images, etc.
 Add gem to Rails app:
 
     gem 'theme_my_theme', path: 'path_of_theme_my_theme'
-    
+
 Use theme in controller:
 
 By default you need to remove `views/layouts/application.html.erb` from Rails app, make sure Rails can use theme's layout.
@@ -88,9 +88,9 @@ Or, you can make this controller use dynamic themes:
       acts_as_themeable :choose_theme
       def index
       end
-      
+
       private
-      
+
       def choose_theme
         case params[:theme]
         when 'my_theme' then 'my_theme'
@@ -103,7 +103,7 @@ Or, you can make this controller use dynamic themes:
 ### Use `theme_my_theme` as theme to scaffold controller views
 
     $ rails g scaffold_controller User --theme=my_theme
-      
+
         create  app/controllers/users_controller.rb
         invoke  erb
         create    app/views/users
@@ -142,11 +142,11 @@ To choose admin template, run:
 In your Rails project, if you feel `theme_my_theme` is not perfect, and want to make some changes to it only affect current Rails project, instead of all Rails projects which are using gem `theme_my_theme`, now you can do this:
 
     $ rails g theme_my_theme:copy_assets
-    
+
          exist  app/assets/themes
         create  app/assets/themes/my_theme/application.css
         create  app/assets/themes/my_theme/application.js
-        
+
     $ rails g theme_my_theme:copy_views
         create  app/themes/my_theme
         create  app/themes/my_theme/layouts/.gitkeep
@@ -180,8 +180,30 @@ in config/application.rb, add `config.generators.theme = :my_theme`
       end
     end
 
+### Automatically choose theme scaffold template
+
+Also, you can use a mapping to set `--theme` and `--theme-scaffold` automatically according to module name
+
+module TestTheme
+  class Application < Rails::Application
+
+    ....
+
+    config.generators.theme_scaffold_mapping = {
+        # Admin::UsersController uses scaffold template from lib/templates/erb/scaffold/my_theme/admin
+        admin: { theme: 'my_theme', theme_scaffold: 'admin' },
+
+        # Agent::ProductsController uses scaffold template from lib/templates/erb/scaffold/my_theme/agent
+        agent: { theme: 'my_theme', theme_scaffold: 'agent' },
 
+        # Member::ProfileController uses scaffold template from lib/templates/erb/scaffold/other_theme/admin
+        member: { theme: 'other_theme', theme_scaffold: 'admin' },
 
+        # HomeController uses scaffold template from lib/templates/erb/scaffold/other_theme/default
+        default: { theme: 'other_theme', theme_scaffold: 'default' }
+    }
 
-    
+    ...
 
+  end
+end

data/lib/themeable/generator_concern.rb

@@ -7,11 +7,32 @@ module Themeable
       end
     end
 
+    def resolve_themeable_value(key)
+      return options[key] if options[key].present?
+      if theme_scaffold_mapping.size > 0
+        folders = name.split('/')
+        folders.pop
+        loop do
+          break if folders.size == 0
+          path = folders.join('/')
+          v = theme_scaffold_mapping.fetch(path.intern) { theme_scaffold_mapping.fetch(path.to_s, nil) }
+          vv = v && (v[key.intern] || v[key.to_s])
+          return vv if vv.present?
+          folders.pop
+        end
+      end
+    end
+
+    def theme_scaffold_mapping
+      Rails.application.config.generators.theme_scaffold_mapping
+    end
+
     # Support theme and template
     def find_in_source_paths(file)
-      theme_scaffold = options[:theme_scaffold]
-      theme_scaffold ||= 'default' if options[:theme].present?
-      themed_file = [options[:theme], theme_scaffold, file].compact.join('/')
+      theme = resolve_themeable_value(:theme)
+      theme_scaffold = resolve_themeable_value(:theme_scaffold)
+      theme_scaffold ||= 'default' if theme
+      themed_file = [theme, theme_scaffold, file].compact.join('/')
       super(themed_file)
     rescue Thor::Error => e
       if e.message =~ /^Could not find /
@@ -22,4 +43,4 @@ module Themeable
       end
     end
   end
-end
+end

data/lib/themeable/version.rb

@@ -1,3 +1,3 @@
 module Themeable
-  VERSION = "1.1.4"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: themeable
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - xiaohui
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails