smooth_operator 1.10.16 → 1.10.17

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2VlMDMwZTU0ODVjZTdiZTg2YmY1NDYzODE4MDVkYjlhOWJlZjliYQ==
+    ZmU3ZWY3OGVjOTg5NTNmMGNiMTI4N2U5YTAyYjQzOGI1MGQ4NjNhMQ==
   data.tar.gz: !binary |-
-    ZDg4ZGQ5NmM5MWFkYWMwYzBjYTQxZTg2ODYwOGY5OWFkZDI3ZjdkNQ==
+    NWY2YWE5NmVmZjM4YzBlNTRhZGJmMjVlODM3M2QxY2ViZDRmMmNmMg==
 SHA512:
   metadata.gz: !binary |-
-    ZjZiYjExYmU3MzdjODRjNmIxNjdhMGJkMzM3M2YzOTk3NzQ3OTAzYTAyNWU4
-    MWE5YjU3MWUyYjAwMmYwN2M3YzE3MTM2NDJmNzNhMTI2ZThlNjljZTM5MmZh
-    OWQzNzE1OWQ1OGE0MDYxNTcxN2M1NWEwN2E1MmZmNWZmNTU4ODQ=
+    YTAxMGQ5YWU1MTFkNzE5OTliZTY0YjU4ZWZiNTVhM2E0Zjg3ODVjZDIzM2Fh
+    NzhmN2FlZmEzM2I4NGJjYTM0ZTUzZGYwZmQ3YWJkODdiNDRkMjJiY2YyNjgz
+    MzNmNmM4OWJlOThlYjM4ZjlmYzVkODIzNDNkNWIzMDcxOTFhNzM=
   data.tar.gz: !binary |-
-    MGJjMzMxZmM0YmFkYmRlMGZiNmZlNGIzMWJlZGM4ZTQ4ZjUwM2E5ZDRlODUy
-    MzE1YWYwODZmYmE5MDUxZjYzZTVhNmM5YmVmZTdlYTQzY2EzMmIwNjE1NTA1
-    YTRkZDc2OGJkNjdkM2U5NmFjN2E4NmJkY2Y4NjA1MjA5NmM0ZWM=
+    MDZiOTJjNmQ1ZTVjNzZmZTc0MWI3MTU5NjBmYTU0ZTY3ZTBhNmUxY2NkZDg2
+    OTk5MzVhNDhmYTBhNTlhYWE0NmFiNmM1MTAyMGM0ZDMxM2VmZTUzZmU2YjE0
+    ZWI0MzBiMDI5MDVkZWRlYjUzNmMwMTMyNDk0OWQxMzk4MzM0MTA=

data/lib/smooth_operator/array_with_meta_data.rb

@@ -6,7 +6,7 @@ module SmoothOperator
 
     include Enumerable
 
-    attr_reader :meta_data, :internal_array, :table_name, :object_class
+    attr_reader :meta_data, :internal_array, :object_class
 
     def_delegators :internal_array, :length, :<<, :[]
 
@@ -14,10 +14,10 @@ module SmoothOperator
       _attributes = attributes.dup
 
       @object_class = object_class
-      @table_name = object_class.table_name
+      resources_name = object_class.resources_name
 
-      @internal_array = [*_attributes[table_name]].map { |array_entry| object_class.new(array_entry).tap { |object| object.reloaded = true } }
-      _attributes.delete(table_name)
+      @internal_array = [*_attributes[resources_name]].map { |array_entry| object_class.new(array_entry).tap { |object| object.reloaded = true } }
+      _attributes.delete(resources_name)
 
       @meta_data = _attributes
     end

data/lib/smooth_operator/attribute_assignment.rb

@@ -63,8 +63,8 @@ module SmoothOperator
       
       attributes = _attributes = Helpers.stringify_keys(_attributes)
 
-      if _attributes.include?(model_name)
-        attributes = _attributes.delete(model_name)
+      if _attributes.include?(resource_name)
+        attributes = _attributes.delete(resource_name)
         @_meta_data = _attributes
       end
       

data/lib/smooth_operator/finder_methods.rb

@@ -27,7 +27,7 @@ module SmoothOperator
       if parsed_response.is_a?(Array)
         parsed_response.map { |array_entry| build_object(array_entry, options, true) }
       elsif parsed_response.is_a?(Hash)
-        if !from_array && parsed_response.include?(table_name)
+        if !from_array && parsed_response.include?(resources_name)
           ArrayWithMetaData.new(parsed_response, self)
         else
           new(parsed_response, from_server: true)

data/lib/smooth_operator/model_schema.rb

@@ -14,22 +14,26 @@ module SmoothOperator
       @internal_structure ||= self.class.internal_structure.dup
     end
 
-    def table_name
-      @table_name ||= self.class.table_name.dup
+    def resources_name
+      @resources_name ||= self.class.resources_name.dup
     end
 
-    def model_name
-      @model_name ||= table_name.singularize
+    def resource_name
+      @resource_name ||= resources_name.singularize
     end
 
     
     module ClassMethods
+      
+      def resources_name
+        @resources_name ||= self.resource_name.pluralize
+      end
+      attr_writer :resources_name
 
-      attr_writer :table_name
-
-      def table_name
-        @table_name ||= self.model_name.to_s.underscore.pluralize
+      def resource_name
+        @resource_name ||= self.model_name.to_s.underscore.pluralize
       end
+      attr_writer :resource_name
 
       def schema(structure)
         internal_structure.merge! Helpers.stringify_keys(structure)

data/lib/smooth_operator/operator.rb

@@ -75,10 +75,10 @@ module SmoothOperator
     end
 
     def resource_path(relative_path, options)
-      table_name = options[:table_name] || self.table_name
+      resources_name = options[:resources_name] || self.resources_name
 
-      if Helpers.present?(table_name)
-        Helpers.present?(relative_path) ? "#{table_name}/#{relative_path}" : table_name
+      if Helpers.present?(resources_name)
+        Helpers.present?(relative_path) ? "#{resources_name}/#{relative_path}" : resources_name
       else
         relative_path.to_s
       end

data/lib/smooth_operator/persistence.rb

@@ -114,8 +114,8 @@ module SmoothOperator
         if parent_object.nil? || options[:ignore_parent] == true
           relative_path = id.to_s
         else
-          options[:table_name] = ''
-          relative_path = "#{parent_object.table_name}/#{parent_object.id}/#{table_name}/#{id}"
+          options[:resources_name] = ''
+          relative_path = "#{parent_object.resources_name}/#{parent_object.id}/#{resources_name}/#{id}"
         end
       end
 
@@ -133,7 +133,7 @@ module SmoothOperator
 
       hash.delete('id')
 
-      { model_name => hash }.merge(data)
+      { resource_name => hash }.merge(data)
     end
 
   end

data/lib/smooth_operator/translation.rb

@@ -5,8 +5,8 @@ module SmoothOperator
     def human_attribute_name(attribute_key_name, options = {})
       no_translation = "-- no translation --"
       
-      defaults = ["smooth_operator.attributes.#{name.underscore}.#{attribute_key_name}".to_sym]
-      defaults << "activerecord.attributes.#{name.underscore}.#{attribute_key_name}".to_sym
+      defaults = ["smooth_operator.attributes.#{model_name.i18n_key}.#{attribute_key_name}".to_sym]
+      defaults << "activerecord.attributes.#{model_name.i18n_key}.#{attribute_key_name}".to_sym
       defaults << options[:default] if options[:default]
       defaults.flatten!
       defaults << no_translation

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.10.16"
+  VERSION = "1.10.17"
 end

data/spec/smooth_operator/finder_methods_spec.rb

@@ -78,7 +78,7 @@ describe SmoothOperator::FinderMethods do
       end
     end
 
-    context "when the server returns a hash with a key (equal to subject's call.table_name) containing an array" do
+    context "when the server returns a hash with a key (equal to subject's call.resources_name) containing an array" do
       it "it should return a RemoteCall instance an instance of ArrayWithMetaData" do
         remote_call = subject.find('with_metadata')
         users = remote_call.data
@@ -90,14 +90,12 @@ describe SmoothOperator::FinderMethods do
       end
     end
 
-    context "when the server returns an array with nested object on each entry, with the same name has the resource", current: true do
-      it "it should return a RemoteCall instance an instance of ArrayWithMetaData" do
-        remote_call = subject.find('with_metadata')
+    context "when the server returns an array with nested object on each entry, with the same name has the resource" do
+      it "it should return an Array with Class instances" do
+        remote_call = subject.find('array_with_nested_users')
         users = remote_call.data
 
-        expect(users).to be_instance_of(SmoothOperator::ArrayWithMetaData)
-        expect(users.page).to be(1)
-        expect(users.total).to be(6)
+        expect(users).to be_instance_of(Array)
         users.each { |user| expect(user).to be_instance_of(subject) }
       end
     end

data/spec/support/models/address.rb

@@ -2,7 +2,7 @@ class Address < SmoothOperator::Base
 
   self.dirty_attributes
 
-  self.model_name = :none
+  self.resource_name = ''
 
   self.endpoint_user = 'admin'
   self.endpoint_pass = 'admin'

data/spec/support/models/user.rb

@@ -2,7 +2,7 @@ module User
   
   class Base < SmoothOperator::Base
 
-    self.model_name = 'user'
+    self.resource_name = 'user'
 
     self.endpoint_user = 'admin'
 
@@ -36,7 +36,7 @@ module User
 
   class TimeoutConnection < Base
     self.timeout = 1
-    self.model_name = 'user'
+    self.resource_name = 'user'
   end
 
 end

data/spec/support/models/user_with_address_and_posts.rb

@@ -2,7 +2,7 @@ module UserWithAddressAndPosts
   
   class Father < User::Base
     
-    self.table_name = 'users'
+    self.resources_name = 'users'
 
     schema(
       posts: Post,
@@ -13,7 +13,7 @@ module UserWithAddressAndPosts
 
   class Son < Father
 
-    self.table_name = 'users'
+    self.resources_name = 'users'
 
     schema(
       age: :int,
@@ -28,7 +28,7 @@ module UserWithAddressAndPosts
 
   class WithPatch < Son
 
-    self.table_name = 'users'
+    self.resources_name = 'users'
 
     self.update_http_verb = :patch
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.10.16
+  version: 1.10.17
 platform: ruby
 authors:
 - João Gonçalves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler