minecraft_jsonapiv2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b3abfecbb87f73064b8b8f616559b5c787f3168
-  data.tar.gz: 60bdcaab1e6f8433adfd37deaaa18804f555644d
+  metadata.gz: 98c43c779d2f78b2c8fbabe9324f3338a9458c52
+  data.tar.gz: a685946592264bc6e795b915e0398968ba20b916
 SHA512:
-  metadata.gz: 4131dd2f1280bae09edc3de7e90443221b6639b9138de614656473b441c2d6c92fc51c373402ef50d41ce2e2ae41dce3fd5637e90b366a70bf9db3d049b50660
-  data.tar.gz: ee69e1c8b426c4c09f3c9d89c74eb6eac1883ab62b2c5133c8b31d84acb023883b01fea11f0147e4c1b9bca9a59da054a50294927afcb448c5134a68b260e3b7
+  metadata.gz: bff260125ffd8cb014560cde8cc810c2eeb134756e458cd9194ac362ab53fff16e0456d8eb754555a450a5ee8bb2521b858d0fdb1e41df3c8b4da8945eb7dce4
+  data.tar.gz: 2519bd7d4cac0664cfa4c7d2ca7b5cedd290bda99264273b6c7512b4d44c68bf208b97541508c6637e494d6f823120b38b3e61a5d58bd520ebf9b1d078b94cde

data/lib/core_ext/hash.rb

@@ -1,14 +1,14 @@
 class Hash
-    # Converts all of the keys to strings, optionally formatting key name
-    def rubyify_keys!
-        keys.each{|k|
-            v = delete(k)
-            new_key = k.to_s.underscore
-            self[new_key] = v
-            v.rubyify_keys! if v.is_a?(Hash)
-            v.each{|p| p.rubyify_keys! if p.is_a?(Hash)} if v.is_a?(Array)
-        }
-        self
-    end
+  # Converts all of the keys to strings, optionally formatting key name
+  def rubyify_keys!
+    keys.each{|k|
+      v = delete(k)
+      new_key = k.to_s.underscore
+      self[new_key] = v
+      v.rubyify_keys! if v.is_a?(Hash)
+      v.each{|p| p.rubyify_keys! if p.is_a?(Hash)} if v.is_a?(Array)
+    }
+    self
+  end
 end
 

data/lib/core_ext/string.rb

@@ -1,10 +1,10 @@
 class String
-    def underscore
-        self.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-            gsub(/([a-z\d])([A-Z])/,'\1_\2').
-            tr("-", "_").
-            downcase
-    end
+  def underscore
+    self.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
 end
 

data/lib/minecraft_jsonapiv2/api.rb

@@ -1,48 +1,40 @@
 module Minecraft
-    module JSONAPIv2
-        class API
-            attr_reader :user
-
-            def initialize(options={})
-                @user= options[:user]
-                @conn = Minecraft::JSONAPIv2::Request.new(options)
-            end
-
-            def call(method)
-                if method.is_a? Array
-                    method.each { |m| call m }
-                else
-                    if method.is_a? Hash
-                        response = Minecraft::JSONAPIv2::Response.new( @conn.make_request(method) ).response[method[:name].gsub(/\./, '_')]
-                        response = Mash.new(response) if response.is_a? Hash
-                    end
-                end
-                begin
-                    unless response.nil?
-                        response
-                    else
-                        raise NoResponseError
-                    end
-                end
-            end
-
-            def method_missing(name, *args, &block)
-                if block_given?
-                    block.call Minecraft::JSONAPIv2::Namespace.new(self, name.to_s)
-                else
-                    response = Minecraft::JSONAPIv2::Response.new( @conn.make_request(name: name.to_s.gsub(/_/, '.'), args: args) ).response[name.to_s]
-                    response = Mash.new(response) if response.is_a? Hash
-                    begin
-                        unless response.nil?
-                            response
-                        else
-                            raise NoResponseError
-                        end
-                    end
-                end
-            end
+  module JSONAPIv2
+    class API
+      attr_reader :user
+
+      def initialize(options={})
+        @user= options[:user]
+        @conn = Minecraft::JSONAPIv2::Request.new(options)
+      end
+
+      def call(method)
+        request = Minecraft::JSONAPIv2::Response.new( @conn.make_request(method) )
+        get_response_for request
+      end
+
+      def get_response_for(request)
+        response = request.response
+        begin
+          unless response.nil?
+            response
+          else
+            raise NoResponseError
+          end
+        end
+
+      end
+
+      def method_missing(name, *args, &block)
+        if block_given?
+          block.call Minecraft::JSONAPIv2::Namespace.new(self, name.to_s)
+        else
+          request = Minecraft::JSONAPIv2::Response.new( @conn.make_request(name: name.to_s.gsub(/_/, '.'), args: args) )
+          get_response_for request
         end
+      end
     end
+  end
 end
 
 # Custom Error classes

data/lib/minecraft_jsonapiv2/authorization.rb

@@ -1,21 +1,21 @@
 module Minecraft
-    module JSONAPIv2
-        class Authorization
-            attr_reader :username, :key
+  module JSONAPIv2
+    class Authorization
+      attr_reader :username, :key
 
-            def initialize(options={})
-                raise "No username given" if options[:user].nil?
-                raise "No password given" if options[:password].nil?
-                raise "No salt given" if options[:salt].nil?
-                @user = options[:user]
-                @pass = options[:password]
-                @salt = options[:salt]
-                @key = nil
-            end
+      def initialize(options={})
+        raise "No username given" if options[:user].nil?
+        raise "No password given" if options[:password].nil?
+        raise "No salt given" if options[:salt].nil?
+        @user = options[:user]
+        @pass = options[:password]
+        @salt = options[:salt]
+        @key = nil
+      end
 
-            def key_for(method)
-                @key = Digest::SHA256.new.update([@user, method, @pass, @salt].join).to_s
-            end
-        end
+      def key_for(method)
+        @key = Digest::SHA256.new.update([@user, method, @pass, @salt].join).to_s
+      end
     end
+  end
 end

data/lib/minecraft_jsonapiv2/namespace.rb

@@ -1,21 +1,21 @@
 module Minecraft
-    module JSONAPIv2
-        class Namespace
-            def initialize(parent, namespace, options={})
-                @parent = parent
-                @namespace = namespace
-            end
+  module JSONAPIv2
+    class Namespace
+      def initialize(parent, namespace, options={})
+        @parent = parent
+        @namespace = namespace
+      end
 
-            def method_missing(method, *args)
-                method = [@namespace.gsub(/_/,'.'), method.to_s].join('.')
-                opts = {name: method, args: args}
+      def method_missing(method, *args)
+        method = [@namespace.gsub(/_/,'.'), method.to_s].join('.')
+        opts = {name: method, args: args}
 
-                @parent.call(opts)
-            end
+        @parent.call(opts)
+      end
 
-            def call(method)
-                @parent.call(methodd)
-            end
-        end
+      def call(method)
+        @parent.call(methodd)
+      end
     end
+  end
 end

data/lib/minecraft_jsonapiv2/request.rb

@@ -1,68 +1,68 @@
 module Minecraft
-    module JSONAPIv2
-        class Request
-            def initialize(options={})
-                @host = options[:host].nil? ? '127.0.0.1' : options[:host]
-                @port = options[:port].nil? ? 20059 : options[:port]
-                @user = options[:user]
-                @auth = Minecraft::JSONAPIv2::Authorization.new(options)
-                @json = []
-                @req = []
-            end
+  module JSONAPIv2
+    class Request
+      def initialize(options={})
+        @host = options[:host].nil? ? '127.0.0.1' : options[:host]
+        @port = options[:port].nil? ? 20059 : options[:port]
+        @user = options[:user]
+        @auth = Minecraft::JSONAPIv2::Authorization.new(options)
+        @json = []
+        @req = []
+      end
 
-            def make_request(options)
-                url = Minecraft::JSONAPIv2::BASE_URI % {host: @host, port: @port}
-                request = generate_array_for_json( generate_request(options) ).to_json
-                response = HTTParty.post(url, body: request, headers: {'Content-Type' => 'application/json'} )
-                @json = []
-                @req = []
-                response.body
-            end
+      def make_request(options)
+        url = Minecraft::JSONAPIv2::BASE_URI % {host: @host, port: @port}
+        request = generate_array_for_json( generate_request(options) ).to_json
+        response = HTTParty.post(url, body: request, headers: {'Content-Type' => 'application/json'} )
+        @json = []
+        @req = []
+        response.body
+      end
 
-            def generate_request(method)
-                if method.is_a? Array
-                    method.each do |m|
-                        generate_request m
-                    end
-                else
-                    @req.push(
-                        user: @user,
-                        method: method,
-                        key: @auth.key_for(method[:name])
-                    )
-                end
-                @req
-            end
+      def generate_request(method)
+        if method.is_a? Array
+          method.each do |m|
+            generate_request m
+          end
+        else
+          @req.push(
+            user: @user,
+            method: method,
+            key: @auth.key_for(method[:name])
+          )
+        end
+        @req
+      end
 
-            def map_to_array(arguments)
-                if arguments.nil?
-                    []
-                elsif arguments.is_a?(Array) || arguments.is_a?(Hash)
-                    arguments
-                else
-                    [arguments]
-                end
-            end
+      def map_to_array(arguments)
+        if arguments.nil?
+          []
+        elsif arguments.is_a?(Array) || arguments.is_a?(Hash)
+          arguments
+        else
+          [arguments]
+        end
+      end
 
-            def generate_array_for_json(options={})
-                if options.is_a? Array
-                    options.each do |o|
-                        generate_array_for_json o
-                    end
-                else
-                raise 'No username given' if options[:user].nil?
-                raise 'No key given' if options[:key].nil?
-                raise 'No method given' if options[:method].nil?
-                raise 'No method name given' if options[:method][:name].nil?
-                @json.push({
-                    name: options[:method][:name],
-                    username: options[:user],
-                    arguments: map_to_array(options[:method][:args]),
-                    key: options[:key],
-                })
-                end
-                @json
-            end
+      def generate_array_for_json(options={})
+        if options.is_a? Array
+          options.each do |o|
+            generate_array_for_json o
+          end
+        else
+          raise 'No username given' if options[:user].nil?
+          raise 'No key given' if options[:key].nil?
+          raise 'No method given' if options[:method].nil?
+          raise 'No method name given' if options[:method][:name].nil?
+          @json.push({
+            name: options[:method][:name],
+            username: options[:user],
+            arguments: map_to_array(options[:method][:args]),
+            key: options[:key],
+          })
         end
+        @json
+      end
     end
+  end
 end

data/lib/minecraft_jsonapiv2/response.rb

@@ -1,20 +1,25 @@
 module Minecraft
-    module JSONAPIv2
-        class Response
-            attr_reader :response, :raw_response
-            def initialize(data)
-                @response = {}
-                data = JSON.parse(data)
-                @raw_response = data
-                if data.is_a? Array
-                    data.each do |d|
-                        @response[d['source'].gsub(/\./, '_')] = d['success']
-                    end
-                else
-                    @response[data['source'].gsub(/\./, '_')] = data['success']
-                end
-                @response.rubyify_keys!
-            end
+  module JSONAPIv2
+    class Response
+      attr_reader :response, :raw_response
+      def initialize(data)
+        @response = {}
+        data = JSON.parse(data)
+        @raw_response = data
+        if data.count == 1
+          data = data[0]
         end
+        if data.is_a? Array
+          data.each do |d|
+            @response[d['source'].gsub(/\./, '_')] = d['success']
+          end
+          @response = Mash.new @response.rubyify_keys!
+        else
+          @response = data['success']
+          @response = Mash.new @response if @response.is_a? Hash
+        end
+        @response
+      end
     end
+  end
 end

data/lib/minecraft_jsonapiv2/version.rb

@@ -1,5 +1,5 @@
 module Minecraft
-    module JSONAPIv2
-        VERSION = "0.0.2"
-    end
+  module JSONAPIv2
+    VERSION = "0.0.3"
+  end
 end

data/lib/minecraft_jsonapiv2.rb

@@ -6,13 +6,13 @@ require 'mash'
 
 
 module Minecraft
-    module JSONAPIv2
-        BASE_URI = 'http://%{host}:%{port}/api/2/call'
+  module JSONAPIv2
+    BASE_URI = 'http://%{host}:%{port}/api/2/call'
 
-        Dir[File.join(File.dirname(__FILE__),  '**', '*.rb')].each { |f| require f }
+    Dir[File.join(File.dirname(__FILE__),  '**', '*.rb')].each { |f| require f }
 
-        def self.new(options={})
-            Minecraft::JSONAPIv2::API.new(options)
-        end
+    def self.new(options={})
+      Minecraft::JSONAPIv2::API.new(options)
     end
+  end
 end

data/spec/lib/minecraft_jsonapiv2/api_spec.rb

@@ -1,51 +1,51 @@
 require_relative '../../spec_helper'
 
 describe Minecraft::JSONAPIv2::API do
-    before do
-       @api = Minecraft::JSONAPIv2::API.new(host: '10.10.0.10', port: 20059, user: 'admin', password: 'changeme', salt: 'mmm')
-    end
+  before do
+    @api = Minecraft::JSONAPIv2::API.new(host: '10.10.0.10', port: 20059, user: 'admin', password: 'changeme', salt: 'mmm')
+  end
 
-    describe 'method' do
-        it 'must raise method not found' do
-            lambda { @api.foobar }.must_raise NoMethodError
-        end
+  describe 'method' do
+    it 'must raise method not found' do
+      lambda { @api.foobar }.must_raise NoMethodError
+    end
 
-        it 'must be String if response is String' do
-            @api.server_version.must_be_instance_of String
-        end
+    it 'must be String if response is String' do
+      @api.server_version.must_be_instance_of String
+    end
 
-        it 'must be Mash when API response is Hash' do
-            @api.server.must_be_instance_of Mash
-        end
+    it 'must be Mash when API response is Hash' do
+      @api.server.must_be_instance_of Mash
     end
+  end
 
-    describe 'methhod with arguments' do
-        it 'must equal called arguments' do
-            @api.players_name('masterodie').name.must_equal 'masterodie'
-        end
+  describe 'methhod with arguments' do
+    it 'must equal called arguments' do
+      @api.players_name('masterodie').name.must_equal 'masterodie'
+    end
 
-        it 'must be Mash response is Hash' do
-            @api.server.must_be_instance_of Mash
-        end
+    it 'must be Mash response is Hash' do
+      @api.server.must_be_instance_of Mash
     end
+  end
 
-    describe 'block' do
-        it 'must respond' do
-            @api.server {|s| s.version }.must_be_instance_of String
-        end
+  describe 'block' do
+    it 'must respond' do
+      @api.server {|s| s.version }.must_be_instance_of String
     end
+  end
 
-    describe 'manual call' do
-        it 'must raise no response' do
-            lambda { @api.call(name: 'foobar') }.must_raise NoResponseError
-        end
+  describe 'manual call' do
+    it 'must raise no response' do
+      lambda { @api.call(name: 'foobar') }.must_raise NoResponseError
+    end
 
-        it 'must be String response is string' do
-            @api.call(name: 'server.version').must_be_instance_of String
-        end
+    it 'must be String response is string' do
+      @api.call(name: 'server.version').must_be_instance_of String
+    end
 
-        it 'must be Mash when response is Hash' do
-            @api.call(name: 'server').must_be_instance_of Mash
-        end
+    it 'must be Mash when response is Hash' do
+      @api.call(name: 'server').must_be_instance_of Mash
     end
+  end
 end

data/spec/lib/minecraft_jsonapiv2/authorization_spec.rb

@@ -1,17 +1,17 @@
 require_relative '../../spec_helper.rb'
 
 describe Minecraft::JSONAPIv2::Authorization do
-    describe 'key_for' do
-        before do
-            @auth = Minecraft::JSONAPIv2::Authorization.new(user: 'admin', password: 'changeme', salt: 'mmm')
-        end
+  describe 'key_for' do
+    before do
+      @auth = Minecraft::JSONAPIv2::Authorization.new(user: 'admin', password: 'changeme', salt: 'mmm')
+    end
 
-        it 'must be String' do
-            @auth.key_for(name: 'server.version').must_be_instance_of String
-        end
+    it 'must be String' do
+      @auth.key_for(name: 'server.version').must_be_instance_of String
+    end
 
-        it 'must have the right length' do
-            @auth.key_for(name: 'server.version').length.must_equal 64
-        end
+    it 'must have the right length' do
+      @auth.key_for(name: 'server.version').length.must_equal 64
     end
+  end
 end

data/spec/lib/minecraft_jsonapiv2_spec.rb

@@ -1,13 +1,13 @@
 require_relative '../spec_helper.rb'
 
 describe Minecraft::JSONAPIv2 do
-    describe 'shortcut' do
-        before do
-           @api = Minecraft::JSONAPIv2.new(host: '10.10.0.10', port: 20059, user: 'admin', password: 'changeme', salt: 'mmm')
-        end
+  describe 'shortcut' do
+    before do
+      @api = Minecraft::JSONAPIv2.new(host: '10.10.0.10', port: 20059, user: 'admin', password: 'changeme', salt: 'mmm')
+    end
 
-        it 'should work' do
-            @api.must_be_instance_of Minecraft::JSONAPIv2::API
-        end
+    it 'should work' do
+      @api.must_be_instance_of Minecraft::JSONAPIv2::API
     end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minecraft_jsonapiv2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Patrick Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler