api_client 0.3.3 → 0.4.0

data/api_client.gemspec

@@ -18,18 +18,33 @@ Gem::Specification.new do |s|
     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>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<multi_json>, [">= 1.6.1"])
     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<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<multi_json>, [">= 1.6.1"])
     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<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<multi_json>, [">= 1.6.1"])
   end
 
   s.files         = `git ls-files`.split("\n")

data/lib/api_client/base.rb

@@ -1,5 +1,5 @@
 require "hashie"
-require "yajl"
+require "multi_json"
 
 module ApiClient
 
@@ -25,7 +25,7 @@ module ApiClient
       def parse(response)
         response = response.body if response.is_a?(Faraday::Response)
         if self.format == :json
-          Yajl::Parser.parse(response)
+          MultiJson.load(response)
         elsif self.format == :xml
           MultiXml.parse(response)
         else

data/lib/api_client/connection/middlewares/request/json.rb

@@ -1,5 +1,5 @@
 require "faraday"
-require "yajl"
+require "multi_json"
 
 class ApiClient::Connection::Middlewares::Request::Json < Faraday::Middleware
   CONTENT_TYPE = "Content-Type".freeze
@@ -12,7 +12,7 @@ class ApiClient::Connection::Middlewares::Request::Json < Faraday::Middleware
   def call(env)
     match_content_type(env) do |data|
       params = Faraday::Utils::ParamsHash[data]
-      env[:body] = Yajl::Encoder.encode(params)
+      env[:body] = MultiJson.dump(params)
     end
     @app.call env
   end

data/lib/api_client/resource/base.rb

@@ -14,7 +14,7 @@ module ApiClient
 
         def inherited(subclass)
           super
-          small_name = NameResolver.resolve(subclass.name)
+          small_name = subclass.name.split('::').last.downcase
           subclass.namespace small_name
           subclass.prefix    self.prefix
           subclass.always do

data/lib/api_client/version.rb

@@ -1,3 +1,3 @@
 module ApiClient
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/api_client.rb

@@ -21,7 +21,6 @@ module ApiClient
   module Resource
     autoload :Base,          "api_client/resource/base"
     autoload :Scope,         "api_client/resource/scope"
-    autoload :NameResolver,  "api_client/resource/name_resolver"
   end
 
   module Connection

data/spec/api_client/base/instantiation_spec.rb

@@ -34,7 +34,7 @@ describe ApiClient::Base do
 
     it "are Hashie::Mashes" do
       result = ApiClient::Base.build({ :id => 1, :subhash => { :foo => 1 } })
-      result.subhash.should be_a(Hashie::Mash)
+      result.subhash.should be_an_instance_of(Hashie::Mash)
     end
 
   end

data/spec/api_client/connection/request/json_spec.rb

@@ -23,7 +23,7 @@ describe ApiClient::Connection::Middlewares::Request::Json do
 
   it "JSON encodes body" do
     app.should_receive(:call).
-      with(hash_including(:body => Yajl::Encoder.encode(body)))
+      with(hash_including(:body => MultiJson.dump(body)))
 
     subject.call(env)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_client
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,6 +11,22 @@ bindir: bin
 cert_chain: []
 date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
@@ -44,13 +60,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +74,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 description: API client builder
 email:
 - marcin@futuresimple.com
@@ -96,7 +112,6 @@ files:
 - lib/api_client/mixins/instantiation.rb
 - lib/api_client/mixins/scoping.rb
 - lib/api_client/resource/base.rb
-- lib/api_client/resource/name_resolver.rb
 - lib/api_client/resource/scope.rb
 - lib/api_client/scope.rb
 - lib/api_client/utils.rb
@@ -115,7 +130,6 @@ files:
 - spec/api_client/connection/request/logger_spec.rb
 - spec/api_client/connection/request/oauth_spec.rb
 - spec/api_client/resource/base_spec.rb
-- spec/api_client/resource/name_spec.rb
 - spec/api_client/resource/scope_spec.rb
 - spec/api_client/scope_spec.rb
 - spec/api_client/utils_spec.rb
@@ -161,7 +175,6 @@ test_files:
 - spec/api_client/connection/request/logger_spec.rb
 - spec/api_client/connection/request/oauth_spec.rb
 - spec/api_client/resource/base_spec.rb
-- spec/api_client/resource/name_spec.rb
 - spec/api_client/resource/scope_spec.rb
 - spec/api_client/scope_spec.rb
 - spec/api_client/utils_spec.rb

data/lib/api_client/resource/name_resolver.rb

@@ -1,37 +0,0 @@
-module ApiClient
-  module Resource
-    class NameResolver
-      def self.resolve(ruby_path)
-        new(ruby_path).resolve
-      end
-
-      attr_reader :name
-
-      def initialize(name)
-        @name = name
-      end
-
-      def resolve
-        select_last_item
-        underscorize
-        lowercase
-        name
-      end
-
-      private
-      def select_last_item
-        @name = @name.split('::').last
-      end
-
-      #Inspired by ActiveSupport::Inflector#underscore
-      def underscorize
-        @name.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-        @name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-      end
-
-      def lowercase
-        @name.downcase!
-      end
-    end
-  end
-end

data/spec/api_client/resource/name_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe ApiClient::Resource::NameResolver do
-  describe '.resolve' do
-    subject { described_class }
-
-    it 'changes My::Namespace::MyResouce to my_resource' do
-      subject.resolve('My::Namespace::MyResource').should == 'my_resource'
-    end
-
-    it 'changes Resource to resource' do
-      subject.resolve('Resource').should == 'resource'
-    end
-
-    it 'changes My::Resource to resoure' do
-      subject.resolve('My::Resource').should == 'resource'
-    end
-  end
-end