css2cocoa 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/css2cocoa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{css2cocoa}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Seivan Heidari"]

data/lib/css2cocoa/gradient.rb

@@ -1,10 +1,10 @@
 #"color-stop(.9,#999999)"
+#puts Gradient.parse_gradient("-webkit-gradient(linear, 0% 96%, 0% 100%, from(#38AFFF), to(#FFFFFF))")
 class Gradient
   def self.parse_gradient(css_gradient, engine=:webkit)
-    css_gradient_array = css_gradient.split(", ") 
-    
-    start_location = css_gradient.split(",")[1].split("%").last.to_i/100
-    end_location = css_gradient.split(",")[2].split("%").last.to_i/100
+    css_gradient_array = css_gradient.split(", ")
+    start_location = css_gradient.split(",")[1].split("%").last.to_f/100.0
+    end_location = css_gradient.split(",")[2].split("%").last.to_f/100.0
     
     start_color, stop_color = css_gradient.split(",")[3..-1]
     colors_and_locations = {}
@@ -21,8 +21,8 @@ class Gradient
       puts "Generating two colour gradient!"
     end
 
-    colors_and_locations[start_location.to_f] = start_color.gsub(/(\w+\d+)/).first
-    colors_and_locations[end_location.to_f]   = stop_color.gsub(/(\w+\d+)/).first
+    colors_and_locations[start_location.to_f] = start_color.scan(/(\.\d+|\w+)/).flatten.last
+    colors_and_locations[end_location.to_f]   = stop_color.scan(/(\.\d+|\w+)/).flatten.last
     colors = []
     locations = []
     colors_and_locations.sort.each do |location, color|
@@ -69,3 +69,4 @@ class Gradient
   end  
 end
 
+#puts Gradient.parse_gradient("-webkit-gradient(linear, 0% 40%, 0% 100%, from(#EEF1F6), to(#E6154D), color-stop(.923,#999999),color-stop(.1,#999999),color-stop(.6,#999999))")

data/spec/gradient_spec.rb

@@ -8,8 +8,8 @@ describe Gradient, "gradients" do
   let(:objc_multiple_colors_and_locations) do
 """
 #define UIColorFromRGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0]
-gradient.locations = [NSArray arrayWithObjects:[NSNumber numberWithFloat:0.0],[NSNumber numberWithFloat:0.1],[NSNumber numberWithFloat:0.6],[NSNumber numberWithFloat:0.923],[NSNumber numberWithFloat:1.0],nil];
-gradient.colors = [NSArray arrayWithObjects:(id)UIColorFromRGB(0xEEF1F6).CGColor,(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0xE6154).CGColor,nil];
+gradient.locations = [NSArray arrayWithObjects:[NSNumber numberWithFloat:0.1],[NSNumber numberWithFloat:0.4],[NSNumber numberWithFloat:0.6],[NSNumber numberWithFloat:0.923],[NSNumber numberWithFloat:1.0],nil];
+gradient.colors = [NSArray arrayWithObjects:(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0xEEF1F6).CGColor,(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0x999999).CGColor,(id)UIColorFromRGB(0xE6154D).CGColor,nil];
 """
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Seivan Heidari
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2462370433945846191
+      hash: 4301940326048217632
       segments: 
       - 0
       version: "0"