apitizer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40fc294404896c8bf5da7bcc98d9a1fb4888d559
-  data.tar.gz: 0f20b6555f17c71ed78843794b7b37c9b3e1abb8
+  metadata.gz: a2b8ff93fa7f78efed6e935c176d6f9ff3323faf
+  data.tar.gz: 5da515bb449d54753870d85872aa91dfddbad6d9
 SHA512:
-  metadata.gz: 4a38a7ce97d22a84accc45630b5810a36875e300dcfb097c90ceb05ca809ce4b80122bdd54350d35972c2ec04789cd0f260c3355f003a598a7fc43bfea2000ec
-  data.tar.gz: 20a7a1afa6a79245ac342635422fcfae978f22f70b75651d9287a813b5bfb0f4057da601dea5d60b62f19c0253b9341de200b2f177088e77811931143f03e174
+  metadata.gz: b25f42624fd95badd0f04af17494d3b763e1f280ab4c217663449497a3d29f9df40e4ad90124d97deea389037e0dcbad37238fde4d7ccf71027132ca46fcd0ae
+  data.tar.gz: 5bcdceb62d92026e806511f501ddb399f52ecdd1f5f5caebac99798d3d41738162e41e20cda7e773cefaf20c365fdba8919e5f956e70aeeaaae3f983f79f414d

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 rvm:
+  - 1.9.3
+  - 2.0.0
   - 2.1.0
+
 branches:
   only:
     - master

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Apitizer 0.0.3 (July 24, 2014)
+
+* Support for Ruby >= 1.9.3 instead of Ruby >= 2.1.
+
 ## Apitizer 0.0.2 (July 20, 2014)
 
 * A new strategy for searching request endpoints.

data/Guardfile

@@ -1,4 +1,4 @@
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^spec/.+_helper\.rb$}) { 'spec' }
   watch(%r{^lib/(.+)\.rb$}) do |match|

data/README.md

@@ -22,8 +22,6 @@ Alternatively, you can install the gem manually:
 $ gem install apitizer
 ```
 
-Note that the minimal supported version of Ruby is `2.1`.
-
 ## Usage
 
 Create an apitizer describing the API of the Web service you would like

data/apitizer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^spec/})
   spec.require_paths = [ 'lib' ]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency 'rack', '~> 1.5'
   spec.add_dependency 'json', '~> 1.8'

data/lib/apitizer/base.rb

@@ -4,7 +4,7 @@ module Apitizer
 
     def_delegator :map, :define
 
-    def initialize(**options, &block)
+    def initialize(options = {}, &block)
       @options = Helper.deep_merge(Apitizer.defaults, options)
       @block = block
     end
@@ -41,7 +41,7 @@ module Apitizer
     def prepare(action, *path)
       action = action.to_sym
       method = @options[:dictionary][action] or raise Error, 'Unknown action'
-      parameters = path.last.is_a?(Hash) ? path.pop : {}
+      parameters = Helper.extract_hash!(path)
       steps = path.flatten.map(&:to_sym)
 
       [ action, method, steps, parameters ]

data/lib/apitizer/connection/adaptor/standard.rb

@@ -6,10 +6,12 @@ module Apitizer
     module Adaptor
       class Standard
         def process(method, address, parameters = {}, headers = {})
+          uri = URI(address)
+
           request = build_request(method, address, parameters)
           headers.each { |k, v| request[k] = v }
 
-          http = Net::HTTP.new(request.uri.host, request.uri.port)
+          http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true if address =~ /^https:/
 
           response = http.request(request)
@@ -27,15 +29,14 @@ module Apitizer
         def build_request(method, address, parameters)
           klass = Net::HTTP.const_get(method.to_s.capitalize)
 
-          return klass.new(URI(address)) if parameters.empty?
+          return klass.new(address) if parameters.empty?
 
           parameters = Helper.build_query(parameters)
 
           if klass == Net::HTTP::Get
-            address = [ address, parameters ].join('?')
-            request = klass.new(URI(address))
+            request = klass.new([ address, parameters ].join('?'))
           else
-            request = klass.new(URI(address))
+            request = klass.new(address)
             request.body = parameters
             request['Content-Type'] = [
               'application/x-www-form-urlencoded',

data/lib/apitizer/connection/dispatcher.rb

@@ -1,10 +1,11 @@
 module Apitizer
   module Connection
     class Dispatcher
-      def initialize(format:, adaptor: :standard, headers: {})
-        @format = Format.build(format)
-        @adaptor = Adaptor.build(adaptor)
-        @headers = headers.merge('Accept' => @format.mime_type)
+      def initialize(options)
+        @format = Format.build(options.fetch(:format))
+        @adaptor = Adaptor.build(options[:adaptor] || :standard)
+        @headers = options[:headers] || {}
+        @headers.merge!('Accept' => @format.mime_type)
       end
 
       def process(request)

data/lib/apitizer/connection/request.rb

@@ -6,10 +6,10 @@ module Apitizer
       attr_reader :method, :path, :parameters
       def_delegator :path, :address
 
-      def initialize(method:, path:, parameters: {})
-        @method = method
-        @path = path
-        @parameters = parameters
+      def initialize(options)
+        @method = options.fetch(:method)
+        @path = options.fetch(:path)
+        @parameters = options[:parameters] || {}
       end
     end
   end

data/lib/apitizer/connection/response.rb

@@ -3,9 +3,9 @@ module Apitizer
     class Response
       attr_reader :code, :content
 
-      def initialize(code:, content:)
-        @code = code
-        @content = content
+      def initialize(options)
+        @code = options.fetch(:code)
+        @content = options.fetch(:content)
       end
     end
   end

data/lib/apitizer/helper.rb

@@ -25,6 +25,10 @@ module Apitizer
       one.merge(two, &merger)
     end
 
+    def self.extract_hash!(arguments)
+      arguments.last.is_a?(Hash) ? arguments.pop : {}
+    end
+
     def self.build_query(parameters)
       query = Rack::Utils.build_nested_query(prepare_parameters(parameters))
       query.encode!('UTF-8')

data/lib/apitizer/result.rb

@@ -6,10 +6,10 @@ module Apitizer
     def_delegator :@response, :code
     def_delegators :__getobj__, :is_a?, :kind_of?, :instance_of?
 
-    def initialize(request:, response:)
-      super(response.content)
-      @request = request
-      @response = response
+    def initialize(options)
+      @request = options.fetch(:request)
+      @response = options.fetch(:response)
+      super(@response.content)
     end
   end
 end

data/lib/apitizer/routing/map.rb

@@ -21,8 +21,9 @@ module Apitizer
         proxy.instance_eval(&block)
       end
 
-      def define_resources(name, parent: @root, **options, &block)
-        child = Node::Collection.new(name, **options)
+      def define_resources(name, options, &block)
+        parent = options.delete(:parent) || @root
+        child = Node::Collection.new(name, options)
         parent.append(child)
         return unless block_given?
         proxy = Proxy.new(self, parent: child)
@@ -30,8 +31,9 @@ module Apitizer
       end
 
       Apitizer.actions.each do |action|
-        define_method "define_#{ action }" do |name, parent:, **options|
-          child = Node::Operation.new(name, action: action, **options)
+        define_method "define_#{ action }" do |name, options|
+          parent = options.delete(:parent)
+          child = Node::Operation.new(name, options.merge(action: action))
           parent.append(child)
         end
       end

data/lib/apitizer/routing/node/base.rb

@@ -25,7 +25,7 @@ module Apitizer
         def recognize?(steps)
         end
 
-        def permit?(action, on:)
+        def permit?(action, options)
         end
 
         private

data/lib/apitizer/routing/node/collection.rb

@@ -2,8 +2,10 @@ module Apitizer
   module Routing
     module Node
       class Collection < Base
-        def initialize(name, only: nil, except: [])
+        def initialize(name, options = {})
           @name = name
+          only = options[:only]
+          except = options[:except] || []
           @actions = (only && Array(only) || Apitizer.actions) - Array(except)
         end
 
@@ -11,8 +13,9 @@ module Apitizer
           @name == steps.first
         end
 
-        def permit?(action, on:)
-          @actions.include?(action) && on == Helper.action_scope(action)
+        def permit?(action, options)
+          @actions.include?(action) &&
+            Helper.action_scope(action) == options.fetch(:on)
         end
 
         private

data/lib/apitizer/routing/node/operation.rb

@@ -2,18 +2,18 @@ module Apitizer
   module Routing
     module Node
       class Operation < Base
-        def initialize(name, action:, on:)
+        def initialize(name, options = {})
           @name = name
-          @action = action
-          @on = on
+          @action = options.fetch(:action)
+          @on = options.fetch(:on)
         end
 
         def recognize?(steps)
           @name == steps.first || @name.to_s =~ /^:/
         end
 
-        def permit?(action, on:)
-          @action == action && @on == on
+        def permit?(action, options)
+          @action == action && @on == options.fetch(:on)
         end
 
         def on?(on)

data/lib/apitizer/routing/path.rb

@@ -3,19 +3,19 @@ module Apitizer
     class Path
       attr_reader :steps, :node
 
-      def initialize(steps: [], node: nil)
-        @steps = steps
-        @node = node
+      def initialize(options = {})
+        @steps = options[:steps] || []
+        @node = options[:node]
       end
 
       def address
         @steps.map(&:to_s).join('/')
       end
 
-      def advance(step, node:, on: nil)
+      def advance(step, options)
         @steps << step
-        @node = node
-        @on = on
+        @node = options.fetch(:node)
+        @on = options[:on]
       end
 
       def permit?(action)

data/lib/apitizer/routing/proxy.rb

@@ -1,16 +1,16 @@
 module Apitizer
   module Routing
     class Proxy
-      def initialize(owner, **options)
+      def initialize(owner, options = {})
         @owner = owner
         @options = options
       end
 
-      def method_missing(name, *arguments, **options, &block)
+      def method_missing(name, *arguments, &block)
         name = :"define_#{ name }"
         return super unless @owner.respond_to?(name)
-        # NOTE: https://bugs.ruby-lang.org/issues/9776
-        @owner.send(name, *arguments, **options, **@options, &block)
+        options = Helper.extract_hash!(arguments)
+        @owner.send(name, *arguments, options.merge(@options), &block)
       end
     end
   end

data/lib/apitizer/version.rb

@@ -1,3 +1,3 @@
 module Apitizer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/apitizer/connection/adaptor_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Apitizer::Connection::Adaptor do
   let(:parent_module) { Apitizer::Connection }
   let(:address) { 'https://service.com/api/articles' }
 
-  shared_examples 'a proper postman' do |method:|
+  shared_examples 'a proper postman' do |method|
     it 'takes into account headers' do
       headers = { 'Secret-Token' => 'arbitrary' }
       stub = stub_http_request(method, address).with(headers: headers)
@@ -13,7 +13,7 @@ RSpec.describe Apitizer::Connection::Adaptor do
     end
   end
 
-  shared_examples '#call of a Rack app' do |method:|
+  shared_examples '#call of a Rack app' do |method|
     let(:code) { 200 }
     let(:headers) { { 'a' => [ 'b' ] } }
     let(:body) { 'Hej!' }
@@ -60,8 +60,8 @@ RSpec.describe Apitizer::Connection::Adaptor do
     describe '#process' do
       [ :get ].each do |method|
         context "when sending #{ method } requests" do
-          it_behaves_like '#call of a Rack app', method: method
-          it_behaves_like 'a proper postman', method: method
+          it_behaves_like '#call of a Rack app', method
+          it_behaves_like 'a proper postman', method
 
           it 'encodes parameters into the URI' do
             stub = stub_http_request(method, address).with(query: { life: 42 })
@@ -73,8 +73,8 @@ RSpec.describe Apitizer::Connection::Adaptor do
 
       [ :post, :put, :patch, :delete ].each do |method|
         context "when sending #{ method } requests" do
-          it_behaves_like '#call of a Rack app', method: method
-          it_behaves_like 'a proper postman', method: method
+          it_behaves_like '#call of a Rack app', method
+          it_behaves_like 'a proper postman', method
 
           it 'encodes parameters into the body' do
             stub = stub_http_request(method, address).with(body: 'life=42')

data/spec/apitizer/routing/node_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Apitizer::Routing::Node do
     end
   end
 
-  shared_examples 'an adequate collection guard' do |only: restful_actions|
+  shared_examples 'an adequate collection guard' do |only = restful_actions|
     (restful_collection_actions & only).each do |action|
       it "permits #{ action } actions" do
         path = root.trace(steps)
@@ -33,7 +33,7 @@ RSpec.describe Apitizer::Routing::Node do
     end
   end
 
-  shared_examples 'an adequate member guard' do |only: restful_actions|
+  shared_examples 'an adequate member guard' do |only = restful_actions|
     (restful_member_actions & only).each do |action|
       it "permites #{ action } actions" do
         path = root.trace(steps)
@@ -96,13 +96,13 @@ RSpec.describe Apitizer::Routing::Node do
     context 'when looking for collections' do
       let(:steps) { [ :articles ] }
       it_behaves_like 'an adequate pathfinder'
-      it_behaves_like 'an adequate collection guard', only: only
+      it_behaves_like 'an adequate collection guard', only
     end
 
     context 'when looking for members' do
       let(:steps) { [ :articles, 'xxx' ] }
       it_behaves_like 'an adequate pathfinder'
-      it_behaves_like 'an adequate member guard', only: only
+      it_behaves_like 'an adequate member guard', only
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apitizer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ivan Ukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-20 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="