tailwind_theme-rails 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af4a596650d11be93a96ed08a70b8155b5865c1ff40c3053b3b4a39ee6585fc3
-  data.tar.gz: 787ff82ef8f220ec9bdd71c880bf50ead8775e2e41727c0237d88244aea6a3be
+  metadata.gz: 81918734df2afa400433d070a33e054a7ecff27278ed8cb332a5d0d5b5ad6ff3
+  data.tar.gz: 49e9fe555c24497dfa90cf99e4273f4dea35e159a49f3b034bde5887cd0e78e5
 SHA512:
-  metadata.gz: bdfa4e58b4079e6204b90a6476cb6e5b87e8b636781ef3efbaca6947eb742fb998be868d08bed4b76f9019d84bcb9f8d869cbf7ed4691bc34619d18759603602
-  data.tar.gz: cfc8b8ea25b3a6997b16e2423ff7ddf9eb88f223712dbd36543424098b6af585524251935e1560d21a19a0520dfd02018c736b8354dc8cbb93276baa6c725231
+  metadata.gz: e3658df7908d3cdd4904a7ae09da72bb3a6417d629f5db329a0ceeebb175378429422e87de7ff10d6f9007b0a6491b0c33d29dd847891cc4d764a83fea32544f
+  data.tar.gz: 016f4f1e791243164e404d1cf803849137bdd0be245828415589df9a08fa8c3fbe673e75de7cdbb99a61f82ead4180dc455c5bebcfa5c084ee5bc9c94c4a95b5

data/lib/tailwind_theme/factory.rb

@@ -12,8 +12,7 @@ module TailwindTheme
   #     TailwindTheme::Factory.new.theme :admin
   #
   class Factory
-    def initialize(config_dir = nil)
-      @config_dir = config_dir || ::Rails.root.join("config").to_s
+    def initialize
       @themes = {}
     end
 
@@ -28,43 +27,44 @@ module TailwindTheme
     # @return [TailwindTheme::Theme, NilClass] returns the theme or nil if the theme cannot be found.
     def theme(name = nil)
       if name.nil? || name.to_s == "default"
-        default_theme
+        @themes[:default] ||= load_default_theme
       else
-        theme_by_name name
+        @themes[name.to_sym] = load_by_name name.to_sym
       end
     end
 
     private
 
-    def default_theme
-      return @themes[:default] if @themes[:default]
-
-      files = Dir[
-        File.expand_path("themes/default.{yml,yml.erb}"),
-        File.expand_path("theme.{yml,yml.erb}", @config_dir)
-      ]
+    def load_default_theme
+      load_theme :default, %w[themes/default.{yml,yml.erb} theme.{yml,yml.erb}]
+    end
 
-      load_theme :default, files
+    def load_by_name(name)
+      load_theme name, %W[themes/#{name}.{yml,yml.erb}]
     end
 
-    def theme_by_name(name)
-      return @themes[name.to_sym] if @themes[name.to_sym]
+    def find_theme(paths)
+      patterns = TailwindTheme.load_paths.each_with_object([]) do |dir, patterns|
+        paths.each do |path|
+          patterns << File.expand_path(path, dir)
+        end
+      end
 
-      files = Dir[File.expand_path("themes/#{name}.{yml,yml.erb}", @config_dir)]
-      load_theme name, files
+      Dir.glob(patterns, 0).first
     end
 
     def load_theme(name, files)
-      return if files.empty?
+      file = find_theme files
+      return unless file
 
-      theme = TailwindTheme.load_file files.first.to_s
+      theme = TailwindTheme.load_file file.to_s
       theme.instance_eval <<-RUBY
 def name
   "#{name}"
 end
       RUBY
 
-      @themes[name.to_sym] = theme
+      theme
     end
   end
 end

data/lib/tailwind_theme/rails/version.rb

@@ -1,5 +1,5 @@
 module TailwindTheme
   module Rails
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/tailwind_theme-rails.rb

@@ -6,3 +6,11 @@ require "tailwind_theme/rails/version"
 require "tailwind_theme/factory"
 require "tailwind_theme/controller_concern"
 require "tailwind_theme/engine"
+
+module TailwindTheme
+  mattr_writer :load_paths
+
+  def self.load_paths
+    @@load_paths ||= [::Rails.root.join("config")]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tailwind_theme-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Fawks