tourcms 0.2.1 → 0.3.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem 'nokogiri'
+gem 'activesupport', ">= 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.7)
     git (1.2.5)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    nokogiri (1.4.4)
     rake (0.8.7)
     rcov (0.9.9)
     shoulda (2.11.3)
@@ -15,8 +15,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 3.0.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
-  nokogiri
   rcov
   shoulda

data/README.md

@@ -77,6 +77,10 @@ Many TourCMS methods accept parameters. Most methods take a hash of parameters l
 *	show\_tour\_departures
 *	show\_tour\_freesale
 
+## Dependencies
+
+This gem depends on ActiveSupport 3.0.0+
+
 ## Contributing to tourcms
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/tour_cms/connection.rb

@@ -73,16 +73,6 @@ module TourCMS
     end
     
     private
-        
-    def construct_params(param_hash)
-      if param_hash.empty?
-        res = ""
-      else
-        qs = param_hash.stringify.reject{|k,v| v.nil? || v.empty?}.collect{|k,v|"#{CGI.escape(k)}=#{CGI.escape(v)}"}.join("&")
-        qs.empty? ? res = "" : res = "?#{qs}"
-      end
-      res
-    end
     
     def generate_signature(path, verb, channel, outbound_time)
       string_to_sign = "#{channel}/#{@marketp_id}/#{verb}/#{outbound_time}#{path}".strip
@@ -93,14 +83,16 @@ module TourCMS
     end
     
     def request(path, channel = 0, params = {}, verb = "GET")
-      url = @base_url + path + construct_params(params)
+      url = @base_url + path + "?#{params.to_query}"
       req_time = Time.now.utc
-      signature = generate_signature(path + construct_params(params), verb, channel, req_time.to_i)
+      signature = generate_signature(path + "?#{params.to_query}", verb, channel, req_time.to_i)
       
       headers = {"Content-type" => "text/xml", "charset" => "utf-8", "Date" => req_time.strftime("%a, %d %b %Y %H:%M:%S GMT"), 
         "Authorization" => "TourCMS #{channel}:#{@marketp_id}:#{signature}" }
             
-      @result_type == "raw" ? open(url, headers) : doc = Hash.from_xml(open(url, headers))[:response]
+      response = open(url, headers).read
+
+      @result_type == "raw" ? response : Hash.from_xml(response)["response"]
     end
   end
 end

data/lib/tourcms.rb

@@ -5,8 +5,7 @@ require 'base64'
 require 'cgi'
 require 'open-uri'
 require 'rubygems'
-require 'nokogiri'
+require 'active_support/core_ext'
 
-require 'tour_cms/hash'
 require 'tour_cms/connection'
 

data/tourcms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tourcms}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Kremer"]
-  s.date = %q{2011-04-19}
+  s.date = %q{2011-04-20}
   s.description = %q{A simple Ruby wrapper for interacting with the TourCMS API}
   s.email = %q{alex@flextrip.com}
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/tour_cms/connection.rb",
-    "lib/tour_cms/hash.rb",
     "lib/tourcms.rb",
     "test/helper.rb",
     "test/test_tourcms.rb",
@@ -33,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/flextrip/tourcms}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A Ruby Library for the TourCMS API}
   s.test_files = [
     "test/helper.rb",
@@ -44,20 +43,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<nokogiri>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tourcms
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alex Kremer
@@ -15,23 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 Z
+date: 2011-04-20 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
+  name: activesupport
   version_requirements: *id001
-  name: nokogiri
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,10 +46,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
   name: shoulda
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -58,10 +62,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id003
   name: bundler
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +78,10 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id004
   name: jeweler
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,9 +92,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
   name: rcov
-  prerelease: false
+  version_requirements: *id005
 description: A simple Ruby wrapper for interacting with the TourCMS API
 email: alex@flextrip.com
 executables: []
@@ -108,11 +111,11 @@ files:
 - Rakefile
 - VERSION
 - lib/tour_cms/connection.rb
-- lib/tour_cms/hash.rb
 - lib/tourcms.rb
 - test/helper.rb
 - test/test_tourcms.rb
 - tourcms.gemspec
+has_rdoc: true
 homepage: http://github.com/flextrip/tourcms
 licenses: 
 - MIT
@@ -142,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby Library for the TourCMS API

data/lib/tour_cms/hash.rb

@@ -1,67 +0,0 @@
-class Hash
-  def stringify
-    inject({}) do |options, (key, value)|
-      options[key.to_s] = value.to_s
-      options
-    end
-  end
-  
-  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 StandardError, "Could not parse TourCMS XML Response. Server error?"
-      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" || child.name == "#cdata-section"
-              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 = "" if data == "\n\t"
-      (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