proxima 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '081e653fe66cc7ffbd3535a48fee5d3c4146ab81'
-  data.tar.gz: b171427373e9544991aba53e5b934376a4f58850
+  metadata.gz: 5e4e449fa262703df9c749f876ff6b529d5c3bf1
+  data.tar.gz: '09ea541775f35a009a17b279c7a783cda0488745'
 SHA512:
-  metadata.gz: 14aef58da59e38ef4b4f285cee5e68d4ceff0e0c472df0a523c8a9b8917f9dd21a0ada2391d204467ce21889d1d6fae1d889189f3c22aa754e9a242c3e12eb09
-  data.tar.gz: 4414e6d9d63b35bf2da37564e05c33827541764395d99ad4dc61c036725f3ecd4ce8e9759a45729919da9af961457c5c50f1a024f9754f1788ee1f4012f33b3a
+  metadata.gz: 242abad6382332c49949e81d3748be602e011acd86c0073762d6c65c445c26ca9b1dffe54fe22bec8a2026f48c172c72ae167f1058f3e8da518ff4042723461b
+  data.tar.gz: b31124f05812c8baf9340da784f3fa348dad5d525e741a708f92a6790c1d8ddae7a5840c9234420cc1b4f2cbe8960f90b8f51a9babb1a36cc762f779ebc72d84

data/lib/proxima/model.rb

@@ -60,9 +60,16 @@ module Proxima
       model
     end
 
-    def self.find(query = {}, opts = {})
+    def self.find(query = {}, params = {}, opts = nil)
+
+      # NOTE: This is a compatibility fix for 0.2 to 0.3
+      if opts == nil
+        opts   = params
+        params = query
+      end
+
       opts[:query] = self.convert_query_or_delta_to_json query
-      @response    = self.api.get self.find_path.call(query), opts
+      @response    = self.api.get self.find_path.call(params), opts
 
       if @response.code != 200
         return []
@@ -72,29 +79,36 @@ module Proxima
       models.each { |model| model.new_record = false }
     end
 
-    def self.find_one(query = {}, opts = {})
+    def self.find_one(query, params, opts = nil)
       query['$limit'] = 1
-      self.find(query, opts)[0]
+      self.find(query, params, opts)[0]
     end
 
-    def self.count(query = {}, opts = {})
+    def self.count(query = {}, params = {}, opts = nil)
+
+      # NOTE: This is a compatibility fix for 0.2 to 0.3
+      if opts == nil
+        opts   = params
+        params = query
+      end
+
       query['$limit'] = 0
       opts[:query]    = self.convert_query_or_delta_to_json query
-      @response       = self.api.get self.find_path.call(query), opts
+      @response       = self.api.get self.find_path.call(params), opts
 
       return nil unless @response.code == 200
 
       @response.headers[:x_total_count] || 0
     end
 
-    def self.find_by_id(id, query = {}, opts = {})
-      if opts == nil && query
-        opts  = query
-        query = {}
+    def self.find_by_id(id, params = {}, opts = nil)
+      if opts == nil
+        opts   = params
+        params = {}
       end
 
-      query[:id] = id
-      @response  = self.api.get self.find_by_id_path.call(query), opts
+      params[:id] = id
+      @response  = self.api.get self.find_by_id_path.call(params), opts
 
       return nil unless @response.code == 200
 
@@ -132,7 +146,7 @@ module Proxima
       @response
     end
 
-    def save(options = {})
+    def save(options = {}, params = {})
       return false unless self.valid?
 
       if self.new_record?
@@ -150,7 +164,7 @@ module Proxima
       return true if self.persisted?
 
       options[:flatten] = true if options[:flatten] == nil
-      path      = self.class.update_by_id_path.call self.to_h
+      path      = self.class.update_by_id_path.call params.merge(self.to_h)
       payload   = { json: self.as_json(options) }
       @response = self.class.api.put path, payload
 

data/lib/proxima/serialization.rb

@@ -20,8 +20,13 @@ module Proxima
 
         next unless value
 
-        if params[:klass] && params[:klass].respond_to?(:from_json)
-          value = params[:klass].from_json(value)
+        if params[:klass]
+          begin
+            value = Proxima.type_from_json params[:klass], value
+          rescue Exception => e
+            raise "Cannot convert value \"#{value}\" for attribute \"#{attribute}\" to type" +
+              " #{params[:klass].name}: #{e.message}"
+          end
         end
 
         hash[attribute] = value
@@ -42,7 +47,15 @@ module Proxima
 
         json_path = params[:json_path]
         value     = hash[attribute.to_s]
-        value     = value.as_json if value.respond_to? :as_json
+
+        if params[:klass]
+          begin
+            value = Proxima.type_to_json params[:klass], value
+          rescue Exception => e
+            raise "Cannot convert value \"#{value}\" for attribute \"#{attribute}\" from type" +
+              " #{params[:klass].name}: #{e.message}"
+          end
+        end
 
         if options.key? :flatten
           json[json_path] = value

data/lib/proxima/version.rb

@@ -1,5 +1,5 @@
 
 
 module Proxima
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/proxima.rb

@@ -4,4 +4,70 @@ require "proxima/model"
 
 
 module Proxima
+
+  @types = [
+    {
+      klass:     String,
+      from_json: -> v { v.to_s },
+      to_json:   -> v { v.to_s }
+    }, {
+      klass:     Integer,
+      from_json: -> v { v.to_i },
+      to_json:   -> v { v.to_i }
+    }, {
+      klass:     Float,
+      from_json: -> v { v.to_f },
+      to_json:   -> v { v.to_f }
+    }, {
+      klass:     Rational,
+      from_json: -> v { v.to_r },
+      to_json:   -> v { v.to_r }
+    }, {
+      klass:     Complex,
+      from_json: -> v { v.to_c },
+      to_json:   -> v { v.to_c }
+    }, {
+      klass:     TrueClass,
+      from_json: -> v { v.to_s == 'true' },
+      to_json:   -> v { v.to_s == 'true' }
+    }, {
+      klass:     Array,
+      from_json: -> v { v.to_a },
+      to_json:   -> v { v.to_a }
+    }, {
+      klass:     Hash,
+      from_json: -> v { v.to_h },
+      to_json:   -> v { v.to_h }
+    }, {
+      klass:     DateTime,
+      from_json: -> v { DateTime.iso8601 v },
+      to_json:   -> v { v.iso8601 3 }
+    }
+  ]
+
+  def self.add_type(klass, from = nil, to = nil)
+    @types.push({
+      klass: klass,
+      from:  from,
+      to:    to
+    })
+  end
+
+  def self.remove_type(klass)
+    @types.delete_if({
+      klass: klass,
+      from:  from,
+      to:    to
+    })
+  end
+
+  def self.type_from_json(klass, value)
+    type = @types.find { |t| t[:klass] == klass }
+    type.from_json(value) if type else value
+  end
+
+  def self.type_to_json(klass, value)
+    type = @types.find { |t| t[:klass] == klass }
+    type.to_json(value) if type else value
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxima
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler