dm-pg-json 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54d528fdfaedc46b62a112b0724e6f64d76ebd26
-  data.tar.gz: 5a1bec53789e29a90fddfd079b752a0615a3bd1e
+  metadata.gz: daef494f25f8cb172e8c96527a943be8682e2486
+  data.tar.gz: c24e17c869fc9a320d0d98265663e4587604970e
 SHA512:
-  metadata.gz: 2a8dbf6a6426b370108c8ec0ae7d6db558def54ee94c6de98f0afcf8e51a51d40bb547748717ace2684264e8814b36654bfb9b5136b8cc251421a161854848b5
-  data.tar.gz: 8b31da87a8878425638944428fd326c5275d1b05011bed81b5b001b4d1f901d8ff997bf7c44c060e194ec67a4676abc7d2e4e9ccfd1662d4176fbad9e2e0c4d2
+  metadata.gz: 1fdc00f2e015e1d7d6747ad1dcd2e126bd2c5c5c939aa78bb80c43e13bb925c1c5ddcf8ba10f43e3e0bb6c0b088ca0f24881938dbfd256ed8d2dc04b96fe1b1c
+  data.tar.gz: acbd90f9afd862aa618e15ab0d8467f46c85f254f587927e9212b94e07cdb44670c13bcc69d8148649d497fa4dda56fd8c2450e0d28dc5086e0c08d0921e22ad

data/lib/dm-pg-json/property/pgjson.rb

@@ -1,14 +1,35 @@
 # encoding: utf-8
 
+require 'dm-core'
+require 'dm-types/support/dirty_minder'
+
 module DataMapper
   class Property
-    class PgJSON < Property
+    class PgJSON < Text
+      def dump(value)
+        case value
+        when ::NilClass, ::String
+          value
+        when ::Hash, ::Array
+          Oj.dump(value, mode: :compat)
+        else
+          '{}'
+        end
+      end
+
       def load(value)
-        Oj.load(value)
+        case value
+        when ::Hash, ::Array
+          value
+        when ::String
+          Oj.load(value)
+        else
+          {}
+        end
       end
 
-      def dump(value)
-        Oj.dump(value, mode: :compat)
+      def primitive?(value)
+        value.kind_of?(::String)
       end
     end
   end

data/lib/dm-pg-json/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module PostgresJSON
-    VERSION = "0.0.1"
+    VERSION = "0.1.0"
   end
 end

data/lib/dm-pg-json.rb

@@ -2,19 +2,16 @@
 
 require 'dm-core'
 require 'dm-postgres-adapter'
+require 'dm-pg-json/property/pgjson'
 require 'dm-pg-json/version'
 
 module DataMapper
-  class Property
-    autoload :PgJSON, 'dm-pg-json/property/pgjson'
-  end
-
   module Migrations
     module PostgresAdapter
       def property_schema_hash(property)
         schema = super
         
-        if property.kind_of?(Property::PgJSON)
+        if property.kind_of?(::DataMapper::Property::PgJSON)
           schema.delete(:length)
         end
 
@@ -35,9 +32,9 @@ module DataMapper
       #
       # @api private
       def type_map
-        super.merge(Property::PgJSON => {:primitive => 'JSON'}).freeze
+        super.merge(::DataMapper::Property::PgJSON => {:primitive => 'JSON'}).freeze
       end
     end
   end
 end
-DataMapper::Adapters::PostgresAdapter.send(:include,DataMapper::PostgresJSON)
+DataMapper::Adapters::PostgresAdapter.send(:include, ::DataMapper::PostgresJSON)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm-pg-json
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - StyleSeek Engineering Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core