sassificator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
 !binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODMyZjg1YmI4YzM2N2Q5YmQ2MWIyNjY1NTk4MDI2Y2ZjMDU1OGUxYQ==
-  data.tar.gz: !binary |-
-    YjkxZDYwMDE1MTRmYjM3OTdiMmY1ZmViNmEwZmVlMWFkZjcyYTQxNA==
+  metadata.gz: 390fc141a58ee31ba2bb65188e62eeac0c7d826b
+  data.tar.gz: 4b337475041f992449a2481790fc751b45689dee
 SHA512:
-  metadata.gz: !binary |-
-    Y2VlOTI2Y2FmNDc4NGRkY2MzOWY0Y2YzYWYxZDQ2OWIzOTlmNzdmZWM2MDk5
-    Y2Y0ODUwN2JjOThjZjRkMjY4ZGJlMDhlMjQzOGM4Yzk4MTg5MWE0MGY2NWY2
-    MjFiNjcyNTg5ZTI5YjcwYTFkZjIwNDcyZGI3NzE5MjhiYTQ1ZTA=
-  data.tar.gz: !binary |-
-    NmExNmEzMWVkNzQxMTI2YTkzMTI3MWQ4ZGMyOTgwMzBkNWY5MzdhMzQ5NTRi
-    NDU3MjYzZjgxY2UyZjk0YjU0MGZmYWVjNWNkNjgwZjk3ZTVjNTY4OWNkZmU2
-    YTkxYWZiOTY3ZjllMzU5YmVjYWExZDg3NTk5ZWI5ZGQ5ZDRiY2Y=
+  metadata.gz: 96fc95dabd748618691e89470bc4f7a53d8f182c62a6f3ecc05f75061a5bdecfcc1aa44f5d2f7532d9df4bae5ccc9889443e3ea74e36b027b4ab267dcaea7cb4
+  data.tar.gz: 6ff9d0aa6539d6e14a40742738f0cf6b5884c6da74215835f214bc6e04aa3063d2e3e7ae057824422acd1dda7c6045fd9fcc579ebffc1f55b706df574174eabb

data/lib/sassificator.rb

@@ -1,8 +1,13 @@
 #TODO:
-# - mediaquery inside of a mediaquery
+# - mediaquery inside of a mediaquery - done partically (only for one tree level deep)
 # - images formating pattern setting
 # - add convertor: all #_colors_ to rgb
 # - MAJOR: formatting is done only for output sass_string, but not for sass_obj. Move formatting options applyment to object creation
+# - write tests
+# - had issue with [] brackets - test
+# - had issue with asset-url asigning - test -             background: asset-url('#{$brand}offersButton_on.png',image',image) 100% 50% no-repeat;
+#                                                          background: asset-url('#{$brand}//offersButton_on.png) 100% 50% no-repeat;
+# - issue with assigning same roles one after onother
 
 class Sassificator
   attr_accessor :colors_to_vars
@@ -20,6 +25,7 @@ class Sassificator
     @colors_to_vars =  (param[:colors_to_vars] != false) != false
     @fromat_image_declarations = (param[:fromat_image_declarations] != false) != false
     @download_images =  (param[:download_images] != false) != false
+
     @image_assets_path = param[:image_assets_path] ? param[:image_assets_path] : ''
     @output_path = param[:output_path] ? param[:output_path] : "#{ENV['HOME']}/Desktop/sassificator_output/"
   end
@@ -57,12 +63,17 @@ class Sassificator
     line.gsub(/\n/,'').gsub(/\t/,'').gsub(/\s+(?=\})/,'').gsub(/(?<=\{)\s+/,'')
   end
 
+  def prepare_input_css(input_css)
+    ## 1. reduses double :: pseudo selectors to :
+    ## 2. removes empty rules
+    input_css.gsub(/::/,':').gsub(/^.+{[\s\t\n]{0,}}/,'')  
+  end
+
   def css_to_hash (input_css)
-    input_css = input_css.gsub(/::/,':')
+    input_css = prepare_input_css(input_css)
     selectors_arr = remove_white_spaces_and_new_lines(input_css).gsub(/@media/,"\n@media").gsub(/(?<={{1}).+}(?=[\s\t\n]{0,}}{1})/,'').gsub(/(?<={{1}).+}(?=[\s\t\n]{0,}}{1})/,'').scan(/[^{^}]+(?=\{)/).map {|line| line.sub(/^\s+/,'').sub(/\s+$/,'')}
     rules_arr = remove_white_spaces_and_new_lines(input_css).gsub(/@media/,"\n@media").scan(/(((?<={{1}).+}(?=[\s\t\n]{0,}}{1})|(?<=\{)[^}]+\}{0,}[\\t\\n\s]{0,}(?=\}))|((?<=\{)[^}]+\}{0,}[\\t\\n\s]{0,}(?=\}))|(?<={{1}).+}(?=[\s\t\n]{0,}}{1}))/).map {|item| item.compact.uniq.join} #super-mega reg-exp that scans for normal rules as well as inlined media-query rule + make a single_string_items out of matched array groups
     return_hash = {}
-
     selectors_arr.each_with_index do |selector, index|
       unless return_hash[selector]
         return_hash[selector] = rules_arr[index.to_i]
@@ -93,7 +104,6 @@ class Sassificator
       #TODO : optimize this
       unless sub_pat.empty?
         unless selector.match(/,/)
-
           match = sub_pat
           selector = selector.sub( Regexp.new('^'+match) ,match+' &')
         end
@@ -104,7 +114,7 @@ class Sassificator
           node = CssNode.new
           childrens_stack[match] = node
         end
-        node.uninitialized[selector.sub( Regexp.new('^'+match+' ') ,'')] =  rule
+        node.uninitialized[selector.sub( Regexp.new('^'+match.sub( /\[/ ,'\[').sub(/\]/, '\]')+' ') ,'')] =  rule
         node.parent = parent_node
       else
         if node = childrens_stack[selector]
@@ -167,7 +177,7 @@ class Sassificator
     sassed_str.scan(/(url\((((http[s]{0,1}:\/\/)([a-z0-9].+\.[a-z]+).+)(\/.+)))\)/).each do |match|
       #TODO: optimize this - move mathched to variables for clarification of match
       formated_rule = formated_rule.sub(Regexp.new(match[0].gsub(/\(/,'\(').gsub(match[5],'')),'asset-url(\''+@image_assets_path)
-      .sub( Regexp.new(match[5]),match[5].sub(/\//,'')+'\',image')
+      .sub( Regexp.new(match[5]),match[5].sub(/\//,'')+'\'')
 
       Net::HTTP.start(match[4]) do |http|
         resp = http.get(match[1])
@@ -189,6 +199,7 @@ class Sassificator
   end
 
   def format_color(sassed_str)
+    #TODO: resolve the match for colors in format #sdsd
     formated_rule = sassed_str
     color_hash = {}
     sassed_str.scan(/rgba\([0-9\,\s\.]+\)|rgb\([0-9\,\s\.]+\)|#[0-9A-Za-z]+(?=;)/).each do|m|
@@ -200,7 +211,7 @@ class Sassificator
     end
 
     color_hash.invert.to_a.reverse_each {|m|
-      formated_rule = m.join(":")+"\n" + formated_rule
+      formated_rule = m.join(":")+";\n" + formated_rule
     }
 
     formated_rule

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassificator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Roman Fromrome
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies: []
 description: Converts Css formatted code to Sass. Generates a Sass formatted hierarchy
   object, as well as properly formatted Sass code text
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool for parsing Css to Sass