php4r 0.0.0 → 0.0.1

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/lib/php4r.rb

@@ -143,10 +143,6 @@ module Php4r
     end
   end
   
-  def gtext(string)
-    return GetText._(string)
-  end
-  
   def gettext(string)
     return GetText._(string)
   end
@@ -195,7 +191,7 @@ module Php4r
   end
   
   def http_build_query(obj)
-    return self.http_build_query_rec("", obj)
+    return Php4r.http_build_query_rec("", obj)
   end
   
   def http_build_query_rec(orig_key, obj, first = true)
@@ -210,7 +206,7 @@ module Php4r
         val = "#<Model::#{val.table}::#{val.id}>" if val.respond_to?("is_knj?")
         
         if val.is_a?(Hash) or val.is_a?(Array)
-          url << self.http_build_query_rec(orig_key_str, val, false)
+          url << Php4r.http_build_query_rec(orig_key_str, val, false)
         else
           url << "&" if !first or !first_ele
           url << "#{Php4r.urlencode(orig_key_str)}=#{Php4r.urlencode(val)}"
@@ -230,7 +226,7 @@ module Php4r
         val = "#<Model::#{val.table}::#{val.id}>" if val.respond_to?("is_knj?")
         
         if val.is_a?(Hash) or val.is_a?(Array)
-          url << self.http_build_query_rec(orig_key_str, val, false)
+          url << Php4r.http_build_query_rec(orig_key_str, val, false)
         else
           url << "&" if !first or !first_ele
           url << "#{Php4r.urlencode(orig_key_str)}=#{Php4r.urlencode(val)}"
@@ -393,10 +389,12 @@ module Php4r
   end
   
   def strtotime(date_string, cur = nil)
+    require "datet"
+    
     if !cur
-      cur = Time.new
+      cur = Datet.new
     else
-      cur = Time.at(cur)
+      cur = Datet.new(Time.at(cur))
     end
     
     date_string = date_string.to_s.downcase
@@ -413,28 +411,22 @@ module Php4r
       timestr = match[3]
       number = match[2].to_i
       mathval = match[1]
-      add = nil
+      number = -number if mathval == "-"
       
       if timestr == "years" or timestr == "year"
-        add = ((number.to_i * 3600) * 24) * 365
+        cur.add_years(number)
       elsif timestr == "months" or timestr == "month"
-        add = ((number.to_i * 3600) * 24) * 30
+        cur.add_months(number)
       elsif timestr == "weeks" or timestr == "week"
-        add = (number.to_i * 3600) * 24 * 7
+        cur.add_days(number * 7)
       elsif timestr == "days" or timestr == "day"
-        add = (number.to_i * 3600) * 24
+        cur.add_days(number)
       elsif timestr == "hours" or timestr == "hour"
-        add = number.to_i * 3600
+        cur.add_hours(number)
       elsif timestr == "minutes" or timestr == "minute" or timestr == "min" or timestr == "mints"
-        add = number.to_i * 60
+        cur.add_minutes(timestr)
       elsif timestr == "seconds" or timestr == "second" or timestr == "sec" or timestr == "secs"
-        add = number.to_i
-      end
-      
-      if mathval == "+"
-        cur += add
-      elsif mathval == "-"
-        cur -= add
+        cur.add_seconds(number)
       end
     end
     
@@ -662,17 +654,16 @@ module Php4r
     month = cur_time.month if month == nil
     year = cur_time.year if year == nil
     
-    new_time = Datet.in("#{year.to_s}-#{month.to_s}-#{date.to_s} #{hour.to_s}:#{min.to_s}:#{sec.to_s}")
-    return new_time.to_i
+    return Time.new(year, month, date, hour, min, sec).to_i
   end
   
   def date(date_format, date_input = nil)
     if date_input == nil
       date_object = Time.now
+    elsif date_input.respond_to?(:to_time)
+      date_object = date_input.to_time
     elsif Php4r.is_numeric(date_input)
       date_object = Time.at(date_input.to_i)
-    elsif date_input.is_a?(Datet)
-      date_object = date_input.time
     elsif date_input.is_a?(Time)
       date_object = date_input
     else
@@ -713,7 +704,7 @@ module Php4r
     
     return {
       "dirname" => dirname,
-      "basename" => self.basename(filepath),
+      "basename" => Php4r.basename(filepath),
       "extension" => filepath.split(".").last,
       "filename" => filepath.split("/").last
     }
@@ -738,7 +729,7 @@ module Php4r
   
   # Should return the peak usage of the running script, but I have found no way to detect this... Instead returns the currently memory usage.
   def memory_get_peak_usage
-    return self.memory_get_usage
+    return Php4r.memory_get_usage
   end
   
   def ip2long(ip)
@@ -950,7 +941,7 @@ module Php4r
   
   private
   
-  def self.parse_str_name(seton, varname, value)
+  def Php4r.parse_str_name(seton, varname, value)
     if value.respond_to?(:filename) and value.filename
       realvalue = value
     else
@@ -978,7 +969,7 @@ module Php4r
     end
   end
   
-  def self.parse_str_secname(seton, secname)
+  def Php4r.parse_str_secname(seton, secname)
     secname_empty = false
     if secname.length <= 0
       secname_empty = true
@@ -998,7 +989,7 @@ module Php4r
     return [secname, secname_empty]
   end
   
-  def self.parse_str_name_second(seton, varname, value)
+  def Php4r.parse_str_name_second(seton, varname, value)
     if value.respond_to?(:filename) and value.filename
       realvalue = value
     else

data/php4r.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{php4r}
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kasper Johansen"]
+  s.date = %q{2012-07-28}
+  s.description = %q{A lib containing various PHP-functions coded in Ruby. You can either use it or use it as a reference, if you are coming from PHP to Ruby or the other way around.}
+  s.email = %q{k@spernj.org}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/php4r.rb",
+    "php4r.gemspec",
+    "spec/php4r_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/kaspernj/php4r}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A lib containing various PHP-functions coded in Ruby.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<http2>, [">= 0"])
+      s.add_runtime_dependency(%q<datet>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+    else
+      s.add_dependency(%q<http2>, [">= 0"])
+      s.add_dependency(%q<datet>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    end
+  else
+    s.add_dependency(%q<http2>, [">= 0"])
+    s.add_dependency(%q<datet>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+  end
+end
+

data/spec/php4r_spec.rb

@@ -36,6 +36,14 @@ describe "Php4r" do
     end
   end
   
+  it "strtotime" do
+    time = Time.new(2010, 1, 1)
+    newtime = Php4r.strtotime("+1 year +1 day +2 months", time.to_i)
+    newtime = Datet.new(Time.at(newtime))
+    
+    raise "Expected dbstr to be '2011-03-02 00:00:00' but it wasnt: '#{newtime.dbstr}'." if newtime.dbstr != "2011-03-02 00:00:00"
+  end
+  
   it "substr" do
     res = Php4r.substr("selcol_15", 7)
     raise "substr should have returned '15' but didnt: '#{res}'." if res != "15"

metadata

@@ -2,7 +2,7 @@
 name: php4r
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -98,6 +98,7 @@ files:
 - Rakefile
 - VERSION
 - lib/php4r.rb
+- php4r.gemspec
 - spec/php4r_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -114,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -841571319118547036
+      hash: 3717817282737004000
       segments: 
       - 0
       version: "0"