api_client 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 2e42b7b564b5052cfc4f16c402ed50c5799863466e80fff627b0c4941ac190aa5163698f53b1cc6213b2a5cf1d243806eb90b12408731b695434471e81f74b9e
-  data.tar.gz: b0753a40feb22f1db2511a8ad4c7266de5ebd9fdf1faf04a617b47e0cf742edec024efeffaae6a449f34fb6e72fda44b283969af2b2d04d7cc7d5218d7fb29eb
-SHA1: 
-  metadata.gz: 8e6ba65ec2ce249765942b32529d15d47c83f6be
-  data.tar.gz: 4ad33db01a65a8801882904b233069a5c09615ae
+---
+SHA1:
+  metadata.gz: c6fe2e3701dfb92512d2b7ea531ed439f81fbcad
+  data.tar.gz: 5873bdb59a8f035466162c7c490e4939ec155202
+SHA512:
+  metadata.gz: 01e91759d90084b309ebd11fa74fbe3f7b300a257912e433f96723c81b06371d337c4f261a742148370a147e56e618ccdadd85f76c23726334564a7551c1d539
+  data.tar.gz: a4c648946d64c325b3bf74e5db7ff889d2086ca108033caf31034cd9aa3db31918501e57a54e9f1d81ac129e23f11f2165bc50e403e8368f6861056d33b9568a

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
+before_install:
+  - gem install bundler -v 1.11.2
 script: bundle exec rspec spec
 rvm:
   - 1.8.7
   - 1.9.3
-  - 2.0.0
-  - 2.1.2
+  - 2.1.8
+  - 2.3.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.14
+
+ * make ApiClient::Base marshallable by not storing proc as instance var
+
 # 0.5.13
 
  * add raw_body method to Scope which allows to set non-hash request payload

data/api_client.gemspec

@@ -13,42 +13,36 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "api_client"
 
+  # Declare runtime dependencies here:
+  def s.add_runtime_dependencies(method)
+    if RUBY_PLATFORM == "java"
+      send method, 'json_pure'
+      send method, 'hashie', [">= 2.0.5"]
+    else
+      send method, 'yajl-ruby'
+      send method, 'hashie', RUBY_VERSION =~ /1\.8/ ? [">= 2.0.5", "<= 3.4.2"] : [">= 2.0.5"]
+    end
+
+    send method, 'faraday', [">= 0.8.1"]
+    send method, 'multi_json', [">= 1.6.1"]
+  end
+
+  # Declare development dependencies here:
+  s.add_development_dependency 'rspec', '2.14.1'
+
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      if RUBY_PLATFORM == "java"
-	      s.add_runtime_dependency(%q<json_pure>)
-      else
-	      s.add_runtime_dependency(%q<yajl-ruby>)
-      end
-      s.add_runtime_dependency(%q<faraday>, [">= 0.8.1"])
-      s.add_runtime_dependency(%q<hashie>, [">= 2.0.5"])
-      s.add_runtime_dependency(%q<multi_json>, [">= 1.6.1"])
+      s.add_runtime_dependencies(:add_runtime_dependency)
     else
-      if RUBY_PLATFORM == "java"
-	      s.add_dependency(%q<json_pure>)
-      else
-	      s.add_dependency(%q<yajl-ruby>)
-      end
-      s.add_dependency(%q<faraday>, [">= 0.8.1"])
-      s.add_dependency(%q<hashie>, [">= 1.2.0"])
-      s.add_dependency(%q<multi_json>, [">= 1.6.1"])
+      s.add_runtime_dependencies(:add_dependency)
     end
   else
-    if RUBY_PLATFORM == "java"
-      s.add_dependency(%q<json_pure>)
-    else
-      s.add_dependency(%q<yajl-ruby>)
-    end
-    s.add_dependency(%q<faraday>, [">= 0.8.1"])
-    s.add_dependency(%q<hashie>, [">= 1.2.0"])
-    s.add_dependency(%q<multi_json>, [">= 1.6.1"])
+    s.add_runtime_dependencies(:add_dependency)
   end
 
-  s.add_development_dependency "rspec", '2.14.1'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/api_client/scope.rb

@@ -15,7 +15,6 @@ module ApiClient
       @params     = {}
       @headers    = {}
       @options    = {}
-      @hooks      = @scopeable.connection_hooks || []
       @scopeable.default_scopes.each do |default_scope|
         self.instance_eval(&default_scope)
       end
@@ -24,7 +23,8 @@ module ApiClient
     def connection
       klass       = Connection.const_get((@adapter || Connection.default).to_s.capitalize)
       @connection = klass.new(@endpoint , @options || {})
-      @hooks.each { |hook| hook.call(@connection) }
+      hooks      = @scopeable.connection_hooks || []
+      hooks.each { |hook| hook.call(@connection) }
       @connection
     end
 

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.5.13"
+  VERSION = "0.5.14"
 end

data/spec/api_client/base/marshalling_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe "Marshaling of ApiClient objects" do
+  ConnectionProc = Proc.new {}
+  AlwaysProc = Proc.new {}
+
+  class Entity < ApiClient::Base
+    connection &ConnectionProc
+    always &AlwaysProc
+
+    def mutated_state?
+      @state == "mutated"
+    end
+
+    def mutate_state!
+      @state = "mutated"
+    end
+  end
+
+  it "is marshallable by default" do
+    scope = Entity.params(:foo => 1).headers("token" => "aaa").options("some" => "option")
+    entity = scope.build :key => "value"
+
+    entity.mutated_state?.should == false
+    entity.mutate_state!
+    entity.mutated_state?.should == true
+
+    reloaded = Marshal.load(Marshal.dump(entity))
+
+    reloaded.should == entity
+    reloaded.mutated_state?.should == true
+  end
+end

metadata

@@ -1,80 +1,95 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: api_client
-version: !ruby/object:Gem::Version 
-  version: 0.5.13
+version: !ruby/object:Gem::Version
+  version: 0.5.14
 platform: ruby
-authors: 
+authors:
 - Marcin Bunsch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-03-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+date: 2016-04-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id006 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.5
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.14.1
-  type: :development
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 description: API client builder
-email: 
+email:
 - marcin@futuresimple.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -114,6 +129,7 @@ files:
 - spec/api_client/base/delegation_spec.rb
 - spec/api_client/base/inheritance_spec.rb
 - spec/api_client/base/instantiation_spec.rb
+- spec/api_client/base/marshalling_spec.rb
 - spec/api_client/base/parsing_spec.rb
 - spec/api_client/base/scoping_spec.rb
 - spec/api_client/base_spec.rb
@@ -133,32 +149,33 @@ files:
 - spec/support/matchers.rb
 homepage: https://github.com/futuresimple/api_client
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id006
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id006
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: api_client
-rubygems_version: 2.4.5
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 3
 summary: API client builder
-test_files: 
+test_files:
 - spec/api_client/base/connection_hook_spec.rb
 - spec/api_client/base/delegation_spec.rb
 - spec/api_client/base/inheritance_spec.rb
 - spec/api_client/base/instantiation_spec.rb
+- spec/api_client/base/marshalling_spec.rb
 - spec/api_client/base/parsing_spec.rb
 - spec/api_client/base/scoping_spec.rb
 - spec/api_client/base_spec.rb