nube 0.1.1 → 0.1.2

data/lib/nube/base.rb

@@ -98,7 +98,7 @@ module Nube
     end
 
     def self.do_request(method, site_options, params={})
-      site = site(site_options[:identity], self.name.pluralize.underscore, site_options[:action], site_options[:id])
+      site = site(site_options[:identity], self.name.split('::').last.pluralize.underscore, site_options[:action], site_options[:id])
       url = URI.parse(site)
       req = "Net::HTTP::#{method.to_s.camelize}".constantize.new(url.to_s)
       req.body = params.to_param
@@ -129,7 +129,7 @@ module Nube
 
     def self.method_missing(name, *args, &block)
       super(name, *args) unless ("#{self.name}Relation".constantize.instance_methods - self.instance_methods).include?(name)
-      args.empty? ? self.node.send(name) : self.node.send(name, args.first)
+      args.empty? ? self.node.send(name) : self.node.send(name, *args)
     end
 
   end

data/lib/nube/controllers/nube_controller.rb

@@ -38,7 +38,7 @@ module NubeController
 
   def self.resource(xmodel); @@resource = xmodel; end
 
-  def apply_relations; @resource = @resource.where(relations).where(params[:server_id]); end
+  def apply_relations; @resource = @resource.where(relations).where(server_id: params[:server_id]); end
 
   def parse_request; @json = JSON.parse(request.body.read); end
 

data/lib/nube/remote_relation.rb

@@ -3,123 +3,122 @@ module RemoteRelation
   extend ActiveSupport::Concern
 
   included do
-    Object.const_set(
-      "#{self.to_s.split('::').last}Relation", Class.new do
-        attr_accessor :xmodel, :params
+    eval("class #{self.to_s}Relation;end")
+    "#{self.to_s}Relation".constantize.class_eval do
+      attr_accessor :xmodel, :params
 
-        def initialize(xmodel, params={})
-          @params = params
-          @xmodel = xmodel
-        end
-
-        def find(*ids)
-          @params.merge!({ where: [{id: ids.flatten}] })
-          resources = all
-          (resources.size > 1) ? resources : resources.first
-        end
+      def initialize(xmodel, params={})
+        @params = params
+        @xmodel = xmodel
+      end
 
-        def controller_name
-          @xmodel.name.pluralize.underscore
-        end
+      def find(*ids)
+        @params.merge!({ where: [{id: ids.flatten}] })
+        resources = all
+        (resources.size > 1) ? resources : resources.first
+      end
 
-        def destroy_all(where={}, relations={})
-          @xmodel.delete(@params.delete(:site_options).merge({ action: 'destroy_all' }), { where: [where].flatten }).map{|attrs| @xmodel.new(attrs, false) }
-        end
+      def controller_name
+        @xmodel.name.pluralize.underscore
+      end
 
-        def update_all(changes={}, where={}, relations={})
-          changes.each do |attrib, value|
-            # change true and false by 1 or 0 becouse params are sent as string
-            changes[attrib] = (value ? 1 : 0) if !!value == value
-          end
-          @xmodel.put(@params.delete(:site_options).merge({ action: 'update_all' }), { changes: changes, where: [where].flatten }).first
-        end
+      def destroy_all(where={}, relations={})
+        @xmodel.delete(@params.delete(:site_options).merge({ action: 'destroy_all' }), { where: [where].flatten }).map{|attrs| @xmodel.new(attrs, false) }
+      end
 
-        def empty_attributes
-          @xmodel.get(@params.delete(:site_options).merge({ action: 'empty_attributes' })).first
+      def update_all(changes={}, where={}, relations={})
+        changes.each do |attrib, value|
+          # change true and false by 1 or 0 becouse params are sent as string
+          changes[attrib] = (value ? 1 : 0) if !!value == value
         end
+        @xmodel.put(@params.delete(:site_options).merge({ action: 'update_all' }), { changes: changes, where: [where].flatten }).first
+      end
 
-        def count
-          @xmodel.get(@params.delete(:site_options).merge({ action: 'count' }), @params).first.to_i
-        end
+      def empty_attributes
+        @xmodel.get(@params.delete(:site_options).merge({ action: 'empty_attributes' })).first
+      end
 
-        def all
-          @xmodel.get(@params.delete(:site_options), @params).map{|attributes| @xmodel.new(attributes, false) }
-        end
+      def count
+        @xmodel.get(@params.delete(:site_options).merge({ action: 'count' }), @params).first.to_i
+      end
 
-        def first
-          (@params[:order] ||= []) << { id: :asc }
-          @params[:limit] = 1
-          all.first
-        end
+      def all
+        @xmodel.get(@params.delete(:site_options), @params).map{|attributes| @xmodel.new(attributes, false) }
+      end
 
-        def last
-          (@params[:order] ||= []) << { id: :desc }
-          @params[:limit] = 1
-          all.last
-        end
+      def first
+        (@params[:order] ||= []) << { id: :asc }
+        @params[:limit] = 1
+        all.first
+      end
 
-        def joins(*models)
-          if @xmodel.same_class?(models)
-            params[:joins]= [] unless params.has_key?(:joins)
-            tap{ |s| s.params[:joins] += models }
-          else
-            raise 'Errors: Some class is not Remote Resource'
-          end
-        end
+      def last
+        (@params[:order] ||= []) << { id: :desc }
+        @params[:limit] = 1
+        all.last
+      end
 
-        def create(attrs={})
-          obj = @xmodel.new(attrs)
-          obj.save
-          obj
+      def joins(*models)
+        if @xmodel.same_class?(models)
+          params[:joins]= [] unless params.has_key?(:joins)
+          tap{ |s| s.params[:joins] += models }
+        else
+          raise 'Errors: Some class is not Remote Resource'
         end
+      end
 
-        def where(conditions); tap{|s| (s.params[:where] || s.params[:where] = []) << conditions}; end
+      def create(attrs={})
+        obj = @xmodel.new(attrs)
+        obj.save
+        obj
+      end
 
-        def order(conditions); tap{|s| (s.params[:order] || s.params[:order] = []) << conditions}; end
+      def where(conditions); tap{|s| (s.params[:where] || s.params[:where] = []) << conditions}; end
 
-        def limit(number); tap{|s| s.params[:limit] = number }; end
+      def order(conditions); tap{|s| (s.params[:order] || s.params[:order] = []) << conditions}; end
 
-        def offset(number); tap{|s| s.params[:offset] = number }; end
+      def limit(number); tap{|s| s.params[:limit] = number }; end
 
-        def page(size=1)
-          @page = size
-          limit(25) unless @params.has_key?(:limit)
-          calculate_offset
-        end
+      def offset(number); tap{|s| s.params[:offset] = number }; end
 
-        def per(size=25)
-          @page ||= 1
-          limit(size)
-          calculate_offset
-        end
+      def page(size=1)
+        @page = size
+        limit(25) unless @params.has_key?(:limit)
+        calculate_offset
+      end
 
-        def calculate_offset; offset(@params[:limit] * (@page - 1)); end
+      def per(size=25)
+        @page ||= 1
+        limit(size)
+        calculate_offset
+      end
 
-        def paginate(value={})
-          value.has_key?(:page)     ? page(value[:page])    : page
-          value.has_key?(:per_page) ? per(value[:per_page]) : per
-        end
+      def calculate_offset; offset(@params[:limit] * (@page - 1)); end
 
-        def search(params={}); tap{|s| s.params[:search] = params }; end
+      def paginate(value={})
+        value.has_key?(:page)     ? page(value[:page])    : page
+        value.has_key?(:per_page) ? per(value[:per_page]) : per
+      end
 
-        alias_method :ransack, :search
+      def search(params={}); tap{|s| s.params[:search] = params }; end
 
-        def massive_transactions(transaction, method, action)
-          @xmodel.send(method, @params.delete(:site_options).merge({ action: action }), @params.merge(transaction: transaction))
-        end
+      alias_method :ransack, :search
 
-        def massive_creation(transaction); massive_transactions(transaction, 'post', 'massive_creation', site_options); end
+      def massive_transactions(transaction, method, action)
+        @xmodel.send(method, @params.delete(:site_options).merge({ action: action }), @params.merge(transaction: transaction))
+      end
 
-        def massive_sum(transaction); massive_transactions(transaction, 'put', 'massive_sum', site_options); end
+      def massive_creation(transaction); massive_transactions(transaction, 'post', 'massive_creation', site_options); end
 
-        def massive_update(transaction); massive_transactions(transaction, 'put', 'massive_update', site_options); end
+      def massive_sum(transaction); massive_transactions(transaction, 'put', 'massive_sum', site_options); end
 
-        def method_missing(name, *args, &block)
-          all.send(name, *args, &block)
-        end
+      def massive_update(transaction); massive_transactions(transaction, 'put', 'massive_update', site_options); end
 
+      def method_missing(name, *args, &block)
+        all.send(name, *args, &block)
       end
-    )
+
+    end
   end
 
   # module ClassMethods

data/lib/nube/remote_scope.rb

@@ -7,7 +7,7 @@ module RemoteScope
 
     def node(identity=nil)
       # identity = IDENTITY_SITE if not identity and defined?(IDENTITY_SITE)
-      "#{self}Relation".constantize.new(self, { site_options: {identity: identity} })
+      "#{self}Relation".constantize.new(self, { site_options: {identity: (identity || token)} })
     end
 
     def build_params keys, values

data/lib/nube/version.rb

@@ -1,3 +1,3 @@
 module Nube
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nube
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - g.edera
@@ -16,7 +16,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 
-date: 2016-04-15 00:00:00 -03:00
+date: 2016-07-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 999358234
+        hash: 352077850
         segments: 
         - 4
         - x
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 999358234
+        hash: 352077850
         segments: 
         - 4
         - x
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 999358234
+        hash: 352077850
         segments: 
         - 4
         - x