neweden 0.0.2 → 0.1.0

data/Gemfile

@@ -3,8 +3,6 @@ source "http://rubygems.org"
 gem "typhoeus"
 gem "nokogiri"
 gem "json"
-gem "awesome_print"
-gem "active_support"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -12,4 +10,5 @@ group :development do
   gem "shoulda-context"
   gem "bundler"
   gem "jeweler"
+  gem "awesome_print"
 end

data/Gemfile.lock

@@ -1,19 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    active_support (3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
     awesome_print (1.0.2)
     git (1.2.5)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.6.6)
     mime-types (1.18)
     nokogiri (1.5.2)
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     shoulda-context (1.0.0)
     typhoeus (0.3.3)
       mime-types
@@ -22,7 +22,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_support
   awesome_print
   bundler
   jeweler

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/init.rb

@@ -1,8 +1,9 @@
 require 'typhoeus'
 require 'nokogiri'
 require 'awesome_print'
-require 'active_support/core_ext/hash/conversions'
 
+require File.join(File.dirname(__FILE__), 'lib', 'string_extensions')
+require File.join(File.dirname(__FILE__), 'lib', 'hash_extensions')
 require File.join(File.dirname(__FILE__), 'lib', 'neweden', 'errors')
 require File.join(File.dirname(__FILE__), 'lib', 'neweden', 'account')
 require File.join(File.dirname(__FILE__), 'lib', 'neweden', 'api')

data/lib/hash_extensions.rb

@@ -0,0 +1,62 @@
+# USAGE: Hash.from_xml:(YOUR_XML_STRING)
+# modified from http://stackoverflow.com/questions/1230741/convert-a-nokogiri-document-to-a-ruby-hash/1231297#1231297
+# Thanks to Dmitry Mozzherin (https://gist.github.com/335286)
+class Hash
+  class << self
+    def from_xml(xml_io)
+      begin
+        result = Nokogiri::XML(xml_io)
+        return { result.root.name.to_sym => xml_node_to_hash(result.root)}
+      rescue Exception => e
+        # raise your custom exception here
+      end
+    end
+
+    def xml_node_to_hash(node)
+      # If we are at the root of the document, start the hash
+      if node.element?
+        result_hash = {}
+        if node.attributes != {}
+          result_hash[:attributes] = {}
+          node.attributes.keys.each do |key|
+            result_hash[:attributes][node.attributes[key].name.to_sym] = prepare(node.attributes[key].value)
+          end
+        end
+        if node.children.size > 0
+          node.children.each do |child|
+            result = xml_node_to_hash(child)
+
+            if child.name == "text"
+              unless child.next_sibling || child.previous_sibling
+                return prepare(result)
+              end
+            elsif result_hash[child.name.to_sym]
+              if result_hash[child.name.to_sym].is_a?(Object::Array)
+                result_hash[child.name.to_sym] << prepare(result)
+              else
+                result_hash[child.name.to_sym] = [result_hash[child.name.to_sym]] << prepare(result)
+              end
+            else
+              result_hash[child.name.to_sym] = prepare(result)
+            end
+          end
+
+          return result_hash
+        else
+          return result_hash
+        end
+      else
+        return prepare(node.content.to_s)
+      end
+    end
+
+    def prepare(data)
+      (data.class == String && data.to_i.to_s == data) ? data.to_i : data
+    end
+  end
+
+  def to_struct(struct_name)
+      Struct.new(struct_name,*keys).new(*values)
+  end
+end
+

data/lib/neweden.rb

@@ -26,7 +26,7 @@ class NewEden
   def request(endpoint, method = :post, params = {})
     xml = handle_response(raw_request(endpoint, method, params))
     if xml
-      symbolize_keys(Hash.from_xml((xml/:eveapi/:result).to_s))[:result] rescue raise XMLParsingError, "No result in set"
+      Hash.from_xml((xml/:eveapi/:result).to_s)[:result] # rescue raise XMLParsingError, "No result in set"
     else
       raise XMLParsingError, "No XML parsed successfully"
     end
@@ -109,26 +109,25 @@ class NewEden
     endpoint.strip.gsub(/^\/+/, '')
   end
 
-  def symbolize_keys(myhash)
-    myhash.symbolize_keys!
-    myhash.keys.each do |key|
-      if myhash[key].kind_of?(Hash)
-        symbolize_keys(myhash[key])
-      elsif myhash[key].kind_of?(Array)
-        myhash[key].each do |element|
-          symbolize_keys(element) if element.kind_of?(Hash)
-        end
-      elsif myhash[key].is_a?(String)
-        if myhash[key].strip =~ /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/
-          myhash[key] = DateTime.parse(myhash[key]).to_time
-        elsif myhash[key].strip =~ /^\d+$/
-          myhash[key] = myhash[key].to_i
-        elsif myhash[key].strip =~ /^\d+\.\d+$/
-          myhash[key] = myhash[key].to_f
-        end
-      end
-    end
-
-    myhash
-  end
+  # def symbolize_keys(myhash)
+  #   myhash.keys.each do |key|
+  #     if myhash[key].kind_of?(Hash)
+  #       symbolize_keys(myhash[key])
+  #     elsif myhash[key].kind_of?(Array)
+  #       myhash[key].each do |element|
+  #         symbolize_keys(element) if element.kind_of?(Hash)
+  #       end
+  #     elsif myhash[key].is_a?(String)
+  #       if myhash[key].strip =~ /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/
+  #         myhash[key] = DateTime.parse(myhash[key]).to_time
+  #       elsif myhash[key].strip =~ /^\d+$/
+  #         myhash[key] = myhash[key].to_i
+  #       elsif myhash[key].strip =~ /^\d+\.\d+$/
+  #         myhash[key] = myhash[key].to_f
+  #       end
+  #     end
+  #   end
+
+  #   myhash
+  # end
 end

data/lib/string_extensions.rb

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

data/neweden.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{neweden}
-  s.version = "0.0.1"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jason Adams}]
-  s.date = %q{2011-09-16}
+  s.date = %q{2012-04-29}
   s.email = %q{jasonmadams@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -23,6 +23,8 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "init.rb",
+    "lib/hash_extensions.rb",
     "lib/neweden.rb",
     "lib/neweden/account.rb",
     "lib/neweden/api.rb",
@@ -33,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/neweden/image.rb",
     "lib/neweden/map.rb",
     "lib/neweden/server.rb",
+    "lib/string_extensions.rb",
     "neweden.gemspec",
     "test/.gitignore",
     "test/config/.keep",
@@ -43,43 +46,37 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ealdent/neweden}
   s.licenses = [%q{MIT}]
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.rubygems_version = %q{1.8.7}
   s.summary = %q{Ruby library for accessing Eve Online API}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, ["= 0.2.4"])
-      s.add_runtime_dependency(%q<nokogiri>, ["= 1.5.0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<awesome_print>, [">= 0"])
-      s.add_runtime_dependency(%q<active_support>, ["= 3.0.0"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
-      s.add_dependency(%q<typhoeus>, ["= 0.2.4"])
-      s.add_dependency(%q<nokogiri>, ["= 1.5.0"])
+      s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
-      s.add_dependency(%q<active_support>, ["= 3.0.0"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
     end
   else
-    s.add_dependency(%q<typhoeus>, ["= 0.2.4"])
-    s.add_dependency(%q<nokogiri>, ["= 1.5.0"])
+    s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
-    s.add_dependency(%q<active_support>, ["= 3.0.0"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neweden
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165648160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2165648160
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165647680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,47 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2165647680
 - !ruby/object:Gem::Dependency
   name: json
-  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: awesome_print
-  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: active_support
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165647200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2165647200
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165646720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2165646720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165646240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *2165646240
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &2165645760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,12 +76,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: *2165645760
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: &2165645280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165645280
 description: 
 email: jasonmadams@gmail.com
 executables: []
@@ -155,6 +104,7 @@ files:
 - Rakefile
 - VERSION
 - init.rb
+- lib/hash_extensions.rb
 - lib/neweden.rb
 - lib/neweden/account.rb
 - lib/neweden/api.rb
@@ -165,6 +115,7 @@ files:
 - lib/neweden/image.rb
 - lib/neweden/map.rb
 - lib/neweden/server.rb
+- lib/string_extensions.rb
 - neweden.gemspec
 - test/.gitignore
 - test/config/.keep
@@ -186,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1927723617298482446
+      hash: -2197534164960895585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -195,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Ruby library for accessing Eve Online API