thematic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4b70c607509150311f1b0895056fdacabf638d
-  data.tar.gz: d0de4d9b20799fa80b7d2cb8a70ad9b9733076af
+  metadata.gz: 595b4c78d370b9a5fa31f4245648d0d34af4f031
+  data.tar.gz: 92d105e2b217c90e4fb78267d4e8d724f18931ce
 SHA512:
-  metadata.gz: 5d281a896c826a80ee5e3416348ccb9403b6c71f10a5285f0be4ed7fa7f173e2b24c030d6d8e76befbb22cfa3b0a260c2234017874b52632e27e105ee0682d96
-  data.tar.gz: 8977ff80323b05eee48fb642905588b1fa2f0611388deffa23e8e41ce909b5e04ca602826abc8a9648cbcefebd21c380737cdeb0b772b49f42e28e5869aea58f
+  metadata.gz: 12875e4efc45866d767d72d4326fd64ef9398680f2e1bb73ebb11ab5518a283945b1dc63a662154989c98ed67c744d96f22635d338ab59663c6e8bb2e08c362e
+  data.tar.gz: d520b6534558fcf1751135ec5e79bf566871c7287a19071f82be1021e243d132927b38ab4b7f4b5817522ec792930b477ce41b4bd172667f0524936e009ab74a

data/lib/thematic/tasks/thematic.rake

@@ -12,6 +12,12 @@ namespace :thematic do
     copy_from_path = args[:filepath]
     theme_subfolder = "theme"
 
+    if File.exist?("#{args[:filepath]}/img")
+      images_folder = "img"
+    elsif File.exist?("#{args[:filepath]}/images")
+      images_folder = "images"
+    end
+
     FileUtils.remove_dir "vendor/assets/stylesheets/#{theme_subfolder}" if File.exist?("vendor/assets/stylesheets/#{theme_subfolder}")
     FileUtils.mkdir "vendor/assets/stylesheets/#{theme_subfolder}"
 
@@ -79,7 +85,7 @@ namespace :thematic do
     FileUtils.remove_dir "app/assets/images/#{theme_subfolder}" if File.exist?("app/assets/images/#{theme_subfolder}")
     FileUtils.mkdir "app/assets/images/#{theme_subfolder}"
 
-    copy_from_path = "#{args[:filepath]}/img"
+    copy_from_path = "#{args[:filepath]}/#{images_folder}"
 
     # We copy all files AND FOLDERS as they exist in the theme folder structure
     Dir.open(copy_from_path).each do |filename|
@@ -137,7 +143,7 @@ namespace :thematic do
 
       f.each do |line|
         if line =~/background.*url/
-          image_filename = /".*"/.match(line)[0].split("img/").last.delete('"')
+          image_filename = /("|').*("|')/.match(line)[0].split("#{images_folder}/").last.delete('"').delete("'")
           new_snippet = "(\"<%= asset_path('#{theme_subfolder}/#{image_filename}') %>\")"
           modified_line = line.gsub(/\(.*\)/, new_snippet)
           tempfile << modified_line
@@ -200,7 +206,7 @@ namespace :thematic do
     sourcefile.each do |line|
       reached_body = true if line =~/<body/
       next unless reached_body
-      tempfile << line.gsub("img/", "assets/#{theme_subfolder}/")
+      tempfile << line.gsub("#{images_folder}/", "assets/#{theme_subfolder}/")
     end
 
     FileUtils.mv("file.tmp", file_to_edit)

data/lib/thematic/version.rb

@@ -1,3 +1,3 @@
 module Thematic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thematic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jay Wengrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler