str2duck 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61febf9032234a1a81c9d3c7de46c45bfea915c6
-  data.tar.gz: cff6f444ddc2e48300e51c575ea3f15e950d5b9f
+  metadata.gz: 4ed1679d8461e9701052f12181183d27973a6fd7
+  data.tar.gz: 17f617ef6025bf2693bf50b5d09a2fff1bce5c2c
 SHA512:
-  metadata.gz: 8ab40406f77758dc561b23cb85c222e030c908f3a3b804a3bfc7b66a7533acf4c6acda46e5d6fabadff583353427a408f0664480999880f3d45c234c5c571aa5
-  data.tar.gz: 2627bb0404caab12f1ebea2bce38f91a795a9d92c008a884d76d51d91620a0dc99e56fb161f46e89f88ebca3ef849b7d99b850598489395eb4e1eb8a9915676c
+  metadata.gz: e286704a3e04cd513e1d845ac4a627aeaa9e939bfd4afe39aeda42487fb3c2add2f24d9ff657c4160da54fece42ddeb08d30bcc01f85a99afd1931bcd45b2f8e
+  data.tar.gz: 7736bdcc6a50e469e64d488dd8fb1673d7ebf33854c8ca0501e1513b1d23fa6ba39738b7c450d74520f108e4154ae0ea7228c62352efbcb9e8a512114cdc2ae9

data/.gitignore

@@ -1,3 +1,4 @@
+Gemfile.lock
 *.gem
 *.rbc
 .bundle

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.7.0

data/lib/str2duck/format.rb

@@ -1,19 +1,16 @@
 #encoding: UTF-8
+require 'yaml'
+require 'json'
+
 module Str2Duck
   module Format
     class << self
 
       def datetime obj
         if Str2Duck::Regexp.datetime?(obj)
-          if defined? DateTime
+          if defined?(DateTime) && DateTime.respond_to?(:parse)
             return DateTime.parse obj
           else
-
-            time_parts= obj.scan(/\d+/).map(&:to_i)
-
-            puts time_parts.inspect
-            Process.exit
-
             if time_parts.count == 8
               2.times{time_parts.pop}
             elsif time_parts.count == 6
@@ -21,8 +18,7 @@ module Str2Duck
             end
             return Time.new(*time_parts)
           end
-        end
-        nil
+        end;nil
       end
 
       def date obj
@@ -33,8 +29,7 @@ module Str2Duck
             time_parts= obj.scan(/\d+/).map(&:to_i)
             return Time.new(*time_parts)
           end
-        end
-        nil
+        end;nil
       end
 
       def time obj
@@ -46,51 +41,48 @@ module Str2Duck
             1.times{time_parts.pop}
             return Time.new(*time_parts)
           end
-        end
-        nil
+        end;nil
       end
 
       def true obj
         if Str2Duck::Regexp.true?(obj)
           return true
-        end
-        nil
+        end;nil
       end
 
       def false obj
         if Str2Duck::Regexp.false?(obj)
           return false
-        end
-        nil
+        end;nil
       end
 
       def float obj
         if Str2Duck::Regexp.float?(obj)
-          return obj.to_f
-        end
-        nil
+          return obj.sub(',','.').to_f
+        end;nil
       end
 
       def integer obj
         if Str2Duck::Regexp.integer?(obj)
           return obj.to_i
-        end
-        nil
+        end;nil
       end
 
       def json obj
         if Str2Duck::Regexp.json?(obj)
           return JSON.parse(obj)
-        end
-        nil
+        end;nil
       end
 
       # damn, this thing eats almost everything...
       def yaml obj
         if Str2Duck::Regexp.yaml?(obj)
-          return YAML.safe_load(obj)
-        end
-        return nil
+          if YAML.respond_to?(:safe_load)
+            return YAML.safe_load(obj)
+          else
+            return YAML.load(obj)
+          end
+        end;nil
       end
 
     end

data/lib/str2duck/mpatch/object.rb

@@ -1,30 +1,20 @@
 module Str2Duck
-
   module MPatch
+    module ObjectEXT
 
-    module Object
-
-      def to_duck(self_obj= self)
-
-        if self_obj.class <= String
-          Str2Duck::MPatch::String.duck(self_obj)
+      def to_duck
+        if self.class <= String
+          Str2Duck.parse(self)
         else
-          return self_obj
+          return self
         end
 
       end
 
       alias :duck :to_duck
 
-      self.instance_methods.each do |symbol|
-        module_function symbol
-        public symbol
-      end
-
     end
-
   end
-
 end
 
-Object.__send__( :include, Str2Duck::MPatch::Object )
+Object.__send__ :include, Str2Duck::MPatch::ObjectEXT

data/lib/str2duck/parser.rb

@@ -2,20 +2,17 @@
 module Str2Duck
 
   def self.activesupport
-    require File.join 'active_support','time'
+    require(File.join 'active_support','time')
   rescue LoadError
-    return false
+    return true
   end
 
   def self.parse str
     raise(ArgumentError,"invalid input, must be string like") unless str.class <= String
-
-    @@activesupport ||= activesupport
-
-    var= nil
+    @activesupport ||= activesupport
     [ :datetime, :date, :time, :true, :false, :float, :integer, :json, :yaml ].each do |method_name|
-      if ::Str2Duck::Config.__send__(method_name)
-        var= Str2Duck::Format.__send__ method_name, str
+      if ::Str2Duck::Config.public_send(method_name)
+        var = Str2Duck::Format.public_send method_name, str
         return var unless var.nil?
       end
     end

data/lib/str2duck/regexp.rb

@@ -16,7 +16,7 @@ module Str2Duck
           answer_value ||= obj =~ regexp
         end
 
-        return Str2Duck.return_value_parse answer_value
+        return !!answer_value
 
       end
 
@@ -30,7 +30,7 @@ module Str2Duck
           answer_value ||= obj =~ regexp
         end
 
-        return Str2Duck.return_value_parse answer_value
+        return !!answer_value
 
       end
 
@@ -43,24 +43,29 @@ module Str2Duck
           answer_value ||= obj =~ regexp
         end
 
-        return Str2Duck.return_value_parse answer_value
+        return !!answer_value
 
       end
 
       def true? obj
-        return Str2Duck.return_value_parse obj =~ /^true$/
+        return !!obj =~ /^true$/
       end
 
       def false? obj
-        return Str2Duck.return_value_parse obj =~ /^false$/
+        return !!obj =~ /^false$/
       end
 
       def float? obj
-        return Str2Duck.return_value_parse obj =~ /^\d+\.\d+$/
+        case obj.to_s
+          when /^\d+\.\d+$/,/^\d+,\d+$/
+            return true
+          else
+            return false
+        end
       end
 
       def integer? obj
-        return Str2Duck.return_value_parse obj =~ /^\d+$/
+        return !!obj =~ /^\d+$/
       end
 
       def json? obj

data/lib/str2duck.rb

@@ -1,15 +1,8 @@
 #encoding: UTF-8
 
-require 'json'
-require 'yaml'
-
-require 'str2duck/support'
-
 require 'str2duck/regexp'
 require 'str2duck/format'
 require 'str2duck/config'
-
 require 'str2duck/parser'
 
-require 'str2duck/mpatch/string'
 require 'str2duck/mpatch/object'

data/test/test_parse.rb

@@ -0,0 +1,29 @@
+require "str2duck"
+require 'minitest/autorun'
+describe 'StringParse' do
+
+  specify 'parse objects into the right format' do
+
+    {
+        "2011-03-12"=>Date,
+        "2007-07-20 18:59:27 +0200"=>Time,
+        "2010-10-30 18:02:56 +0200"=>Time,
+        "2012-09-12T14:49:50+02:00"=>DateTime,
+        "123"=>Fixnum,
+        "asd"=>String,
+        "123.432"=>Float,
+        "123,432"=>Float,
+        "true"=>TrueClass,
+        "false"=>FalseClass,
+        "some string data"=>String,
+        "{\"hello\":\"json\"}"=>Hash,
+        "--- hello\n..."=>String,
+        "hello: yaml"=>Hash
+    }.each_pair do |str,klass|
+      str.to_duck.must_be_instance_of klass
+    end
+
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: str2duck
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies: []
 description: " Parse string into obj "
 email:
@@ -19,7 +19,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -30,11 +29,10 @@ files:
 - lib/str2duck/config.rb
 - lib/str2duck/format.rb
 - lib/str2duck/mpatch/object.rb
-- lib/str2duck/mpatch/string.rb
 - lib/str2duck/parser.rb
 - lib/str2duck/regexp.rb
-- lib/str2duck/support.rb
 - str2duck.gemspec
+- test/test_parse.rb
 homepage: https://github.com/adamluzsi/str2duck
 licenses: []
 metadata: {}
@@ -58,4 +56,6 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: String to Obj, Duck type parser
-test_files: []
+test_files:
+- test/test_parse.rb
+has_rdoc: 

data/Gemfile.lock

@@ -1,14 +0,0 @@
-PATH
-  remote: .
-  specs:
-    str2duck (1.4.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  str2duck!

data/lib/str2duck/mpatch/string.rb

@@ -1,23 +0,0 @@
-module Str2Duck
-
-  module MPatch
-
-    module String
-
-      def to_duck(self_obj= self)
-        Str2Duck.parse(self_obj)
-      end
-      alias :duck :to_duck
-
-      self.instance_methods.each do |symbol|
-        module_function symbol
-        public symbol
-      end
-
-    end
-
-  end
-
-end
-
-String.__send__( :include, Str2Duck::MPatch::String )

data/lib/str2duck/support.rb

@@ -1,17 +0,0 @@
-#encoding: UTF-8
-module Str2Duck
-  class << self
-    def return_value_parse object
-      case object
-
-        when nil
-          return false
-        when 0
-          return true
-        else
-          nil
-
-      end
-    end
-  end
-end