dm-postgres-types 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e639a4b51d8e2801528d28f361678a77cc22fddd
-  data.tar.gz: 21859491842b616d4376b838f651e725e4c6eabd
+  metadata.gz: b34c0fed29d2734988332c1ebc2feb36b701c8a8
+  data.tar.gz: 2d43675b7212f143f7fdcc2ad8b5bef523b2eba2
 SHA512:
-  metadata.gz: a8c61bb9da397af557b989cf16c8302949e2086fbf032b6efdacf6aaef3e331f75b52a583446a1d51ac267e2cceefceed293a9071a7b76898aa342fc0ec70668
-  data.tar.gz: fbe056c6f2e989f8fe5d54b639063056fd0b19c7d9e403067ea0ca79115e78795110eab572eccbf5171b8758b971678f7b1f46a7e79c06b73742f5c9ae88dd48
+  metadata.gz: bb572e25a2ab66f534816d62717fdfa3d2e544e5274022fca8549170a0fbc98c0df8969106dafefc0b806af694116b1c596ff3215b753451c04e2c193001afbf
+  data.tar.gz: 0f7fe62848199365af2b9ce45f5028705715844573ea21365c587f56731f738b527ceafb41b4f7ef01a8faaf03148c0efcfeb45139a744568c1f186f32b3f14d

data/README.md

@@ -39,7 +39,7 @@ m.elements
 # => ["abc", "def"]
 ````
 
-Use this property when you want to store an array of strings. This property dosn't have any options.
+Use this property when you want to store an array of strings. This property doesn't have any options.
 
 ---
 
@@ -84,7 +84,7 @@ m.things
 # => { "a" => "bcd", "e" => "fgh" }
 ````
 
-Use this property when you want to store simple hash values. This property dosn't have any options. 
+Use this property when you want to store simple hash values. This property doesn't have any options. 
 
 Please note: All hash keys will be returned as strings when your hash is loaded from the database, even if you supplied a hash with symbol keys when you saved it. If this is undesired, check out the `Hash#symbolize_keys` method provided by `ActiveSupport` ([link](http://rubygems.org/gems/activesupport)).
 
@@ -118,3 +118,10 @@ Please note: JSON de/serializtion is being handled by the `Oj` gem, which is the
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Shout Outs
+
+This library is heavily inspired by and borrows ideas and sometimes code from:
+ - `dm-pg-types` ([More Info](https://github.com/svs/dm-pg-types))
+ - `dm-types` ([More Info](https://github.com/svs/dm-types))
+ - `dm-pg-json` ([More Info](https://github.com/styleseek/dm-pg-json))

data/lib/dm-postgres-types/property/pg_hstore.rb

@@ -7,17 +7,17 @@ module DataMapper
     class PgHStore < Object
       def load(value)
         return nil unless value
-        values = value.split(",")
-        values.map! { |val| unescape_pg_hash(val) }
-        values.map! { |key, val| [key, unescape_nil(val)] }
+        values = value.split(", ")
+        values.map! do |val|
+          k, v = val.split("=>")
+          [unescape_double_quote(k),unescape_double_quote(unescape_nil(v))]
+        end
         Hash[*(values.flatten)]
       end
 
       def dump(value)
         return "" unless value
-        value.map! do |idx, val|
-          [escape_double_quote(idx), escape_value(val)].join(",")
-        end
+        value.map { |key, val| %Q{"#{key.to_s}"=>"#{escape_nil(val)}"} }.join(", ")
       end
 
       private
@@ -30,30 +30,11 @@ module DataMapper
         (value == 'NULL') ? nil : value
       end
 
-      def escape_double_quote(value)
-        value.gsub!(/"/, '\"')
-        value
-      end
-
       def unescape_double_quote(value)
         value.gsub!('"','')
         value.strip!
         value
       end
-
-      def escape_pg_hash(value)
-        (value =~ /[,\s=>]/ || value.empty?) ? %Q{"#{value}"} : value
-      end
-
-      def unescape_pg_hash(value)
-        values = value.split("=>")
-        values.map! { |val| unescape_double_quote(val) }
-        values
-      end
-
-      def escape_value(value)
-        escape_double_quote(escape_nil(escape_pg_hash(value)))
-      end
     end
   end
 end

data/lib/dm-postgres-types/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module PostgresTypes
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-postgres-types
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eric Marden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core