amiando 0.3.10 → 0.3.11

data/lib/amiando.rb

@@ -9,6 +9,7 @@ module Amiando
   autoload :Boolean,        'amiando/boolean'
   autoload :Result,         'amiando/result'
   autoload :Autorun,        'amiando/autorun'
+  autoload :Utils,          'amiando/utils'
 
   autoload :ApiKey,         'amiando/api_key'
   autoload :User,           'amiando/user'

data/lib/amiando/event.rb

@@ -3,17 +3,8 @@ module Amiando
   ##
   # http://developers.amiando.com/index.php/REST_API_Events
   class Event < Resource
-    map :host_id,                  :hostId
     map :selected_date,            :selectedDate,     :type => :time
     map :selected_end_date,        :selectedEndDate,  :type => :time
-    map :short_description,        :shortDescription
-    map :event_type,               :eventType
-    map :organisator_display_name, :organisatorDisplayName
-    map :partner_event_url,        :partnerEventUrl
-    map :publish_search_engines,   :publishSearchEngines
-    map :search_engine_tags,       :searchEngineTags
-    map :location_description,     :locationDescription
-    map :zip_code,                 :zipCode
     map :creation_time,            :creationTime,     :type => :time
     map :last_modified,            :lastModified,     :type => :time
 

data/lib/amiando/partner.rb

@@ -3,13 +3,6 @@ module Amiando
   ##
   # http://developers.amiando.com/index.php/REST_API_Partner
   class Partner < Resource
-    map :admin_id, :adminId
-    map :default_country, :defaultCountry
-    map :menu_css_url, :menuCssUrl
-    map :ticket_shop_css_url, :ticketShopCssUrl
-    map :sso_callback, :ssoCallback
-    map :referrer_partner_id, :referrerPartnerId
-
     ##
     # Creates a partner.
     #

data/lib/amiando/resource.rb

@@ -14,11 +14,11 @@ module Amiando
       end
 
       def typecasting
-        @@typecasting ||= {}
+        @typecasting ||= {}
       end
 
       def mapping
-        @@mapping ||= {}
+        @mapping ||= {}
       end
 
       ##
@@ -26,7 +26,7 @@ module Amiando
       # to   { :firstName  => '1', :lastName   => '2' }
       def map_params(attributes)
         mapped_attributes = attributes.map do |key,value|
-          mapped_key = mapping[key] || key
+          mapped_key = mapping[key] || Utils.camelize(key, :lower).to_sym
           value = typecast(key, value)
           [mapped_key, value]
         end
@@ -37,7 +37,7 @@ module Amiando
         inverted_mapping = mapping.invert
         mapped_attributes = attributes.map do |key,value|
           key        = key.to_sym
-          mapped_key = inverted_mapping[key] || key
+          mapped_key = inverted_mapping[key] || Utils.underscore(key).to_sym
           value      = inverse_typecast(mapped_key, value)
           [mapped_key, value]
         end

data/lib/amiando/ticket_category.rb

@@ -5,15 +5,6 @@ module Amiando
   class TicketCategory < Resource
     map :sale_start,         :saleStart, :type => :time
     map :sale_end,           :saleEnd,   :type => :time
-    map :reserved_count,     :reservedCount
-    map :min_sell,           :minSell
-    map :max_sell,           :maxSell
-    map :default_value,      :defaultValue
-    map :min_sell_required,  :minSellRequired
-    map :ticket_description, :ticketDescription
-    map :display_price,      :displayPrice
-    map :display_quantity,   :displayQuantity
-    map :price_editable,     :priceEditable
 
     ##
     # Creates a ticket category for an event

data/lib/amiando/ticket_shop.rb

@@ -10,23 +10,6 @@ module Amiando
   #   If you delete the related event, the ticketshop will also be deleted.
   #
   class TicketShop < Resource
-
-    map :ticket_base_fee, :ticketBaseFee
-    map :product_disagio, :productDisagio
-    map :fee_inclusive, :feeInclusive
-    map :shipment_fee_inclusive, :shipmentFeeInclusive
-    map :sales_tax, :salesTax
-    map :available_limit, :availableLimit
-    map :show_available_tickets, :showAvailableTickets
-    map :cancelation_possible, :cancelationPossible
-    map :num_tickets_sold, :numTicketsSold
-    map :total_income, :totalIncome
-    map :total_fees, :totalFees
-    map :collect_user_data, :collectUserData
-    map :max_possible_number_of_participants, :maxPossibleNumberOfParticipants
-    map :num_tickets_checked, :numTicketsChecked
-    map :vat_id, :vatId
-
     ##
     # Get the ticket shop of an event.
     #

data/lib/amiando/user.rb

@@ -3,9 +3,6 @@ module Amiando
   ##
   # http://developers.amiando.com/index.php/REST_API_Users
   class User < Resource
-    map :first_name, :firstName
-    map :last_name,  :lastName
-
     ##
     # Will return a {Boolean} deferred object containing the result
     #

data/lib/amiando/utils.rb

@@ -0,0 +1,21 @@
+module Amiando
+  module Utils
+    extend self
+
+    def camelize(lower_case_and_underscored_word, first_letter_in_downcase = false)
+      if first_letter_in_downcase
+        lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+      else
+        lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      end
+    end
+
+    def underscore(camel_cased_word)
+      word = camel_cased_word.to_s.dup
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+  end
+end

data/lib/amiando/version.rb

@@ -1,3 +1,3 @@
 module Amiando
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/test/amiando/resource_test.rb

@@ -2,9 +2,7 @@ require 'test_helper'
 
 describe Amiando::Resource do
   class Wadus < Amiando::Resource
-    map :first_name, :firstName
-    map :last_name , :lastName
-    map :creation, :creation, :type => :time
+    map :creation, :creationTime, :type => :time
 
     def self.create(params = {})
       object = new
@@ -82,7 +80,7 @@ describe Amiando::Resource do
 
   it 'maps attributes with typecasting' do
     time      = Time.at(0).utc
-    expected  = { :creation => '1970-01-01T00:00:00Z' }
+    expected  = { :creationTime => '1970-01-01T00:00:00Z' }
     Wadus.map_params(:creation => time).must_equal expected
   end
 
@@ -94,7 +92,7 @@ describe Amiando::Resource do
 
   it 'reverse maps attributes with typecasting' do
     time      = Time.at(0).utc
-    expected  = { :creation_time => time }
+    expected  = { :creation => time }
     Wadus.reverse_map_params(:creationTime => '1970-01-01T00:00:00Z').must_equal expected
   end
 

data/test/amiando/ticket_type_test.rb

@@ -28,19 +28,25 @@ describe Amiando::TicketType do
       ticket_type.errors.must_include "com.amiando.api.rest.ticketType.TicketTypeNotAllowed"
     end
 
-    it 'should accept a Hash as a param' do
-      ticket_type = Amiando::TicketType.create(event.id, :type => :eticket)
-      ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
-    end
-
-    it 'should accept a ticket string as a param' do
-      ticket_type = Amiando::TicketType.create(event.id, :type => "TICKETTYPE_ETICKET")
-      ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
-    end
-
-    it 'should accept a short string as a param' do
-      ticket_type = Amiando::TicketType.create(event.id, "ETICKET")
-      ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
+    describe 'param convertion' do
+      after do
+        Amiando.reset_requests
+      end
+
+      it 'should accept a Hash as a param' do
+        ticket_type = Amiando::TicketType.create(event.id, :type => :eticket)
+        ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
+      end
+
+      it 'should accept a ticket string as a param' do
+        ticket_type = Amiando::TicketType.create(event.id, :type => "TICKETTYPE_ETICKET")
+        ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
+      end
+
+      it 'should accept a short string as a param' do
+        ticket_type = Amiando::TicketType.create(event.id, "ETICKET")
+        ticket_type.request.params.must_equal(:type => "TICKETTYPE_ETICKET")
+      end
     end
   end
 

data/test/test_helper.rb

@@ -32,6 +32,10 @@ module Amiando
   self.api_key = TEST_KEY = Amiando::Factory.create(:api_key, :name => 'test key').key
 
   TEST_USER = Amiando::Factory.create(:user, :username => "jorgellop-base-#{HydraCache.revision}@example.com")
+
+  def self.reset_requests
+    @requests = []
+  end
 end
 
 HydraCache.prefix = nil

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amiando
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Jorge Dias
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: typhoeus
@@ -125,6 +125,7 @@ files:
 - lib/amiando/ticket_shop.rb
 - lib/amiando/ticket_type.rb
 - lib/amiando/user.rb
+- lib/amiando/utils.rb
 - lib/amiando/version.rb
 - test/amiando/amiando_test.rb
 - test/amiando/api_key_test.rb