faraday_json 0.1.1 → 0.1.2

data/Gemfile

@@ -5,10 +5,9 @@ gem 'rake', '>= 0.9'
 
 group :test do
   gem 'parallel', '= 1.3.3', :platforms => [:mri_19]
-  gem 'cane', '>= 2.2.2', :platforms => [:mri_19, :mri_20, :mri_21, :mri_22]
+  gem 'cane', '>= 2.2.2', :platforms => [:mri_19, :mri_20, :mri_21]
   gem 'rspec', '>= 3'
   gem 'simplecov'
-#  gem 'webmock'
 end
 
 platforms :ruby_18 do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faraday_json (0.1.0)
+    faraday_json (0.1.2)
       faraday (>= 0.7.4, < 0.10)
 
 GEM

data/lib/faraday_json/encoding.rb

@@ -88,7 +88,7 @@ if RUBY_VERSION.start_with?("1.8")
     elsif data.is_a? Array
       transcoded = []
       data.each do |value|
-        transcoded << to_utf8(value, charest, opts)
+        transcoded << to_utf8(value, charset, opts)
       end
       return transcoded
     elsif data.is_a? String

data/lib/faraday_json/version.rb

@@ -6,5 +6,5 @@
 # All rights reserved.
 #
 module FaradayJSON
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/encode_json_spec.rb

@@ -314,15 +314,7 @@ describe FaradayJSON::EncodeJson do
     end
 
     ### Dealing with files in various encoding should ideally be easy
-    FILES = {
-      'spec/data/iso8859-15_file.json' => 'iso-8859-15',
-      'spec/data/utf16be_file.json' => 'utf-16be',
-      'spec/data/utf16le_file.json' => 'utf-16le',
-      'spec/data/utf8_file.json' => 'utf-8',
-    }
-
-
-    FILES.each do |fname, enc|
+    TEST_FILES.each do |fname, enc|
       context "reading #{enc} encoded file '#{fname}'" do
         # Read the string from file; read binary/with encoding. Ruby 1.8 will
         # ignore this, but must still work.
@@ -347,7 +339,7 @@ describe FaradayJSON::EncodeJson do
       end
     end
 
-    FILES.each do |fname, enc|
+    TEST_FILES.each do |fname, enc|
       context "reading #{enc} encoded file '#{fname}' as binary" do
         # Read the string from file; read binary/with encoding. Ruby 1.8 will
         # ignore this, but must still work.
@@ -372,5 +364,5 @@ describe FaradayJSON::EncodeJson do
       end
     end
 
-  end
+  end # Ruby version > 1.8
 end

data/spec/helper.rb

@@ -72,3 +72,10 @@ def test_encode(str, encoding)
     return str.encode(encoding)
   end
 end
+
+TEST_FILES = {
+  'spec/data/iso8859-15_file.json' => 'iso-8859-15',
+  'spec/data/utf16be_file.json' => 'utf-16be',
+  'spec/data/utf16le_file.json' => 'utf-16le',
+  'spec/data/utf8_file.json' => 'utf-8',
+}

data/spec/issues_spec.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require 'helper'
+require 'faraday_json/encode_json'
+
+describe FaradayJSON::EncodeJson do
+  let(:middleware) { described_class.new(lambda{|env| env}) }
+
+  def process(body, content_type = nil)
+    env = {:body => body, :request_headers => Faraday::Utils::Headers.new}
+    env[:request_headers]['content-type'] = content_type if content_type
+    middleware.call(faraday_env(env))
+  end
+
+  def result_body() result[:body] end
+  def result_type() result[:request_headers]['content-type'] end
+  def result_length() result[:request_headers]['content-length'].to_i end
+
+
+  ### Test cases specifically for filed issues
+  context "issue #2: encoding an object with a contained array" do
+    data = {
+      :some_array => [1, 2, 3],
+    }
+
+    # Passing that data with a charset should do the right thing.
+    let(:result) {
+      process(data, "application/json; charset=utf-8")
+    }
+
+    it "encodes body" do
+      expect(result_body).to eq("{\"some_array\":[1,2,3]}")
+    end
+  end
+end

data/spec/parse_json_spec.rb

@@ -177,15 +177,8 @@ describe FaradayJSON::ParseJson, :type => :response do
   end
 
   ### Dealing with files in various encoding should ideally be easy
-  FILES = {
-    'spec/data/iso8859-15_file.json' => 'iso-8859-15',
-    'spec/data/utf16be_file.json' => 'utf-16be',
-    'spec/data/utf16le_file.json' => 'utf-16le',
-    'spec/data/utf8_file.json' => 'utf-8',
-  }
-
 if not RUBY_VERSION.start_with?("1.8")
-  FILES.each do |fname, enc|
+  TEST_FILES.each do |fname, enc|
     context "reading #{enc} encoded file '#{fname}'" do
       # Read the string from file; read binary/with encoding. Ruby 1.8 will
       # ignore this, but must still work.
@@ -200,7 +193,7 @@ if not RUBY_VERSION.start_with?("1.8")
   end
 end
 
-  FILES.each do |fname, enc|
+  TEST_FILES.each do |fname, enc|
     context "reading #{enc} encoded file '#{fname}' as binary" do
       # Read the string from file; read binary/with encoding. Ruby 1.8 will
       # ignore this, but must still work.

metadata

@@ -1,61 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: faraday_json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
+  prerelease: 
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.4
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '0.10'
 description: This is a character encoding-aware JSON middleware for Faraday.
@@ -65,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile-0.7.rb
 - Gemfile-0.7.rb.lock
@@ -88,30 +95,32 @@ files:
 - spec/data/utf8_file.json
 - spec/encode_json_spec.rb
 - spec/helper.rb
+- spec/issues_spec.rb
 - spec/parse_json_spec.rb
 homepage: https://github.com/spriteCloud/faraday_json
 licenses:
 - MITNFA
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: This is a character encoding-aware JSON middleware for Faraday.
 test_files:
 - spec/data/iso8859-15_file.json
@@ -120,4 +129,5 @@ test_files:
 - spec/data/utf8_file.json
 - spec/encode_json_spec.rb
 - spec/helper.rb
+- spec/issues_spec.rb
 - spec/parse_json_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: c77a32170d967ebaa3950cda3adda8697a1408e1
-  data.tar.gz: 229a0bd27bc9a29873ecc20e80e24d67835cdaa2
-SHA512:
-  metadata.gz: 8a1d60bda56f2465d32d22a8be678b691b11e8401f7d7deb791da725efb5fa1938667eaf2bd5348ee28c3abc9b1ddd4d66689dcdb44e577484189f464fd35566
-  data.tar.gz: 22b9691239581d61629c4a263960f4f24370d9ad2fadc4b059b17a7812a8a47429ca1fe9ef67c8fac7bd61eb2218158533d1d6730171b0b7c49fe9c74ee2a059