dm-pg-json 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0d2b6f83ab1aae625a0f205ffddcefd5e57361
-  data.tar.gz: 44ab33d2962fa168b739d6d3d48f355f994d15fa
+  metadata.gz: 6a0f66fbe7d16dc57693879322dc2e3edb3ac580
+  data.tar.gz: 1402a8e3d30f47cc206dd07211c814e79c365360
 SHA512:
-  metadata.gz: 28d42c87a26e6a2ee2c21f4c441ddc91092aa682ac4c4c4ab3286e56474113952c5c44bce7d0a2e611dbdcc438e6f5196e96340900b261fceb61c2f38fbfa31d
-  data.tar.gz: 1dfeb689bf0ae27c2e8378d9189c2474c2c9325bd533dbaf1b0eba4175ac5a8c12171f5771bb8fad01c087b79d97d2a2e02644f1cc5d63e4f1dd252699c93570
+  metadata.gz: e6c598c82484f2f0a83e1d3639d3fca6b5ac6ab9941b18ac15acb5d74ae2c3758154410929bf6c40b901cc80aadfe0980de153e342c605a31fb568c97ae01b0e
+  data.tar.gz: da3be02da1aa874a2b4ef3614f9a0239577db2e1c5044b2969cf71333a6bcf5e8a931bde072e63bc5bfa6de21f65345a85aa69099d64d358754b51e63521299d

data/dm-pg-json.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'dm-core'
   gem.add_dependency 'dm-postgres-adapter'
+  gem.add_dependency 'dm-migrations'
+  gem.add_dependency 'dm-validations'
 
   gem.add_development_dependency "bundler", "~> 1.3"
   gem.add_development_dependency "rake"

data/lib/dm-pg-json.rb

@@ -2,35 +2,55 @@
 
 require 'dm-core'
 require 'dm-postgres-adapter'
+require 'dm-migrations'
+require 'dm-validations'
 require 'dm-pg-json/property/pgjson'
 require 'dm-pg-json/version'
 
 module DataMapper
   module Migrations
     module PostgresAdapter
-      def property_schema_hash(property)
-        schema = super
-       
-        if property.kind_of?(Property::PgJSON)
-          schema.delete(:length)
-        end
+      module SQL
+        def property_schema_statement(connection, schema)
+          statement = quote_name(schema[:name])
+          statement << " #{schema[:primitive]}"
+
+          length = schema[:length]
+
+          if schema[:precision] && schema[:scale]
+            statement << "(#{[ :precision, :scale ].map { |key| connection.quote_value(schema[key]) }.join(', ')})"
+          elsif length == 'max'
+            statement << '(max)'
+          elsif length
+            statement << "(#{connection.quote_value(length)})"
+          end
+
+          default = schema[:default]
+          if default
+            if schema[:primitive] == 'JSON'
+              stmt = " DEFAULT #{connection.quote_value(default)}::JSON"
+            else
+              stmt = " DEFAULT #{connection.quote_value(default)}"
+            end
+            statement << stmt
+          end
 
-        schema
+          statement << ' NOT NULL' unless schema[:allow_nil]
+
+          statement
+        end
       end
     end
   end
+end
 
+module DataMapper
   module PostgresJSON
     def self.included(base)
       base.extend ClassMethods
     end
 
     module ClassMethods
-      # Types for PostgreSQL databases.
-      #
-      # @return [Hash] types for PostgreSQL databases.
-      #
-      # @api private
       def type_map
         super.merge(Property::PgJSON => {:primitive => 'JSON'}).freeze
       end

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

@@ -5,7 +5,8 @@ require 'dm-types/support/dirty_minder'
 
 module DataMapper
   class Property
-    class PgJSON < Object
+    class PgJSON
+      include ::DataMapper::Property::DirtyMinder
       def dump(value)
         case value
         when ::NilClass, ::String
@@ -24,12 +25,13 @@ module DataMapper
         when ::String
           Oj.load(value)
         else
-          {}
+          nil
         end
       end
 
       def primitive?(value)
-        value.kind_of?(::String)
+        value = load(value) if value.kind_of?(::String)
+        value.kind_of?(::Array) || value.kind_of?(::Hash)
       end
     end
   end

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

@@ -1,5 +1,5 @@
 module DataMapper
   module PostgresJSON
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,69 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: dm-pg-json
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - StyleSeek Engineering Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-postgres-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds support for the JSON datatype (available in PostgreSQL 9.3+) to
@@ -74,7 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -93,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adds support for the JSON datatype to DataMapper