proxima 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24311aa26e3346bf960345d304ce06d55b81dff8
-  data.tar.gz: a66129b2cb4b677ea05cfa55a5ff0f606ea711f8
+  metadata.gz: 2b6e9e03067a1f333f43b25db6b84209452f41f9
+  data.tar.gz: be46e25021188d6f145b24ad4f1de16a89164416
 SHA512:
-  metadata.gz: aff9c654c5b106aec74ec6dfa1941e2857b82960081834ce8859b37c9212888d9ee0577f80c22b7d6bfeb1ad017cce6f66346073ae2f0d7d7d07840ec6a4ba7c
-  data.tar.gz: a270bd19fa4b9350326d9783ab91226b5b23953350f947f1aad1c9bb00479d76c75e10016f69b7bbaf8fe67f20534bb34ef980fbdca9e2a7e22c3543a823c511
+  metadata.gz: 19fba539d2135ade5bb1fe07055dc120ce1a4fdda542cbef96c89bb976be6284b230f542acc1657b7c091fcef78b60f277886ad82884baca30fe0442b4c28b80
+  data.tar.gz: 3d3555bb65407aec5f2b6c5135583a692db2cda14bfed4caac0a0dfeeb2bd94aa0ff05255af8e30a790bbc6dfbc18940e75bc763403d446c68a18f80af66b2e7

data/lib/proxima/attributes.rb

@@ -29,6 +29,18 @@ module Proxima
       end
     end
 
+    def eql? otherModel
+      self.id.eql? otherModel.id
+    end
+
+    def hash
+      self.id.hash
+    end
+
+    def <=> otherModel
+      self.id <=> otherModel.id
+    end
+
     module ClassMethods
 
       def attributes

data/lib/proxima/model.rb

@@ -1,5 +1,6 @@
 require 'active_model'
 require 'proxima/watch'
+require 'proxima/rest'
 require 'proxima/attributes'
 require 'proxima/paths'
 require 'proxima/serialization'
@@ -18,6 +19,7 @@ module Proxima
     include ActiveModel::Serializers::JSON
     include ActiveModel::Validations
 
+    include Proxima::Rest
     include Proxima::Attributes
     include Proxima::Paths
     include Proxima::Serialization
@@ -66,8 +68,7 @@ module Proxima
 
       return [] unless @response.code == 200
 
-      models = self.from_json @response.body
-      models.each { |model| model.new_record = false }
+      self.from_json @response.body
     end
 
     def self.count_and_find(query = {}, params = {}, opts = {})
@@ -98,10 +99,7 @@ module Proxima
 
       return nil unless @response.code == 200
 
-      model = self.new
-      model.from_json @response.body
-      model.new_record = false
-      model
+      self.from_json @response.body, single_model_from_array: true
     end
 
     def initialize(record = {})
@@ -167,7 +165,7 @@ module Proxima
     end
 
     def destroy
-      return false if new_record?
+      raise "Cannot destroy a new record" if new_record?
 
       @response = self.class.api.delete(self.class.delete_by_id_path.call(self.to_h))
 
@@ -176,7 +174,7 @@ module Proxima
     end
 
     def restore
-      return false if new_record?
+      raise "Cannot restore a new record" if new_record?
 
       @response = self.class.api.post(self.class.restore_by_id_path.call(self.to_h))
 

data/lib/proxima/rest.rb

@@ -0,0 +1,28 @@
+
+
+module Proxima
+
+  module Rest
+
+    [:post, :get, :put, :delete].each do |http_method|
+      define_method :"#{http_method}" do |path, opts = {}, &block|
+        @response = self.class.api.public_send(:"#{http_method}", path, opts, &block)
+        @response
+      end
+    end
+
+    module ClassMethods
+
+      [:post, :get, :put, :delete].each do |http_method|
+        define_method :"#{http_method}" do |path, opts = {}, &block|
+          @response = self.api.public_send(:"#{http_method}", path, opts, &block)
+          @response
+        end
+      end
+    end
+
+    def self.included base
+      base.extend ClassMethods
+    end
+  end
+end

data/lib/proxima/serialization.rb

@@ -3,9 +3,11 @@
 module Proxima
   module Serialization
 
-    def from_json(json, include_root = self.include_root_in_json)
+    def from_json(json, opts = {})
       json = ActiveSupport::JSON.decode(json) if json.is_a?(String)
-      json = json.values.first if include_root
+      binding.pry
+      json = json.values.first if opts[:include_root] || self.include_root_in_json
+      json = json.first        if opts[:single_model_from_array] && json.is_a?(Array)
       hash = {}
 
       self.class.attributes.each do |attribute, params|
@@ -33,16 +35,18 @@ module Proxima
       end
 
       self.attributes = hash
+      self.new_record = opts[:new_record] if opts[:new_record] != nil
       self
     end
 
-    def as_json(options = {})
-      hash = serializable_hash options
+    def as_json(opts = {})
+      hash = self.serializable_hash opts
+
       json = {}
       self.class.attributes.each do |attribute, params|
         next if (
-          !options.key?(:include_clean) && !send("#{attribute}_changed?") ||
-          !options.key?(:include_nil) && hash[attribute.to_s] == nil
+          !opts.key?(:include_clean) && !send("#{attribute}_changed?") ||
+          !opts.key?(:include_nil)   && hash[attribute.to_s] == nil
         )
 
         json_path = params[:json_path]
@@ -57,7 +61,7 @@ module Proxima
           end
         end
 
-        if options.key? :flatten
+        if opts.key? :flatten
           json[json_path] = value
           next
         end
@@ -72,8 +76,8 @@ module Proxima
         json_ctx[last_json_path_chunk] = value
       end
 
-      root = if options.key? :root
-        options[:root]
+      root = if opts.key? :root
+        opts[:root]
       else
         self.include_root_in_json
       end
@@ -96,15 +100,19 @@ module Proxima
 
     module ClassMethods
 
-      def from_json(json, include_root=self.include_root_in_json)
+      def from_json(json, opts = {})
         json = ActiveSupport::JSON.decode(json) if json.is_a? String
-        json = json.values.first if include_root
+        json = json.values.first if opts[:include_root] || self.include_root_in_json
+        json = json.first        if opts[:single_model_from_array] && json.is_a?(Array)
 
         if json.is_a? Array
           return json.map { |json| self.new.from_json json }
         end
 
-        self.new.from_json json
+        model            = self.new.from_json json
+        model.new_record = opts[:new_record] || false
+
+        model
       end
 
       def convert_query_or_delta_to_json(query)

data/lib/proxima/version.rb

@@ -1,5 +1,5 @@
 
 
 module Proxima
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxima
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Robert Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ files:
 - lib/proxima/attributes.rb
 - lib/proxima/model.rb
 - lib/proxima/paths.rb
+- lib/proxima/rest.rb
 - lib/proxima/serialization.rb
 - lib/proxima/validation.rb
 - lib/proxima/version.rb