acfs 0.30.0.1.b261 → 0.30.0.1.b262

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDBhNGMzOTliN2YzYWNiZjZiMmM5ZjZhODMxYzk5NmU4MDU2ODA2Mg==
+    M2U0MmM3NmE4NTkzZjliOTE3NjViZjgzNTYyNWE0ZGRkNDAxNTJjMw==
   data.tar.gz: !binary |-
-    NTAyZDVkZDEzOWFhY2I1OTM0OTQwMjk5MmE4YzIyZTQ4ZmJhNmY2MA==
+    NTA4MDJjYWJmMTYwNjVjNmZiMDU1NmY3MjRhMjY5YjY5MjIxYTdkNA==
 SHA512:
   metadata.gz: !binary |-
-    N2M4YTAwOTZmMWNkY2E1NWVjYzcxNjFlY2QwN2MwMGU5YmM5ZWEwNjA0MTEy
-    OTY4OWZhZjliZjI1ZGM3ZWY2OGE1ZjUwNjc5NjUyMTI1OWI2NDUyODgyNDg1
-    MmU3ODYxMmZhNTAyMWUxOGFiZjA2YzRjMWNkNjgxNmU2YWIxNjY=
+    YjBiMmMzM2FjODhlZDRmM2VjZWQ0M2Y5NjAyYzRmNGZhNzA3ZDc5Y2NhOWNi
+    ZjIyNjlhNzYzN2UzMjllZDNjZDg1YzUyYzVkMmUzMDcyNmNhOGRmYzNkZWE3
+    NjQzZThiN2UwMGY0MWM2NDcyMGIzMDdlOTYzOTZlNDRhZGZmZWE=
   data.tar.gz: !binary |-
-    MmEyYWRlODQyODNlNWNkNTQ2NmFjZjhiNDliNTc1ZTA5M2QwMWRiNTljOTUz
-    YjBmYmQzMGQ1M2Q3ZjYyZWUxM2U5OTAwMDIwZDZhMWU3Y2QyMmRmYzMxMmJl
-    MDdmOTRjMmJmYjRiMjUxYmY4YzI1YmZmNDhhMjRhNmNkMTczN2M=
+    NjUwZGViMmE3YjY4MWM1NGM0Mjk4Zjk0MTM0MjJhMDBhMjE4YzBkNGIzM2Y3
+    ZGU2YjBiNmZkZmNjMGE0ZmYxM2FkZGJkNjAxMGFiODhjOTk5YTRhOWY0MDA4
+    OTBkYjMwZGRhNDEzZDA1ZmUzNTZlMzdlNDA3MDVhYTQ4ZGM5YWQ=

data/lib/acfs/location.rb

@@ -34,19 +34,22 @@ module Acfs
 
     def str
       uri = raw.dup
-      uri.path = '/' + struct.map{|s| lookup_arg(s, args) }.join('/')
+      uri.path = URI.escape '/' + struct.map{|s| lookup_arg(s, args) }.join('/')
       uri.to_s
     end
 
-    def to_s
+    def raw_uri
       raw.to_s
     end
+    alias_method :to_s, :raw_uri
 
     private
     def extract_arg(key, hashes)
       hashes.each_with_index do |hash, index|
         return (index == 0 ? hash.delete(key) : hash.fetch(key)) if hash.has_key?(key)
       end
+
+      nil
     end
 
     def lookup_arg(arg, args)

data/lib/acfs/model/locatable.rb

@@ -83,14 +83,15 @@ module Acfs::Model
       end
 
       # @api private
-      def path_defaults
-        {
-            list: '/:path',
-            create: '/:path',
-            read: '/:path/:id',
-            update: '/:path/:id',
-            delete: '/:path/:id'
-        }
+      def location_default_path(action, path)
+        case action
+          when :list, :create
+            return path
+          when :read, :update, :delete
+            return "#{path}/:id"
+          else
+            nil
+        end
       end
     end
 

data/lib/acfs/operation.rb

@@ -6,7 +6,7 @@ module Acfs
   # processing as well as error handling and stubbing.
   #
   class Operation
-    attr_reader :action, :params, :resource, :data, :callback, :location
+    attr_reader :action, :params, :resource, :data, :callback, :location, :url
     delegate :service, to: :resource
     delegate :call, to: :callback
 
@@ -20,6 +20,7 @@ module Acfs
       @data     = (opts[:data]   || {}).dup
 
       @location = resource.location(action: @action).extract_from(@params, @data)
+      @url      = location.str
 
       @callback = block
     end
@@ -46,7 +47,7 @@ module Acfs
     end
 
     def request
-      request = ::Acfs::Request.new location.str, method: method, params: params, data: data
+      request = ::Acfs::Request.new url, method: method, params: params, data: data
       request.on_complete do |response|
         handle_failure response unless response.success?
         callback.call response.data

data/lib/acfs/service.rb

@@ -37,13 +37,25 @@ module Acfs
     def location(resource_class, opts = {})
       opts.reverse_merge! self.options
 
-      url  = self.class.base_url.to_s
-      url += resource_class.path_defaults[opts[:action] || :list] || '/:path'
+      action = opts[:action] || :list
 
-      path = opts[:path]
-      path ||= (resource_class.name || 'class').pluralize.underscore
+      path = if Hash === opts[:path] && opts[:path].has_key?(action)
+               opts[:path].fetch(action)
+             else
+               path = if Hash === opts[:path]
+                        opts[:path][:all].to_s
+                      else
+                        opts[:path].to_s
+                      end
 
-      Location.new Location.new(url).build(raise: false, path: path).str
+               path = (resource_class.name || 'class').pluralize.underscore if path.blank?
+
+               resource_class.location_default_path(action, path.strip)
+             end
+
+      raise ArgumentError.new "Location for `#{action}' explicit disabled by set to nil." if path.nil?
+
+      Location.new [self.class.base_url.to_s, path.to_s].join('/')
     end
 
     class << self

data/lib/acfs/singleton_resource.rb

@@ -97,14 +97,8 @@ module Acfs
       undef_method :find_by!
 
       # @api private
-      def path_defaults
-        {
-            list: '/:path',
-            create: '/:path',
-            read: '/:path',
-            update: '/:path',
-            delete: '/:path'
-        }
+      def location_default_path(_, path)
+        path
       end
     end
   end

data/spec/acfs/model/locatable_spec.rb

@@ -29,6 +29,37 @@ describe Acfs::Model::Locatable do
         end
       end
     end
+
+    describe 'custom paths' do
+      let(:model) { Session }
+      let(:location) { Session.location action: action }
+      subject { location }
+
+      context ':list location' do
+        let(:action) { :list }
+        its(:raw_uri) { should eq 'http://users.example.org/users/:user_id/sessions' }
+      end
+
+      context ':create location' do
+        let(:action) { :create }
+        its(:raw_uri) { should eq 'http://users.example.org/sessions' }
+      end
+
+      context ':read location' do
+        let(:action) { :read }
+        its(:raw_uri) { should eq 'http://users.example.org/sessions/:id' }
+      end
+
+      context ':update location' do
+        let(:action) { :update }
+        its(:raw_uri) { expect{ subject }.to raise_error(ArgumentError, /update.*disabled/)}
+      end
+
+      context ':delete location' do
+        let(:action) { :delete }
+        its(:raw_uri) { should eq 'http://users.example.org/users/:user_id/sessions/del/:id' }
+      end
+    end
   end
 
   describe '#url' do

data/spec/acfs/service_spec.rb

@@ -19,7 +19,7 @@ describe Acfs::Service do
 
   describe '#location' do
     let(:resource) { Class.new }
-    before { allow(resource).to receive(:path_defaults).and_return({}) }
+    before { allow(resource).to receive(:location_default_path, &proc{|a, p| p}) }
 
     it 'should extract resource path name from given class' do
       expect(service.location(resource).to_s).to eq('/classes')

data/spec/support/service.rb

@@ -42,7 +42,11 @@ class MyUserWithValidations < MyUser
 end
 
 class Session < Acfs::Resource
-  service UserService
+  service UserService, path: {
+      list: 'users/:user_id/sessions',
+      delete: 'users/:user_id/sessions/del/:id',
+      update: nil
+  }
 
   attribute :id, :string
   attribute :user, :integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.30.0.1.b261
+  version: 0.30.0.1.b262
 platform: ruby
 authors:
 - Jan Graichen