mattfawcett-ruby-reads-php 1.0.0 → 1.1.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
-:minor: 0
+:minor: 1
 :patch: 0

data/lib/ruby_reads_php.rb

@@ -19,15 +19,27 @@ class RubyReadsPHP
 	end
 
 	def parse_file(file)		
-		constant_regex = /define\((\s)*('|")((\w|\s)+)('|")(\s)*,(\s)*('|")?((\w|\s)*)('|")(\s)*\);/
+		constant_regex = /define\((\s)*('|")((\w|\s)+)('|")(\s)*,(\s)*(('|")?)([^'"]*)(('|")?)(\s)*\);/
 		while (line = file.gets)
       if line.match(constant_regex)
 				contant_key = line[constant_regex, 3]
-				constant_value = line[constant_regex, 9]
+				constant_value = line[constant_regex, 10]
+				if line[constant_regex, 9].nil?
+					#This value was not wrapped in quotes. cast it to either an integer or a float
+					constant_value = cast_not_string_value(constant_value)
+				end
 				constants[contant_key] = constant_value
 			end
 		end
   end
 
+	def cast_not_string_value(value)
+		if value.match(/\./)
+			return value.to_f
+		else
+			return value.to_i
+		end
+	end
+
 
 end

data/test/fixtures/float.php

@@ -0,0 +1,5 @@
+<?php
+
+define('MY_CONSTANT', 95.5);
+
+?>

data/test/fixtures/integer.php

@@ -0,0 +1,5 @@
+<?php
+
+define('MY_CONSTANT', 100);
+
+?>

data/test/fixtures/integer_quoted.php

@@ -0,0 +1,5 @@
+<?php
+
+define('MY_CONSTANT', "100");
+
+?>

data/test/fixtures/simple_constant_with_slashes.php

@@ -0,0 +1,5 @@
+<?php
+
+define('MY_CONSTANT', 'http://www.google.com');
+
+?>

data/test/ruby_reads_php.spec

@@ -22,6 +22,29 @@ describe "Ruby reads PHP" do
 			rrp.constants['MY_CONSTANT'].should eql('my value')
 			rrp.constants['MY_CONSTANT_NUMBER_2'].should eql('my value 2')
 		end
+
+		it "should read slashes" do
+      rrp = RubyReadsPHP.read(File.dirname(__FILE__) + "/fixtures/simple_constant_with_slashes.php")
+      rrp.constants['MY_CONSTANT'].should eql('http://www.google.com')
+    end
+
+		it "should cast as integer" do 
+      rrp = RubyReadsPHP.read(File.dirname(__FILE__) + "/fixtures/integer.php")
+      rrp.constants['MY_CONSTANT'].should eql(100)
+    end
+
+		it "should not cast as integer when quoted" do 
+      rrp = RubyReadsPHP.read(File.dirname(__FILE__) + "/fixtures/integer_quoted.php")
+      rrp.constants['MY_CONSTANT'].should eql("100")
+    end
+
+
+	  it "should cast as float" do 
+      rrp = RubyReadsPHP.read(File.dirname(__FILE__) + "/fixtures/float.php")
+      rrp.constants['MY_CONSTANT'].should eql(95.5.to_f)
+    end
+
+
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mattfawcett-ruby-reads-php
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matt Fawcett
@@ -27,8 +27,12 @@ files:
 - test/ruby_reads_php.spec
 - test/fixtures
 - test/fixtures/multiple_constants.php
+- test/fixtures/simple_constant_with_slashes.php
 - test/fixtures/simple_constant.php
+- test/fixtures/integer_quoted.php
+- test/fixtures/integer.php
 - test/fixtures/simple_constant_with_double_quotes.php
+- test/fixtures/float.php
 - test/fixtures/simple_constant_with_extra_spacing.php
 has_rdoc: true
 homepage: http://github.com/mattfawcett/ruby-reads-php