takeout 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e8981158e8e5dafbab52af5d934153c69dbf3ee
-  data.tar.gz: 5a06c10a7867c3671a476612b5b5933d30a51e8a
+  metadata.gz: 40f6ac479b705e18b5a3bfe835f7246573ee3047
+  data.tar.gz: 28b76878cd8de120cdae8de967a6d7016242c2d3
 SHA512:
-  metadata.gz: 877c0d6f415c7b6f338c65334169da8d1730b8881fb851edc01dcecf0426d8f1a32ee456d8873292c8036058ee6feb65225edb40f9304d723d83b729ac453af9
-  data.tar.gz: 73bed704d4271d3c1c20e4b65b0dfcdb2cf49f20710464095f10656b0ee31098e22f6ee932767a0c728b94940e5e52f9d07e6edc4531e50c600d131c66f71b07
+  metadata.gz: 80ef2d524ba29db29b2743492b463e9f1b1f853afed7157f1c34bdb6c9296cd8484af1eb2bc4dfc600ba10eb410fc4ff6d8e91d9eeb3cf783efca930a305350b
+  data.tar.gz: 806bb933cd151d8803972727531d520fb7442bdd7ce74aed6d8cda7918b66e922ddc62db590e41ed351bbce611f7475cdba0a41cd1f08a11cd3e3f68b6dc0be8

data/Gemfile

@@ -2,3 +2,12 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in takeout.gemspec
 gemspec
+
+group :development do
+  gem "guard", "2.12.5", require: false
+  gem "guard-rspec", '4.5.0', require: false
+  gem "guard-bundler", require: false
+  gem "guard-rake", require: false
+  gem "terminal-notifier-guard", require: false
+  gem 'guard-yard', require: false
+end

data/README.md

@@ -5,7 +5,8 @@ A powerful little tool for generating on-the-fly API clients.
 
 ## Requirements
 
-All version of MRI 1.8 and up are supported, it probably work sunder other variations of ruby it just hasn't been tested on the,
+All versions of MRI 1.9.3+ and up are supported, currently un supported on JRuby, MRI 1.8-1.9.2, and Rubinus.
+Support of these platforms is a future goal for the project.
 
 ## Installation
 

data/circle.yml

@@ -1,3 +1,22 @@
-machine:
-  ruby:
-    version: 2.1.0-p0
+dependencies:
+  override:
+    - >
+      case $CIRCLE_NODE_INDEX in
+       0)
+         rvm-exec 1.9.3-p0 bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
+         ;;
+       1)
+         rvm-exec 2.0.0-p0 bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
+         ;;
+       2)
+         rvm-exec 2.2.0 bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
+         ;;
+       3)
+         rvm-exec 2.1.0 bash -c "bundle check --path=vendor/bundle || bundle install --path=vendor/bundle"
+         ;;
+      esac
+
+test:
+  override:
+    - case $CIRCLE_NODE_INDEX in 0) rvm-exec 1.9.3-p0 bundle exec rspec ;; 1) rvm-exec 2.0.0-p0 bundle exec rspec ;; 2) rvm-exec 2.2.0 bundle exec rspec ;; 3) rvm-exec 2.1.0 bundle exec rspec ;; esac:
+        parallel: true

data/lib/takeout/client.rb

@@ -49,18 +49,7 @@ module Takeout
       if block_given?
         yield self
       else
-        # Set instance variables
-        @uri = options[:uri] ? options[:uri] : ''
-        self.endpoints = options[:endpoints] ? options[:endpoints] : {}
-        @headers = options[:headers] ? options[:headers] : {}
-        @debug = options[:debug] ? options[:debug] : false
-        @ssl = options[:ssl] ? options[:ssl] : false
-        @schemas = options[:schemas] ? options[:schemas] : {}
-        @extension =  options[:extension] ? options[:extension] : nil
-
-        # Clean instance variables out of options hash and set that as options instance variable
-        [:uri, :endpoints, :headers, :debug, :ssl, :schemas, :extension].each { |v| options.delete(v) }
-        @options = options
+        extract_instance_variables_from_options(options)
       end
     end
 
@@ -111,7 +100,7 @@ module Takeout
             return perform_curl_request(request_type, request_url, options, headers)
           end
         end
-      end if endpoints.is_a? Hash
+      end
     end
 
     # Render out the template values and return the updated options hash
@@ -142,30 +131,26 @@ module Takeout
       extracted_options.merge!({object_id: options[:object_id]}) if options[:object_id]
       template.scan(/\{\{(\w+)\}\}/).flatten(1).each { |template_key| extracted_options.merge!(options.select {|key| key == template_key.to_sym }) }
 
-      # Convert keys to strings
-      extracted_options = extracted_options.inject({}){|memo,(k,v)| memo[k.to_s] = v; memo}
-
-      # Encode the template values and remove template values from original options hash
-      extracted_options.each do |key, value|
-        extracted_options[key] = ERB::Util.url_encode(value.to_s)
-        options.delete(key.to_sym)
+      # Convert keys to strings, encode values, clean up hash
+      extracted_options = extracted_options.inject({}) do |memo,(key,value)|
+        options.delete(key)
+        memo.merge({key.to_s => ERB::Util.url_encode(value)})
       end
 
       return extracted_options, options
     end
 
     def perform_curl_request(request_type, request_url, options=nil, headers=nil)
-      curl = Curl.send(request_type.to_sym, request_url.to_s, options) do |curl|
+      curl = Curl.send(request_type, request_url.to_s, options) do |curl|
         curl.verbose = true if @debug
+        curl.headers = headers if headers
 
-        if options[:basic_auth]
+        if options[:username] && options[:password]
           curl.http_auth_types = :basic
-          curl.username = options[:basic_auth][:username]
-          curl.password = options[:basic_auth][:password]
+          curl.username = options[:username]
+          curl.password = options[:password]
         end
 
-        headers.each { |key, value| curl.headers[key.to_s] = value } if headers
-
         curl.on_success {|response| @parsed_body, @failure = Oj.load(response.body_str), false }
 
         FAILURES.each { |failure_type| curl.send("on_#{failure_type}") {@failure=true} }
@@ -173,7 +158,7 @@ module Takeout
 
       raise Takeout::EndpointFailureError.new(curl, request_type) if @failure
 
-      return @parsed_body if @parsed_body
+      return @parsed_body
     end
 
 
@@ -189,11 +174,31 @@ module Takeout
                     end
 
       # Append extension if one is given
-      request_url = "#{request_url}.#{options[:extension] ? options[:extension] : self.extension}" if options[:extension] || self.extension
+      request_url = append_extension(request_url, options)
 
       return request_url, options
     end
 
+    def append_extension(request_url, options)
+      request_url = "#{request_url}.#{options[:extension] || self.extension}" if options[:extension] || self.extension
+      return request_url
+    end
+
+    def extract_instance_variables_from_options(options)
+      # Set instance variables
+      @uri = options[:uri] || ''
+      self.endpoints = options[:endpoints] || {}
+      @headers = options[:headers] || {}
+      @schemas = options[:schemas] || {}
+      @debug = options[:debug]
+      @ssl = options[:ssl]
+      @extension =  options[:extension]
+
+      # Clean instance variables out of options hash and set that as options instance variable
+      [:uri, :endpoints, :headers, :debug, :ssl, :schemas, :extension].each { |v| options.delete(v) }
+      @options = options
+    end
+
     def url(endpoint=nil)
       ssl? ? URI::HTTPS.build(host: @uri, path: endpoint) : URI::HTTP.build(host: @uri, path: endpoint)
     end

data/lib/takeout/version.rb

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

data/spec/client_spec.rb

@@ -38,6 +38,10 @@ describe Takeout::Client do
     it 'properly handles an object_id' do
       expect(client.send(:generate_request_url, :posts, :get, {object_id: 1}).first.to_s).to eq 'http://test.com/posts/1'
     end
+
+    it 'properly appends an extension' do
+      expect(client.send(:generate_request_url, :posts, :get, {extension: 'json'}).first.to_s).to eq 'http://test.com/posts.json'
+    end
   end
 
 

data/takeout.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{}
   spec.homepage      = "http://github.com/kyelgrantlucas/takeout"
   spec.license       = "MIT"
-  spec.required_ruby_version = '>= 1.8.0'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -27,11 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "guard", "2.12.5"
-  spec.add_development_dependency "guard-rspec", '4.5.0'
-  spec.add_development_dependency "guard-bundler"
-  spec.add_development_dependency "guard-rake"
-  spec.add_development_dependency "terminal-notifier-guard"
+
   spec.add_development_dependency "codeclimate-test-reporter"
-  spec.add_development_dependency 'guard-yard'
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeout
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kyle Lucas
@@ -122,76 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.5
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.5.0
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +136,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: ''
 email:
 - kglucas93@gmail.com
@@ -260,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="